summaryrefslogtreecommitdiff
authordrw <drw>2005-02-23 16:43:06 (UTC)
committer drw <drw>2005-02-23 16:43:06 (UTC)
commit57fa728ffb32c52d9e5b56a5a0c79b6e8416ed2e (patch) (unidiff)
treed36a6d071f2d3bd5ba1083ae66a6d37585a40a2f
parent81d6c0b396ce1f4acae85a8449367800787fe5c3 (diff)
downloadopie-57fa728ffb32c52d9e5b56a5a0c79b6e8416ed2e.zip
opie-57fa728ffb32c52d9e5b56a5a0c79b6e8416ed2e.tar.gz
opie-57fa728ffb32c52d9e5b56a5a0c79b6e8416ed2e.tar.bz2
Comment out filer/filter settings menu options as they will not be implemented for Opie 1.2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.cpp28
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.h3
2 files changed, 12 insertions, 19 deletions
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index f22a302..a6d574b 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -210,66 +210,66 @@ void OPimMainWindow::timerEvent( QTimerEvent* e) {
210 210
211QPopupMenu *OPimMainWindow::itemContextMenu() { 211QPopupMenu *OPimMainWindow::itemContextMenu() {
212 if ( !m_itemContextMenu ) { 212 if ( !m_itemContextMenu ) {
213 // Create context menu if hasn't been done before 213 // Create context menu if hasn't been done before
214 m_itemContextMenu = new QPopupMenu( this ); 214 m_itemContextMenu = new QPopupMenu( this );
215 m_itemEditAction->addTo( m_itemContextMenu ); 215 m_itemEditAction->addTo( m_itemContextMenu );
216 m_itemDuplicateAction->addTo( m_itemContextMenu ); 216 m_itemDuplicateAction->addTo( m_itemContextMenu );
217 m_itemBeamAction->addTo( m_itemContextMenu ); 217 m_itemBeamAction->addTo( m_itemContextMenu );
218 m_itemDeleteAction->addTo( m_itemContextMenu ); 218 m_itemDeleteAction->addTo( m_itemContextMenu );
219 } 219 }
220 220
221 return m_itemContextMenu; 221 return m_itemContextMenu;
222} 222}
223 223
224void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) { 224void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) {
225 // Insert menu items into Item menu 225 // Insert menu items into Item menu
226 if ( items ) { 226 if ( items ) {
227 // Rebuild Item menu 227 // Rebuild Item menu
228 m_itemMenu->clear(); 228 m_itemMenu->clear();
229 m_itemMenuGroup1->addTo( m_itemMenu ); 229 m_itemMenuGroup1->addTo( m_itemMenu );
230 m_itemMenu->insertSeparator(); 230 m_itemMenu->insertSeparator();
231 items->addTo( m_itemMenu ); 231 items->addTo( m_itemMenu );
232 m_itemMenu->insertSeparator(); 232 m_itemMenu->insertSeparator();
233 m_itemMenuGroup2->addTo( m_itemMenu ); 233 m_itemMenuGroup2->addTo( m_itemMenu );
234 } 234 }
235} 235}
236 236
237void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { 237void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) {
238 // Insert menu items into View menu 238 // Insert menu items into View menu
239 if ( items ) { 239 if ( items ) {
240 // Rebuild Item menu 240 // Rebuild Item menu
241 m_viewMenu->clear(); 241 m_viewMenu->clear();
242 m_viewMenuGroup->addTo( m_viewMenu ); 242// m_viewMenuGroup->addTo( m_viewMenu );
243 m_viewMenu->insertSeparator(); 243// m_viewMenu->insertSeparator();
244 m_viewMenuAppGroup = items; 244 m_viewMenuAppGroup = items;
245 m_viewMenuAppGroup->addTo( m_viewMenu ); 245 m_viewMenuAppGroup->addTo( m_viewMenu );
246 } 246 }
247} 247}
248 248
249void OPimMainWindow::setViewCategory( const QString &category ) { 249void OPimMainWindow::setViewCategory( const QString &category ) {
250 // Find category in list 250 // Find category in list
251 for ( int i = 0; i < m_catSelect->count(); i++ ) { 251 for ( int i = 0; i < m_catSelect->count(); i++ ) {
252 if ( m_catSelect->text( i ) == category ) { 252 if ( m_catSelect->text( i ) == category ) {
253 m_catSelect->setCurrentItem( i ); 253 m_catSelect->setCurrentItem( i );
254 emit categorySelected( category ); 254 emit categorySelected( category );
255 return; 255 return;
256 } 256 }
257 } 257 }
258} 258}
259 259
260void OPimMainWindow::reloadCategories() { 260void OPimMainWindow::reloadCategories() {
261 QString selected = m_catSelect->currentText(); 261 QString selected = m_catSelect->currentText();
262 262
263 // Remove old categories from list 263 // Remove old categories from list
264 m_catSelect->clear(); 264 m_catSelect->clear();
265 265
266 // Add categories to list 266 // Add categories to list
267 Categories cats; 267 Categories cats;
268 cats.load( categoryFileName() ); 268 cats.load( categoryFileName() );
269 m_catSelect->insertItem( tr( "All" ) ); 269 m_catSelect->insertItem( tr( "All" ) );
270 m_catSelect->insertStringList( cats.labels( m_catGroupName ) ); 270 m_catSelect->insertStringList( cats.labels( m_catGroupName ) );
271 m_catSelect->insertItem( tr( "Unfiled" ) ); 271 m_catSelect->insertItem( tr( "Unfiled" ) );
272} 272}
273 273
274void OPimMainWindow::setItemNewEnabled( bool enable ) { 274void OPimMainWindow::setItemNewEnabled( bool enable ) {
275 m_itemNewAction->setEnabled( enable ); 275 m_itemNewAction->setEnabled( enable );
@@ -335,67 +335,61 @@ void OPimMainWindow::initBars( const QString &itemName ) {
335 335
336 m_itemEditAction = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), 336 m_itemEditAction = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ),
337 QString::null, 0, m_itemMenuGroup1, 0 ); 337 QString::null, 0, m_itemMenuGroup1, 0 );
338 connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) ); 338 connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) );
339 m_itemEditAction->setWhatsThis( tr( "Click here to edit the selected item." ) ); 339 m_itemEditAction->setWhatsThis( tr( "Click here to edit the selected item." ) );
340 m_itemEditAction->addTo( toolbar ); 340 m_itemEditAction->addTo( toolbar );
341 341
342 m_itemDuplicateAction = new QAction( tr( "Duplicate" ), Resource::loadPixmap( "copy" ), 342 m_itemDuplicateAction = new QAction( tr( "Duplicate" ), Resource::loadPixmap( "copy" ),
343 QString::null, 0, m_itemMenuGroup1, 0 ); 343 QString::null, 0, m_itemMenuGroup1, 0 );
344 connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) ); 344 connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) );
345 m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) ); 345 m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) );
346 346
347 if ( Ir::supported() ) { 347 if ( Ir::supported() ) {
348 m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), 348 m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ),
349 QString::null, 0, m_itemMenuGroup1, 0 ); 349 QString::null, 0, m_itemMenuGroup1, 0 );
350 connect( m_itemBeamAction, SIGNAL(activated()), this, SLOT(slotItemBeam()) ); 350 connect( m_itemBeamAction, SIGNAL(activated()), this, SLOT(slotItemBeam()) );
351 m_itemBeamAction->setWhatsThis( tr( "Click here to transmit the selected item." ) ); 351 m_itemBeamAction->setWhatsThis( tr( "Click here to transmit the selected item." ) );
352 m_itemBeamAction->addTo( toolbar ); 352 m_itemBeamAction->addTo( toolbar );
353 } 353 }
354 354
355 m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), 355 m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ),
356 QString::null, 0, m_itemMenuGroup1, 0 ); 356 QString::null, 0, m_itemMenuGroup1, 0 );
357 connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) ); 357 connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) );
358 m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) ); 358 m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) );
359 m_itemDeleteAction->addTo( toolbar ); 359 m_itemDeleteAction->addTo( toolbar );
360 360
361 m_itemMenuGroup1->addTo( m_itemMenu ); 361 m_itemMenuGroup1->addTo( m_itemMenu );
362 362
363 m_itemMenu->insertSeparator(); 363 m_itemMenu->insertSeparator();
364 364
365 m_itemMenuGroup2 = new QActionGroup( this, QString::null, false ); 365 m_itemMenuGroup2 = new QActionGroup( this, QString::null, false );
366 366
367// a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ),
368// QString::null, 0, m_itemMenuGroup2, 0 );
369// connect( a, SIGNAL(activated()), this, SLOT(slotItemFind()) );
370// a->setWhatsThis( tr( "Click here to search for an item." ) );
371// a->addTo( toolbar );
372
373 m_configureAction = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), 367 m_configureAction = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ),
374 QString::null, 0, m_itemMenuGroup2, 0 ); 368 QString::null, 0, m_itemMenuGroup2, 0 );
375 connect( m_configureAction, SIGNAL(activated()), this, SLOT(slotConfigure()) ); 369 connect( m_configureAction, SIGNAL(activated()), this, SLOT(slotConfigure()) );
376 m_configureAction->setWhatsThis( tr( "Click here to set your preferences for this application." ) ); 370 m_configureAction->setWhatsThis( tr( "Click here to set your preferences for this application." ) );
377 371
378 m_itemMenuGroup2->addTo( m_itemMenu ); 372 m_itemMenuGroup2->addTo( m_itemMenu );
379 373
380 // View menu 374 // View menu
381 m_viewMenuGroup = new QActionGroup( this, QString::null, false ); 375// m_viewMenuGroup = new QActionGroup( this, QString::null, false );
382 376
383 QAction *a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 ); 377// QAction *a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 );
384 connect( a, SIGNAL(activated()), this, SLOT(slotViewFilter()) ); 378// connect( a, SIGNAL(activated()), this, SLOT(slotViewFilter()) );
385 a->setWhatsThis( tr( "Click here to filter the items displayed." ) ); 379// a->setWhatsThis( tr( "Click here to filter the items displayed." ) );
386 380//
387 a = new QAction( tr( "Filter Settings" ), QString::null, 0, m_viewMenuGroup, 0 ); 381// a = new QAction( tr( "Filter Settings" ), QString::null, 0, m_viewMenuGroup, 0 );
388 connect( a, SIGNAL(activated()), this, SLOT(slotViewFilterSettings()) ); 382// connect( a, SIGNAL(activated()), this, SLOT(slotViewFilterSettings()) );
389 a->setWhatsThis( tr( "Click here to modify the current filter settings." ) ); 383// a->setWhatsThis( tr( "Click here to modify the current filter settings." ) );
390 384
391 // Create view toolbar 385 // Create view toolbar
392 toolbar = new QToolBar( this ); 386 toolbar = new QToolBar( this );
393 m_catSelect = new QComboBox( toolbar ); 387 m_catSelect = new QComboBox( toolbar );
394 connect( m_catSelect, SIGNAL(activated(const QString&)), this, SIGNAL(categorySelected(const QString&)) ); 388 connect( m_catSelect, SIGNAL(activated(const QString&)), this, SIGNAL(categorySelected(const QString&)) );
395 QWhatsThis::add( m_catSelect, tr( "Click here to filter items by category." ) ); 389 QWhatsThis::add( m_catSelect, tr( "Click here to filter items by category." ) );
396 390
397 // Do initial load of categories 391 // Do initial load of categories
398 reloadCategories(); 392 reloadCategories();
399} 393}
400 394
401} // namespace Opie 395} // namespace Opie
diff --git a/libopie2/opiepim/ui/opimmainwindow.h b/libopie2/opiepim/ui/opimmainwindow.h
index fa7a730..0d3f7b7 100644
--- a/libopie2/opiepim/ui/opimmainwindow.h
+++ b/libopie2/opiepim/ui/opimmainwindow.h
@@ -78,115 +78,114 @@ protected slots:
78 * couldn't be handled by this window 78 * couldn't be handled by this window
79 */ 79 */
80 virtual void doSetDocument( const QString& ); 80 virtual void doSetDocument( const QString& );
81 /* for syncing */ 81 /* for syncing */
82 virtual void flush() = 0; 82 virtual void flush() = 0;
83 virtual void reload() = 0; 83 virtual void reload() = 0;
84 84
85 /** create a new Records and return the uid */ 85 /** create a new Records and return the uid */
86 virtual int create() = 0; 86 virtual int create() = 0;
87 /** remove a record with UID == uid */ 87 /** remove a record with UID == uid */
88 virtual bool remove( int uid ) = 0; 88 virtual bool remove( int uid ) = 0;
89 /** beam the record with UID = uid */ 89 /** beam the record with UID = uid */
90 virtual void beam( int uid ) = 0; 90 virtual void beam( int uid ) = 0;
91 91
92 /** show the record with UID == uid */ 92 /** show the record with UID == uid */
93 virtual void show( int uid ) = 0; 93 virtual void show( int uid ) = 0;
94 /** edit the record */ 94 /** edit the record */
95 virtual void edit( int uid ) = 0; 95 virtual void edit( int uid ) = 0;
96 96
97 /** make a copy of it! */ 97 /** make a copy of it! */
98 virtual void add( const OPimRecord& ) = 0; 98 virtual void add( const OPimRecord& ) = 0;
99 99
100 virtual void doAlarm( const QDateTime&, int uid ); 100 virtual void doAlarm( const QDateTime&, int uid );
101 101
102 QCopChannel* channel(); 102 QCopChannel* channel();
103 103
104 /** UI-related slots */ 104 /** UI-related slots */
105 virtual void slotItemNew() = 0; 105 virtual void slotItemNew() = 0;
106 virtual void slotItemEdit() = 0; 106 virtual void slotItemEdit() = 0;
107 virtual void slotItemDuplicate() = 0; 107 virtual void slotItemDuplicate() = 0;
108 virtual void slotItemDelete() = 0; 108 virtual void slotItemDelete() = 0;
109 virtual void slotItemBeam() = 0; 109 virtual void slotItemBeam() = 0;
110 //virtual void slotItemFind() = 0;
111 virtual void slotConfigure() = 0; 110 virtual void slotConfigure() = 0;
112 111
113protected: 112protected:
114 /** 113 /**
115 * start to play soundAlarm() 114 * start to play soundAlarm()
116 * @param count How many times the alarm is played 115 * @param count How many times the alarm is played
117 */ 116 */
118 void startAlarm( int count = 10 ); 117 void startAlarm( int count = 10 );
119 void killAlarm(); 118 void killAlarm();
120 void timerEvent( QTimerEvent* ); 119 void timerEvent( QTimerEvent* );
121 120
122 /** UI-related functions */ 121 /** UI-related functions */
123 QPopupMenu *itemContextMenu(); 122 QPopupMenu *itemContextMenu();
124 123
125 void insertItemMenuItems( QActionGroup *items ); 124 void insertItemMenuItems( QActionGroup *items );
126 void insertViewMenuItems( QActionGroup *items ); 125 void insertViewMenuItems( QActionGroup *items );
127 126
128 void setViewCategory( const QString &category ); 127 void setViewCategory( const QString &category );
129 void reloadCategories(); 128 void reloadCategories();
130 129
131 void setItemNewEnabled( bool enable ); 130 void setItemNewEnabled( bool enable );
132 void setItemEditEnabled( bool enable ); 131 void setItemEditEnabled( bool enable );
133 void setItemDuplicateEnabled( bool enable ); 132 void setItemDuplicateEnabled( bool enable );
134 void setItemDeleteEnabled( bool enable ); 133 void setItemDeleteEnabled( bool enable );
135 void setItemBeamEnabled( bool enable ); 134 void setItemBeamEnabled( bool enable );
136 void setConfigureEnabled( bool enable ); 135 void setConfigureEnabled( bool enable );
137 void setShowCategories( bool show ); 136 void setShowCategories( bool show );
138 137
139private slots: 138private slots:
140 void appMessage( const QCString&, const QByteArray& ); 139 void appMessage( const QCString&, const QByteArray& );
141 void setDocument( const QString& ); 140 void setDocument( const QString& );
142 141
143private: 142private:
144 class Private; 143 class Private;
145 Private* d; 144 Private* d;
146 145
147 int m_rtti; 146 int m_rtti;
148 QCopChannel* m_channel; 147 QCopChannel* m_channel;
149 QString m_service; 148 QString m_service;
150 QCString m_str; 149 QCString m_str;
151 OPimRecord* m_fallBack; 150 OPimRecord* m_fallBack;
152 int m_alarmCount; 151 int m_alarmCount;
153 int m_playedCount; 152 int m_playedCount;
154 int m_timerId; 153 int m_timerId;
155 154
156 QString m_catGroupName; // Name of category group 155 QString m_catGroupName; // Name of category group
157 Config m_config; // Configuration settings file 156 Config m_config; // Configuration settings file
158 157
159 // Menu bar data 158 // Menu bar data
160 QPopupMenu *m_itemContextMenu; // Pointer to context-sensitive menu 159 QPopupMenu *m_itemContextMenu; // Pointer to context-sensitive menu
161 QPopupMenu *m_itemMenu; // Pointer to item menu 160 QPopupMenu *m_itemMenu; // Pointer to item menu
162 QPopupMenu *m_viewMenu; // Pointer to view menu 161 QPopupMenu *m_viewMenu; // Pointer to view menu
163 QActionGroup *m_itemMenuGroup1; // Action group containing default items in Item menu 162 QActionGroup *m_itemMenuGroup1; // Action group containing default items in Item menu
164 QActionGroup *m_itemMenuGroup2; // Action group containing default items in Item menu 163 QActionGroup *m_itemMenuGroup2; // Action group containing default items in Item menu
165 QActionGroup *m_viewMenuAppGroup; // Action group containing application items in View menu 164 QActionGroup *m_viewMenuAppGroup; // Action group containing application items in View menu
166 QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu 165// QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu
167 QAction *m_itemNewAction; // Add new item action 166 QAction *m_itemNewAction; // Add new item action
168 QAction *m_itemEditAction; // Edit current item action 167 QAction *m_itemEditAction; // Edit current item action
169 QAction *m_itemDuplicateAction; // Duplicate current item action 168 QAction *m_itemDuplicateAction; // Duplicate current item action
170 QAction *m_itemDeleteAction; // Delete current item action 169 QAction *m_itemDeleteAction; // Delete current item action
171 QAction *m_itemBeamAction; // Beam current item action 170 QAction *m_itemBeamAction; // Beam current item action
172 QAction *m_configureAction; // Configure application dialog action 171 QAction *m_configureAction; // Configure application dialog action
173 172
174 QComboBox *m_catSelect; // Category selection combo box 173 QComboBox *m_catSelect; // Category selection combo box
175 174
176 /* I would love to do this as a template 175 /* I would love to do this as a template
177 * but can't think of a right way 176 * but can't think of a right way
178 * because I need signal and slots -zecke 177 * because I need signal and slots -zecke
179 */ 178 */
180 virtual OPimRecord* record( int rtti, const QByteArray& ) ; 179 virtual OPimRecord* record( int rtti, const QByteArray& ) ;
181 int service(); 180 int service();
182 181
183 /** UI-related functions */ 182 /** UI-related functions */
184 void initBars( const QString &itemName = tr( "Item" ) ); 183 void initBars( const QString &itemName = tr( "Item" ) );
185 184
186signals: 185signals:
187 void categorySelected( const QString &cat ); 186 void categorySelected( const QString &cat );
188}; 187};
189 188
190} 189}
191 190
192#endif 191#endif