summaryrefslogtreecommitdiff
authordrw <drw>2005-02-07 20:32:21 (UTC)
committer drw <drw>2005-02-07 20:32:21 (UTC)
commitaeda5d05178f635c05ce4556e3a0b7f9be7d6401 (patch) (unidiff)
treefd7dffb1ce16c02e80396294ac100cf0522c9bfe
parented8328723ff32caee7db4064a0436703623a2de2 (diff)
downloadopie-aeda5d05178f635c05ce4556e3a0b7f9be7d6401.zip
opie-aeda5d05178f635c05ce4556e3a0b7f9be7d6401.tar.gz
opie-aeda5d05178f635c05ce4556e3a0b7f9be7d6401.tar.bz2
Minor addition
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.cpp5
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index cf05329..bdf20a9 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -233,128 +233,133 @@ void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) {
233 } 233 }
234} 234}
235 235
236void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { 236void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) {
237 // Insert menu items into View menu 237 // Insert menu items into View menu
238 if ( items ) { 238 if ( items ) {
239 // Rebuild Item menu 239 // Rebuild Item menu
240 m_viewMenu->clear(); 240 m_viewMenu->clear();
241 m_viewMenuGroup->addTo( m_viewMenu ); 241 m_viewMenuGroup->addTo( m_viewMenu );
242 m_viewMenu->insertSeparator(); 242 m_viewMenu->insertSeparator();
243 m_viewMenuAppGroup = items; 243 m_viewMenuAppGroup = items;
244 m_viewMenuAppGroup->addTo( m_viewMenu ); 244 m_viewMenuAppGroup->addTo( m_viewMenu );
245 } 245 }
246} 246}
247 247
248void OPimMainWindow::setViewCategory( const QString &category ) { 248void OPimMainWindow::setViewCategory( const QString &category ) {
249 // Find category in list 249 // Find category in list
250 for ( int i = 0; i < m_catSelect->count(); i++ ) { 250 for ( int i = 0; i < m_catSelect->count(); i++ ) {
251 if ( m_catSelect->text( i ) == category ) { 251 if ( m_catSelect->text( i ) == category ) {
252 m_catSelect->setCurrentItem( i ); 252 m_catSelect->setCurrentItem( i );
253 emit categorySelected( category ); 253 emit categorySelected( category );
254 return; 254 return;
255 } 255 }
256 } 256 }
257} 257}
258 258
259void OPimMainWindow::reloadCategories() { 259void OPimMainWindow::reloadCategories() {
260 QString selected = m_catSelect->currentText(); 260 QString selected = m_catSelect->currentText();
261 261
262 // Remove old categories from list 262 // Remove old categories from list
263 m_catSelect->clear(); 263 m_catSelect->clear();
264 264
265 // Add categories to list 265 // Add categories to list
266 Categories cats; 266 Categories cats;
267 cats.load( categoryFileName() ); 267 cats.load( categoryFileName() );
268 m_catSelect->insertItem( tr( "All" ) ); 268 m_catSelect->insertItem( tr( "All" ) );
269 m_catSelect->insertStringList( cats.labels( m_catGroupName ) ); 269 m_catSelect->insertStringList( cats.labels( m_catGroupName ) );
270 m_catSelect->insertItem( tr( "Unfiled" ) ); 270 m_catSelect->insertItem( tr( "Unfiled" ) );
271} 271}
272 272
273void OPimMainWindow::setItemNewEnabled( bool enable ) { 273void OPimMainWindow::setItemNewEnabled( bool enable ) {
274 m_itemNewAction->setEnabled( enable ); 274 m_itemNewAction->setEnabled( enable );
275} 275}
276 276
277void OPimMainWindow::setItemEditEnabled( bool enable ) { 277void OPimMainWindow::setItemEditEnabled( bool enable ) {
278 m_itemEditAction->setEnabled( enable ); 278 m_itemEditAction->setEnabled( enable );
279} 279}
280 280
281void OPimMainWindow::setItemDuplicateEnabled( bool enable ) { 281void OPimMainWindow::setItemDuplicateEnabled( bool enable ) {
282 m_itemDuplicateAction->setEnabled( enable ); 282 m_itemDuplicateAction->setEnabled( enable );
283} 283}
284 284
285void OPimMainWindow::setItemDeleteEnabled( bool enable ) { 285void OPimMainWindow::setItemDeleteEnabled( bool enable ) {
286 m_itemDeleteAction->setEnabled( enable ); 286 m_itemDeleteAction->setEnabled( enable );
287} 287}
288 288
289void OPimMainWindow::setItemBeamEnabled( bool enable ) { 289void OPimMainWindow::setItemBeamEnabled( bool enable ) {
290 m_itemBeamAction->setEnabled( enable ); 290 m_itemBeamAction->setEnabled( enable );
291} 291}
292 292
293void OPimMainWindow::setConfigureEnabled( bool enable ) { 293void OPimMainWindow::setConfigureEnabled( bool enable ) {
294 m_configureAction->setEnabled( enable ); 294 m_configureAction->setEnabled( enable );
295} 295}
296 296
297void OPimMainWindow::setShowCategories( bool show ) {
298 show ? m_catSelect->show()
299 : m_catSelect->hide();
300}
301
297void OPimMainWindow::initBars( const QString &itemName ) { 302void OPimMainWindow::initBars( const QString &itemName ) {
298 QString itemStr = itemName.lower(); 303 QString itemStr = itemName.lower();
299 304
300 setToolBarsMovable( false ); 305 setToolBarsMovable( false );
301 306
302 // Create application menu bar 307 // Create application menu bar
303 QToolBar *mbHold = new QToolBar( this ); 308 QToolBar *mbHold = new QToolBar( this );
304 mbHold->setHorizontalStretchable( true ); 309 mbHold->setHorizontalStretchable( true );
305 QMenuBar *menubar = new QMenuBar( mbHold ); 310 QMenuBar *menubar = new QMenuBar( mbHold );
306 menubar->setMargin( 0 ); 311 menubar->setMargin( 0 );
307 312
308 // Create application menu bar 313 // Create application menu bar
309 QToolBar *toolbar = new QToolBar( this ); 314 QToolBar *toolbar = new QToolBar( this );
310 315
311 // Create sub-menus 316 // Create sub-menus
312 m_itemMenu = new QPopupMenu( this ); 317 m_itemMenu = new QPopupMenu( this );
313 m_itemMenu->setCheckable( true ); 318 m_itemMenu->setCheckable( true );
314 menubar->insertItem( itemName, m_itemMenu ); 319 menubar->insertItem( itemName, m_itemMenu );
315 m_viewMenu = new QPopupMenu( this ); 320 m_viewMenu = new QPopupMenu( this );
316 m_viewMenu->setCheckable( true ); 321 m_viewMenu->setCheckable( true );
317 menubar->insertItem( tr( "View" ), m_viewMenu ); 322 menubar->insertItem( tr( "View" ), m_viewMenu );
318 323
319 m_viewMenuAppGroup = 0l; 324 m_viewMenuAppGroup = 0l;
320 325
321 // Item menu 326 // Item menu
322 m_itemMenuGroup1 = new QActionGroup( this, QString::null, false ); 327 m_itemMenuGroup1 = new QActionGroup( this, QString::null, false );
323 328
324 m_itemNewAction = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), 329 m_itemNewAction = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
325 QString::null, 0, m_itemMenuGroup1, 0 ); 330 QString::null, 0, m_itemMenuGroup1, 0 );
326 connect( m_itemNewAction, SIGNAL(activated()), this, SLOT(slotItemNew()) ); 331 connect( m_itemNewAction, SIGNAL(activated()), this, SLOT(slotItemNew()) );
327 m_itemNewAction->setWhatsThis( tr( "Click here to create a new item." ) ); 332 m_itemNewAction->setWhatsThis( tr( "Click here to create a new item." ) );
328 m_itemNewAction->addTo( toolbar ); 333 m_itemNewAction->addTo( toolbar );
329 334
330 m_itemEditAction = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), 335 m_itemEditAction = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ),
331 QString::null, 0, m_itemMenuGroup1, 0 ); 336 QString::null, 0, m_itemMenuGroup1, 0 );
332 connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) ); 337 connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) );
333 m_itemEditAction->setWhatsThis( tr( "Click here to edit the selected item." ) ); 338 m_itemEditAction->setWhatsThis( tr( "Click here to edit the selected item." ) );
334 m_itemEditAction->addTo( toolbar ); 339 m_itemEditAction->addTo( toolbar );
335 340
336 m_itemDuplicateAction = new QAction( tr( "Duplicate" ), Resource::loadPixmap( "copy" ), 341 m_itemDuplicateAction = new QAction( tr( "Duplicate" ), Resource::loadPixmap( "copy" ),
337 QString::null, 0, m_itemMenuGroup1, 0 ); 342 QString::null, 0, m_itemMenuGroup1, 0 );
338 connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) ); 343 connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) );
339 m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) ); 344 m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) );
340 345
341 m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), 346 m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ),
342 QString::null, 0, m_itemMenuGroup1, 0 ); 347 QString::null, 0, m_itemMenuGroup1, 0 );
343 connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) ); 348 connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) );
344 m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) ); 349 m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) );
345 m_itemDeleteAction->addTo( toolbar ); 350 m_itemDeleteAction->addTo( toolbar );
346 351
347 if ( Ir::supported() ) { 352 if ( Ir::supported() ) {
348 m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), 353 m_itemBeamAction = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ),
349 QString::null, 0, m_itemMenuGroup1, 0 ); 354 QString::null, 0, m_itemMenuGroup1, 0 );
350 connect( m_itemBeamAction, SIGNAL(activated()), this, SLOT(slotItemBeam()) ); 355 connect( m_itemBeamAction, SIGNAL(activated()), this, SLOT(slotItemBeam()) );
351 m_itemBeamAction->setWhatsThis( tr( "Click here to transmit the selected item." ) ); 356 m_itemBeamAction->setWhatsThis( tr( "Click here to transmit the selected item." ) );
352 m_itemBeamAction->addTo( toolbar ); 357 m_itemBeamAction->addTo( toolbar );
353 } 358 }
354 359
355 m_itemMenuGroup1->addTo( m_itemMenu ); 360 m_itemMenuGroup1->addTo( m_itemMenu );
356 361
357 m_itemMenu->insertSeparator(); 362 m_itemMenu->insertSeparator();
358 363
359 m_itemMenuGroup2 = new QActionGroup( this, QString::null, false ); 364 m_itemMenuGroup2 = new QActionGroup( this, QString::null, false );
360 365
diff --git a/libopie2/opiepim/ui/opimmainwindow.h b/libopie2/opiepim/ui/opimmainwindow.h
index 9aa0ded..fa7a730 100644
--- a/libopie2/opiepim/ui/opimmainwindow.h
+++ b/libopie2/opiepim/ui/opimmainwindow.h
@@ -73,119 +73,120 @@ public:
73 73
74 74
75protected slots: 75protected slots:
76 /* 76 /*
77 * called when a setDocument 77 * called when a setDocument
78 * couldn't be handled by this window 78 * couldn't be handled by this window
79 */ 79 */
80 virtual void doSetDocument( const QString& ); 80 virtual void doSetDocument( const QString& );
81 /* for syncing */ 81 /* for syncing */
82 virtual void flush() = 0; 82 virtual void flush() = 0;
83 virtual void reload() = 0; 83 virtual void reload() = 0;
84 84
85 /** create a new Records and return the uid */ 85 /** create a new Records and return the uid */
86 virtual int create() = 0; 86 virtual int create() = 0;
87 /** remove a record with UID == uid */ 87 /** remove a record with UID == uid */
88 virtual bool remove( int uid ) = 0; 88 virtual bool remove( int uid ) = 0;
89 /** beam the record with UID = uid */ 89 /** beam the record with UID = uid */
90 virtual void beam( int uid ) = 0; 90 virtual void beam( int uid ) = 0;
91 91
92 /** show the record with UID == uid */ 92 /** show the record with UID == uid */
93 virtual void show( int uid ) = 0; 93 virtual void show( int uid ) = 0;
94 /** edit the record */ 94 /** edit the record */
95 virtual void edit( int uid ) = 0; 95 virtual void edit( int uid ) = 0;
96 96
97 /** make a copy of it! */ 97 /** make a copy of it! */
98 virtual void add( const OPimRecord& ) = 0; 98 virtual void add( const OPimRecord& ) = 0;
99 99
100 virtual void doAlarm( const QDateTime&, int uid ); 100 virtual void doAlarm( const QDateTime&, int uid );
101 101
102 QCopChannel* channel(); 102 QCopChannel* channel();
103 103
104 /** UI-related slots */ 104 /** UI-related slots */
105 virtual void slotItemNew() = 0; 105 virtual void slotItemNew() = 0;
106 virtual void slotItemEdit() = 0; 106 virtual void slotItemEdit() = 0;
107 virtual void slotItemDuplicate() = 0; 107 virtual void slotItemDuplicate() = 0;
108 virtual void slotItemDelete() = 0; 108 virtual void slotItemDelete() = 0;
109 virtual void slotItemBeam() = 0; 109 virtual void slotItemBeam() = 0;
110 //virtual void slotItemFind() = 0; 110 //virtual void slotItemFind() = 0;
111 virtual void slotConfigure() = 0; 111 virtual void slotConfigure() = 0;
112 112
113protected: 113protected:
114 /** 114 /**
115 * start to play soundAlarm() 115 * start to play soundAlarm()
116 * @param count How many times the alarm is played 116 * @param count How many times the alarm is played
117 */ 117 */
118 void startAlarm( int count = 10 ); 118 void startAlarm( int count = 10 );
119 void killAlarm(); 119 void killAlarm();
120 void timerEvent( QTimerEvent* ); 120 void timerEvent( QTimerEvent* );
121 121
122 /** UI-related functions */ 122 /** UI-related functions */
123 QPopupMenu *itemContextMenu(); 123 QPopupMenu *itemContextMenu();
124 124
125 void insertItemMenuItems( QActionGroup *items ); 125 void insertItemMenuItems( QActionGroup *items );
126 void insertViewMenuItems( QActionGroup *items ); 126 void insertViewMenuItems( QActionGroup *items );
127 127
128 void setViewCategory( const QString &category ); 128 void setViewCategory( const QString &category );
129 void reloadCategories(); 129 void reloadCategories();
130 130
131 void setItemNewEnabled( bool enable ); 131 void setItemNewEnabled( bool enable );
132 void setItemEditEnabled( bool enable ); 132 void setItemEditEnabled( bool enable );
133 void setItemDuplicateEnabled( bool enable ); 133 void setItemDuplicateEnabled( bool enable );
134 void setItemDeleteEnabled( bool enable ); 134 void setItemDeleteEnabled( bool enable );
135 void setItemBeamEnabled( bool enable ); 135 void setItemBeamEnabled( bool enable );
136 void setConfigureEnabled( bool enable ); 136 void setConfigureEnabled( bool enable );
137 void setShowCategories( bool show );
137 138
138private slots: 139private slots:
139 void appMessage( const QCString&, const QByteArray& ); 140 void appMessage( const QCString&, const QByteArray& );
140 void setDocument( const QString& ); 141 void setDocument( const QString& );
141 142
142private: 143private:
143 class Private; 144 class Private;
144 Private* d; 145 Private* d;
145 146
146 int m_rtti; 147 int m_rtti;
147 QCopChannel* m_channel; 148 QCopChannel* m_channel;
148 QString m_service; 149 QString m_service;
149 QCString m_str; 150 QCString m_str;
150 OPimRecord* m_fallBack; 151 OPimRecord* m_fallBack;
151 int m_alarmCount; 152 int m_alarmCount;
152 int m_playedCount; 153 int m_playedCount;
153 int m_timerId; 154 int m_timerId;
154 155
155 QString m_catGroupName; // Name of category group 156 QString m_catGroupName; // Name of category group
156 Config m_config; // Configuration settings file 157 Config m_config; // Configuration settings file
157 158
158 // Menu bar data 159 // Menu bar data
159 QPopupMenu *m_itemContextMenu; // Pointer to context-sensitive menu 160 QPopupMenu *m_itemContextMenu; // Pointer to context-sensitive menu
160 QPopupMenu *m_itemMenu; // Pointer to item menu 161 QPopupMenu *m_itemMenu; // Pointer to item menu
161 QPopupMenu *m_viewMenu; // Pointer to view menu 162 QPopupMenu *m_viewMenu; // Pointer to view menu
162 QActionGroup *m_itemMenuGroup1; // Action group containing default items in Item menu 163 QActionGroup *m_itemMenuGroup1; // Action group containing default items in Item menu
163 QActionGroup *m_itemMenuGroup2; // Action group containing default items in Item menu 164 QActionGroup *m_itemMenuGroup2; // Action group containing default items in Item menu
164 QActionGroup *m_viewMenuAppGroup; // Action group containing application items in View menu 165 QActionGroup *m_viewMenuAppGroup; // Action group containing application items in View menu
165 QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu 166 QActionGroup *m_viewMenuGroup; // Action group containing default items in View menu
166 QAction *m_itemNewAction; // Add new item action 167 QAction *m_itemNewAction; // Add new item action
167 QAction *m_itemEditAction; // Edit current item action 168 QAction *m_itemEditAction; // Edit current item action
168 QAction *m_itemDuplicateAction; // Duplicate current item action 169 QAction *m_itemDuplicateAction; // Duplicate current item action
169 QAction *m_itemDeleteAction; // Delete current item action 170 QAction *m_itemDeleteAction; // Delete current item action
170 QAction *m_itemBeamAction; // Beam current item action 171 QAction *m_itemBeamAction; // Beam current item action
171 QAction *m_configureAction; // Configure application dialog action 172 QAction *m_configureAction; // Configure application dialog action
172 173
173 QComboBox *m_catSelect; // Category selection combo box 174 QComboBox *m_catSelect; // Category selection combo box
174 175
175 /* I would love to do this as a template 176 /* I would love to do this as a template
176 * but can't think of a right way 177 * but can't think of a right way
177 * because I need signal and slots -zecke 178 * because I need signal and slots -zecke
178 */ 179 */
179 virtual OPimRecord* record( int rtti, const QByteArray& ) ; 180 virtual OPimRecord* record( int rtti, const QByteArray& ) ;
180 int service(); 181 int service();
181 182
182 /** UI-related functions */ 183 /** UI-related functions */
183 void initBars( const QString &itemName = tr( "Item" ) ); 184 void initBars( const QString &itemName = tr( "Item" ) );
184 185
185signals: 186signals:
186 void categorySelected( const QString &cat ); 187 void categorySelected( const QString &cat );
187}; 188};
188 189
189} 190}
190 191
191#endif 192#endif