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
@@ -37,60 +37,58 @@
 #include <qpe/ir.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 
 /* QT */
 #include <qaction.h>
 #include <qapplication.h>
 #include <qcombobox.h>
 #include <qcopchannel_qws.h>
 #include <qdatetime.h>
 #include <qmenubar.h>
 #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 )
 {
 
     /*
      * let's generate our QCopChannel
      */
     m_str = QString("QPE/"+m_service).local8Bit();
     m_channel= new QCopChannel(m_str, this );
     connect(m_channel, SIGNAL(received(const QCString&,const QByteArray&)),
             this, SLOT(appMessage(const QCString&,const QByteArray&)) );
     connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
             this, SLOT(appMessage(const QCString&,const QByteArray&)) );
 
     /* connect flush and reload */
     connect(qApp, SIGNAL(flush() ),
             this, SLOT(flush() ) );
     connect(qApp, SIGNAL(reload() ),
             this, SLOT(reload() ) );
 
-    // Initialize user interface items
-    setCaption( m_appName );
     initBars( itemName );
 }
 
 OPimMainWindow::~OPimMainWindow() {
     delete m_channel;
 }
 
 QCopChannel* OPimMainWindow::channel() {
     return m_channel;
 }
 
 void OPimMainWindow::doSetDocument( const QString&  ) {
 
 }
 
 void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) {
@@ -234,49 +232,38 @@ void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) {
         m_itemMenuGroup2->addTo( m_itemMenu );
     }
 }
 
 void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) {
     // Insert menu items into View menu
     if ( items ) {
         // Rebuild Item menu
         m_viewMenu->clear();
         m_viewMenuGroup->addTo( m_viewMenu );
         m_viewMenu->insertSeparator();
         m_viewMenuAppGroup = items;
         m_viewMenuAppGroup->addTo( m_viewMenu );
     }
 }
 
-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;
         }
     }
 }
 
 void OPimMainWindow::reloadCategories() {
     QString selected = m_catSelect->currentText();
 
     // Remove old categories from list
     m_catSelect->clear();
 
     // Add categories to list
     Categories cats;
     cats.load( categoryFileName() );
     m_catSelect->insertItem( tr( "All" ) );
     m_catSelect->insertStringList( cats.labels( m_catGroupName ) );
@@ -362,23 +349,24 @@ 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&)) );
+    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();
 }
 
 } // namespace Opie
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
@@ -52,33 +52,32 @@ namespace Opie {
  */
 /*
  * due Qt and Templates with signal and slots
  * do not work that good :(
  * (Ok how to moc a template ;) )
  * We will have the mainwindow which calls a struct which
  * is normally reimplemented as a template ;)
  */
 
 class OPimMainWindow : public QMainWindow {
     Q_OBJECT
 public:
     enum TransPort { BlueTooth=0,
                      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,
                     QWidget *parent = 0l,  const char* name = 0l, WFlags f = WType_TopLevel );
     virtual ~OPimMainWindow();
 
 
 protected slots:
     /*
      * called when a setDocument
      * couldn't be handled by this window
      */
     virtual void doSetDocument( const QString& );
     /* for syncing */
     virtual void flush()  = 0;
     virtual void reload() = 0;
@@ -120,49 +119,45 @@ protected:
     void killAlarm();
     void timerEvent( QTimerEvent* );
 
     /** UI-related functions */
     QPopupMenu *itemContextMenu();
 
     void insertItemMenuItems( QActionGroup *items );
     void insertViewMenuItems( QActionGroup *items );
 
     void setViewCategory( const QString &category );
     void reloadCategories();
 
 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;
 
     int m_rtti;
     QCopChannel* m_channel;
     QString m_service;
     QCString m_str;
     OPimRecord* m_fallBack;
     int m_alarmCount;
     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
 
     // Menu bar data
     QPopupMenu   *m_itemContextMenu;     // Pointer to context-sensitive menu
     QPopupMenu   *m_itemMenu;            // Pointer to item menu
     QPopupMenu   *m_viewMenu;            // Pointer to view menu
     QActionGroup *m_itemMenuGroup1;      // Action group containing default items in Item menu
     QActionGroup *m_itemMenuGroup2;      // Action group containing default items in Item menu
     QActionGroup *m_viewMenuAppGroup;    // Action group containing application items in View menu
     QActionGroup *m_viewMenuGroup;       // Action group containing default items 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