author | zautrix <zautrix> | 2005-01-16 10:26:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-16 10:26:46 (UTC) |
commit | 5138d4edea4189100ddc8bf6bd82bccbdcaebf95 (patch) (unidiff) | |
tree | c4ec0d0552d06065a1e9f8eb12c44fcbfdd19f4a /korganizer | |
parent | 62ff81d5d292ddf3c6032b48f27a6daedf6a6cb0 (diff) | |
download | kdepimpi-5138d4edea4189100ddc8bf6bd82bccbdcaebf95.zip kdepimpi-5138d4edea4189100ddc8bf6bd82bccbdcaebf95.tar.gz kdepimpi-5138d4edea4189100ddc8bf6bd82bccbdcaebf95.tar.bz2 |
filter setings changed
-rw-r--r-- | korganizer/calendarview.cpp | 11 | ||||
-rw-r--r-- | korganizer/filteredit_base.cpp | 73 | ||||
-rw-r--r-- | korganizer/filteredit_base.h | 18 | ||||
-rw-r--r-- | korganizer/filteredit_base.ui | 101 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 0 |
5 files changed, 143 insertions, 60 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 378c7d4..8258c74 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -951,96 +951,107 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
951 | if ( eventR ) { | 951 | if ( eventR ) { |
952 | eventRSync = (Event*) eventR->clone(); | 952 | eventRSync = (Event*) eventR->clone(); |
953 | remote->deleteEvent(eventR ); | 953 | remote->deleteEvent(eventR ); |
954 | 954 | ||
955 | } else { | 955 | } else { |
956 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { | 956 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { |
957 | eventRSync = (Event*)eventLSync->clone(); | 957 | eventRSync = (Event*)eventLSync->clone(); |
958 | } else { | 958 | } else { |
959 | fullDateRange = true; | 959 | fullDateRange = true; |
960 | eventRSync = new Event(); | 960 | eventRSync = new Event(); |
961 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); | 961 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); |
962 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); | 962 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); |
963 | eventRSync->setDtStart( mLastCalendarSync ); | 963 | eventRSync->setDtStart( mLastCalendarSync ); |
964 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 964 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
965 | eventRSync->setCategories( i18n("SyncEvent") ); | 965 | eventRSync->setCategories( i18n("SyncEvent") ); |
966 | } | 966 | } |
967 | } | 967 | } |
968 | if ( eventLSync->dtStart() == mLastCalendarSync ) | 968 | if ( eventLSync->dtStart() == mLastCalendarSync ) |
969 | fullDateRange = true; | 969 | fullDateRange = true; |
970 | 970 | ||
971 | if ( ! fullDateRange ) { | 971 | if ( ! fullDateRange ) { |
972 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { | 972 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { |
973 | 973 | ||
974 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); | 974 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); |
975 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); | 975 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); |
976 | fullDateRange = true; | 976 | fullDateRange = true; |
977 | } | 977 | } |
978 | } | 978 | } |
979 | if ( mSyncManager->syncWithDesktop() ) { | 979 | if ( mSyncManager->syncWithDesktop() ) { |
980 | fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync ); | 980 | fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync ); |
981 | } | 981 | } |
982 | if ( fullDateRange ) | 982 | if ( fullDateRange ) |
983 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 983 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |
984 | else | 984 | else |
985 | mLastCalendarSync = eventLSync->dtStart(); | 985 | mLastCalendarSync = eventLSync->dtStart(); |
986 | // for resyncing if own file has changed | 986 | // for resyncing if own file has changed |
987 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 987 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
988 | mLastCalendarSync = loadedFileVersion; | 988 | mLastCalendarSync = loadedFileVersion; |
989 | //qDebug("setting mLastCalendarSync "); | 989 | //qDebug("setting mLastCalendarSync "); |
990 | } | 990 | } |
991 | //qDebug("*************************** "); | 991 | //qDebug("*************************** "); |
992 | qDebug("mLastCalendarSync %s full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); | 992 | qDebug("mLastCalendarSync %s full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); |
993 | QPtrList<Incidence> er = remote->rawIncidences(); | 993 | QPtrList<Incidence> er = remote->rawIncidences(); |
994 | Incidence* inR = er.first(); | 994 | Incidence* inR = er.first(); |
995 | Incidence* inL; | 995 | Incidence* inL; |
996 | QProgressBar bar( er.count(),0 ); | 996 | QProgressBar bar( er.count(),0 ); |
997 | bar.setCaption (i18n("Syncing - close to abort!") ); | 997 | bar.setCaption (i18n("Syncing - close to abort!") ); |
998 | 998 | ||
999 | // ************** setting up filter ************* | ||
1000 | CalFilter *filterIN = 0; | ||
1001 | CalFilter *filterOUT = 0; | ||
1002 | CalFilter *filter = mFilters.first(); | ||
1003 | while(filter) { | ||
1004 | if ( filter->name() == mSyncManager->mFilterInCal ) | ||
1005 | filterIN = filter; | ||
1006 | if ( filter->name() == mSyncManager->mFilterOutCal ) | ||
1007 | filterOUT = filter; | ||
1008 | filter = mFilters.next(); | ||
1009 | } | ||
999 | int w = 300; | 1010 | int w = 300; |
1000 | if ( QApplication::desktop()->width() < 320 ) | 1011 | if ( QApplication::desktop()->width() < 320 ) |
1001 | w = 220; | 1012 | w = 220; |
1002 | int h = bar.sizeHint().height() ; | 1013 | int h = bar.sizeHint().height() ; |
1003 | int dw = QApplication::desktop()->width(); | 1014 | int dw = QApplication::desktop()->width(); |
1004 | int dh = QApplication::desktop()->height(); | 1015 | int dh = QApplication::desktop()->height(); |
1005 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 1016 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
1006 | bar.show(); | 1017 | bar.show(); |
1007 | int modulo = (er.count()/10)+1; | 1018 | int modulo = (er.count()/10)+1; |
1008 | int incCounter = 0; | 1019 | int incCounter = 0; |
1009 | while ( inR ) { | 1020 | while ( inR ) { |
1010 | if ( ! bar.isVisible() ) | 1021 | if ( ! bar.isVisible() ) |
1011 | return false; | 1022 | return false; |
1012 | if ( incCounter % modulo == 0 ) | 1023 | if ( incCounter % modulo == 0 ) |
1013 | bar.setProgress( incCounter ); | 1024 | bar.setProgress( incCounter ); |
1014 | ++incCounter; | 1025 | ++incCounter; |
1015 | uid = inR->uid(); | 1026 | uid = inR->uid(); |
1016 | bool skipIncidence = false; | 1027 | bool skipIncidence = false; |
1017 | if ( uid.left(15) == QString("last-syncEvent-") ) | 1028 | if ( uid.left(15) == QString("last-syncEvent-") ) |
1018 | skipIncidence = true; | 1029 | skipIncidence = true; |
1019 | QString idS; | 1030 | QString idS; |
1020 | qApp->processEvents(); | 1031 | qApp->processEvents(); |
1021 | if ( !skipIncidence ) { | 1032 | if ( !skipIncidence ) { |
1022 | inL = local->incidence( uid ); | 1033 | inL = local->incidence( uid ); |
1023 | if ( inL ) { // maybe conflict - same uid in both calendars | 1034 | if ( inL ) { // maybe conflict - same uid in both calendars |
1024 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { | 1035 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { |
1025 | //qDebug("take %d %s ", take, inL->summary().latin1()); | 1036 | //qDebug("take %d %s ", take, inL->summary().latin1()); |
1026 | if ( take == 3 ) | 1037 | if ( take == 3 ) |
1027 | return false; | 1038 | return false; |
1028 | if ( take == 1 ) {// take local ********************** | 1039 | if ( take == 1 ) {// take local ********************** |
1029 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) | 1040 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) |
1030 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1041 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
1031 | else | 1042 | else |
1032 | idS = inR->IDStr(); | 1043 | idS = inR->IDStr(); |
1033 | remote->deleteIncidence( inR ); | 1044 | remote->deleteIncidence( inR ); |
1034 | inR = inL->clone(); | 1045 | inR = inL->clone(); |
1035 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 1046 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
1036 | if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) | 1047 | if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) |
1037 | inR->setIDStr( idS ); | 1048 | inR->setIDStr( idS ); |
1038 | remote->addIncidence( inR ); | 1049 | remote->addIncidence( inR ); |
1039 | if ( mSyncManager->syncWithDesktop() ) | 1050 | if ( mSyncManager->syncWithDesktop() ) |
1040 | inR->setPilotId( 2 ); | 1051 | inR->setPilotId( 2 ); |
1041 | ++changedRemote; | 1052 | ++changedRemote; |
1042 | } else {// take remote ********************** | 1053 | } else {// take remote ********************** |
1043 | idS = inL->IDStr(); | 1054 | idS = inL->IDStr(); |
1044 | int pid = inL->pilotId(); | 1055 | int pid = inL->pilotId(); |
1045 | local->deleteIncidence( inL ); | 1056 | local->deleteIncidence( inL ); |
1046 | inL = inR->clone(); | 1057 | inL = inR->clone(); |
diff --git a/korganizer/filteredit_base.cpp b/korganizer/filteredit_base.cpp index 21a0954..e724da4 100644 --- a/korganizer/filteredit_base.cpp +++ b/korganizer/filteredit_base.cpp | |||
@@ -1,128 +1,145 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Form implementation generated from reading ui file 'filteredit_base.ui' | 2 | ** Form implementation generated from reading ui file 'filteredit_base.ui' |
3 | ** | 3 | ** |
4 | ** Created: Di Mai 4 15:30:31 2004 | 4 | ** Created: So Jan 16 11:23:21 2005 |
5 | ** by: The User Interface Compiler ($Id$) | 5 | ** by: The User Interface Compiler ($Id$) |
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | 9 | ||
10 | #include "filteredit_base.h" | 10 | #include "filteredit_base.h" |
11 | 11 | ||
12 | #include <qvariant.h> | 12 | #include <qvariant.h> |
13 | #include <qpushbutton.h> | 13 | #include <qpushbutton.h> |
14 | #include <qframe.h> | 14 | #include <qframe.h> |
15 | #include <qbuttongroup.h> | 15 | #include <qbuttongroup.h> |
16 | #include <qradiobutton.h> | 16 | #include <qradiobutton.h> |
17 | #include <qlistbox.h> | 17 | #include <qlistbox.h> |
18 | #include <qlabel.h> | 18 | #include <qlabel.h> |
19 | #include <qcheckbox.h> | 19 | #include <qcheckbox.h> |
20 | #include <qlayout.h> | 20 | #include <qlayout.h> |
21 | #include <qtooltip.h> | 21 | #include <qtooltip.h> |
22 | #include <qwhatsthis.h> | 22 | #include <qwhatsthis.h> |
23 | #include "filteredit_base.ui.h" | ||
23 | 24 | ||
24 | /* | 25 | /* |
25 | * Constructs a FilterEdit_base as a child of 'parent', with the | 26 | * Constructs a FilterEdit_base as a child of 'parent', with the |
26 | * name 'name' and widget flags set to 'f'. | 27 | * name 'name' and widget flags set to 'f'. |
27 | */ | 28 | */ |
28 | FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | 29 | FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) |
29 | : QWidget( parent, name, fl ) | 30 | : QWidget( parent, name, fl ) |
30 | { | 31 | { |
31 | if ( !name ) | 32 | if ( !name ) |
32 | setName( "FilterEdit_base" ); | 33 | setName( "FilterEdit_base" ); |
33 | FilterEdit_baseLayout = new QVBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); | 34 | FilterEdit_baseLayout = new QVBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); |
34 | 35 | ||
35 | mCriteriaFrame = new QFrame( this, "mCriteriaFrame" ); | 36 | mCriteriaFrame = new QFrame( this, "mCriteriaFrame" ); |
36 | mCriteriaFrame->setFrameShape( QFrame::StyledPanel ); | 37 | mCriteriaFrame->setFrameShape( QFrame::StyledPanel ); |
37 | mCriteriaFrame->setFrameShadow( QFrame::Raised ); | 38 | mCriteriaFrame->setFrameShadow( QFrame::Raised ); |
38 | mCriteriaFrameLayout = new QGridLayout( mCriteriaFrame, 1, 1, 3, 2, "mCriteriaFrameLayout"); | 39 | mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); |
39 | 40 | ||
40 | ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" ); | 41 | ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" ); |
41 | ButtonGroup1->setColumnLayout(0, Qt::Vertical ); | 42 | ButtonGroup1->setColumnLayout(0, Qt::Vertical ); |
42 | ButtonGroup1->layout()->setSpacing( 6 ); | 43 | ButtonGroup1->layout()->setSpacing( 6 ); |
43 | ButtonGroup1->layout()->setMargin( 11 ); | 44 | ButtonGroup1->layout()->setMargin( 6 ); |
44 | ButtonGroup1Layout = new QVBoxLayout( ButtonGroup1->layout() ); | 45 | ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() ); |
45 | ButtonGroup1Layout->setAlignment( Qt::AlignTop ); | 46 | ButtonGroup1Layout->setAlignment( Qt::AlignTop ); |
46 | 47 | ||
48 | layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); | ||
49 | |||
47 | mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" ); | 50 | mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" ); |
48 | ButtonGroup1Layout->addWidget( mCatShowCheck ); | 51 | layout4->addWidget( mCatShowCheck ); |
49 | 52 | ||
50 | mCatHideCheck = new QRadioButton( ButtonGroup1, "mCatHideCheck" ); | 53 | mCatHideCheck = new QRadioButton( ButtonGroup1, "mCatHideCheck" ); |
51 | ButtonGroup1Layout->addWidget( mCatHideCheck ); | 54 | layout4->addWidget( mCatHideCheck ); |
52 | |||
53 | mCatList = new QListBox( ButtonGroup1, "mCatList" ); | ||
54 | ButtonGroup1Layout->addWidget( mCatList ); | ||
55 | 55 | ||
56 | mCatEditButton = new QPushButton( ButtonGroup1, "mCatEditButton" ); | 56 | mCatEditButton = new QPushButton( ButtonGroup1, "mCatEditButton" ); |
57 | ButtonGroup1Layout->addWidget( mCatEditButton ); | 57 | layout4->addWidget( mCatEditButton ); |
58 | 58 | ||
59 | mCriteriaFrameLayout->addWidget( ButtonGroup1, 0, 0 ); | 59 | ButtonGroup1Layout->addLayout( layout4, 0, 0 ); |
60 | 60 | ||
61 | layout1 = new QHBoxLayout( 0, 0, 0, "layout1"); | 61 | mCatList = new QListBox( ButtonGroup1, "mCatList" ); |
62 | |||
63 | ButtonGroup1Layout->addWidget( mCatList, 1, 0 ); | ||
64 | mCriteriaFrameLayout->addWidget( ButtonGroup1 ); | ||
65 | |||
66 | layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); | ||
62 | 67 | ||
63 | textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" ); | 68 | textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" ); |
64 | layout1->addWidget( textLabel1 ); | 69 | layout7->addWidget( textLabel1 ); |
65 | 70 | ||
66 | mRecurringCheck = new QCheckBox( mCriteriaFrame, "mRecurringCheck" ); | 71 | mRecurringCheck = new QCheckBox( mCriteriaFrame, "mRecurringCheck" ); |
67 | layout1->addWidget( mRecurringCheck ); | 72 | layout7->addWidget( mRecurringCheck ); |
68 | 73 | ||
69 | mCompletedCheck = new QCheckBox( mCriteriaFrame, "mCompletedCheck" ); | 74 | mCompletedCheck = new QCheckBox( mCriteriaFrame, "mCompletedCheck" ); |
70 | layout1->addWidget( mCompletedCheck ); | 75 | layout7->addWidget( mCompletedCheck ); |
76 | mCriteriaFrameLayout->addLayout( layout7 ); | ||
77 | |||
78 | layout9 = new QHBoxLayout( 0, 0, 6, "layout9"); | ||
71 | 79 | ||
72 | mCriteriaFrameLayout->addLayout( layout1, 1, 0 ); | 80 | textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" ); |
81 | layout9->addWidget( textLabel1_2 ); | ||
82 | |||
83 | mEventCheck = new QCheckBox( mCriteriaFrame, "mEventCheck" ); | ||
84 | layout9->addWidget( mEventCheck ); | ||
85 | |||
86 | mTodoCheck = new QCheckBox( mCriteriaFrame, "mTodoCheck" ); | ||
87 | layout9->addWidget( mTodoCheck ); | ||
88 | |||
89 | mJournalCheck = new QCheckBox( mCriteriaFrame, "mJournalCheck" ); | ||
90 | layout9->addWidget( mJournalCheck ); | ||
91 | mCriteriaFrameLayout->addLayout( layout9 ); | ||
73 | 92 | ||
74 | layout2 = new QHBoxLayout( 0, 0, 0, "layout2"); | 93 | layout2 = new QHBoxLayout( 0, 0, 0, "layout2"); |
75 | 94 | ||
76 | textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" ); | 95 | textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" ); |
77 | layout2->addWidget( textLabel2 ); | 96 | layout2->addWidget( textLabel2 ); |
78 | 97 | ||
79 | mPublicCheck = new QCheckBox( mCriteriaFrame, "mPublicCheck" ); | 98 | mPublicCheck = new QCheckBox( mCriteriaFrame, "mPublicCheck" ); |
80 | layout2->addWidget( mPublicCheck ); | 99 | layout2->addWidget( mPublicCheck ); |
81 | 100 | ||
82 | mPrivateCheck = new QCheckBox( mCriteriaFrame, "mPrivateCheck" ); | 101 | mPrivateCheck = new QCheckBox( mCriteriaFrame, "mPrivateCheck" ); |
83 | layout2->addWidget( mPrivateCheck ); | 102 | layout2->addWidget( mPrivateCheck ); |
84 | 103 | ||
85 | mConfidentialCheck = new QCheckBox( mCriteriaFrame, "mConfidentialCheck" ); | 104 | mConfidentialCheck = new QCheckBox( mCriteriaFrame, "mConfidentialCheck" ); |
86 | mConfidentialCheck->setChecked( FALSE ); | 105 | mConfidentialCheck->setChecked( FALSE ); |
87 | layout2->addWidget( mConfidentialCheck ); | 106 | layout2->addWidget( mConfidentialCheck ); |
88 | 107 | mCriteriaFrameLayout->addLayout( layout2 ); | |
89 | mCriteriaFrameLayout->addLayout( layout2, 2, 0 ); | ||
90 | FilterEdit_baseLayout->addWidget( mCriteriaFrame ); | 108 | FilterEdit_baseLayout->addWidget( mCriteriaFrame ); |
91 | languageChange(); | 109 | languageChange(); |
92 | resize( QSize(284, 241).expandedTo(minimumSizeHint()) ); | 110 | resize( QSize(351, 275).expandedTo(minimumSizeHint()) ); |
93 | clearWState( WState_Polished ); | 111 | clearWState( WState_Polished ); |
94 | } | 112 | } |
95 | 113 | ||
96 | /* | 114 | /* |
97 | * Destroys the object and frees any allocated resources | 115 | * Destroys the object and frees any allocated resources |
98 | */ | 116 | */ |
99 | FilterEdit_base::~FilterEdit_base() | 117 | FilterEdit_base::~FilterEdit_base() |
100 | { | 118 | { |
101 | // no need to delete child widgets, Qt does it all for us | 119 | // no need to delete child widgets, Qt does it all for us |
102 | } | 120 | } |
103 | 121 | ||
104 | /* | 122 | /* |
105 | * Sets the strings of the subwidgets using the current | 123 | * Sets the strings of the subwidgets using the current |
106 | * language. | 124 | * language. |
107 | */ | 125 | */ |
108 | void FilterEdit_base::languageChange() | 126 | void FilterEdit_base::languageChange() |
109 | { | 127 | { |
110 | setCaption( tr( "FilterEditor" ) ); | 128 | setCaption( tr( "FilterEditor" ) ); |
111 | ButtonGroup1->setTitle( tr( "Categories" ) ); | 129 | ButtonGroup1->setTitle( tr( "Categories" ) ); |
112 | mCatShowCheck->setText( tr( "Show only selected" ) ); | 130 | mCatShowCheck->setText( tr( "Include" ) ); |
113 | mCatHideCheck->setText( tr( "Show all but selected" ) ); | 131 | mCatHideCheck->setText( tr( "Exclude" ) ); |
114 | mCatEditButton->setText( tr( "Edit Selection..." ) ); | 132 | mCatEditButton->setText( tr( "Edit Selection..." ) ); |
115 | textLabel1->setText( tr( "Hide" ) ); | 133 | textLabel1->setText( tr( "Exclude" ) ); |
116 | mRecurringCheck->setText( tr( "recurring events" ) ); | 134 | mRecurringCheck->setText( tr( "recurring events" ) ); |
117 | mCompletedCheck->setText( tr( "completed to-dos" ) ); | 135 | mCompletedCheck->setText( tr( "completed to-dos" ) ); |
118 | textLabel2->setText( tr( "Show" ) ); | 136 | textLabel1_2->setText( tr( "Exclude" ) ); |
137 | mEventCheck->setText( tr( "events" ) ); | ||
138 | mTodoCheck->setText( tr( "todos" ) ); | ||
139 | mJournalCheck->setText( tr( "journals" ) ); | ||
140 | textLabel2->setText( tr( "Include" ) ); | ||
119 | mPublicCheck->setText( tr( "public" ) ); | 141 | mPublicCheck->setText( tr( "public" ) ); |
120 | mPrivateCheck->setText( tr( "private" ) ); | 142 | mPrivateCheck->setText( tr( "private" ) ); |
121 | mConfidentialCheck->setText( tr( "confidential" ) ); | 143 | mConfidentialCheck->setText( tr( "confidential" ) ); |
122 | } | 144 | } |
123 | 145 | ||
124 | void FilterEdit_base::updateFilter() | ||
125 | { | ||
126 | qWarning( "FilterEdit_base::updateFilter(): Not implemented yet" ); | ||
127 | } | ||
128 | |||
diff --git a/korganizer/filteredit_base.h b/korganizer/filteredit_base.h index 664598a..0c2988a 100644 --- a/korganizer/filteredit_base.h +++ b/korganizer/filteredit_base.h | |||
@@ -1,66 +1,72 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Form interface generated from reading ui file 'filteredit_base.ui' | 2 | ** Form interface generated from reading ui file 'filteredit_base.ui' |
3 | ** | 3 | ** |
4 | ** Created: Di Mai 4 15:24:50 2004 | 4 | ** Created: So Jan 16 11:23:21 2005 |
5 | ** by: The User Interface Compiler ($Id$) | 5 | ** by: The User Interface Compiler ($Id$) |
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | 9 | ||
10 | #ifndef FILTEREDIT_BASE_H | 10 | #ifndef FILTEREDIT_BASE_H |
11 | #define FILTEREDIT_BASE_H | 11 | #define FILTEREDIT_BASE_H |
12 | 12 | ||
13 | #include <qvariant.h> | 13 | #include <qvariant.h> |
14 | #include <qwidget.h> | 14 | #include <qwidget.h> |
15 | 15 | ||
16 | class QVBoxLayout; | 16 | class QVBoxLayout; |
17 | class QHBoxLayout; | 17 | class QHBoxLayout; |
18 | class QGridLayout; | 18 | class QGridLayout; |
19 | class QSpacerItem; | 19 | class QSpacerItem; |
20 | class QFrame; | 20 | class QFrame; |
21 | class QButtonGroup; | 21 | class QButtonGroup; |
22 | class QRadioButton; | 22 | class QRadioButton; |
23 | class QPushButton; | ||
23 | class QListBox; | 24 | class QListBox; |
24 | class QListBoxItem; | 25 | class QListBoxItem; |
25 | class QPushButton; | ||
26 | class QLabel; | 26 | class QLabel; |
27 | class QCheckBox; | 27 | class QCheckBox; |
28 | 28 | ||
29 | class FilterEdit_base : public QWidget | 29 | class FilterEdit_base : public QWidget |
30 | { | 30 | { |
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | 32 | ||
33 | public: | 33 | public: |
34 | FilterEdit_base( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 34 | FilterEdit_base( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
35 | ~FilterEdit_base(); | 35 | ~FilterEdit_base(); |
36 | 36 | ||
37 | QFrame* mCriteriaFrame; | 37 | QFrame* mCriteriaFrame; |
38 | QButtonGroup* ButtonGroup1; | 38 | QButtonGroup* ButtonGroup1; |
39 | QRadioButton* mCatShowCheck; | 39 | QRadioButton* mCatShowCheck; |
40 | QRadioButton* mCatHideCheck; | 40 | QRadioButton* mCatHideCheck; |
41 | QListBox* mCatList; | ||
42 | QPushButton* mCatEditButton; | 41 | QPushButton* mCatEditButton; |
42 | QListBox* mCatList; | ||
43 | QLabel* textLabel1; | 43 | QLabel* textLabel1; |
44 | QCheckBox* mRecurringCheck; | 44 | QCheckBox* mRecurringCheck; |
45 | QCheckBox* mCompletedCheck; | 45 | QCheckBox* mCompletedCheck; |
46 | QLabel* textLabel1_2; | ||
47 | QCheckBox* mEventCheck; | ||
48 | QCheckBox* mTodoCheck; | ||
49 | QCheckBox* mJournalCheck; | ||
46 | QLabel* textLabel2; | 50 | QLabel* textLabel2; |
47 | QCheckBox* mPublicCheck; | 51 | QCheckBox* mPublicCheck; |
48 | QCheckBox* mPrivateCheck; | 52 | QCheckBox* mPrivateCheck; |
49 | QCheckBox* mConfidentialCheck; | 53 | QCheckBox* mConfidentialCheck; |
50 | 54 | ||
51 | public slots: | 55 | public slots: |
52 | virtual void updateFilter(); | 56 | virtual void updateFilter(); |
53 | 57 | ||
54 | protected: | 58 | protected: |
55 | QVBoxLayout* FilterEdit_baseLayout; | 59 | QVBoxLayout* FilterEdit_baseLayout; |
56 | QGridLayout* mCriteriaFrameLayout; | 60 | QVBoxLayout* mCriteriaFrameLayout; |
57 | QVBoxLayout* ButtonGroup1Layout; | 61 | QGridLayout* ButtonGroup1Layout; |
58 | QHBoxLayout* layout1; | 62 | QHBoxLayout* layout4; |
63 | QHBoxLayout* layout7; | ||
64 | QHBoxLayout* layout9; | ||
59 | QHBoxLayout* layout2; | 65 | QHBoxLayout* layout2; |
60 | 66 | ||
61 | protected slots: | 67 | protected slots: |
62 | virtual void languageChange(); | 68 | virtual void languageChange(); |
63 | 69 | ||
64 | }; | 70 | }; |
65 | 71 | ||
66 | #endif // FILTEREDIT_BASE_H | 72 | #endif // FILTEREDIT_BASE_H |
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index b7cbb59..2436f57 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui | |||
@@ -1,201 +1,250 @@ | |||
1 | <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> | 1 | <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> |
2 | <class>FilterEdit_base</class> | 2 | <class>FilterEdit_base</class> |
3 | <widget class="QWidget"> | 3 | <widget class="QWidget"> |
4 | <property name="name"> | 4 | <property name="name"> |
5 | <cstring>FilterEdit_base</cstring> | 5 | <cstring>FilterEdit_base</cstring> |
6 | </property> | 6 | </property> |
7 | <property name="geometry"> | 7 | <property name="geometry"> |
8 | <rect> | 8 | <rect> |
9 | <x>0</x> | 9 | <x>0</x> |
10 | <y>0</y> | 10 | <y>0</y> |
11 | <width>284</width> | 11 | <width>351</width> |
12 | <height>241</height> | 12 | <height>275</height> |
13 | </rect> | 13 | </rect> |
14 | </property> | 14 | </property> |
15 | <property name="caption"> | 15 | <property name="caption"> |
16 | <string>FilterEditor</string> | 16 | <string>FilterEditor</string> |
17 | </property> | 17 | </property> |
18 | <property name="layoutMargin" stdset="0"> | 18 | <property name="layoutMargin" stdset="0"> |
19 | </property> | 19 | </property> |
20 | <property name="layoutSpacing" stdset="0"> | 20 | <property name="layoutSpacing" stdset="0"> |
21 | </property> | 21 | </property> |
22 | <vbox> | 22 | <vbox> |
23 | <property name="name"> | 23 | <property name="name"> |
24 | <cstring>unnamed</cstring> | 24 | <cstring>unnamed</cstring> |
25 | </property> | 25 | </property> |
26 | <property name="margin"> | 26 | <property name="margin"> |
27 | <number>0</number> | 27 | <number>0</number> |
28 | </property> | 28 | </property> |
29 | <property name="spacing"> | 29 | <property name="spacing"> |
30 | <number>0</number> | 30 | <number>0</number> |
31 | </property> | 31 | </property> |
32 | <widget class="QFrame"> | 32 | <widget class="QFrame"> |
33 | <property name="name"> | 33 | <property name="name"> |
34 | <cstring>mCriteriaFrame</cstring> | 34 | <cstring>mCriteriaFrame</cstring> |
35 | </property> | 35 | </property> |
36 | <property name="frameShape"> | 36 | <property name="frameShape"> |
37 | <enum>StyledPanel</enum> | 37 | <enum>StyledPanel</enum> |
38 | </property> | 38 | </property> |
39 | <property name="frameShadow"> | 39 | <property name="frameShadow"> |
40 | <enum>Raised</enum> | 40 | <enum>Raised</enum> |
41 | </property> | 41 | </property> |
42 | <property name="layoutMargin" stdset="0"> | 42 | <property name="layoutMargin" stdset="0"> |
43 | </property> | 43 | </property> |
44 | <grid> | 44 | <vbox> |
45 | <property name="name"> | 45 | <property name="name"> |
46 | <cstring>unnamed</cstring> | 46 | <cstring>unnamed</cstring> |
47 | </property> | 47 | </property> |
48 | <property name="margin"> | 48 | <property name="margin"> |
49 | <number>3</number> | 49 | <number>3</number> |
50 | </property> | 50 | </property> |
51 | <property name="spacing"> | 51 | <property name="spacing"> |
52 | <number>2</number> | 52 | <number>2</number> |
53 | </property> | 53 | </property> |
54 | <widget class="QButtonGroup" row="0" column="0"> | 54 | <widget class="QButtonGroup"> |
55 | <property name="name"> | 55 | <property name="name"> |
56 | <cstring>ButtonGroup1</cstring> | 56 | <cstring>ButtonGroup1</cstring> |
57 | </property> | 57 | </property> |
58 | <property name="title"> | 58 | <property name="title"> |
59 | <string>Categories</string> | 59 | <string>Categories</string> |
60 | </property> | 60 | </property> |
61 | <vbox> | 61 | <grid> |
62 | <property name="name"> | 62 | <property name="name"> |
63 | <cstring>unnamed</cstring> | 63 | <cstring>unnamed</cstring> |
64 | </property> | 64 | </property> |
65 | <property name="margin"> | 65 | <property name="margin"> |
66 | <number>11</number> | 66 | <number>6</number> |
67 | </property> | 67 | </property> |
68 | <property name="spacing"> | 68 | <property name="spacing"> |
69 | <number>6</number> | 69 | <number>6</number> |
70 | </property> | 70 | </property> |
71 | <widget class="QLayoutWidget" row="0" column="0"> | ||
72 | <property name="name"> | ||
73 | <cstring>layout4</cstring> | ||
74 | </property> | ||
75 | <hbox> | ||
76 | <property name="name"> | ||
77 | <cstring>unnamed</cstring> | ||
78 | </property> | ||
71 | <widget class="QRadioButton"> | 79 | <widget class="QRadioButton"> |
72 | <property name="name"> | 80 | <property name="name"> |
73 | <cstring>mCatShowCheck</cstring> | 81 | <cstring>mCatShowCheck</cstring> |
74 | </property> | 82 | </property> |
75 | <property name="text"> | 83 | <property name="text"> |
76 | <string>Show only selected</string> | 84 | <string>Include</string> |
77 | </property> | 85 | </property> |
78 | </widget> | 86 | </widget> |
79 | <widget class="QRadioButton"> | 87 | <widget class="QRadioButton"> |
80 | <property name="name"> | 88 | <property name="name"> |
81 | <cstring>mCatHideCheck</cstring> | 89 | <cstring>mCatHideCheck</cstring> |
82 | </property> | 90 | </property> |
83 | <property name="text"> | 91 | <property name="text"> |
84 | <string>Show all but selected</string> | 92 | <string>Exclude</string> |
85 | </property> | ||
86 | </widget> | ||
87 | <widget class="QListBox"> | ||
88 | <property name="name"> | ||
89 | <cstring>mCatList</cstring> | ||
90 | </property> | 93 | </property> |
91 | </widget> | 94 | </widget> |
92 | <widget class="QPushButton"> | 95 | <widget class="QPushButton"> |
93 | <property name="name"> | 96 | <property name="name"> |
94 | <cstring>mCatEditButton</cstring> | 97 | <cstring>mCatEditButton</cstring> |
95 | </property> | 98 | </property> |
96 | <property name="text"> | 99 | <property name="text"> |
97 | <string>Edit Selection...</string> | 100 | <string>Edit Selection...</string> |
98 | </property> | 101 | </property> |
99 | </widget> | 102 | </widget> |
100 | </vbox> | 103 | </hbox> |
104 | </widget> | ||
105 | <widget class="QListBox" row="1" column="0"> | ||
106 | <property name="name"> | ||
107 | <cstring>mCatList</cstring> | ||
108 | </property> | ||
109 | </widget> | ||
110 | </grid> | ||
101 | </widget> | 111 | </widget> |
102 | <widget class="QLayoutWidget" row="1" column="0"> | 112 | <widget class="QLayoutWidget"> |
103 | <property name="name"> | 113 | <property name="name"> |
104 | <cstring>layout1</cstring> | 114 | <cstring>layout7</cstring> |
105 | </property> | 115 | </property> |
106 | <hbox> | 116 | <hbox> |
107 | <property name="name"> | 117 | <property name="name"> |
108 | <cstring>unnamed</cstring> | 118 | <cstring>unnamed</cstring> |
109 | </property> | 119 | </property> |
110 | <property name="margin"> | ||
111 | <number>0</number> | ||
112 | </property> | ||
113 | <property name="spacing"> | ||
114 | <number>0</number> | ||
115 | </property> | ||
116 | <widget class="QLabel"> | 120 | <widget class="QLabel"> |
117 | <property name="name"> | 121 | <property name="name"> |
118 | <cstring>textLabel1</cstring> | 122 | <cstring>textLabel1</cstring> |
119 | </property> | 123 | </property> |
120 | <property name="text"> | 124 | <property name="text"> |
121 | <string>Hide</string> | 125 | <string>Exclude</string> |
122 | </property> | 126 | </property> |
123 | </widget> | 127 | </widget> |
124 | <widget class="QCheckBox"> | 128 | <widget class="QCheckBox"> |
125 | <property name="name"> | 129 | <property name="name"> |
126 | <cstring>mRecurringCheck</cstring> | 130 | <cstring>mRecurringCheck</cstring> |
127 | </property> | 131 | </property> |
128 | <property name="text"> | 132 | <property name="text"> |
129 | <string>recurring events</string> | 133 | <string>recurring events</string> |
130 | </property> | 134 | </property> |
131 | </widget> | 135 | </widget> |
132 | <widget class="QCheckBox"> | 136 | <widget class="QCheckBox"> |
133 | <property name="name"> | 137 | <property name="name"> |
134 | <cstring>mCompletedCheck</cstring> | 138 | <cstring>mCompletedCheck</cstring> |
135 | </property> | 139 | </property> |
136 | <property name="text"> | 140 | <property name="text"> |
137 | <string>completed to-dos</string> | 141 | <string>completed to-dos</string> |
138 | </property> | 142 | </property> |
139 | </widget> | 143 | </widget> |
140 | </hbox> | 144 | </hbox> |
141 | </widget> | 145 | </widget> |
142 | <widget class="QLayoutWidget" row="2" column="0"> | 146 | <widget class="QLayoutWidget"> |
147 | <property name="name"> | ||
148 | <cstring>layout9</cstring> | ||
149 | </property> | ||
150 | <hbox> | ||
151 | <property name="name"> | ||
152 | <cstring>unnamed</cstring> | ||
153 | </property> | ||
154 | <widget class="QLabel"> | ||
155 | <property name="name"> | ||
156 | <cstring>textLabel1_2</cstring> | ||
157 | </property> | ||
158 | <property name="text"> | ||
159 | <string>Exclude</string> | ||
160 | </property> | ||
161 | </widget> | ||
162 | <widget class="QCheckBox"> | ||
163 | <property name="name"> | ||
164 | <cstring>mEventCheck</cstring> | ||
165 | </property> | ||
166 | <property name="text"> | ||
167 | <string>events</string> | ||
168 | </property> | ||
169 | </widget> | ||
170 | <widget class="QCheckBox"> | ||
171 | <property name="name"> | ||
172 | <cstring>mTodoCheck</cstring> | ||
173 | </property> | ||
174 | <property name="text"> | ||
175 | <string>todos</string> | ||
176 | </property> | ||
177 | </widget> | ||
178 | <widget class="QCheckBox"> | ||
179 | <property name="name"> | ||
180 | <cstring>mJournalCheck</cstring> | ||
181 | </property> | ||
182 | <property name="text"> | ||
183 | <string>journals</string> | ||
184 | </property> | ||
185 | </widget> | ||
186 | </hbox> | ||
187 | </widget> | ||
188 | <widget class="QLayoutWidget"> | ||
143 | <property name="name"> | 189 | <property name="name"> |
144 | <cstring>layout2</cstring> | 190 | <cstring>layout2</cstring> |
145 | </property> | 191 | </property> |
146 | <hbox> | 192 | <hbox> |
147 | <property name="name"> | 193 | <property name="name"> |
148 | <cstring>unnamed</cstring> | 194 | <cstring>unnamed</cstring> |
149 | </property> | 195 | </property> |
150 | <property name="margin"> | 196 | <property name="margin"> |
151 | <number>0</number> | 197 | <number>0</number> |
152 | </property> | 198 | </property> |
153 | <property name="spacing"> | 199 | <property name="spacing"> |
154 | <number>0</number> | 200 | <number>0</number> |
155 | </property> | 201 | </property> |
156 | <widget class="QLabel"> | 202 | <widget class="QLabel"> |
157 | <property name="name"> | 203 | <property name="name"> |
158 | <cstring>textLabel2</cstring> | 204 | <cstring>textLabel2</cstring> |
159 | </property> | 205 | </property> |
160 | <property name="text"> | 206 | <property name="text"> |
161 | <string>Show</string> | 207 | <string>Include</string> |
162 | </property> | 208 | </property> |
163 | </widget> | 209 | </widget> |
164 | <widget class="QCheckBox"> | 210 | <widget class="QCheckBox"> |
165 | <property name="name"> | 211 | <property name="name"> |
166 | <cstring>mPublicCheck</cstring> | 212 | <cstring>mPublicCheck</cstring> |
167 | </property> | 213 | </property> |
168 | <property name="text"> | 214 | <property name="text"> |
169 | <string>public</string> | 215 | <string>public</string> |
170 | </property> | 216 | </property> |
171 | </widget> | 217 | </widget> |
172 | <widget class="QCheckBox"> | 218 | <widget class="QCheckBox"> |
173 | <property name="name"> | 219 | <property name="name"> |
174 | <cstring>mPrivateCheck</cstring> | 220 | <cstring>mPrivateCheck</cstring> |
175 | </property> | 221 | </property> |
176 | <property name="text"> | 222 | <property name="text"> |
177 | <string>private</string> | 223 | <string>private</string> |
178 | </property> | 224 | </property> |
179 | </widget> | 225 | </widget> |
180 | <widget class="QCheckBox"> | 226 | <widget class="QCheckBox"> |
181 | <property name="name"> | 227 | <property name="name"> |
182 | <cstring>mConfidentialCheck</cstring> | 228 | <cstring>mConfidentialCheck</cstring> |
183 | </property> | 229 | </property> |
184 | <property name="text"> | 230 | <property name="text"> |
185 | <string>confidential</string> | 231 | <string>confidential</string> |
186 | </property> | 232 | </property> |
187 | <property name="checked"> | 233 | <property name="checked"> |
188 | <bool>false</bool> | 234 | <bool>false</bool> |
189 | </property> | 235 | </property> |
190 | </widget> | 236 | </widget> |
191 | </hbox> | 237 | </hbox> |
192 | </widget> | 238 | </widget> |
193 | </grid> | 239 | </vbox> |
194 | </widget> | 240 | </widget> |
195 | </vbox> | 241 | </vbox> |
196 | </widget> | 242 | </widget> |
243 | <includes> | ||
244 | <include location="local" impldecl="in implementation">filteredit_base.ui.h</include> | ||
245 | </includes> | ||
197 | <slots> | 246 | <slots> |
198 | <slot>updateFilter()</slot> | 247 | <slot>updateFilter()</slot> |
199 | </slots> | 248 | </slots> |
200 | <layoutdefaults spacing="6" margin="11"/> | 249 | <layoutdefaults spacing="6" margin="11"/> |
201 | </UI> | 250 | </UI> |
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 2816c6e..628d84e 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||