UI and code cleanup. Both UI and code is now more consistent. Also removed menus in favor of toolbuttons. (why were they even available as menus in the first place?)

1 files changed, 126 insertions, 150 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index cf1eeca..b7e89b0 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -82,86 +82,89 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
       alarmCounter(0)
 {
-    bool needEvilHack= false; // if we need an Evil Hack
-    QTime t;
-    t.start();
-    db = new DateBookDBHack;
-    qDebug("loading db t=%d", t.elapsed() );
-    loadSettings();
-    setCaption( tr("Calendar") );
-    setIcon( Resource::loadPixmap( "datebook_icon" ) );
-
-    setToolBarsMovable( FALSE );
-
-    views = new QWidgetStack( this );
-    setCentralWidget( views );
-
-    dayView = 0;
-    weekView = 0;
-    weekLstView = 0;
-    monthView = 0;
-
-    QPEToolBar *bar = new QPEToolBar( this );
-    bar->setHorizontalStretchable( TRUE );
-
-    QPEMenuBar *mb = new QPEMenuBar( bar );
-    mb->setMargin( 0 );
-
-    QPEToolBar *sub_bar = new QPEToolBar(this);
-
-    QPopupMenu *view = new QPopupMenu( this );
-    QPopupMenu *settings = new QPopupMenu( this );
-
-    mb->insertItem( tr( "View" ), view );
-    mb->insertItem( tr( "Settings" ), settings );
-
-    QActionGroup *g = new QActionGroup( this );
-    g->setExclusive( TRUE );
-
-    QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
-                              QString::null, 0, this, 0 );
-    connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
-    a->addTo( sub_bar );
-
-    a = new QAction( tr( "Today" ), Resource::loadPixmap( "datebook/to_day" ),  QString::null, 0, g, 0 );
-    connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
-    a->addTo( sub_bar );
-    a->addTo( view );
-
-    a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 );
-    connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) );
-    a->addTo( sub_bar );
-    a->addTo( view );
-    a->setToggleAction( TRUE );
-    a->setOn( TRUE );
-    dayAction = a;
-
-    a = new QAction( tr( "Week" ), Resource::loadPixmap( "week" ), QString::null, 0, g, 0 );
-    connect( a, SIGNAL( activated() ), this, SLOT( viewWeek() ) );
-    a->addTo( sub_bar );
-    a->addTo( view );
-    a->setToggleAction( TRUE );
-    weekAction = a;
-
-    a = new QAction( tr( "WeekLst" ), Resource::loadPixmap( "datebook/weeklst" ), QString::null, 0, g, 0 );
-    connect( a, SIGNAL( activated() ), this, SLOT( viewWeekLst() ) );
-    a->addTo( sub_bar );
-    a->addTo( view );
-    a->setToggleAction( TRUE );
-    weekLstAction = a;
-
-    a = new QAction( tr( "Month" ), Resource::loadPixmap( "month" ), QString::null, 0, g, 0 );
-    connect( a, SIGNAL( activated() ), this, SLOT( viewMonth() ) );
-    a->addTo( sub_bar );
-    a->addTo( view );
-    a->setToggleAction( TRUE );
-    monthAction = a;
-
-    a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, g, 0 );
-    connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
-    a->addTo( sub_bar );
-
-    a = new QAction( tr( "Edit..." ), QString::null, 0, 0 );
-    connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
-    a->addTo( settings );
+	bool needEvilHack= false; // if we need an Evil Hack
+	QTime t;
+	t.start();
+	db = new DateBookDBHack;
+	qDebug("loading db t=%d", t.elapsed() );
+	loadSettings();
+	setCaption( tr("Calendar") );
+	setIcon( Resource::loadPixmap( "datebook_icon" ) );
+
+	setToolBarsMovable( FALSE );
+
+	views = new QWidgetStack( this );
+	setCentralWidget( views );
+
+	dayView = 0;
+	weekView = 0;
+	weekLstView = 0;
+	monthView = 0;
+
+//    QPEToolBar *bar = new QPEToolBar( this );
+//    bar->setHorizontalStretchable( TRUE );
+
+//    QPEMenuBar *mb = new QPEMenuBar( bar );
+//    mb->setMargin( 0 );
+
+//    QPopupMenu *view = new QPopupMenu( this );
+//    mb->insertItem( tr( "View" ), view );
+
+	QPEToolBar *sub_bar = new QPEToolBar(this);
+	sub_bar->setHorizontalStretchable(TRUE);
+
+	QActionGroup *g = new QActionGroup( this );
+	g->setExclusive( TRUE );
+
+	QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
+	connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
+	a->addTo( sub_bar );
+
+	sub_bar->addSeparator();
+
+	a = new QAction( tr( "Today" ), Resource::loadPixmap( "datebook/to_day" ),  QString::null, 0, g, 0 );
+	connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
+	a->addTo( sub_bar );
+//	a->addTo( view );
+
+	sub_bar->addSeparator();
+
+	a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 );
+	connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) );
+	a->addTo( sub_bar );
+//    a->addTo( view );
+	a->setToggleAction( TRUE );
+	a->setOn( TRUE );
+	dayAction = a;
+
+	a = new QAction( tr( "Week" ), Resource::loadPixmap( "week" ), QString::null, 0, g, 0 );
+	connect( a, SIGNAL( activated() ), this, SLOT( viewWeek() ) );
+	a->addTo( sub_bar );
+//    a->addTo( view );
+	a->setToggleAction( TRUE );
+	weekAction = a;
+
+	a = new QAction( tr( "WeekLst" ), Resource::loadPixmap( "datebook/weeklst" ), QString::null, 0, g, 0 );
+	connect( a, SIGNAL( activated() ), this, SLOT( viewWeekLst() ) );
+	a->addTo( sub_bar );
+//    a->addTo( view );
+	a->setToggleAction( TRUE );
+	weekLstAction = a;
+
+	a = new QAction( tr( "Month" ), Resource::loadPixmap( "month" ), QString::null, 0, g, 0 );
+	connect( a, SIGNAL( activated() ), this, SLOT( viewMonth() ) );
+	a->addTo( sub_bar );
+//    a->addTo( view );
+	a->setToggleAction( TRUE );
+	monthAction = a;
+
+	sub_bar->addSeparator();
+
+	a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, this, 0 );
+	connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
+	a->addTo( sub_bar );
+
+	a = new QAction( tr( "Edit..." ), Resource::loadPixmap("SettingsIcon"), QString::null, 0, this, 0 );
+	connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
+	a->addTo( sub_bar );
 
 	if(defaultView==DAY) viewDay();
