author | zautrix <zautrix> | 2005-02-08 16:24:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-08 16:24:18 (UTC) |
commit | 78c70cfbbe79243d8b0ec40f8f6438c99046e12b (patch) (unidiff) | |
tree | 382bc11ad3b56f72b8f84414e1da5e5ea871204b /korganizer | |
parent | 584ed7893497b2adad5ba6c3e914d90b76973b92 (diff) | |
download | kdepimpi-78c70cfbbe79243d8b0ec40f8f6438c99046e12b.zip kdepimpi-78c70cfbbe79243d8b0ec40f8f6438c99046e12b.tar.gz kdepimpi-78c70cfbbe79243d8b0ec40f8f6438c99046e12b.tar.bz2 |
fix
-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 | |||
@@ -2021,25 +2021,25 @@ void MainWindow::printSel( ) | |||
2021 | void MainWindow::printCal() | 2021 | void MainWindow::printCal() |
2022 | { | 2022 | { |
2023 | mView->print();//mCp->showDialog(); | 2023 | mView->print();//mCp->showDialog(); |
2024 | } | 2024 | } |
2025 | 2025 | ||
2026 | 2026 | ||
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; |
2040 | int y = iconToolBar->height(); | 2040 | int y = iconToolBar->height(); |
2041 | int dX = 0; | 2041 | int dX = 0; |
2042 | int dY = 0; | 2042 | int dY = 0; |
2043 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { | 2043 | if ( iconToolBar->orientation () == Qt:: Horizontal ) { |
2044 | if ( iconToolBar->y() > height()/2 ) { | 2044 | if ( iconToolBar->y() > height()/2 ) { |
2045 | dY = picker->sizeHint().height()+8; | 2045 | dY = picker->sizeHint().height()+8; |
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 4a31c77..2b8fd4f 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -159,28 +159,25 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
159 | 159 | ||
160 | } | 160 | } |
161 | 161 | ||
162 | NavigatorBar::~NavigatorBar() | 162 | NavigatorBar::~NavigatorBar() |
163 | { | 163 | { |
164 | } | 164 | } |
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())))) |
181 | { | 178 | { |
182 | month = picker->getResult(); | 179 | month = picker->getResult(); |
183 | emit monthSelected ( month ); | 180 | emit monthSelected ( month ); |
184 | } else { | 181 | } else { |
185 | KNotifyClient::beep(); | 182 | KNotifyClient::beep(); |
186 | } | 183 | } |