| -rw-r--r-- | korganizer/mainwindow.cpp | 106 | ||||
| -rw-r--r-- | korganizer/mainwindow.h | 15 |
2 files changed, 84 insertions, 37 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; #include "mainwindow.h" + class KOex2phonePrefs : public QDialog { @@ -145,8 +146,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : mBlockAtStartup = true; mFlagKeyPressed = false; + setCaption("KOrganizer/Pi"); KOPrefs *p = KOPrefs::instance(); KPimGlobalPrefs::instance()->setGlobalConfig(); - if ( p->mHourSize > 18 ) - p->mHourSize = 18; + if ( p->mHourSize > 22 ) + p->mHourSize = 22; QMainWindow::ToolBarDock tbd; if ( p->mToolBarHor ) { @@ -168,6 +170,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : addToolBar (iconToolBar , tbd ); mCalendarModifiedFlag = false; - - setCaption("KOrganizer/Pi"); QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); splash->setAlignment ( AlignCenter ); @@ -558,41 +558,47 @@ void MainWindow::initActions() connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); - - menuBarWeek = new QPEMenuBar( iconToolBar ); - QPopupMenu * wpo = new QPopupMenu (this); - QPopupMenu * all = new QPopupMenu (this); - //wpo->insertItem( i18n("W#"), 0 ); - int first = 1; - int i; - for ( i = 1; i < 50; ++i ) { - if ( !(i%10) ) { - all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); - connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); - first = i; - wpo = new QPopupMenu (this); + QIconSet icon; + int pixWid = 22, pixHei = 22; + QString pathString = ""; + if ( !p->mToolBarMiniIcons ) { + if ( QApplication::desktop()->width() < 480 ) { + pathString += "icons16/"; + pixWid = 18; pixHei = 16; } - wpo->insertItem( QString::number(i), i ); - } - for ( i = 50; i < 53; ++i ) { - wpo->insertItem( QString::number(i), i); + } else { + pathString += "iconsmini/"; + pixWid = 18; pixHei = 16; + } + mWeekBgColor = iconToolBar->backgroundColor(); + mWeekPixmap.resize( pixWid , pixHei ); + mWeekPixmap.fill( mWeekBgColor ); + icon = mWeekPixmap; + mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); + mWeekAction->addTo( iconToolBar ); + mWeekFont = font(); + + int fontPoint = mWeekFont.pointSize(); + QFontMetrics f( mWeekFont ); + int fontWid = f.width( "30" ); + while ( fontWid > pixWid ) { + --fontPoint; + mWeekFont.setPointSize( fontPoint ); + QFontMetrics f( mWeekFont ); + fontWid = f.width( "30" ); + qDebug("dec-- "); } - all->insertItem( i18n("Select week %1-%2" ).arg(first).arg( i-1) ,wpo ); - connect( wpo, SIGNAL( activated(int) ), SIGNAL( selectWeek ( int ) ) ); - menuBarWeek->insertItem( "00",all,1); - menuBarWeek->setMaximumSize( menuBarWeek->sizeHint( )); + + connect( mWeekAction, SIGNAL( activated() ), + this, SLOT( weekAction() ) ); connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); + + //#endif // ****************** QAction *action; - QIconSet icon; // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); configureToolBarMenu->setCheckable( true ); - QString pathString = ""; - if ( !p->mToolBarMiniIcons ) { - if ( QApplication::desktop()->width() < 480 ) - pathString += "icons16/"; - } else - pathString += "iconsmini/"; + configureAgendaMenu->setCheckable( true ); int iii ; @@ -1371,6 +1377,12 @@ void MainWindow::updateWeek(QDate seda) weekNum = d.daysTo( seda ) / 7 +1; } - //qDebug("weeknum %s ", QString::number( weekNum).latin1()); - menuBarWeek-> changeItem(1, QString::number( weekNum) ); + + mWeekPixmap.fill( mWeekBgColor ); + QPainter p ( &mWeekPixmap ); + p.setFont( mWeekFont ); + p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) ); + p.end(); + QIconSet icon3 ( mWeekPixmap ); + mWeekAction->setIconSet ( icon3 ); } @@ -1720,5 +1732,5 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) case Qt::Key_Plus: size = p->mHourSize +2; - if ( size <= 18 ) + if ( size <= 22 ) configureAgenda( size ); break; @@ -2012,2 +2024,26 @@ void MainWindow::printCal() } + +#include "libkdepim/kdatepicker.h" +#include <kdatetbl.h> +void MainWindow::weekAction() +{ + int month; + KPopupFrame* popup = new KPopupFrame(this); + int size = 12; + if ( QApplication::desktop()->width() >= 480 ) + size = 18; + KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(size, popup); + // ----- + picker->resize(picker->sizeHint()); + popup->setMainWidget(picker); + picker->setFocus(); + connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); + if(popup->exec(iconToolBar->mapToGlobal(QPoint(0, iconToolBar->height())))) + { + month = picker->getResult(); + emit selectWeek ( month ); + //qDebug("weekSelected %d ", month); + } + delete popup; +} diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 076ab94..5b9f903 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -6,4 +6,5 @@ #include <qdict.h> #include <qfile.h> +#include <qmenubar.h> #include <qtextstream.h> #include <qregexp.h> @@ -24,5 +25,4 @@ class KSyncProfile; #endif class QPEToolBar; -class QPEMenuBar; @@ -31,4 +31,11 @@ class CalendarLocal; } +class KOMenuBar : public QMenuBar +{ + public: + KOMenuBar( QWidget *parent=0 ): QMenuBar (parent ) {;} + QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );} +}; + using namespace KCal; @@ -51,4 +58,5 @@ class MainWindow : public QMainWindow protected slots: void setCaptionToDates(); + void weekAction(); void about(); void licence(); @@ -121,5 +129,8 @@ class MainWindow : public QMainWindow CalendarView *mView; QAction *mNewSubTodoAction; - QPEMenuBar *menuBarWeek; + QAction *mWeekAction; + QFont mWeekFont; + QPixmap mWeekPixmap; + QColor mWeekBgColor; QAction *mShowAction; |