@@ -171,8 +174,8 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 
 	connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(changeClock(bool)) );
-    connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(changeWeek(bool)) );
+	connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(changeWeek(bool)) );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
-    connect( qApp, SIGNAL(appMessage(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&)) );
 #endif
 
@@ -180,13 +183,13 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
-    QCopChannel *channel = new QCopChannel( "QPE/System", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
-    channel = new QCopChannel( "QPE/Datebook", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
-    qDebug("olle\n");
+	QCopChannel *channel = new QCopChannel( "QPE/System", this );
+	connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
+	channel = new QCopChannel( "QPE/Datebook", this );
+	connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
+	qDebug("olle\n");
 #endif
 #endif
 
-    qDebug("done t=%d", t.elapsed() );
+	qDebug("done t=%d", t.elapsed() );
 
     /*
@@ -374,28 +377,21 @@ void DateBook::view(int v, const QDate &d) {
 
 void DateBook::viewDefault(const QDate &d) {
-/*
-  Config config("DateBook");
-  config.setGroup("Main");
-  int current=config.readNumEntry("defaultview", DAY);
-
-  view(current,d);
-*/
 	view(defaultView,d);
 }
 
 void DateBook::viewDay() {
-  view(DAY,currentDate());
+	view(DAY,currentDate());
 }
 
 void DateBook::viewWeek() {
-    view(WEEK,currentDate());
+	view(WEEK,currentDate());
 }
 
 void DateBook::viewWeekLst() {
-    view(WEEKLST,currentDate());
+	view(WEEKLST,currentDate());
 }
 
 void DateBook::viewMonth() {
-    view(MONTH,currentDate());
+	view(MONTH,currentDate());
 }
 
@@ -527,19 +523,12 @@ void DateBook::initDay()
 		dayView->setJumpToCurTime( bJumpToCurTime );
 		dayView->setRowStyle( rowStyle );
-		connect( this, SIGNAL( newEvent() ),
-			dayView, SLOT( redraw() ) );
-		connect( dayView, SIGNAL( newEvent() ),
-			this, SLOT( fileNew() ) );
-		connect( dayView, SIGNAL( removeEvent( const Event & ) ),
-			this, SLOT( removeEvent( const Event & ) ) );
-		connect( dayView, SIGNAL( editEvent( const Event & ) ),
-			this, SLOT( editEvent( const Event & ) ) );
-		connect( dayView, SIGNAL( duplicateEvent( const Event & ) ),
-			this, SLOT( duplicateEvent( const Event & ) ) );
-		connect( dayView, SIGNAL( beamEvent( const Event & ) ),
-			this, SLOT( beamEvent( const Event & ) ) );
-		connect( dayView, SIGNAL(sigNewEvent(const QString &)),
-			this, SLOT(slotNewEventFromKey(const QString &)) );
-    }
+		connect( this, SIGNAL( newEvent() ), dayView, SLOT( redraw() ) );
+		connect( dayView, SIGNAL( newEvent() ), 	this, SLOT( fileNew() ) );
+		connect( dayView, SIGNAL( removeEvent( const Event & ) ), this, SLOT( removeEvent( const Event & ) ) );
+		connect( dayView, SIGNAL( editEvent( const Event & ) ), this, SLOT( editEvent( const Event & ) ) );
+		connect( dayView, SIGNAL( duplicateEvent( const Event & ) ), this, SLOT( duplicateEvent( const Event & ) ) );
+		connect( dayView, SIGNAL( beamEvent( const Event & ) ), this, SLOT( beamEvent( const Event & ) ) );
+		connect( dayView, SIGNAL(sigNewEvent(const QString &)), this, SLOT(slotNewEventFromKey(const QString &)) );
+	}
 }
 
