diff --git a/src/incidenceeditor.kcfg b/src/incidenceeditor.kcfg index 44b3219..6d19651 100644 --- a/src/incidenceeditor.kcfg +++ b/src/incidenceeditor.kcfg @@ -1,36 +1,38 @@ + Choose the default way of attaching dropped emails to an event The default way of attaching dropped emails to an event Ask + The last selected folder. -1 diff --git a/src/resourcemodel.h b/src/resourcemodel.h index 315754b..3cb2853 100644 --- a/src/resourcemodel.h +++ b/src/resourcemodel.h @@ -1,128 +1,128 @@ /* * Copyright 2014 Sandro Knauß * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved * by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . * */ #ifndef RESOURCEMODEL_H #define RESOURCEMODEL_H #include "resourceitem.h" #include #include #include #include namespace IncidenceEditorNG { class ResourceModel : public QAbstractItemModel { Q_OBJECT public: /* Copied from http://qt-project.org/doc/qt-4.8/itemviews-editabletreemodel.html: * QT 4.8: Editable Tree Model Example */ enum Roles { Resource = Qt::UserRole, FullName }; - ResourceModel(const QStringList &headers, QObject *parent = nullptr); + explicit ResourceModel(const QStringList &headers, QObject *parent = nullptr); ~ResourceModel() override; Q_REQUIRED_RESULT QVariant data(const QModelIndex &index, int role) const override; Q_REQUIRED_RESULT QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; Q_REQUIRED_RESULT QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; Q_REQUIRED_RESULT QModelIndex parent(const QModelIndex &index) const override; Q_REQUIRED_RESULT int rowCount(const QModelIndex &parent = QModelIndex()) const override; Q_REQUIRED_RESULT int columnCount(const QModelIndex &parent = QModelIndex()) const override; Q_REQUIRED_RESULT Qt::ItemFlags flags(const QModelIndex &index) const override; Q_REQUIRED_RESULT bool removeRows(int position, int rows, const QModelIndex &parent = QModelIndex()) override; private: ResourceItem *getItem(const QModelIndex &index) const; ResourceItem::Ptr rootItem; public: /* Start search on LDAP Server with the given string. * If the model is not ready to search, the string is cached and is executed afterwards. */ void startSearch(const QString &); private: /* Start search with cached string (stored in searchString) * */ void startSearch(); /* Search for collections of resources * */ KLDAP::LdapClientSearch ldapSearchCollections; /* Search for matching resources * */ KLDAP::LdapClientSearch ldapSearch; /* Map from dn of resource -> collectionItem * A Resource can be part of different collection, so a QMuliMap is needed * */ QMultiMap ldapCollectionsMap; /* A Set of all collection ResourceItems * */ QSet ldapCollections; /* Cached searchString (set by startSearch(QString)) * */ QString searchString; /* Is the search of collections ended * */ bool foundCollection; /* List of all attributes in LDAP an the headers of the model * */ QStringList headers; private: /* Slot for founded collections * */ void slotLDAPCollectionData(const KLDAP::LdapResultObject::List &); /* Slot for matching resources * */ void slotLDAPSearchData(const KLDAP::LdapResultObject::List &); }; } #endif // RESOURCEMODEL_H diff --git a/src/ui/alarmdialog.ui b/src/ui/alarmdialog.ui index 2036b53..39d3e9e 100644 --- a/src/ui/alarmdialog.ui +++ b/src/ui/alarmdialog.ui @@ -1,563 +1,569 @@ AlarmDialog 0 0 439 315 Alarms 0 0 0 0 When: 0 0 Set the reminder trigger time This spinbox allows you to set the reminder trigger time. The time unit is set in the combobox immediately adjacent. 0 99999 15 0 0 Select the reminder trigger time unit This combobox allows you to set the units for the reminder trigger time. The trigger time value is set in the spinbox immediately adjacent. false minute(s) hour(s) day(s) Select the reminder trigger relative to the start or end time Use this combobox to specify if you want the reminder to trigger before or after the start or end time. before the event starts after the event starts before the event ends after the event ends Repeat: 0 0 Set the reminder to repeat Check this if you want to the reminder to recur on a periodic interval. false Select how often the reminder should repeat Use this selector to choose how many times you want the recurring reminder to repeat. time(s) 1 500 false Select the time between reminder repeats Use this selector to choose the time between repeating reminders. Minute(s) every 1 999 0 0 What: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + Select the alarm type + + + Use this selector to choose the alarm type for the reminders. + 0 0 Display text Play sound file Run application / script Send email 0 6 0 0 0 0 Provide text to display when the reminder triggers Specify any text you desire to display in the popup notice when the reminder triggers. 0 0 0 0 Audio File: Qt::AlignJustify|Qt::AlignVCenter mSoundFile Specify a file containing a sound to play when the reminder triggers Use the adjacent file browser to help you find the file you want to use when playing a sound when the reminder triggers. Qt::Vertical QSizePolicy::Expanding 20 61 0 0 0 0 &Application / Script: mApplication Specify a file containing the application to run when the reminder triggers Use the adjacent file browser to help you find the file you want to use when running an application when the reminder triggers. *|All files Ar&guments: mAppArguments Specify arguments to pass to the application when the reminder triggers Enter the application arguments to use when running an application when the reminder triggers. Qt::Vertical QSizePolicy::Expanding 20 16 0 0 0 0 &To: mEmailAddress Specify a list of addresses to send email when the reminder triggers. If the 'To:' field stays empty the email reminder will be sent to the default email configured in Kmail (Settings menu/Configure Kmail/Identities). Enter a list comma-separated addresses to which an email will be sent when the reminder triggers &Message: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop mEmailText Specify text of an email message to send when the reminder triggers Enter any text you desire for the email message that will be sent when the alarm triggers. KPIM::AddresseeLineEdit KLineEdit
LibkdepimAkonadi/AddresseeLineEdit
 KLineEdit QLineEdit
