summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.cpp24
-rw-r--r--libopie2/opiepim/ui/opimmainwindow.h5
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
@@ -47,20 +47,20 @@
#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();
@@ -73,14 +73,12 @@ OPimMainWindow::OPimMainWindow( const QString &serviceName,
/* 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;
}
@@ -244,29 +242,18 @@ void OPimMainWindow::insertViewMenuItems( QActionGroup *items ) {
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() {
@@ -372,13 +359,14 @@ void OPimMainWindow::initBars( const QString &itemName ) {
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
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
@@ -62,13 +62,12 @@ 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();
@@ -130,15 +129,12 @@ protected:
void reloadCategories();
private slots:
void appMessage( const QCString&, const QByteArray& );
void setDocument( const QString& );
- /** UI-related slots */
- void slotViewCategory( const QString &category );
-
private:
class Private;
Private* d;
int m_rtti;
QCopChannel* m_channel;
@@ -146,13 +142,12 @@ private:
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