[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/korganizer
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-02-14 19:28:06
Message-ID: 20050214192806.291CD1CF5F () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

--frame


  M +6 -17     navigatorbar.cpp   1.19
  M +1 -2      navigatorbar.h   1.7


--- kdepim/korganizer/navigatorbar.h  #1.6:1.7
@@ -72,5 +72,4 @@ class NavigatorBar: public QWidget
   
     QDate mDate;
-    QFrame *mCtrlFrame;
 
     QPushButton *mPrevYear;

--- kdepim/korganizer/navigatorbar.cpp  #1.18:1.19
@@ -57,13 +57,4 @@ NavigatorBar::NavigatorBar( QWidget *par
   : QWidget( parent, name ), mHasMinWidth( false )
 {
-  QBoxLayout *topLayout = new QHBoxLayout( this );
-
-  // Set up the control buttons and date label
-  mCtrlFrame = new QFrame( this );
-  mCtrlFrame->setFrameStyle( QFrame::Panel | QFrame::Raised );
-  mCtrlFrame->setLineWidth( 1 );
-
-  topLayout->addWidget( mCtrlFrame );
-
   QFont tfont = font();
   tfont.setPointSize( 10 );
@@ -74,5 +65,5 @@ NavigatorBar::NavigatorBar( QWidget *par
   QPixmap pix;
   // Create backward navigation buttons
-  mPrevYear = new QPushButton( mCtrlFrame );
+  mPrevYear = new QPushButton( this );
   pix = KOGlobals::self()->smallIcon( isRTL ? "2rightarrow" : "2leftarrow" );
   mPrevYear->setPixmap( pix );
@@ -81,5 +72,5 @@ NavigatorBar::NavigatorBar( QWidget *par
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "1rightarrow" : "1leftarrow");
-  mPrevMonth = new QPushButton( mCtrlFrame );
+  mPrevMonth = new QPushButton( this );
   mPrevMonth->setPixmap( pix );
   mPrevMonth->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
@@ -88,5 +79,5 @@ NavigatorBar::NavigatorBar( QWidget *par
   // Create forward navigation buttons
   pix = KOGlobals::self()->smallIcon( isRTL ? "1leftarrow" : "1rightarrow");
-  mNextMonth = new QPushButton( mCtrlFrame );
+  mNextMonth = new QPushButton( this );
   mNextMonth->setPixmap( pix );
   mNextMonth->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
@@ -94,5 +85,5 @@ NavigatorBar::NavigatorBar( QWidget *par
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "2leftarrow" : "2rightarrow");
-  mNextYear = new QPushButton( mCtrlFrame );
+  mNextYear = new QPushButton( this );
   mNextYear->setPixmap( pix );
   mNextYear->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
@@ -100,5 +91,5 @@ NavigatorBar::NavigatorBar( QWidget *par
 
   // Create month name button
-  mMonth = new ActiveLabel( mCtrlFrame );
+  mMonth = new ActiveLabel( this );
   mMonth->setFont( tfont );
   mMonth->setAlignment( AlignCenter );
@@ -107,10 +98,8 @@ NavigatorBar::NavigatorBar( QWidget *par
 
   // set up control frame layout
-  QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 );
+  QBoxLayout *ctrlLayout = new QHBoxLayout( this, 0, 4 );
   ctrlLayout->addWidget( mPrevYear, 3 );
   ctrlLayout->addWidget( mPrevMonth, 3 );
-  ctrlLayout->addSpacing( 2 );
   ctrlLayout->addWidget( mMonth, 3 );
-  ctrlLayout->addSpacing( 2 );
   ctrlLayout->addWidget( mNextMonth, 3 );
   ctrlLayout->addWidget( mNextYear, 3 );


[prev in list] [next in list] [prev in thread] [next in thread]