klineedit.h
 KUrlRequester QWidget
kurlrequester.h
1 KTextEdit QTextEdit
ktextedit.h
 KComboBox QComboBox
kcombobox.h
 LibkdepimAkonadi/AddresseeLineEdit mTypeCombo currentIndexChanged(int) mTypeStack setCurrentIndex(int) 147 83 216 97 mRepeats clicked(bool) mRepeatCount setEnabled(bool) 67 49 118 50 mRepeats toggled(bool) mRepeatInterval setEnabled(bool) 69 42 284 48 diff --git a/src/ui/categorydialog_base.ui b/src/ui/categorydialog_base.ui index 12f25e7..259681a 100644 --- a/src/ui/categorydialog_base.ui +++ b/src/ui/categorydialog_base.ui @@ -1,76 +1,82 @@ CategoryDialog_base 0 0 433 269 Select Categories + + Select categories + + + Use this list to choose categories. + 1 Category KColorCombo QComboBox
kcolorcombo.h
 IncidenceEditorNG::AutoCheckTreeWidget QTreeWidget
autochecktreewidget.h
 mCategories diff --git a/src/ui/categoryselectdialog_base.ui b/src/ui/categoryselectdialog_base.ui index a2c4c9e..4821af8 100644 --- a/src/ui/categoryselectdialog_base.ui +++ b/src/ui/categoryselectdialog_base.ui @@ -1,92 +1,98 @@ CategorySelectDialog_base 0 0 387 280 Select Categories 0 6 + + Select incidence categories + + + Use this list to choose incidence categories. + 1 Category 0 6 Qt::Horizontal QSizePolicy::Expanding 20 20 &Clear Selection &Edit Categories... IncidenceEditorNG::AutoCheckTreeWidget QTreeWidget