@@ -550,8 +539,6 @@ void DateBook::initWeek()
 		weekView->setStartViewTime( startTime );
 		views->addWidget( weekView, WEEK );
-		connect( weekView, SIGNAL( showDate( int, int, int ) ),
-			this, SLOT( showDay( int, int, int ) ) );
-		connect( this, SIGNAL( newEvent() ),
-			weekView, SLOT( redraw() ) );
+		connect( weekView, SIGNAL( showDate( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) );
+		connect( this, SIGNAL( newEvent() ), weekView, SLOT( redraw() ) );
 	}
 
@@ -569,28 +556,18 @@ void DateBook::initWeek()
 		calcWeek( d, totWeeks, yearNumber, onMonday );
 	}
-	if ( totWeeks != weekView->totalWeeks() )
-		weekView->setTotalWeeks( totWeeks );
 }
 
 void DateBook::initWeekLst() {
-  if ( !weekLstView ) {
-      weekLstView = new DateBookWeekLst( ampm, onMonday, db,
-					 views, "weeklst view" );
-      views->addWidget( weekLstView, WEEKLST );
-
-      //weekLstView->setStartViewTime( startTime );
-      connect( weekLstView, SIGNAL( showDate( int, int, int ) ),
-	       this, SLOT( showDay( int, int, int ) ) );
-      connect( weekLstView, SIGNAL( addEvent( const QDateTime &,
-					      const QDateTime &,
-					      const QString & , const QString &) ),
-	       this, SLOT( slotNewEntry( const QDateTime &,
-					 const QDateTime &,
-					 const QString & , const QString &) ) );
-      connect( this, SIGNAL( newEvent() ),
-	       weekLstView, SLOT( redraw() ) );
-      connect( weekLstView, SIGNAL( editEvent( const Event & ) ),
-	       this, SLOT( editEvent( const Event & ) ) );
-  }
+	if ( !weekLstView ) {
+		weekLstView = new DateBookWeekLst( ampm, onMonday, db, views, "weeklst view" );
+		views->addWidget( weekLstView, WEEKLST );
+
+		//weekLstView->setStartViewTime( startTime );
+		connect( weekLstView, SIGNAL( showDate( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) );
+		connect( weekLstView, SIGNAL( addEvent( const QDateTime &, const QDateTime &, const QString & , const QString &) ),
+			this, SLOT( slotNewEntry( const QDateTime &, const QDateTime &, const QString & , const QString &) ) );
+		connect( this, SIGNAL( newEvent() ), weekLstView, SLOT( redraw() ) );
+		connect( weekLstView, SIGNAL( editEvent( const Event & ) ), this, SLOT( editEvent( const Event & ) ) );
+	}
 }
 
@@ -598,13 +575,11 @@ void DateBook::initWeekLst() {
 void DateBook::initMonth()
 {
-    if ( !monthView ) {
-	monthView = new DateBookMonth( views, "month view", FALSE, db );
-	views->addWidget( monthView, MONTH );
-	connect( monthView, SIGNAL( dateClicked( int, int, int ) ),
-             this, SLOT( showDay( int, int, int ) ) );
-	connect( this, SIGNAL( newEvent() ),
-		 monthView, SLOT( redraw() ) );
-	qApp->processEvents();
-    }
+	if ( !monthView ) {
+		monthView = new DateBookMonth( views, "month view", FALSE, db );
+		views->addWidget( monthView, MONTH );
+		connect( monthView, SIGNAL( dateClicked( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) );
+		connect( this, SIGNAL( newEvent() ), monthView, SLOT( redraw() ) );
+		qApp->processEvents();
+	}
 }
 
@@ -630,4 +605,5 @@ void DateBook::loadSettings()
 	QStringList tmpStringList=QStringList::split(",",tmpString);
 	defaultCategories.truncate(0);
+
 	for( QStringList::Iterator i=tmpStringList.begin(); i!=tmpStringList.end(); i++) {
 		defaultCategories.resize(defaultCategories.count()+1);