author | drw <drw> | 2005-02-02 18:37:25 (UTC) |
---|---|---|
committer | drw <drw> | 2005-02-02 18:37:25 (UTC) |
commit | 5b2a4d83b6b60cc9ca634aeb481cf15d70fc9b2f (patch) (unidiff) | |
tree | d25b57c129781d58800fd708a207cb128737c8fb /libopie2/opiepim/ui | |
parent | 130d8dbc763e51cf072c39c21f5fa7ae15f56ba3 (diff) | |
download | opie-5b2a4d83b6b60cc9ca634aeb481cf15d70fc9b2f.zip opie-5b2a4d83b6b60cc9ca634aeb481cf15d70fc9b2f.tar.gz opie-5b2a4d83b6b60cc9ca634aeb481cf15d70fc9b2f.tar.bz2 |
Some minor updates/simplification
-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 | |||
@@ -41,52 +41,50 @@ | |||
41 | #include <qpe/sound.h> | 41 | #include <qpe/sound.h> |
42 | 42 | ||
43 | /* QT */ | 43 | /* QT */ |
44 | #include <qaction.h> | 44 | #include <qaction.h> |
45 | #include <qapplication.h> | 45 | #include <qapplication.h> |
46 | #include <qcombobox.h> | 46 | #include <qcombobox.h> |
47 | #include <qcopchannel_qws.h> | 47 | #include <qcopchannel_qws.h> |
48 | #include <qdatetime.h> | 48 | #include <qdatetime.h> |
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 |
65 | */ | 65 | */ |
66 | m_str = QString("QPE/"+m_service).local8Bit(); | 66 | m_str = QString("QPE/"+m_service).local8Bit(); |
67 | m_channel= new QCopChannel(m_str, this ); | 67 | m_channel= new QCopChannel(m_str, this ); |
68 | connect(m_channel, SIGNAL(received(const QCString&,const QByteArray&)), | 68 | connect(m_channel, SIGNAL(received(const QCString&,const QByteArray&)), |
69 | this, SLOT(appMessage(const QCString&,const QByteArray&)) ); | 69 | this, SLOT(appMessage(const QCString&,const QByteArray&)) ); |
70 | connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), | 70 | connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), |
71 | this, SLOT(appMessage(const QCString&,const QByteArray&)) ); | 71 | this, SLOT(appMessage(const QCString&,const QByteArray&)) ); |
72 | 72 | ||
73 | /* connect flush and reload */ | 73 | /* connect flush and reload */ |
74 | connect(qApp, SIGNAL(flush() ), | 74 | connect(qApp, SIGNAL(flush() ), |
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() { |
85 | delete m_channel; | 83 | delete m_channel; |
86 | } | 84 | } |
87 | 85 | ||
88 | QCopChannel* OPimMainWindow::channel() { | 86 | QCopChannel* OPimMainWindow::channel() { |
89 | return m_channel; | 87 | return m_channel; |
90 | } | 88 | } |
91 | 89 | ||
92 | void OPimMainWindow::doSetDocument( const QString& ) { | 90 | void OPimMainWindow::doSetDocument( const QString& ) { |
@@ -238,41 +236,30 @@ void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) { | |||
238 | void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { | 236 | void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { |
239 | // Insert menu items into View menu | 237 | // Insert menu items into View menu |
240 | if ( items ) { | 238 | if ( items ) { |
241 | // Rebuild Item menu | 239 | // Rebuild Item menu |
242 | m_viewMenu->clear(); | 240 | m_viewMenu->clear(); |
243 | m_viewMenuGroup->addTo( m_viewMenu ); | 241 | m_viewMenuGroup->addTo( m_viewMenu ); |
244 | m_viewMenu->insertSeparator(); | 242 | m_viewMenu->insertSeparator(); |
245 | m_viewMenuAppGroup = items; | 243 | m_viewMenuAppGroup = 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 | } |
271 | 258 | ||
272 | void OPimMainWindow::reloadCategories() { | 259 | void OPimMainWindow::reloadCategories() { |
273 | QString selected = m_catSelect->currentText(); | 260 | QString selected = m_catSelect->currentText(); |
274 | 261 | ||
275 | // Remove old categories from list | 262 | // Remove old categories from list |
276 | m_catSelect->clear(); | 263 | m_catSelect->clear(); |
277 | 264 | ||
278 | // Add categories to list | 265 | // Add categories to list |
@@ -366,19 +353,20 @@ void OPimMainWindow::initBars( const QString &itemName ) { | |||
366 | 353 | ||
367 | a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 ); | 354 | a = new QAction( tr( "Filter" ), QString::null, 0, m_viewMenuGroup, 0 ); |
368 | connect( a, SIGNAL(activated()), this, SLOT(slotViewFilter()) ); | 355 | connect( a, SIGNAL(activated()), this, SLOT(slotViewFilter()) ); |
369 | a->setWhatsThis( tr( "Click here to filter the items displayed." ) ); | 356 | a->setWhatsThis( tr( "Click here to filter the items displayed." ) ); |
370 | 357 | ||
371 | a = new QAction( tr( "Filter Settings" ), QString::null, 0, m_viewMenuGroup, 0 ); | 358 | a = new QAction( tr( "Filter Settings" ), QString::null, 0, m_viewMenuGroup, 0 ); |
372 | connect( a, SIGNAL(activated()), this, SLOT(slotViewFilterSettings()) ); | 359 | connect( a, SIGNAL(activated()), this, SLOT(slotViewFilterSettings()) ); |
373 | a->setWhatsThis( tr( "Click here to modify the current filter settings." ) ); | 360 | a->setWhatsThis( tr( "Click here to modify the current filter settings." ) ); |
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 | } |
383 | 371 | ||
384 | } // namespace Opie | 372 | } // 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 | |||
@@ -56,25 +56,24 @@ namespace Opie { | |||
56 | * (Ok how to moc a template ;) ) | 56 | * (Ok how to moc a template ;) ) |
57 | * We will have the mainwindow which calls a struct which | 57 | * We will have the mainwindow which calls a struct which |
58 | * is normally reimplemented as a template ;) | 58 | * is normally reimplemented as a template ;) |
59 | */ | 59 | */ |
60 | 60 | ||
61 | class OPimMainWindow : public QMainWindow { | 61 | class OPimMainWindow : public QMainWindow { |
62 | Q_OBJECT | 62 | Q_OBJECT |
63 | public: | 63 | 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 ); |
73 | virtual ~OPimMainWindow(); | 72 | virtual ~OPimMainWindow(); |
74 | 73 | ||
75 | 74 | ||
76 | protected slots: | 75 | protected slots: |
77 | /* | 76 | /* |
78 | * called when a setDocument | 77 | * called when a setDocument |
79 | * couldn't be handled by this window | 78 | * couldn't be handled by this window |
80 | */ | 79 | */ |
@@ -124,41 +123,37 @@ protected: | |||
124 | QPopupMenu *itemContextMenu(); | 123 | QPopupMenu *itemContextMenu(); |
125 | 124 | ||
126 | void insertItemMenuItems( QActionGroup *items ); | 125 | void insertItemMenuItems( QActionGroup *items ); |
127 | void insertViewMenuItems( QActionGroup *items ); | 126 | void insertViewMenuItems( QActionGroup *items ); |
128 | 127 | ||
129 | void setViewCategory( const QString &category ); | 128 | void setViewCategory( const QString &category ); |
130 | void reloadCategories(); | 129 | void reloadCategories(); |
131 | 130 | ||
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 | ||
143 | int m_rtti; | 139 | int m_rtti; |
144 | QCopChannel* m_channel; | 140 | QCopChannel* m_channel; |
145 | QString m_service; | 141 | QString m_service; |
146 | QCString m_str; | 142 | QCString m_str; |
147 | OPimRecord* m_fallBack; | 143 | OPimRecord* m_fallBack; |
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 |
157 | QPopupMenu *m_itemContextMenu; // Pointer to context-sensitive menu | 152 | QPopupMenu *m_itemContextMenu; // Pointer to context-sensitive menu |
158 | QPopupMenu *m_itemMenu; // Pointer to item menu | 153 | QPopupMenu *m_itemMenu; // Pointer to item menu |
159 | QPopupMenu *m_viewMenu; // Pointer to view menu | 154 | QPopupMenu *m_viewMenu; // Pointer to view menu |
160 | QActionGroup *m_itemMenuGroup1; // Action group containing default items in Item menu | 155 | QActionGroup *m_itemMenuGroup1; // Action group containing default items in Item menu |
161 | QActionGroup *m_itemMenuGroup2; // Action group containing default items in Item menu | 156 | QActionGroup *m_itemMenuGroup2; // Action group containing default items in Item menu |
162 | QActionGroup *m_viewMenuAppGroup; // Action group containing application items in View menu | 157 | QActionGroup *m_viewMenuAppGroup; // Action group containing application items in View menu |
163 | QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu | 158 | QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu |
164 | QAction *m_itemEditAction; // Edit current item action | 159 | QAction *m_itemEditAction; // Edit current item action |