autochecktreewidget.h
0 mCategories mButtonClear mButtonEdit diff --git a/src/ui/dialogdesktop.ui b/src/ui/dialogdesktop.ui index afeb8c3..86c14be 100644 --- a/src/ui/dialogdesktop.ui +++ b/src/ui/dialogdesktop.ui @@ -1,1849 +1,1855 @@ EventOrTodoDesktop 0 0 661 660 + + A message on this incidence item + + + Use this message to correct the item parameters. + false 0 0 0 0 0 0 Qt::LeftToRight Calen&dar: Qt::PlainText Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse 0 0 0 0 You are Invited, what do you want to do? Accept the invitation Click this button to accept the invitation. Accept Decline Qt::Horizontal 40 20 0 0 75 true Set the title Sets the Title of this event or to-do. Qt::LeftToRight &Title: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter mSummaryEdit 0 0 Set the title Sets the Title of this event or to-do. 0 0 Qt::LeftToRight &Location: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter mLocationEdit 0 0 Set the location Sets where the event or to-do will take place. Qt::Horizontal Completion: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter 0 0 0 0 100 10 true Qt::Horizontal QSlider::TicksBelow 10 0 0 completed Priority: 5 unspecified 1 (highest) 2 3 4 5 (medium) 6 7 8 9 (lowest) 0 0 Set if this to-do's start and due dates have times associated with them. All Day true Qt::Horizontal QSizePolicy::Fixed 40 20 Blocks me for other events Qt::Horizontal 40 20 0 0 Qt::LeftToRight S&tart: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter mStartDateEdit 0 0 Set the start date Sets the start date for this to-do false 0 0 Sets the start time for this to-do. false 0 0 Select the timezone for this event. It will also affect recurrences 0 0 false <a href="hide">&lt;&lt; Time zones</a> Qt::RichText Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter Qt::Horizontal 40 20 0 0 Qt::LeftToRight E&nd: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter mEndDateEdit 0 0 Sets the due date for this to-do. false 0 0 Sets the due time for this to-do. false 0 0 Select the timezone for this event. It will also affect recurrences Qt::Horizontal 40 0 Qt::Horizontal 0 General 0 0 Set the secrecy level Sets whether the access to this event or to-do is restricted. Please note that KOrganizer currently does not use this setting, so the implementation of the restrictions will depend on the groupware server. This means that events or to-dos marked as private or confidential may be visible to others. Access: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter 0 0 <a href=\"hide\">Rich text &gt;&gt;</a> Qt::RichText Qt::Horizontal 40 20 0 0 Categories: Set the secrecy level Sets whether the access to this event or to-do is restricted. Please note that KOrganizer currently does not use this setting, so the implementation of the restrictions will depend on the groupware server. This means that events or to-dos marked as private or confidential may be visible to others. Attendees QAbstractItemView::AllEditTriggers false Meeting organizer: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter Participants: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter Schedule the meeting with your attendees. Opens the scheduling dialog, which will assist in picking a time slot that works for all attendees. Schedule... Qt::Horizontal 258 24 false Substitute with group members Select attendees from your address book. Opens your address book, allowing you to select new attendees from it. Select Attendees... 0 0 1 0 0 0 0 0 0 Set the organizer identity Sets the identity corresponding to the organizer of this to-do or event. Identities can be set in the 'Personal' section of the KOrganizer configuration. In addition, identities are gathered from your KMail settings and from your address book. 0 0 0 0 0 0 TextLabel Resources QAbstractItemView::AllEditTriggers true Qt::SolidLine false false false true true Book resource false false Qt::Horizontal QSizePolicy::Preferred 40 0 Find Resources... Reminder 0 0 Add default reminder: 0 0 0 0 Add Qt::Horizontal 141 22 QAbstractItemView::NoEditTriggers New Modify Disable Remove Qt::Vertical 88 126 Recurrence 0 0 Repeats: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter 0 0 Never Daily Weekly Monthly Yearly 0 0 every 0 0 1 999 1 0 0 day(s) This and future occurrences. Qt::Horizontal 40 20 0 0 2 0 0 0 0 0 0 0 0 0 0 QComboBox::AdjustToContentsOnFirstShow 0 0 0 0 0 0 QComboBox::AdjustToContents Qt::Horizontal 40 20 0 0 0 0 0 0 QComboBox::AdjustToContents Qt::Horizontal 40 20 0 0 Ends: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter 0 0 0 never on after 0 0 2 0 0 0 0 0 0 0 0 0 0 Date after which the event or to-do should stop recurring Qt::Horizontal 276 18 0 0 0 0 0 1 9999 0 0 occurrence(s) 0 0 Exceptions: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter 0 0 false Add Qt::Horizontal 40 20 0 0 QAbstractItemView::ExtendedSelection on: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter false Remove Qt::Vertical 20 40 Attachments 0 0 0 0 Add an attachment Shows a dialog used to select an attachment to add to this event or to-do as link or as inline data. Add false 0 0 Remove the selected attachment Removes the attachment selected in the list above from this event or to-do. Remove Qt::Vertical 20 210 QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults KPIM::KCheckComboBox KComboBox
Libkdepim/KCheckComboBox
 KLineEdit QLineEdit
