Some minor updates/simplification

1 files changed, 6 insertions, 18 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