-rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.cpp | 97 | ||||
-rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.h | 8 |
2 files changed, 33 insertions, 72 deletions
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp index d46df69..a72d174 100644 --- a/libopie2/opiepim/ui/opimmainwindow.cpp +++ b/libopie2/opiepim/ui/opimmainwindow.cpp | |||
@@ -45,2 +45,3 @@ | |||
45 | #include <qapplication.h> | 45 | #include <qapplication.h> |
46 | #include <qcombobox.h> | ||
46 | #include <qcopchannel_qws.h> | 47 | #include <qcopchannel_qws.h> |
@@ -241,4 +242,2 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { | |||
241 | m_viewMenu->clear(); | 242 | m_viewMenu->clear(); |
242 | m_viewMenuCategories->addTo( m_viewMenu ); | ||
243 | m_viewMenu->insertSeparator(); | ||
244 | m_viewMenuGroup->addTo( m_viewMenu ); | 243 | m_viewMenuGroup->addTo( m_viewMenu ); |
@@ -250,7 +249,7 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { | |||
250 | 249 | ||
251 | void OPimMainWindow::slotViewCategory( QAction *category ) { | 250 | void OPimMainWindow::slotViewCategory( const QString &category ) { |
252 | // Set application caption | 251 | // Set application caption |
253 | QString caption = m_appName; | 252 | QString caption = m_appName; |
254 | if ( category->text() != tr( "All" ) ) | 253 | if ( category != tr( "All" ) ) |
255 | caption.append( QString( " - %1" ).arg( category->text() ) ); | 254 | caption.append( QString( " - %1" ).arg( category ) ); |
256 | setCaption( caption ); | 255 | setCaption( caption ); |
@@ -258,3 +257,3 @@ void OPimMainWindow::slotViewCategory( QAction *category ) { | |||
258 | // Notify application | 257 | // Notify application |
259 | emit categorySelected( category->text() ); | 258 | emit categorySelected( category ); |
260 | } | 259 | } |
@@ -262,13 +261,9 @@ void OPimMainWindow::slotViewCategory( QAction *category ) { | |||
262 | void OPimMainWindow::setViewCategory( const QString &category ) { | 261 | void OPimMainWindow::setViewCategory( const QString &category ) { |
263 | // Find category in menu | 262 | // Find category in list |
264 | QObjectListIt kidIt( *(m_viewMenuCategories->children()) ); | 263 | for ( int i = 0; i < m_catSelect->count(); i++ ) { |
265 | QObject *obj; | 264 | if ( m_catSelect->text( i ) == category ) { |
266 | while ( (obj=kidIt.current()) != 0 ) { | 265 | m_catSelect->setCurrentItem( i ); |
267 | QAction *currAction = reinterpret_cast<QAction*>(obj); | 266 | slotViewCategory( category ); |
268 | if ( currAction->text() == category ) { | ||
269 | // Category was found, enable it | ||
270 | currAction->setOn( true ); | ||
271 | return; | 267 | return; |
272 | } | 268 | } |
273 | ++kidIt; | ||
274 | } | 269 | } |
@@ -277,54 +272,13 @@ void OPimMainWindow::setViewCategory( const QString &category ) { | |||
277 | void OPimMainWindow::reloadCategories() { | 272 | void OPimMainWindow::reloadCategories() { |
278 | QString selected; | 273 | QString selected = m_catSelect->currentText(); |
279 | |||
280 | // Remove old categories from View menu | ||
281 | if ( m_viewMenuCategories ) { | ||
282 | QObjectListIt kidIt( *(m_viewMenuCategories->children()) ); | ||
283 | QObject *obj; | ||
284 | while ( (obj=kidIt.current()) != 0 ) { | ||
285 | QAction *currAction = reinterpret_cast<QAction*>(obj); | ||
286 | if ( currAction->isOn() ) | ||
287 | selected = currAction->text(); | ||
288 | ++kidIt; | ||
289 | delete currAction; | ||
290 | } | ||
291 | } | ||
292 | else { | ||
293 | m_viewMenuCategories = new QActionGroup( this ); | ||
294 | connect( m_viewMenuCategories, SIGNAL(selected(QAction*)), this, SLOT(slotViewCategory(QAction*)) ); | ||
295 | |||
296 | selected = tr( "All" ); | ||
297 | } | ||
298 | 274 | ||
299 | m_viewMenu->clear(); | 275 | // Remove old categories from list |
300 | 276 | m_catSelect->clear(); | |
301 | // Add categories to View menu | ||
302 | QAction *a = new QAction( tr( "All" ), QString::null, 0, m_viewMenuCategories, QString::null, true ); | ||
303 | a->setWhatsThis( tr( "Click here to view all items." ) ); | ||
304 | a->setOn( selected == tr( "All" ) ); | ||
305 | 277 | ||
278 | // Add categories to list | ||
306 | Categories cats; | 279 | Categories cats; |
307 | cats.load( categoryFileName() ); | 280 | cats.load( categoryFileName() ); |
308 | QStringList catList = cats.labels( m_catGroupName ); | 281 | m_catSelect->insertItem( tr( "All" ) ); |
309 | for ( QStringList::Iterator it = catList.begin(); it != catList.end(); ++it ) { | 282 | m_catSelect->insertStringList( cats.labels( m_catGroupName ) ); |
310 | a = new QAction( tr( (*it) ), QString::null, 0, m_viewMenuCategories, QString::null, true ); | 283 | m_catSelect->insertItem( tr( "Unfiled" ) ); |
311 | a->setWhatsThis( tr( "Click here to view items belonging to %1." ).arg( (*it) ) ); | ||
312 | a->setOn( selected == (*it) ); | ||
313 | } | ||
314 | |||
315 | a = new QAction( tr( "Unfiled" ), QString::null, 0, m_viewMenuCategories, QString::null, true ); | ||
316 | a->setWhatsThis( tr( "Click here to view all unfiled items." ) ); | ||
317 | a->setOn( selected == tr( "Unfiled" ) ); | ||
318 | |||
319 | m_viewMenuCategories->addTo( m_viewMenu ); | ||
320 | |||
321 | // Add default items to View menu | ||
322 | m_viewMenu->insertSeparator(); | ||
323 | m_viewMenuGroup->addTo( m_viewMenu ); | ||
324 | |||
325 | // Insert application-specific items (if any) | ||
326 | if ( m_viewMenuAppGroup ) { | ||
327 | m_viewMenu->insertSeparator(); | ||
328 | m_viewMenuAppGroup->addTo( m_viewMenu ); | ||
329 | } | ||
330 | } | 284 | } |
@@ -353,3 +307,2 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
353 | 307 | ||
354 | m_viewMenuCategories = 0l; | ||
355 | m_viewMenuAppGroup = 0l; | 308 | m_viewMenuAppGroup = 0l; |
@@ -397,7 +350,7 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
397 | 350 | ||
398 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), | 351 | // a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), |
399 | QString::null, 0, m_itemMenuGroup2, 0 ); | 352 | // QString::null, 0, m_itemMenuGroup2, 0 ); |
400 | connect( a, SIGNAL(activated()), this, SLOT(slotItemFind()) ); | 353 | // connect( a, SIGNAL(activated()), this, SLOT(slotItemFind()) ); |
401 | a->setWhatsThis( tr( "Click here to search for an item." ) ); | 354 | // a->setWhatsThis( tr( "Click here to search for an item." ) ); |
402 | a->addTo( toolbar ); | 355 | // a->addTo( toolbar ); |
403 | 356 | ||
@@ -421,2 +374,8 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
421 | 374 | ||
375 | // Create view toolbar | ||
376 | toolbar = new QToolBar( this ); | ||
377 | m_catSelect = new QComboBox( toolbar ); | ||
378 | connect( m_catSelect, SIGNAL(activated(const QString&)), this, SLOT(slotViewCategory(const QString&)) ); | ||
379 | |||
380 | // Do initial load of categories | ||
422 | reloadCategories(); | 381 | reloadCategories(); |
diff --git a/libopie2/opiepim/ui/opimmainwindow.h b/libopie2/opiepim/ui/opimmainwindow.h index 4aed8b8..ffc7feb 100644 --- a/libopie2/opiepim/ui/opimmainwindow.h +++ b/libopie2/opiepim/ui/opimmainwindow.h | |||
@@ -40,2 +40,3 @@ class QAction; | |||
40 | class QActionGroup; | 40 | class QActionGroup; |
41 | class QComboBox; | ||
41 | class QCopChannel; | 42 | class QCopChannel; |
@@ -109,3 +110,3 @@ protected slots: | |||
109 | virtual void slotItemBeam() = 0; | 110 | virtual void slotItemBeam() = 0; |
110 | virtual void slotItemFind() = 0; | 111 | //virtual void slotItemFind() = 0; |
111 | virtual void slotConfigure() = 0; | 112 | virtual void slotConfigure() = 0; |
@@ -135,3 +136,3 @@ private slots: | |||
135 | /** UI-related slots */ | 136 | /** UI-related slots */ |
136 | void slotViewCategory( QAction *category ); | 137 | void slotViewCategory( const QString &category ); |
137 | 138 | ||
@@ -162,3 +163,2 @@ private: | |||
162 | QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu | 163 | QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu |
163 | QActionGroup *m_viewMenuCategories; // Pointer to action group containing categories in View menu | ||
164 | QAction *m_itemEditAction; // Edit current item action | 164 | QAction *m_itemEditAction; // Edit current item action |
@@ -167,2 +167,4 @@ private: | |||
167 | 167 | ||
168 | QComboBox *m_catSelect; // Category selection combo box | ||
169 | |||
168 | /* I would love to do this as a template | 170 | /* I would love to do this as a template |