author | zautrix <zautrix> | 2005-02-07 06:10:09 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-07 06:10:09 (UTC) |
commit | 301a4a207171549bd87815705d8dcf32ad15559d (patch) (unidiff) | |
tree | 715fde2cd0af0c057f767c25d8e67298425b2c82 /korganizer | |
parent | 961fc44f4092c1f981eb3be4284715e6829f885c (diff) | |
download | kdepimpi-301a4a207171549bd87815705d8dcf32ad15559d.zip kdepimpi-301a4a207171549bd87815705d8dcf32ad15559d.tar.gz kdepimpi-301a4a207171549bd87815705d8dcf32ad15559d.tar.bz2 |
new cool feature
-rw-r--r-- | korganizer/mainwindow.cpp | 110 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 15 |
2 files changed, 86 insertions, 39 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 348dd5e..119e28a 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -72,6 +72,7 @@ using namespace KCal; | |||
72 | #endif | 72 | #endif |
73 | #include "mainwindow.h" | 73 | #include "mainwindow.h" |
74 | 74 | ||
75 | |||
75 | class KOex2phonePrefs : public QDialog | 76 | class KOex2phonePrefs : public QDialog |
76 | { | 77 | { |
77 | public: | 78 | public: |
@@ -144,10 +145,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
144 | setIcon(SmallIcon( "ko24" ) ); | 145 | setIcon(SmallIcon( "ko24" ) ); |
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 ) { |
153 | if ( p->mToolBarUp ) | 155 | if ( p->mToolBarUp ) |
@@ -167,8 +169,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
167 | iconToolBar = new QPEToolBar( this ); | 169 | iconToolBar = new QPEToolBar( this ); |
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 ); |
174 | setCentralWidget( splash ); | 174 | setCentralWidget( splash ); |
@@ -557,43 +557,49 @@ void MainWindow::initActions() | |||
557 | } | 557 | } |
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 ) { | 567 | } |
568 | if ( !(i%10) ) { | 568 | } else { |
569 | all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); | 569 | pathString += "iconsmini/"; |
570 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); | 570 | pixWid = 18; pixHei = 16; |
571 | first = i; | 571 | } |
572 | wpo = new QPopupMenu (this); | 572 | mWeekBgColor = iconToolBar->backgroundColor(); |
573 | } | 573 | mWeekPixmap.resize( pixWid , pixHei ); |
574 | wpo->insertItem( QString::number(i), i ); | 574 | mWeekPixmap.fill( mWeekBgColor ); |
575 | } | 575 | icon = mWeekPixmap; |
576 | for ( i = 50; i < 53; ++i ) { | 576 | mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); |
577 | wpo->insertItem( QString::number(i), i); | 577 | mWeekAction->addTo( iconToolBar ); |
578 | } | 578 | mWeekFont = font(); |
579 | all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); | 579 | |
580 | connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); | 580 | int fontPoint = mWeekFont.pointSize(); |
581 | menuBarWeek->insertItem( "00",all,1); | 581 | QFontMetrics f( mWeekFont ); |
582 | menuBarWeek->setMaximumSize( menuBarWeek->sizeHint( )); | 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-- "); | ||
589 | } | ||
590 | |||
591 | connect( mWeekAction, SIGNAL( activated() ), | ||
592 | this, SLOT( weekAction() ) ); | ||
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 ; |
599 | for ( iii = 1;iii<= 10 ;++iii ){ | 605 | for ( iii = 1;iii<= 10 ;++iii ){ |
@@ -1370,8 +1376,14 @@ void MainWindow::updateWeek(QDate seda) | |||
1370 | // we have the first week of the year.we are on monday | 1376 | // we have the first week of the year.we are on monday |
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 | } |
1377 | void MainWindow::updateWeekNum(const DateList &selectedDates) | 1389 | void MainWindow::updateWeekNum(const DateList &selectedDates) |
@@ -1719,7 +1731,7 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) | |||
1719 | break; | 1731 | break; |
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; |
1725 | case Qt::Key_Minus: | 1737 | case Qt::Key_Minus: |
@@ -2011,3 +2023,27 @@ void MainWindow::printCal() | |||
2011 | mView->print();//mCp->showDialog(); | 2023 | mView->print();//mCp->showDialog(); |
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 | } | ||
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 076ab94..5b9f903 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <qtimer.h> | 5 | #include <qtimer.h> |
6 | #include <qdict.h> | 6 | #include <qdict.h> |
7 | #include <qfile.h> | 7 | #include <qfile.h> |
8 | #include <qmenubar.h> | ||
8 | #include <qtextstream.h> | 9 | #include <qtextstream.h> |
9 | #include <qregexp.h> | 10 | #include <qregexp.h> |
10 | 11 | ||
@@ -23,13 +24,19 @@ class KSyncProfile; | |||
23 | #define QPEMenuBar QMenuBar | 24 | #define QPEMenuBar QMenuBar |
24 | #endif | 25 | #endif |
25 | class QPEToolBar; | 26 | class QPEToolBar; |
26 | class QPEMenuBar; | ||
27 | 27 | ||
28 | 28 | ||
29 | namespace KCal { | 29 | namespace KCal { |
30 | class CalendarLocal; | 30 | class CalendarLocal; |
31 | } | 31 | } |
32 | 32 | ||
33 | class KOMenuBar : public QMenuBar | ||
34 | { | ||
35 | public: | ||
36 | KOMenuBar( QWidget *parent=0 ): QMenuBar (parent ) {;} | ||
37 | QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );} | ||
38 | }; | ||
39 | |||
33 | using namespace KCal; | 40 | using namespace KCal; |
34 | 41 | ||
35 | class MainWindow : public QMainWindow | 42 | class MainWindow : public QMainWindow |
@@ -50,6 +57,7 @@ class MainWindow : public QMainWindow | |||
50 | void recieve( const QCString& msg, const QByteArray& data ); | 57 | void recieve( const QCString& msg, const QByteArray& data ); |
51 | protected slots: | 58 | protected slots: |
52 | void setCaptionToDates(); | 59 | void setCaptionToDates(); |
60 | void weekAction(); | ||
53 | void about(); | 61 | void about(); |
54 | void licence(); | 62 | void licence(); |
55 | void faq(); | 63 | void faq(); |
@@ -120,7 +128,10 @@ class MainWindow : public QMainWindow | |||
120 | CalendarLocal *mCalendar; | 128 | CalendarLocal *mCalendar; |
121 | CalendarView *mView; | 129 | CalendarView *mView; |
122 | QAction *mNewSubTodoAction; | 130 | QAction *mNewSubTodoAction; |
123 | QPEMenuBar *menuBarWeek; | 131 | QAction *mWeekAction; |
132 | QFont mWeekFont; | ||
133 | QPixmap mWeekPixmap; | ||
134 | QColor mWeekBgColor; | ||
124 | 135 | ||
125 | QAction *mShowAction; | 136 | QAction *mShowAction; |
126 | QAction *mEditAction; | 137 | QAction *mEditAction; |