| -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 @@ -51,12 +51,12 @@ #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 ) { @@ -77,6 +77,4 @@ OPimMainWindow::OPimMainWindow( const QString &serviceName, this, SLOT(reload() ) ); - // Initialize user interface items - setCaption( m_appName ); initBars( itemName ); } @@ -248,15 +246,4 @@ 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 @@ -264,5 +251,5 @@ void OPimMainWindow::setViewCategory( const QString &category ) { if ( m_catSelect->text( i ) == category ) { m_catSelect->setCurrentItem( i ); - slotViewCategory( category ); + emit categorySelected( category ); return; } @@ -376,5 +363,6 @@ void OPimMainWindow::initBars( const QString &itemName ) { 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 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 @@ -66,5 +66,4 @@ public: OPimMainWindow( const QString &serviceName, - const QString &appName = QString::null, const QString &catName = QString::null, const QString &itemName = QString::null, @@ -134,7 +133,4 @@ private slots: void setDocument( const QString& ); - /** UI-related slots */ - void slotViewCategory( const QString &category ); - private: class Private; @@ -150,5 +146,4 @@ private: 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 |