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, 41 insertions, 65 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
@@ -97,75 +97,78 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 
     dayView = 0;
     weekView = 0;
     weekLstView = 0;
     monthView = 0;
 
-    QPEToolBar *bar = new QPEToolBar( this );
-    bar->setHorizontalStretchable( TRUE );
+//    QPEToolBar *bar = new QPEToolBar( this );
+//    bar->setHorizontalStretchable( TRUE );
 
-    QPEMenuBar *mb = new QPEMenuBar( bar );
-    mb->setMargin( 0 );
+//    QPEMenuBar *mb = new QPEMenuBar( bar );
+//    mb->setMargin( 0 );
 
-    QPEToolBar *sub_bar = new QPEToolBar(this);
-
-    QPopupMenu *view = new QPopupMenu( this );
-    QPopupMenu *settings = new QPopupMenu( this );
+//    QPopupMenu *view = new QPopupMenu( this );
+//    mb->insertItem( tr( "View" ), view );
 
-    mb->insertItem( tr( "View" ), view );
-    mb->insertItem( tr( "Settings" ), settings );
+	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 );
+	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 );
+//	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->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->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->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->addTo( view );
     a->setToggleAction( TRUE );
     monthAction = a;
 
-    a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, g, 0 );
+	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..." ), QString::null, 0, 0 );
+	a = new QAction( tr( "Edit..." ), Resource::loadPixmap("SettingsIcon"), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
-    a->addTo( settings );
+	a->addTo( sub_bar );
 
 	if(defaultView==DAY) viewDay();
 	if(defaultView==WEEK) needEvilHack=true;	// viewWeek();
 	if(defaultView==WEEKLST) viewWeekLst();
 	if(defaultView==MONTH) viewMonth();
 
@@ -370,19 +373,12 @@ void DateBook::view(int v, const QDate &d) {
 		views->raiseWidget( monthView );
 		monthView->redraw();
 	}
 }
 
 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());
 }
@@ -523,39 +519,30 @@ void DateBook::initDay()
 	if ( !dayView ) {
 		dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
 		views->addWidget( dayView, DAY );
 		dayView->setStartViewTime( startTime );
 		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 &)) );
     }
 }
 
 void DateBook::initWeek()
 {
 	if ( !weekView ) {
 		weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
 		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() ) );
 	}
 
 	//But also get it right: the year that we display can be different
 	//from the year of the current date. So, first find the year
 	//number of the current week.
 	int yearNumber, totWeeks;
@@ -565,48 +552,36 @@ void DateBook::initWeek()
 	calcWeek( d, totWeeks, yearNumber, onMonday );
 
 	while ( totWeeks == 1 ) {
 		d = d.addDays( -1 );
 		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" );
+		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 & ) ) );
+		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 & ) ) );
   }
 }
 
 
 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() ) );
+		connect( monthView, SIGNAL( dateClicked( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) );
+		connect( this, SIGNAL( newEvent() ), monthView, SLOT( redraw() ) );
 	qApp->processEvents();
     }
 }
 
 void DateBook::loadSettings()
 {
@@ -626,12 +601,13 @@ void DateBook::loadSettings()
 	weeklistviewconfig = config.readNumEntry("weeklistviewconfig",NORMAL);
 
 	defaultLocation=config.readEntry("defaultLocation");
 	QString tmpString=config.readEntry("defaultCategories");
 	QStringList tmpStringList=QStringList::split(",",tmpString);
 	defaultCategories.truncate(0);
+
 	for( QStringList::Iterator i=tmpStringList.begin(); i!=tmpStringList.end(); i++) {
 		defaultCategories.resize(defaultCategories.count()+1);
 		defaultCategories[defaultCategories.count()-1]=(*i).toInt();
 	}
 }