author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /korganizer/navigatorbar.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-p1.zip kdepimpi-p1.tar.gz kdepimpi-p1.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | korganizer/navigatorbar.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index f6a1a6a..59c3e45 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -26,10 +26,13 @@ | |||
26 | #include <qtooltip.h> | 26 | #include <qtooltip.h> |
27 | #include <qpushbutton.h> | 27 | #include <qpushbutton.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qframe.h> | 29 | #include <q3frame.h> |
30 | #include <qlabel.h> | 30 | #include <qlabel.h> |
31 | #include <qpopupmenu.h> | 31 | #include <q3popupmenu.h> |
32 | #include <qapplication.h> | 32 | #include <qapplication.h> |
33 | #include <QDesktopWidget> | ||
34 | //Added by qt3to4: | ||
35 | #include <Q3HBoxLayout> | ||
33 | 36 | ||
34 | #include <kdebug.h> | 37 | #include <kdebug.h> |
35 | #include <klocale.h> | 38 | #include <klocale.h> |
@@ -53,11 +56,11 @@ | |||
53 | NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *name ) | 56 | NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *name ) |
54 | : QWidget( parent, name ) | 57 | : QWidget( parent, name ) |
55 | { | 58 | { |
56 | QBoxLayout *topLayout = new QHBoxLayout( this ); | 59 | Q3BoxLayout *topLayout = new Q3HBoxLayout( this ); |
57 | 60 | ||
58 | // Set up the control buttons and date label | 61 | // Set up the control buttons and date label |
59 | mCtrlFrame = new QFrame( this ); | 62 | mCtrlFrame = new Q3Frame( this ); |
60 | mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised); | 63 | mCtrlFrame->setFrameStyle(Q3Frame::Panel|Q3Frame::Raised); |
61 | mCtrlFrame->setLineWidth(1); | 64 | mCtrlFrame->setLineWidth(1); |
62 | 65 | ||
63 | topLayout->addWidget( mCtrlFrame ); | 66 | topLayout->addWidget( mCtrlFrame ); |
@@ -129,7 +132,7 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
129 | 132 | ||
130 | 133 | ||
131 | // set up control frame layout | 134 | // set up control frame layout |
132 | QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 ); | 135 | Q3BoxLayout *ctrlLayout = new Q3HBoxLayout( mCtrlFrame, 1 ); |
133 | ctrlLayout->addWidget( mPrevYear, 3 ); | 136 | ctrlLayout->addWidget( mPrevYear, 3 ); |
134 | ctrlLayout->addWidget( mPrevMonth, 3 ); | 137 | ctrlLayout->addWidget( mPrevMonth, 3 ); |
135 | ctrlLayout->addWidget( mPrevWeek, 3 ); | 138 | ctrlLayout->addWidget( mPrevWeek, 3 ); |
@@ -150,13 +153,13 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
150 | connect( mNextWeek, SIGNAL( clicked() ), SIGNAL( goNextWeek() ) ); | 153 | connect( mNextWeek, SIGNAL( clicked() ), SIGNAL( goNextWeek() ) ); |
151 | connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) ); | 154 | connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) ); |
152 | connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) ); | 155 | connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) ); |
153 | mPrevYear->setFocusPolicy(NoFocus); | 156 | mPrevYear->setFocusPolicy(Qt::NoFocus); |
154 | mPrevMonth->setFocusPolicy(NoFocus); | 157 | mPrevMonth->setFocusPolicy(Qt::NoFocus); |
155 | mNextMonth->setFocusPolicy(NoFocus); | 158 | mNextMonth->setFocusPolicy(Qt::NoFocus); |
156 | mPrevWeek->setFocusPolicy(NoFocus); | 159 | mPrevWeek->setFocusPolicy(Qt::NoFocus); |
157 | mNextWeek->setFocusPolicy(NoFocus); | 160 | mNextWeek->setFocusPolicy(Qt::NoFocus); |
158 | mNextYear->setFocusPolicy(NoFocus); | 161 | mNextYear->setFocusPolicy(Qt::NoFocus); |
159 | mSelectMonth->setFocusPolicy(NoFocus); | 162 | mSelectMonth->setFocusPolicy(Qt::NoFocus); |
160 | setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); | 163 | setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); |
161 | 164 | ||
162 | } | 165 | } |