| -rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.cpp | 97 | ||||
| -rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.h | 8 |
2 files changed, 33 insertions, 72 deletions
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp index d46df69..a72d174 100644 --- a/libopie2/opiepim/ui/opimmainwindow.cpp +++ b/libopie2/opiepim/ui/opimmainwindow.cpp @@ -1,141 +1,142 @@ /* This file is part of the Opie Project Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de) =. Copyright (C) The Opie Team <opie-devel@handhelds.org> .=l. .>+-= _;:, .> :=|. This program is free software; you can .> <`_, > . <= redistribute it and/or modify it under :`=1 )Y*s>-.-- : the terms of the GNU Library General Public .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; either version 2 of the License, ._= =} : or (at your option) any later version. .%`+i> _;_. .i_,=:_. -<s. This program is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "opimmainwindow.h" /* OPIE */ #include <opie2/opimresolver.h> #include <opie2/odebug.h> #include <qpe/categoryselect.h> #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> namespace Opie { 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 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; /* * create demands to create * a new record... */ QDataStream stream(array, IO_ReadOnly); if ( cmd == "create()" ) { raise(); int uid = create(); QCopEnvelope e(m_str, "created(int)" ); e << uid; needShow = true; }else if ( cmd == "remove(int)" ) { int uid; stream >> uid; bool rem = remove( uid ); QCopEnvelope e(m_str, "removed(bool)" ); e << rem; needShow = true; }else if ( cmd == "beam(int)" ) { int uid; stream >> uid; beam( uid); }else if ( cmd == "show(int)" ) { raise(); int uid; stream >> uid; show( uid ); needShow = true; }else if ( cmd == "edit(int)" ) { raise(); int uid; stream >> uid; edit( uid ); }else if ( cmd == "add(int,QByteArray)" ) { int rtti; QByteArray array; stream >> rtti; stream >> array; m_fallBack = record(rtti, array ); if (!m_fallBack) return; add( *m_fallBack ); delete m_fallBack; }else if ( cmd == "alarm(QDateTime,int)" ) { raise(); QDateTime dt; int uid; @@ -146,280 +147,238 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) return; doAlarm( dt, uid ); needShow = true; } 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 */ OPimRecord* OPimMainWindow::record( int rtti, const QByteArray& array ) { if ( service() != rtti ) return 0l; OPimRecord* record = OPimResolver::self()->record( rtti ); QDataStream str(array, IO_ReadOnly ); if ( !record || !record->loadFromStream(str) ) { delete record; record = 0l; } return record; } /* * get the rtti for the service */ int OPimMainWindow::service() { if ( m_rtti == -1 ) m_rtti = OPimResolver::self()->serviceId( m_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 <m_alarmCount ) { m_playedCount++; Sound::soundAlarm(); }else { killTimer( e->timerId() ); } } QPopupMenu *OPimMainWindow::itemContextMenu() { if ( !m_itemContextMenu ) { // Create context menu if hasn't been done before m_itemContextMenu = new QPopupMenu( this ); m_itemEditAction->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 ) { +void OPimMainWindow::slotViewCategory( const QString &category ) { // Set application caption QString caption = m_appName; - if ( category->text() != tr( "All" ) ) - caption.append( QString( " - %1" ).arg( category->text() ) ); + if ( category != tr( "All" ) ) + caption.append( QString( " - %1" ).arg( category ) ); setCaption( caption ); // Notify application - emit categorySelected( category->text() ); + emit categorySelected( category ); } 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<QAction*>(obj); - if ( currAction->text() == category ) { - // Category was found, enable it - currAction->setOn( true ); + // 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 ); 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<QAction*>(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" ); - } + QString selected = m_catSelect->currentText(); - 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" ) ); + // Remove old categories from list + m_catSelect->clear(); + // Add categories to list 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 ); - } + m_catSelect->insertItem( tr( "All" ) ); + m_catSelect->insertStringList( cats.labels( m_catGroupName ) ); + m_catSelect->insertItem( tr( "Unfiled" ) ); } 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" ), Resource::loadPixmap( "copy" ), 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( "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." ) ); + // Create view toolbar + toolbar = new QToolBar( this ); + m_catSelect = new QComboBox( toolbar ); + connect( m_catSelect, SIGNAL(activated(const QString&)), this, SLOT(slotViewCategory(const QString&)) ); + + // Do initial load of categories reloadCategories(); } } // namespace Opie diff --git a/libopie2/opiepim/ui/opimmainwindow.h b/libopie2/opiepim/ui/opimmainwindow.h index 4aed8b8..ffc7feb 100644 --- a/libopie2/opiepim/ui/opimmainwindow.h +++ b/libopie2/opiepim/ui/opimmainwindow.h @@ -1,184 +1,186 @@ /* This file is part of the Opie Project Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de) =. Copyright (C) The Opie Team <opie-devel@handhelds.org> .=l. .>+-= _;:, .> :=|. This program is free software; you can .> <`_, > . <= redistribute it and/or modify it under :`=1 )Y*s>-.-- : the terms of the GNU Library General Public .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; either version 2 of the License, ._= =} : or (at your option) any later version. .%`+i> _;_. .i_,=:_. -<s. This program is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef OPIE_PIM_MAINWINDOW_H #define OPIE_PIM_MAINWINDOW_H #include <opie2/opimrecord.h> #include <qpe/categories.h> #include <qpe/config.h> #include <qmainwindow.h> class QAction; class QActionGroup; +class QComboBox; class QCopChannel; class QDateTime; class QPopupMenu; namespace Opie { /** * This is a common Opie PIM MainWindow * it takes care of the QCOP internals * and implements some functions * for the URL scripting schema */ /* * 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; /** create a new Records and return the uid */ virtual int create() = 0; /** remove a record with UID == uid */ virtual bool remove( int uid ) = 0; /** beam the record with UID = uid */ virtual void beam( int uid ) = 0; /** show the record with UID == uid */ virtual void show( int uid ) = 0; /** edit the record */ virtual void edit( int uid ) = 0; /** make a copy of it! */ virtual void add( const OPimRecord& ) = 0; virtual void doAlarm( const QDateTime&, int uid ); 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 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 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 ); + 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 - 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 + QComboBox *m_catSelect; // Category selection combo box + /* 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 ); }; } #endif |