Diffstat (limited to 'libopie2/opiepim/ui/opimmainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiepim/ui/opimmainwindow.cpp | 24 |
1 files changed, 6 insertions, 18 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 @@ #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> +#include <qwhatsthis.h> namespace Opie { -OPimMainWindow::OPimMainWindow( const QString &serviceName, - const QString &appName, const QString &catName, +OPimMainWindow::OPimMainWindow( const QString &serviceName, 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 ) + 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& ) { @@ -238,41 +236,30 @@ void OPimMainWindow::insertItemMenuItems( QActionGroup *items ) { void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) { // Insert menu items into View menu if ( items ) { // Rebuild Item menu m_viewMenu->clear(); m_viewMenuGroup->addTo( m_viewMenu ); m_viewMenu->insertSeparator(); m_viewMenuAppGroup = items; m_viewMenuAppGroup->addTo( m_viewMenu ); } } -void OPimMainWindow::slotViewCategory( const QString &category ) { - // Set application caption - QString caption = m_appName; - if ( category != tr( "All" ) ) - caption.append( QString( " - %1" ).arg( category ) ); - setCaption( caption ); - - // Notify application - emit categorySelected( category ); -} - void OPimMainWindow::setViewCategory( const QString &category ) { // 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 ); + emit categorySelected( category ); return; } } } void OPimMainWindow::reloadCategories() { QString selected = m_catSelect->currentText(); // Remove old categories from list m_catSelect->clear(); // Add categories to list @@ -366,19 +353,20 @@ void OPimMainWindow::initBars( const QString &itemName ) { 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&)) ); + connect( m_catSelect, SIGNAL(activated(const QString&)), this, SIGNAL(categorySelected(const QString&)) ); + QWhatsThis::add( m_catSelect, tr( "Click here to filter items by category." ) ); // Do initial load of categories reloadCategories(); } } // namespace Opie |