Some minor updates/simplification

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
@@ -52,6 +52,6 @@
 #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,
@@ -59,3 +59,3 @@ OPimMainWindow::OPimMainWindow( const QString &serviceName,
     : 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 )
 {
@@ -78,4 +78,2 @@ OPimMainWindow::OPimMainWindow( const QString &serviceName,
 
-    // Initialize user interface items
-    setCaption( m_appName );
     initBars( itemName );
@@ -249,13 +247,2 @@ 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 ) {
@@ -265,3 +252,3 @@ void OPimMainWindow::setViewCategory( const QString &category ) {
             m_catSelect->setCurrentItem( i );
-            slotViewCategory( category );
+            emit categorySelected( category );
             return;
@@ -377,3 +364,4 @@ void OPimMainWindow::initBars( const QString &itemName ) {
     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." ) );
 
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
@@ -67,3 +67,2 @@ public:
     OPimMainWindow( const QString &serviceName,
-                    const QString &appName = QString::null,
                     const QString &catName = QString::null,
@@ -135,5 +134,2 @@ private slots:
 
-    /** UI-related slots */
-    void slotViewCategory( const QString &category );
-
 private:
@@ -151,3 +147,2 @@ private:
 
-    QString    m_appName;      // Name of application for title bar
     QString    m_catGroupName; // Name of category group