author | drw <drw> | 2005-02-02 18:37:25 (UTC) |
---|---|---|
committer | drw <drw> | 2005-02-02 18:37:25 (UTC) |
commit | 5b2a4d83b6b60cc9ca634aeb481cf15d70fc9b2f (patch) (side-by-side diff) | |
tree | d25b57c129781d58800fd708a207cb128737c8fb /libopie2/opiepim/ui | |
parent | 130d8dbc763e51cf072c39c21f5fa7ae15f56ba3 (diff) | |
download | opie-5b2a4d83b6b60cc9ca634aeb481cf15d70fc9b2f.zip opie-5b2a4d83b6b60cc9ca634aeb481cf15d70fc9b2f.tar.gz opie-5b2a4d83b6b60cc9ca634aeb481cf15d70fc9b2f.tar.bz2 |
Some minor updates/simplification
-rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.cpp | 24 | ||||
-rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.h | 5 |
2 files changed, 6 insertions, 23 deletions
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp index a72d174..053b250 100644 --- a/libopie2/opiepim/ui/opimmainwindow.cpp +++ b/libopie2/opiepim/ui/opimmainwindow.cpp @@ -50,14 +50,14 @@ #include <qobjectlist.h> #include <qpopupmenu.h> #include <qtoolbar.h> +#include <qwhatsthis.h> namespace Opie { -OPimMainWindow::OPimMainWindow( const QString &serviceName, - const QString &appName, const QString &catName, +OPimMainWindow::OPimMainWindow( const QString &serviceName, const QString &catName, const QString &itemName, const QString &configName, QWidget *parent, const char* name, WFlags f ) : QMainWindow( parent, name, f ), m_rtti(-1), m_service( serviceName ), m_fallBack( 0l ), - m_appName( appName ), m_catGroupName( catName ), m_config( configName ), m_itemContextMenu( 0l ) + m_catGroupName( catName ), m_config( configName ), m_itemContextMenu( 0l ) { /* @@ -76,8 +76,6 @@ OPimMainWindow::OPimMainWindow( const QString &serviceName, connect(qApp, SIGNAL(reload() ), this, SLOT(reload() ) ); - // Initialize user interface items - setCaption( m_appName ); initBars( itemName ); } @@ -247,23 +245,12 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { } } -void OPimMainWindow::slotViewCategory( const QString &category ) { - // Set application caption - QString caption = m_appName; - if ( category != tr( "All" ) ) - caption.append( QString( " - %1" ).arg( category ) ); - setCaption( caption ); - - // Notify application - emit categorySelected( category ); -} - void OPimMainWindow::setViewCategory( const QString &category ) { // 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 ); + emit categorySelected( category ); return; } } @@ -375,7 +362,8 @@ void OPimMainWindow::initBars( const QString &itemName ) { // Create view toolbar toolbar = new QToolBar( this ); m_catSelect = new QComboBox( toolbar ); - connect( m_catSelect, SIGNAL(activated(const QString&)), this, SLOT(slotViewCategory(const QString&)) ); + connect( m_catSelect, SIGNAL(activated(const QString&)), this, SIGNAL(categorySelected(const QString&)) ); + QWhatsThis::add( m_catSelect, tr( "Click here to filter items by category." ) ); // Do initial load of categories reloadCategories(); diff --git a/libopie2/opiepim/ui/opimmainwindow.h b/libopie2/opiepim/ui/opimmainwindow.h index ffc7feb..b446583 100644 --- a/libopie2/opiepim/ui/opimmainwindow.h +++ b/libopie2/opiepim/ui/opimmainwindow.h @@ -65,7 +65,6 @@ public: IrDa }; OPimMainWindow( const QString &serviceName, - const QString &appName = QString::null, const QString &catName = QString::null, const QString &itemName = QString::null, const QString &configName = QString::null, @@ -133,9 +132,6 @@ private slots: void appMessage( const QCString&, const QByteArray& ); void setDocument( const QString& ); - /** UI-related slots */ - void slotViewCategory( const QString &category ); - private: class Private; Private* d; @@ -149,7 +145,6 @@ private: int m_playedCount; int m_timerId; - QString m_appName; // Name of application for title bar QString m_catGroupName; // Name of category group Config m_config; // Configuration settings file |