-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 | |||
@@ -2009,49 +2009,49 @@ void MainWindow::getFile( bool success ) | |||
2009 | mView->openCalendar( defaultFileName() ); | 2009 | mView->openCalendar( defaultFileName() ); |
2010 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | 2010 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { |
2011 | mSyncManager->slotSyncMenu( 999 ); | 2011 | mSyncManager->slotSyncMenu( 999 ); |
2012 | } | 2012 | } |
2013 | setCaption( i18n("Pi-Sync successful!") ); | 2013 | setCaption( i18n("Pi-Sync successful!") ); |
2014 | } | 2014 | } |
2015 | 2015 | ||
2016 | void MainWindow::printSel( ) | 2016 | void MainWindow::printSel( ) |
2017 | { | 2017 | { |
2018 | mView->viewManager()->agendaView()->agenda()->printSelection(); | 2018 | mView->viewManager()->agendaView()->agenda()->printSelection(); |
2019 | } | 2019 | } |
2020 | 2020 | ||
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; |
2046 | y = 0; | 2046 | y = 0; |
2047 | } | 2047 | } |
2048 | } else { | 2048 | } else { |
2049 | if ( iconToolBar->x() > width()/2 ) { // right side | 2049 | if ( iconToolBar->x() > width()/2 ) { // right side |
2050 | x=0; | 2050 | x=0; |
2051 | dX= picker->sizeHint().width()+8; | 2051 | dX= picker->sizeHint().width()+8; |
2052 | y = 0; | 2052 | y = 0; |
2053 | } else { | 2053 | } else { |
2054 | x= iconToolBar->width(); | 2054 | x= iconToolBar->width(); |
2055 | y = 0; | 2055 | y = 0; |
2056 | } | 2056 | } |
2057 | } | 2057 | } |
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 4a31c77..2b8fd4f 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -147,52 +147,49 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
147 | 147 | ||
148 | connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) ); | 148 | connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) ); |
149 | connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) ); | 149 | connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) ); |
150 | connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) ); | 150 | connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) ); |
151 | connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) ); | 151 | connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) ); |
152 | connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) ); | 152 | connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) ); |
153 | mPrevYear->setFocusPolicy(NoFocus); | 153 | mPrevYear->setFocusPolicy(NoFocus); |
154 | mPrevMonth->setFocusPolicy(NoFocus); | 154 | mPrevMonth->setFocusPolicy(NoFocus); |
155 | mNextMonth->setFocusPolicy(NoFocus); | 155 | mNextMonth->setFocusPolicy(NoFocus); |
156 | mNextYear->setFocusPolicy(NoFocus); | 156 | mNextYear->setFocusPolicy(NoFocus); |
157 | mSelectMonth->setFocusPolicy(NoFocus); | 157 | mSelectMonth->setFocusPolicy(NoFocus); |
158 | setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); | 158 | setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); |
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 | } |
187 | delete popup; | 184 | delete popup; |
188 | } | 185 | } |
189 | void NavigatorBar::selectDates( const KCal::DateList &dateList ) | 186 | void NavigatorBar::selectDates( const KCal::DateList &dateList ) |
190 | { | 187 | { |
191 | if (dateList.count() > 0) { | 188 | if (dateList.count() > 0) { |
192 | QDate date = dateList.first(); | 189 | QDate date = dateList.first(); |
193 | 190 | ||
194 | const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem(); | 191 | const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem(); |
195 | 192 | ||
196 | // compute the label at the top of the navigator | 193 | // compute the label at the top of the navigator |
197 | QString dtstr = i18n(calSys->monthName( date )) + " '" + | 194 | QString dtstr = i18n(calSys->monthName( date )) + " '" + |
198 | QString::number( calSys->year( date ) ).right(2); | 195 | QString::number( calSys->year( date ) ).right(2); |