From 43f82d5c68e1d7a5b26f862c26a76253a85e7518 Mon Sep 17 00:00:00 2001 From: drw Date: Sun, 30 Jan 2005 00:30:47 +0000 Subject: First part of PIM app consistancy/consolidation - added menu/tool bar, app caption and context menu handling to OPimMainWindow --- (limited to 'libopie2') diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp index 058a428..40bbb7b 100644 --- a/libopie2/opiepim/ui/opimmainwindow.cpp +++ b/libopie2/opiepim/ui/opimmainwindow.cpp @@ -33,47 +33,65 @@ #include #include -#include +#include +#include #include #include +#include +#include /* QT */ +#include #include -#include #include - - +#include +#include +#include +#include +#include namespace Opie { -OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent, - const char* name, WFlags flag ) - : QMainWindow( parent, name, flag ), m_rtti(-1), m_service( service ), m_fallBack(0l) { +OPimMainWindow::OPimMainWindow( const QString &serviceName, + const QString &appName, 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 ) +{ /* * 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(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 ) { bool needShow = false; /* @@ -133,10 +151,12 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) if (needShow ) QPEApplication::setKeepRunning(); } + /* implement the url scripting here */ void OPimMainWindow::setDocument( const QString& str) { doSetDocument( str ); } + /* * we now try to get the array demarshalled * check if the rtti matches this one @@ -154,6 +174,7 @@ OPimRecord* OPimMainWindow::record( int rtti, const QByteArray& array ) { return record; } + /* * get the rtti for the service */ @@ -163,18 +184,22 @@ int OPimMainWindow::service() { return m_rtti; } + void OPimMainWindow::doAlarm( const QDateTime&, int ) { } + void OPimMainWindow::startAlarm(int count ) { m_alarmCount = count; m_playedCount = 0; Sound::soundAlarm(); m_timerId = startTimer( 5000 ); } + void OPimMainWindow::killAlarm() { killTimer( m_timerId ); } + void OPimMainWindow::timerEvent( QTimerEvent* e) { if ( m_playedCount addTo( m_itemContextMenu ); + m_itemDuplicateAction->addTo( m_itemContextMenu ); + m_itemDeleteAction->addTo( m_itemContextMenu ); + } + + return m_itemContextMenu; +} + +void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) { + // Insert menu items into Item menu + if ( items ) { + // Rebuild Item menu + m_itemMenu->clear(); + m_itemMenuGroup1->addTo( m_itemMenu ); + m_itemMenu->insertSeparator(); + items->addTo( m_itemMenu ); + m_itemMenu->insertSeparator(); + 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_viewMenuCategories->addTo( m_viewMenu ); + m_viewMenu->insertSeparator(); + m_viewMenuGroup->addTo( m_viewMenu ); + m_viewMenu->insertSeparator(); + m_viewMenuAppGroup = items; + m_viewMenuAppGroup->addTo( m_viewMenu ); + } +} + +void OPimMainWindow::slotViewCategory( QAction *category ) { + // Set application caption + QString caption = m_appName; + if ( category->text() != tr( "All" ) ) + caption.append( QString( " - %1" ).arg( category->text() ) ); + setCaption( caption ); + + // Notify application + emit categorySelected( category->text() ); +} + +void OPimMainWindow::setViewCategory( const QString &category ) { + // Find category in menu + QObjectListIt kidIt( *(m_viewMenuCategories->children()) ); + QObject *obj; + while ( (obj=kidIt.current()) != 0 ) { + QAction *currAction = reinterpret_cast(obj); + if ( currAction->text() == category ) { + // Category was found, enable it + currAction->setOn( true ); + return; + } + ++kidIt; + } } + +void OPimMainWindow::reloadCategories() { + QString selected; + + // Remove old categories from View menu + if ( m_viewMenuCategories ) { + QObjectListIt kidIt( *(m_viewMenuCategories->children()) ); + QObject *obj; + while ( (obj=kidIt.current()) != 0 ) { + QAction *currAction = reinterpret_cast(obj); + if ( currAction->isOn() ) + selected = currAction->text(); + ++kidIt; + delete currAction; + } + } + else { + m_viewMenuCategories = new QActionGroup( this ); + connect( m_viewMenuCategories, SIGNAL(selected(QAction*)), this, SLOT(slotViewCategory(QAction*)) ); + + selected = tr( "All" ); + } + + m_viewMenu->clear(); + + // Add categories to View menu + QAction *a = new QAction( tr( "All" ), QString::null, 0, m_viewMenuCategories, QString::null, true ); + a->setWhatsThis( tr( "Click here to view all items." ) ); + a->setOn( selected == tr( "All" ) ); + + Categories cats; + cats.load( categoryFileName() ); + QStringList catList = cats.labels( m_catGroupName ); + for ( QStringList::Iterator it = catList.begin(); it != catList.end(); ++it ) { + a = new QAction( tr( (*it) ), QString::null, 0, m_viewMenuCategories, QString::null, true ); + a->setWhatsThis( tr( "Click here to view items belonging to %1." ).arg( (*it) ) ); + a->setOn( selected == (*it) ); + } + + a = new QAction( tr( "Unfiled" ), QString::null, 0, m_viewMenuCategories, QString::null, true ); + a->setWhatsThis( tr( "Click here to view all unfiled items." ) ); + a->setOn( selected == tr( "Unfiled" ) ); + + m_viewMenuCategories->addTo( m_viewMenu ); + + // Add default items to View menu + m_viewMenu->insertSeparator(); + m_viewMenuGroup->addTo( m_viewMenu ); + + // Insert application-specific items (if any) + if ( m_viewMenuAppGroup ) { + m_viewMenu->insertSeparator(); + m_viewMenuAppGroup->addTo( m_viewMenu ); + } +} + +void OPimMainWindow::initBars( const QString &itemName ) { + QString itemStr = itemName.lower(); + + setToolBarsMovable( false ); + + // Create application menu bar + QToolBar *mbHold = new QToolBar( this ); + mbHold->setHorizontalStretchable( true ); + QMenuBar *menubar = new QMenuBar( mbHold ); + menubar->setMargin( 0 ); + + // Create application menu bar + QToolBar *toolbar = new QToolBar( this ); + + // Create sub-menus + m_itemMenu = new QPopupMenu( this ); + m_itemMenu->setCheckable( true ); + menubar->insertItem( itemName, m_itemMenu ); + m_viewMenu = new QPopupMenu( this ); + m_viewMenu->setCheckable( true ); + menubar->insertItem( tr( "View" ), m_viewMenu ); + + m_viewMenuCategories = 0l; + m_viewMenuAppGroup = 0l; + + // Item menu + m_itemMenuGroup1 = new QActionGroup( this, QString::null, false ); + + QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), + QString::null, 0, m_itemMenuGroup1, 0 ); + connect( a, SIGNAL(activated()), this, SLOT(slotItemNew()) ); + a->setWhatsThis( tr( "Click here to create a new item." ) ); + a->addTo( toolbar ); + + m_itemEditAction = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), + QString::null, 0, m_itemMenuGroup1, 0 ); + connect( m_itemEditAction, SIGNAL(activated()), this, SLOT(slotItemEdit()) ); + m_itemEditAction->setWhatsThis( tr( "Click here to edit the selected item." ) ); + m_itemEditAction->addTo( toolbar ); + + m_itemDuplicateAction = new QAction( tr( "Duplicate" ), QString::null, 0, m_itemMenuGroup1, 0 ); + connect( m_itemDuplicateAction, SIGNAL(activated()), this, SLOT(slotItemDuplicate()) ); + m_itemDuplicateAction->setWhatsThis( tr( "Click here to duplicate the selected item." ) ); + + m_itemDeleteAction = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), + QString::null, 0, m_itemMenuGroup1, 0 ); + connect( m_itemDeleteAction, SIGNAL(activated()), this, SLOT(slotItemDelete()) ); + m_itemDeleteAction->setWhatsThis( tr( "Click here to delete the selected item." ) ); + m_itemDeleteAction->addTo( toolbar ); + + if ( Ir::supported() ) { + a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), + QString::null, 0, m_itemMenuGroup1, 0 ); + connect( a, SIGNAL(activated()), this, SLOT(slotItemBeam()) ); + a->setWhatsThis( tr( "Click here to transmit the selected item." ) ); + //a->addTo( m_itemMenu ); + a->addTo( toolbar ); + } + + m_itemMenuGroup1->addTo( m_itemMenu ); + + m_itemMenu->insertSeparator(); + + m_itemMenuGroup2 = new QActionGroup( this, QString::null, false ); + + a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), + QString::null, 0, m_itemMenuGroup2, 0 ); + connect( a, SIGNAL(activated()), this, SLOT(slotItemFind()) ); + a->setWhatsThis( tr( "Click here to search for an item." ) ); + a->addTo( toolbar ); + + a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), + QString::null, 0, m_itemMenuGroup2, 0 ); + connect( a, SIGNAL(activated()), this, SLOT(slotConfigure()) ); + a->setWhatsThis( tr( "Click here to set your preferences for this application." ) ); + + 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." ) ); + + reloadCategories(); +} + +} // namespace Opie diff --git a/libopie2/opiepim/ui/opimmainwindow.h b/libopie2/opiepim/ui/opimmainwindow.h index abad630..4aed8b8 100644 --- a/libopie2/opiepim/ui/opimmainwindow.h +++ b/libopie2/opiepim/ui/opimmainwindow.h @@ -29,11 +29,18 @@ #ifndef OPIE_PIM_MAINWINDOW_H #define OPIE_PIM_MAINWINDOW_H +#include + +#include +#include + #include -#include +class QAction; +class QActionGroup; class QCopChannel; class QDateTime; +class QPopupMenu; namespace Opie { /** @@ -56,8 +63,12 @@ public: enum TransPort { BlueTooth=0, IrDa }; - OPimMainWindow( const QString& service, QWidget *parent = 0, const char* name = 0, - WFlags f = WType_TopLevel); + 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(); @@ -90,20 +101,40 @@ protected slots: QCopChannel* channel(); + /** UI-related slots */ + virtual void slotItemNew() = 0; + virtual void slotItemEdit() = 0; + virtual void slotItemDuplicate() = 0; + virtual void slotItemDelete() = 0; + virtual void slotItemBeam() = 0; + virtual void slotItemFind() = 0; + virtual void slotConfigure() = 0; + protected: /** * start to play soundAlarm() * @param count How many times the alarm is played */ - void startAlarm(int count = 10); + void startAlarm( int count = 10 ); 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( QAction *category ); + private: class Private; Private* d; @@ -116,12 +147,36 @@ private: 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 + QActionGroup *m_viewMenuCategories; // Pointer to action group containing categories in View menu + QAction *m_itemEditAction; // Edit current item action + QAction *m_itemDuplicateAction; // Duplicate current item action + QAction *m_itemDeleteAction; // Delete current item action + /* I would love to do this as a template * but can't think of a right way * because I need signal and slots -zecke */ virtual OPimRecord* record( int rtti, const QByteArray& ) ; int service(); + + /** UI-related functions */ + void initBars( const QString &itemName = tr( "Item" ) ); + +signals: + void categorySelected( const QString &cat ); }; } -- cgit v0.9.0.2