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 | |||
@@ -998,2 +998,13 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
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; |
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 | |||
@@ -3,3 +3,3 @@ | |||
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$) |
@@ -22,2 +22,3 @@ | |||
22 | #include <qwhatsthis.h> | 22 | #include <qwhatsthis.h> |
23 | #include "filteredit_base.ui.h" | ||
23 | 24 | ||
@@ -37,3 +38,3 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | |||
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 | ||
@@ -42,32 +43,50 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | |||
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 | ||
@@ -87,7 +106,6 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) | |||
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 ); |
@@ -111,9 +129,13 @@ void FilterEdit_base::languageChange() | |||
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" ) ); |
@@ -123,6 +145 @@ void FilterEdit_base::languageChange() | |||
123 | |||
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 | |||
@@ -3,3 +3,3 @@ | |||
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$) |
@@ -22,5 +22,5 @@ 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; |
@@ -40,4 +40,4 @@ public: | |||
40 | QRadioButton* mCatHideCheck; | 40 | QRadioButton* mCatHideCheck; |
41 | QListBox* mCatList; | ||
42 | QPushButton* mCatEditButton; | 41 | QPushButton* mCatEditButton; |
42 | QListBox* mCatList; | ||
43 | QLabel* textLabel1; | 43 | QLabel* textLabel1; |
@@ -45,2 +45,6 @@ public: | |||
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; |
@@ -55,5 +59,7 @@ 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; |
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 | |||
@@ -10,4 +10,4 @@ | |||
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> |
@@ -43,3 +43,3 @@ | |||
43 | </property> | 43 | </property> |
44 | <grid> | 44 | <vbox> |
45 | <property name="name"> | 45 | <property name="name"> |
@@ -53,3 +53,3 @@ | |||
53 | </property> | 53 | </property> |
54 | <widget class="QButtonGroup" row="0" column="0"> | 54 | <widget class="QButtonGroup"> |
55 | <property name="name"> | 55 | <property name="name"> |
@@ -60,3 +60,3 @@ | |||
60 | </property> | 60 | </property> |
61 | <vbox> | 61 | <grid> |
62 | <property name="name"> | 62 | <property name="name"> |
@@ -65,3 +65,3 @@ | |||
65 | <property name="margin"> | 65 | <property name="margin"> |
66 | <number>11</number> | 66 | <number>6</number> |
67 | </property> | 67 | </property> |
@@ -70,2 +70,10 @@ | |||
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"> |
@@ -75,3 +83,3 @@ | |||
75 | <property name="text"> | 83 | <property name="text"> |
76 | <string>Show only selected</string> | 84 | <string>Include</string> |
77 | </property> | 85 | </property> |
@@ -83,8 +91,3 @@ | |||
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> |
@@ -99,7 +102,14 @@ | |||
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> |
@@ -109,8 +119,2 @@ | |||
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"> |
@@ -120,3 +124,3 @@ | |||
120 | <property name="text"> | 124 | <property name="text"> |
121 | <string>Hide</string> | 125 | <string>Exclude</string> |
122 | </property> | 126 | </property> |
@@ -141,3 +145,45 @@ | |||
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"> |
@@ -160,3 +206,3 @@ | |||
160 | <property name="text"> | 206 | <property name="text"> |
161 | <string>Show</string> | 207 | <string>Include</string> |
162 | </property> | 208 | </property> |
@@ -192,3 +238,3 @@ | |||
192 | </widget> | 238 | </widget> |
193 | </grid> | 239 | </vbox> |
194 | </widget> | 240 | </widget> |
@@ -196,2 +242,5 @@ | |||
196 | </widget> | 242 | </widget> |
243 | <includes> | ||
244 | <include location="local" impldecl="in implementation">filteredit_base.ui.h</include> | ||
245 | </includes> | ||
197 | <slots> | 246 | <slots> |
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 2816c6e..628d84e 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||