-rw-r--r-- | korganizer/mainwindow.cpp | 2 | ||||
-rw-r--r-- | korganizer/navigatorbar.cpp | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 856f7db..468fd5b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -2027,13 +2027,13 @@ void MainWindow::printCal() | |||
2027 | #include "libkdepim/kdatepicker.h" | 2027 | #include "libkdepim/kdatepicker.h" |
2028 | #include <kdatetbl.h> | 2028 | #include <kdatetbl.h> |
2029 | void MainWindow::weekAction() | 2029 | void MainWindow::weekAction() |
2030 | { | 2030 | { |
2031 | int month; | 2031 | int month; |
2032 | KPopupFrame* popup = new KPopupFrame(this); | 2032 | KPopupFrame* popup = new KPopupFrame(this); |
2033 | KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(10, popup); | 2033 | KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); |
2034 | // ----- | 2034 | // ----- |
2035 | picker->resize(picker->sizeHint()); | 2035 | picker->resize(picker->sizeHint()); |
2036 | popup->setMainWidget(picker); | 2036 | popup->setMainWidget(picker); |
2037 | picker->setFocus(); | 2037 | picker->setFocus(); |
2038 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); | 2038 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); |
2039 | int x = 0; | 2039 | int x = 0; |
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 4a31c77..2b8fd4f 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -165,16 +165,13 @@ NavigatorBar::~NavigatorBar() | |||
165 | 165 | ||
166 | void NavigatorBar::selectMonth() | 166 | void NavigatorBar::selectMonth() |
167 | { | 167 | { |
168 | 168 | ||
169 | int month; | 169 | int month; |
170 | KPopupFrame* popup = new KPopupFrame(this); | 170 | KPopupFrame* popup = new KPopupFrame(this); |
171 | int size = 12; | 171 | KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(popup); |
172 | if ( QApplication::desktop()->width() >= 480 ) | ||
173 | size = 18; | ||
174 | KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(size, popup); | ||
175 | // ----- | 172 | // ----- |
176 | picker->resize(picker->sizeHint()); | 173 | picker->resize(picker->sizeHint()); |
177 | popup->setMainWidget(picker); | 174 | popup->setMainWidget(picker); |
178 | picker->setFocus(); | 175 | picker->setFocus(); |
179 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); | 176 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); |
180 | if(popup->exec(mSelectMonth->mapToGlobal(QPoint(0, mSelectMonth->height())))) | 177 | if(popup->exec(mSelectMonth->mapToGlobal(QPoint(0, mSelectMonth->height())))) |