klineedit.h
 KTimeComboBox QComboBox
ktimecombobox.h
 KDateComboBox QComboBox
kdatecombobox.h
 KSeparator QFrame
kseparator.h
1 KComboBox QComboBox
kcombobox.h
 KPIMTextEdit::RichTextComposerWidget QWidget
kpimtextedit/richtextcomposerwidget.h
 KPIM::KWeekdayCheckCombo KPIM::KCheckComboBox
Libkdepim/KWeekdayCheckCombo
 IncidenceEditorNG::KTimeZoneComboBox KComboBox
ktimezonecombobox.h
 CalendarSupport::MessageWidget QWidget
CalendarSupport/MessageWidget
 Akonadi::TagWidget QWidget
AkonadiWidgets/TagWidget
1 mCalSelectorPlaceHolder mAcceptInvitationButton mDeclineInvitationButton mSummaryEdit mLocationEdit mCompletionSlider mPriorityCombo mWholeDayCheck mFreeBusyCheck mStartCheck mStartDateEdit mStartTimeEdit mTimeZoneComboStart mEndCheck mEndDateEdit mEndTimeEdit mTimeZoneComboEnd mTabWidget mTagWidget mSecrecyCombo mSolveButton mSelectButton mOrganizerCombo mAlarmPresetCombo mAlarmAddPresetButton mAlarmList mAlarmNewButton mAlarmConfigureButton mAlarmToggleButton mAlarmRemoveButton mRecurrenceTypeCombo mFrequencyEdit mThisAndFutureCheck mWeekDayCombo mMonthlyCombo mYearlyCombo mRecurrenceEndCombo mRecurrenceEndDate mEndDurationEdit mExceptionDateEdit mExceptionAddButton mExceptionList mExceptionRemoveButton mAddButton mRemoveButton mRecurrenceEndCombo activated(int) mRecurrenceEndStack setCurrentIndex(int) 144 314 144 314 mRecurrenceTypeCombo activated(int) mRepeatStack setCurrentIndex(int) 142 304 104 280 mNewResource returnPressed() mBookResourceButton click() 271 805 402 808 diff --git a/src/ui/resourcemanagement.ui b/src/ui/resourcemanagement.ui index b6a0ffe..4bd9540 100644 --- a/src/ui/resourcemanagement.ui +++ b/src/ui/resourcemanagement.ui @@ -1,120 +1,126 @@ resourceManagement 0 0 552 566 0 0 0 0 Qt::Horizontal false + + Enter the search term + + + Use this text box to enter some keyword for the resource you want to find. + true true QAbstractItemView::SelectRows Qt::Vertical false true Details 4 true Owner QLayout::SetDefaultConstraint KLineEdit QLineEdit
klineedit.h
 diff --git a/src/ui/schedulingdialog.ui b/src/ui/schedulingdialog.ui index 6903355..93afa96 100644 --- a/src/ui/schedulingdialog.ui +++ b/src/ui/schedulingdialog.ui @@ -1,288 +1,294 @@ Dialog 0 0 558 502 Schedule a time 0 0 0 0 QFormLayout::ExpandingFieldsGrow Earliest time to start: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter Latest time to end: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter Check the weekdays to include in the search. Only the checked weekdays will be included in the free time slot search. Allowed weekdays: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter 0 0 Check the weekdays to include in the search. Only the checked weekdays will be included in the free time slot search. Check the roles to include in the search. Only the participants with the checked roles will be considered in the free time slot search. Mandatory roles: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter 0 0 Check the roles to include in the search. Only the participants with the checked roles will be considered in the free time slot search. + + Select the search option + + + Use these tabs to choose the search option. + 0 Automatic Search true QAbstractItemView::SingleSelection QAbstractItemView::SelectRows false false true false false Visual Search Move your appointment to: Qt::Horizontal 40 20 Monday, 12th June Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter to 10:00am Qt::Horizontal 40 20 KPIM::KCheckComboBox KComboBox
Libkdepim/KCheckComboBox
 KComboBox QComboBox
kcombobox.h
 KDateComboBox QComboBox
kdatecombobox.h
 KTimeComboBox QComboBox
ktimecombobox.h
 KPIM::KWeekdayCheckCombo KPIM::KCheckComboBox
Libkdepim/KWeekdayCheckCombo