-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 | |||
@@ -49,16 +49,16 @@ | |||
49 | #include <qmenubar.h> | 49 | #include <qmenubar.h> |
50 | #include <qobjectlist.h> | 50 | #include <qobjectlist.h> |
51 | #include <qpopupmenu.h> | 51 | #include <qpopupmenu.h> |
52 | #include <qtoolbar.h> | 52 | #include <qtoolbar.h> |
53 | #include <qwhatsthis.h> | ||
53 | 54 | ||
54 | namespace Opie { | 55 | namespace Opie { |
55 | OPimMainWindow::OPimMainWindow( const QString &serviceName, | 56 | OPimMainWindow::OPimMainWindow( const QString &serviceName, const QString &catName, |
56 | const QString &appName, const QString &catName, | ||
57 | const QString &itemName, const QString &configName, | 57 | const QString &itemName, const QString &configName, |
58 | QWidget *parent, const char* name, WFlags f ) | 58 | QWidget *parent, const char* name, WFlags f ) |
59 | : QMainWindow( parent, name, f ), m_rtti(-1), m_service( serviceName ), m_fallBack( 0l ), | 59 | : QMainWindow( parent, name, f ), m_rtti(-1), m_service( serviceName ), m_fallBack( 0l ), |
60 | m_appName( appName ), m_catGroupName( catName ), m_config( configName ), m_itemContextMenu( 0l ) | 60 | m_catGroupName( catName ), m_config( configName ), m_itemContextMenu( 0l ) |
61 | { | 61 | { |
62 | 62 | ||
63 | /* | 63 | /* |
64 | * let's generate our QCopChannel | 64 | * let's generate our QCopChannel |
@@ -75,10 +75,8 @@ OPimMainWindow::OPimMainWindow( const QString &serviceName, | |||
75 | this, SLOT(flush() ) ); | 75 | this, SLOT(flush() ) ); |
76 | connect(qApp, SIGNAL(reload() ), | 76 | connect(qApp, SIGNAL(reload() ), |
77 | this, SLOT(reload() ) ); | 77 | this, SLOT(reload() ) ); |
78 | 78 | ||
79 | // Initialize user interface items | ||
80 | setCaption( m_appName ); | ||
81 | initBars( itemName ); | 79 | initBars( itemName ); |
82 | } | 80 | } |
83 | 81 | ||
84 | OPimMainWindow::~OPimMainWindow() { | 82 | OPimMainWindow::~OPimMainWindow() { |
@@ -246,25 +244,14 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { | |||
246 | m_viewMenuAppGroup->addTo( m_viewMenu ); | 244 | m_viewMenuAppGroup->addTo( m_viewMenu ); |
247 | } | 245 | } |
248 | } | 246 | } |
249 | 247 | ||
250 | void OPimMainWindow::slotViewCategory( const QString &category ) { | ||
251 | // Set application caption | ||
252 | QString caption = m_appName; | ||
253 | if ( category != tr( "All" ) ) | ||
254 | caption.append( QString( " - %1" ).arg( category ) ); | ||
255 | setCaption( caption ); | ||
256 | |||
257 | // Notify application | ||
258 | emit categorySelected( category ); | ||
259 | } | ||
260 | |||
261 | void OPimMainWindow::setViewCategory( const QString &category ) { | 248 | void OPimMainWindow::setViewCategory( const QString &category ) { |
262 | // Find category in list | 249 | // Find category in list |
263 | for ( int i = 0; i < m_catSelect->count(); i++ ) { | 250 | for ( int i = 0; i < m_catSelect->count(); i++ ) { |
264 | if ( m_catSelect->text( i ) == category ) { | 251 | if ( m_catSelect->text( i ) == category ) { |
265 | m_catSelect->setCurrentItem( i ); | 252 | m_catSelect->setCurrentItem( i ); |
266 | slotViewCategory( category ); | 253 | emit categorySelected( category ); |
267 | return; | 254 | return; |
268 | } | 255 | } |
269 | } | 256 | } |
270 | } | 257 | } |
@@ -374,9 +361,10 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
374 | 361 | ||
375 | // Create view toolbar | 362 | // Create view toolbar |
376 | toolbar = new QToolBar( this ); | 363 | toolbar = new QToolBar( this ); |
377 | m_catSelect = new QComboBox( toolbar ); | 364 | m_catSelect = new QComboBox( toolbar ); |
378 | connect( m_catSelect, SIGNAL(activated(const QString&)), this, SLOT(slotViewCategory(const QString&)) ); | 365 | connect( m_catSelect, SIGNAL(activated(const QString&)), this, SIGNAL(categorySelected(const QString&)) ); |
366 | QWhatsThis::add( m_catSelect, tr( "Click here to filter items by category." ) ); | ||
379 | 367 | ||
380 | // Do initial load of categories | 368 | // Do initial load of categories |
381 | reloadCategories(); | 369 | reloadCategories(); |
382 | } | 370 | } |
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 | |||
@@ -64,9 +64,8 @@ public: | |||
64 | enum TransPort { BlueTooth=0, | 64 | enum TransPort { BlueTooth=0, |
65 | IrDa }; | 65 | IrDa }; |
66 | 66 | ||
67 | OPimMainWindow( const QString &serviceName, | 67 | OPimMainWindow( const QString &serviceName, |
68 | const QString &appName = QString::null, | ||
69 | const QString &catName = QString::null, | 68 | const QString &catName = QString::null, |
70 | const QString &itemName = QString::null, | 69 | const QString &itemName = QString::null, |
71 | const QString &configName = QString::null, | 70 | const QString &configName = QString::null, |
72 | QWidget *parent = 0l, const char* name = 0l, WFlags f = WType_TopLevel ); | 71 | QWidget *parent = 0l, const char* name = 0l, WFlags f = WType_TopLevel ); |
@@ -132,11 +131,8 @@ protected: | |||
132 | private slots: | 131 | private slots: |
133 | void appMessage( const QCString&, const QByteArray& ); | 132 | void appMessage( const QCString&, const QByteArray& ); |
134 | void setDocument( const QString& ); | 133 | void setDocument( const QString& ); |
135 | 134 | ||
136 | /** UI-related slots */ | ||
137 | void slotViewCategory( const QString &category ); | ||
138 | |||
139 | private: | 135 | private: |
140 | class Private; | 136 | class Private; |
141 | Private* d; | 137 | Private* d; |
142 | 138 | ||
@@ -148,9 +144,8 @@ private: | |||
148 | int m_alarmCount; | 144 | int m_alarmCount; |
149 | int m_playedCount; | 145 | int m_playedCount; |
150 | int m_timerId; | 146 | int m_timerId; |
151 | 147 | ||
152 | QString m_appName; // Name of application for title bar | ||
153 | QString m_catGroupName; // Name of category group | 148 | QString m_catGroupName; // Name of category group |
154 | Config m_config; // Configuration settings file | 149 | Config m_config; // Configuration settings file |
155 | 150 | ||
156 | // Menu bar data | 151 | // Menu bar data |