author | drw <drw> | 2005-02-02 01:07:14 (UTC) |
---|---|---|
committer | drw <drw> | 2005-02-02 01:07:14 (UTC) |
commit | 9c9c35ab1c0366b69ba1be63a4b7ba7b847fb66a (patch) (side-by-side diff) | |
tree | 88d42e3fee67021735890852bf73e53c209bac6f | |
parent | 7500adc8443f9044da7773e32742dbae51391bef (diff) | |
download | opie-9c9c35ab1c0366b69ba1be63a4b7ba7b847fb66a.zip opie-9c9c35ab1c0366b69ba1be63a4b7ba7b847fb66a.tar.gz opie-9c9c35ab1c0366b69ba1be63a4b7ba7b847fb66a.tar.bz2 |
Change the way categories can be selected, combo box is much more useful than a menu for many different categories
-rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.cpp | 115 | ||||
-rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.h | 14 |
2 files changed, 45 insertions, 84 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 @@ -44,4 +44,5 @@ #include <qaction.h> #include <qapplication.h> +#include <qcombobox.h> #include <qcopchannel_qws.h> #include <qdatetime.h> @@ -240,6 +241,4 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { // Rebuild Item menu m_viewMenu->clear(); - m_viewMenuCategories->addTo( m_viewMenu ); - m_viewMenu->insertSeparator(); m_viewMenuGroup->addTo( m_viewMenu ); m_viewMenu->insertSeparator(); @@ -249,83 +248,38 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { } -void OPimMainWindow::slotViewCategory( QAction *category ) { +void OPimMainWindow::slotViewCategory( const QString &category ) { // Set application caption QString caption = m_appName; - if ( category->text() != tr( "All" ) ) - caption.append( QString( " - %1" ).arg( category->text() ) ); + if ( category != tr( "All" ) ) + caption.append( QString( " - %1" ).arg( category ) ); setCaption( caption ); // Notify application - emit categorySelected( category->text() ); + emit categorySelected( category ); } void OPimMainWindow::setViewCategory( const QString &category ) { - // Find category in menu - QObjectListIt kidIt( *(m_viewMenuCategories->children()) ); - QObject *obj; - while ( (obj=kidIt.current()) != 0 ) { - QAction *currAction = reinterpret_cast<QAction*>(obj); - if ( currAction->text() == category ) { - // Category was found, enable it - currAction->setOn( true ); - return; - } - ++kidIt; + // Find category in list + for ( int i = 0; i < m_catSelect->count(); i++ ) { + if ( m_catSelect->text( i ) == category ) { + m_catSelect->setCurrentItem( i ); + slotViewCategory( category ); + return; } + } } void OPimMainWindow::reloadCategories() { - QString selected; - - // Remove old categories from View menu - if ( m_viewMenuCategories ) { - QObjectListIt kidIt( *(m_viewMenuCategories->children()) ); - QObject *obj; - while ( (obj=kidIt.current()) != 0 ) { - QAction *currAction = reinterpret_cast<QAction*>(obj); - if ( currAction->isOn() ) - selected = currAction->text(); - ++kidIt; - delete currAction; - } - } - else { - m_viewMenuCategories = new QActionGroup( this ); - connect( m_viewMenuCategories, SIGNAL(selected(QAction*)), this, SLOT(slotViewCategory(QAction*)) ); + QString selected = m_catSelect->currentText(); - selected = tr( "All" ); - } - - m_viewMenu->clear(); - - // Add categories to View menu - QAction *a = new QAction( tr( "All" ), QString::null, 0, m_viewMenuCategories, QString::null, true ); - a->setWhatsThis( tr( "Click here to view all items." ) ); - a->setOn( selected == tr( "All" ) ); + // Remove old categories from list + m_catSelect->clear(); + // Add categories to list Categories cats; cats.load( categoryFileName() ); - QStringList catList = cats.labels( m_catGroupName ); - for ( QStringList::Iterator it = catList.begin(); it != catList.end(); ++it ) { - a = new QAction( tr( (*it) ), QString::null, 0, m_viewMenuCategories, QString::null, true ); - a->setWhatsThis( tr( "Click here to view items belonging to %1." ).arg( (*it) ) ); - a->setOn( selected == (*it) ); - } - - a = new QAction( tr( "Unfiled" ), QString::null, 0, m_viewMenuCategories, QString::null, true ); - a->setWhatsThis( tr( "Click here to view all unfiled items." ) ); - a->setOn( selected == tr( "Unfiled" ) ); - - m_viewMenuCategories->addTo( m_viewMenu ); - - // Add default items to View menu - m_viewMenu->insertSeparator(); - m_viewMenuGroup->addTo( m_viewMenu ); - - // Insert application-specific items (if any) - if ( m_viewMenuAppGroup ) { - m_viewMenu->insertSeparator(); - m_viewMenuAppGroup->addTo( m_viewMenu ); - } + m_catSelect->insertItem( tr( "All" ) ); + m_catSelect->insertStringList( cats.labels( m_catGroupName ) ); + m_catSelect->insertItem( tr( "Unfiled" ) ); } @@ -343,5 +297,5 @@ void OPimMainWindow::initBars( const QString &itemName ) { // Create application menu bar QToolBar *toolbar = new QToolBar( this ); - + // Create sub-menus m_itemMenu = new QPopupMenu( this ); @@ -352,10 +306,9 @@ void OPimMainWindow::initBars( const QString &itemName ) { menubar->insertItem( tr( "View" ), m_viewMenu ); - m_viewMenuCategories = 0l; m_viewMenuAppGroup = 0l; - + // Item menu m_itemMenuGroup1 = new QActionGroup( this, QString::null, false ); - + QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, m_itemMenuGroup1, 0 ); @@ -374,5 +327,5 @@ void OPimMainWindow::initBars( const QString &itemName ) { connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) ); m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) ); - + m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, m_itemMenuGroup1, 0 ); @@ -396,9 +349,9 @@ void OPimMainWindow::initBars( const QString &itemName ) { m_itemMenuGroup2 = new QActionGroup( this, QString::null, false ); - a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), - QString::null, 0, m_itemMenuGroup2, 0 ); - connect( a, SIGNAL(activated()), this, SLOT(slotItemFind()) ); - a->setWhatsThis( tr( "Click here to search for an item." ) ); - a->addTo( toolbar ); +// a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), +// QString::null, 0, m_itemMenuGroup2, 0 ); +// connect( a, SIGNAL(activated()), this, SLOT(slotItemFind()) ); +// a->setWhatsThis( tr( "Click here to search for an item." ) ); +// a->addTo( toolbar ); a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), @@ -408,16 +361,22 @@ void OPimMainWindow::initBars( const QString &itemName ) { m_itemMenuGroup2->addTo( m_itemMenu ); - + // View menu m_viewMenuGroup = new QActionGroup( this, QString::null, false ); - + a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 ); connect( a, SIGNAL(activated()), this, SLOT(slotViewFilter()) ); a->setWhatsThis( tr( "Click here to filter the items displayed." ) ); - + a = new QAction( tr( "Filter Settings" ), QString::null, 0, m_viewMenuGroup, 0 ); connect( a, SIGNAL(activated()), this, SLOT(slotViewFilterSettings()) ); a->setWhatsThis( tr( "Click here to modify the current filter settings." ) ); + // Create view toolbar + toolbar = new QToolBar( this ); + m_catSelect = new QComboBox( toolbar ); + connect( m_catSelect, SIGNAL(activated(const QString&)), this, SLOT(slotViewCategory(const QString&)) ); + + // Do initial load of categories 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 @@ -39,4 +39,5 @@ class QAction; class QActionGroup; +class QComboBox; class QCopChannel; class QDateTime; @@ -108,5 +109,5 @@ protected slots: virtual void slotItemDelete() = 0; virtual void slotItemBeam() = 0; - virtual void slotItemFind() = 0; + //virtual void slotItemFind() = 0; virtual void slotConfigure() = 0; @@ -122,5 +123,5 @@ protected: /** UI-related functions */ QPopupMenu *itemContextMenu(); - + void insertItemMenuItems( QActionGroup *items ); void insertViewMenuItems( QActionGroup *items ); @@ -128,5 +129,5 @@ protected: void setViewCategory( const QString &category ); void reloadCategories(); - + private slots: void appMessage( const QCString&, const QByteArray& ); @@ -134,6 +135,6 @@ private slots: /** UI-related slots */ - void slotViewCategory( QAction *category ); - + void slotViewCategory( const QString &category ); + private: class Private; @@ -161,9 +162,10 @@ private: QActionGroup *m_viewMenuAppGroup; // Action group containing application items in View menu QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu - QActionGroup *m_viewMenuCategories; // Pointer to action group containing categories in View menu QAction *m_itemEditAction; // Edit current item action QAction *m_itemDuplicateAction; // Duplicate current item action QAction *m_itemDeleteAction; // Delete current item action + QComboBox *m_catSelect; // Category selection combo box + /* I would love to do this as a template * but can't think of a right way |