summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-04-05 12:44:31 (UTC)
committer zautrix <zautrix>2005-04-05 12:44:31 (UTC)
commite1fd021493c30106d2a31449d620ab6eaf96f18f (patch) (unidiff)
tree95667bbee29f5913c7c2e70dd9ba80356432c351 /korganizer
parent854e1b46d7895bf4860d914abb5f1e954dfbfe6a (diff)
downloadkdepimpi-e1fd021493c30106d2a31449d620ab6eaf96f18f.zip
kdepimpi-e1fd021493c30106d2a31449d620ab6eaf96f18f.tar.gz
kdepimpi-e1fd021493c30106d2a31449d620ab6eaf96f18f.tar.bz2
font point fix + versionupdate
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7aa3b60..9505d06 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2391,57 +2391,57 @@ void MainWindow::weekAction()
2391 picker->resize(picker->sizeHint()); 2391 picker->resize(picker->sizeHint());
2392 popup->setMainWidget(picker); 2392 popup->setMainWidget(picker);
2393 picker->setFocus(); 2393 picker->setFocus();
2394 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); 2394 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
2395 int x = 0; 2395 int x = 0;
2396 int y = iconToolBar->height(); 2396 int y = iconToolBar->height();
2397 int dX = 0; 2397 int dX = 0;
2398 int dY = 0; 2398 int dY = 0;
2399 if ( iconToolBar->orientation () == Qt:: Horizontal ) { 2399 if ( iconToolBar->orientation () == Qt:: Horizontal ) {
2400 if ( iconToolBar->y() > height()/2 ) { 2400 if ( iconToolBar->y() > height()/2 ) {
2401 dY = picker->sizeHint().height()+8; 2401 dY = picker->sizeHint().height()+8;
2402 y = 0; 2402 y = 0;
2403 } 2403 }
2404 } else { 2404 } else {
2405 if ( iconToolBar->x() > width()/2 ) { // right side 2405 if ( iconToolBar->x() > width()/2 ) { // right side
2406 x=0; 2406 x=0;
2407 dX= picker->sizeHint().width()+8; 2407 dX= picker->sizeHint().width()+8;
2408 y = 0; 2408 y = 0;
2409 } else { 2409 } else {
2410 x= iconToolBar->width(); 2410 x= iconToolBar->width();
2411 y = 0; 2411 y = 0;
2412 } 2412 }
2413 } 2413 }
2414 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); 2414 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
2415 if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) 2415 if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))))
2416 { 2416 {
2417 month = picker->getResult(); 2417 month = picker->getResult();
2418 emit selectWeek ( month ); 2418 emit selectWeek ( month );
2419 //qDebug("weekSelected %d ", month); 2419 //qDebug("weekSelected %d ", month);
2420 } 2420 }
2421 delete popup; 2421 delete popup;
2422} 2422}
2423 2423
2424void MainWindow::hideEvent ( QHideEvent * ) 2424void MainWindow::hideEvent ( QHideEvent * )
2425{ 2425{
2426 QString message; 2426 QString message;
2427 QDateTime nextA = mCalendar->nextAlarmEventDateTime(); 2427 QDateTime nextA = mCalendar->nextAlarmEventDateTime();
2428 if ( nextA.isValid() ) { 2428 if ( nextA.isValid() ) {
2429 QString sum = mCalendar->nextSummary(); 2429 QString sum = mCalendar->nextSummary();
2430 2430
2431 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false)); 2431 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false));
2432 setCaption( message ); 2432 setCaption( message );
2433 } 2433 }
2434} 2434}
2435 2435
2436void MainWindow::resizeEvent( QResizeEvent* e) 2436void MainWindow::resizeEvent( QResizeEvent* e)
2437{ 2437{
2438#ifndef DESKTOP_VERSION 2438#ifndef DESKTOP_VERSION
2439 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar ) { 2439 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
2440 if (QApplication::desktop()->width() > QApplication::desktop()->height() ) 2440 if (QApplication::desktop()->width() > QApplication::desktop()->height() )
2441 filterToolBar->hide(); 2441 filterToolBar->hide();
2442 else 2442 else
2443 filterToolBar->show(); 2443 filterToolBar->show();
2444 } 2444 }
2445#endif 2445#endif
2446 QMainWindow::resizeEvent( e); 2446 QMainWindow::resizeEvent( e);
2447} 2447}