-rw-r--r-- | korganizer/mainwindow.cpp | 106 |
1 files changed, 71 insertions, 35 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 348dd5e..119e28a 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -73,4 +73,5 @@ using namespace KCal; | |||
73 | #include "mainwindow.h" | 73 | #include "mainwindow.h" |
74 | 74 | ||
75 | |||
75 | class KOex2phonePrefs : public QDialog | 76 | class KOex2phonePrefs : public QDialog |
76 | { | 77 | { |
@@ -145,8 +146,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
145 | mBlockAtStartup = true; | 146 | mBlockAtStartup = true; |
146 | mFlagKeyPressed = false; | 147 | mFlagKeyPressed = false; |
148 | setCaption("KOrganizer/Pi"); | ||
147 | KOPrefs *p = KOPrefs::instance(); | 149 | KOPrefs *p = KOPrefs::instance(); |
148 | KPimGlobalPrefs::instance()->setGlobalConfig(); | 150 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
149 | if ( p->mHourSize > 18 ) | 151 | if ( p->mHourSize > 22 ) |
150 | p->mHourSize = 18; | 152 | p->mHourSize = 22; |
151 | QMainWindow::ToolBarDock tbd; | 153 | QMainWindow::ToolBarDock tbd; |
152 | if ( p->mToolBarHor ) { | 154 | if ( p->mToolBarHor ) { |
@@ -168,6 +170,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
168 | addToolBar (iconToolBar , tbd ); | 170 | addToolBar (iconToolBar , tbd ); |
169 | mCalendarModifiedFlag = false; | 171 | mCalendarModifiedFlag = false; |
170 | |||
171 | setCaption("KOrganizer/Pi"); | ||
172 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); | 172 | QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); |
173 | splash->setAlignment ( AlignCenter ); | 173 | splash->setAlignment ( AlignCenter ); |
@@ -558,41 +558,47 @@ void MainWindow::initActions() | |||
558 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); | 558 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); |
559 | connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); | 559 | connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); |
560 | 560 | QIconSet icon; | |
561 | menuBarWeek = new QPEMenuBar( iconToolBar ); | 561 | int pixWid = 22, pixHei = 22; |
562 | QPopupMenu * wpo = new QPopupMenu (this); | 562 | QString pathString = ""; |
563 | QPopupMenu * all = new QPopupMenu (this); | 563 | if ( !p->mToolBarMiniIcons ) { |
564 | //wpo->insertItem( i18n("W#"), 0 ); | 564 | if ( QApplication::desktop()->width() < 480 ) { |
565 | int first = 1; | 565 | pathString += "icons16/"; |
566 | int i; | 566 | pixWid = 18; pixHei = 16; |
567 | for ( i = 1; i < 50; ++i ) { | ||
568 | if ( !(i%10) ) { | ||
569 | all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); | ||
570 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); | ||
571 | first = i; | ||
572 | wpo = new QPopupMenu (this); | ||
573 | } | 567 | } |
574 | wpo->insertItem( QString::number(i), i ); | 568 | } else { |
575 | } | 569 | pathString += "iconsmini/"; |
576 | for ( i = 50; i < 53; ++i ) { | 570 | pixWid = 18; pixHei = 16; |
577 | wpo->insertItem( QString::number(i), i); | 571 | } |
572 | mWeekBgColor = iconToolBar->backgroundColor(); | ||
573 | mWeekPixmap.resize( pixWid , pixHei ); | ||
574 | mWeekPixmap.fill( mWeekBgColor ); | ||
575 | icon = mWeekPixmap; | ||
576 | mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); | ||
577 | mWeekAction->addTo( iconToolBar ); | ||
578 | mWeekFont = font(); | ||
579 | |||
580 | int fontPoint = mWeekFont.pointSize(); | ||
581 | QFontMetrics f( mWeekFont ); | ||
582 | int fontWid = f.width( "30" ); | ||
583 | while ( fontWid > pixWid ) { | ||
584 | --fontPoint; | ||
585 | mWeekFont.setPointSize( fontPoint ); | ||
586 | QFontMetrics f( mWeekFont ); | ||
587 | fontWid = f.width( "30" ); | ||
588 | qDebug("dec-- "); | ||
578 | } | 589 | } |
579 | all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); | 590 | |
580 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); | 591 | connect( mWeekAction, SIGNAL( activated() ), |
581 | menuBarWeek->insertItem( "00",all,1); | 592 | this, SLOT( weekAction() ) ); |
582 | menuBarWeek->setMaximumSize( menuBarWeek->sizeHint( )); | ||
583 | 593 | ||
584 | connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); | 594 | connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); |
595 | |||
596 | //#endif | ||
585 | // ****************** | 597 | // ****************** |
586 | QAction *action; | 598 | QAction *action; |
587 | QIconSet icon; | ||
588 | // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); | 599 | // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); |
589 | configureToolBarMenu->setCheckable( true ); | 600 | configureToolBarMenu->setCheckable( true ); |
590 | 601 | ||
591 | QString pathString = ""; | 602 | |
592 | if ( !p->mToolBarMiniIcons ) { | ||
593 | if ( QApplication::desktop()->width() < 480 ) | ||
594 | pathString += "icons16/"; | ||
595 | } else | ||
596 | pathString += "iconsmini/"; | ||
597 | configureAgendaMenu->setCheckable( true ); | 603 | configureAgendaMenu->setCheckable( true ); |
598 | int iii ; | 604 | int iii ; |
@@ -1371,6 +1377,12 @@ void MainWindow::updateWeek(QDate seda) | |||
1371 | weekNum = d.daysTo( seda ) / 7 +1; | 1377 | weekNum = d.daysTo( seda ) / 7 +1; |
1372 | } | 1378 | } |
1373 | //qDebug("weeknum %s ", QString::number( weekNum).latin1()); | 1379 | |
1374 | menuBarWeek-> changeItem(1, QString::number( weekNum) ); | 1380 | mWeekPixmap.fill( mWeekBgColor ); |
1381 | QPainter p ( &mWeekPixmap ); | ||
1382 | p.setFont( mWeekFont ); | ||
1383 | p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) ); | ||
1384 | p.end(); | ||
1385 | QIconSet icon3 ( mWeekPixmap ); | ||
1386 | mWeekAction->setIconSet ( icon3 ); | ||
1375 | 1387 | ||
1376 | } | 1388 | } |
@@ -1720,5 +1732,5 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) | |||
1720 | case Qt::Key_Plus: | 1732 | case Qt::Key_Plus: |
1721 | size = p->mHourSize +2; | 1733 | size = p->mHourSize +2; |
1722 | if ( size <= 18 ) | 1734 | if ( size <= 22 ) |
1723 | configureAgenda( size ); | 1735 | configureAgenda( size ); |
1724 | break; | 1736 | break; |
@@ -2012,2 +2024,26 @@ void MainWindow::printCal() | |||
2012 | } | 2024 | } |
2013 | 2025 | ||
2026 | |||
2027 | #include "libkdepim/kdatepicker.h" | ||
2028 | #include <kdatetbl.h> | ||
2029 | void MainWindow::weekAction() | ||
2030 | { | ||
2031 | int month; | ||
2032 | KPopupFrame* popup = new KPopupFrame(this); | ||
2033 | int size = 12; | ||
2034 | if ( QApplication::desktop()->width() >= 480 ) | ||
2035 | size = 18; | ||
2036 | KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(size, popup); | ||
2037 | // ----- | ||
2038 | picker->resize(picker->sizeHint()); | ||
2039 | popup->setMainWidget(picker); | ||
2040 | picker->setFocus(); | ||
2041 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); | ||
2042 | if(popup->exec(iconToolBar->mapToGlobal(QPoint(0, iconToolBar->height())))) | ||
2043 | { | ||
2044 | month = picker->getResult(); | ||
2045 | emit selectWeek ( month ); | ||
2046 | //qDebug("weekSelected %d ", month); | ||
2047 | } | ||
2048 | delete popup; | ||
2049 | } | ||