| -rw-r--r-- | korganizer/koprefs.cpp | 2 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 26 | ||||
| -rw-r--r-- | korganizer/mainwindow.h | 1 |
3 files changed, 24 insertions, 5 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 9e7f18c..6560877 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -266,3 +266,3 @@ KOPrefs::KOPrefs() : addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true); - addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,true); + addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,false); addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index bfae1b5..5249300 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1120,2 +1120,3 @@ void MainWindow::initActions() importMenu->insertItem( i18n("Export"), exportMenu_X ); + mPrintSelAction = 0; #ifndef DESKTOP_VERSION @@ -1146,3 +1147,3 @@ void MainWindow::initActions() - icon = loadPixmap( pathString + "print" ); + icon = loadPixmap( pathString + "week" ); action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); @@ -1151,2 +1152,3 @@ void MainWindow::initActions() this, SLOT( printSel() ) ); + icon = loadPixmap( pathString + "whatsnext" ); action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); @@ -1157,3 +1159,3 @@ void MainWindow::initActions() - icon = loadPixmap( pathString + "print" ); + icon = loadPixmap( pathString + "list" ); action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); @@ -1163,2 +1165,3 @@ void MainWindow::initActions() + icon = loadPixmap( pathString + "newevent" ); action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); @@ -1167,3 +1170,3 @@ void MainWindow::initActions() mView, SLOT( slotprintSelInc() ) ); - + mPrintSelAction = action; importMenu->insertItem( i18n("Print"), beamMenu_X ); @@ -1742,2 +1745,15 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) } + static QPixmap jP = SmallIcon( "journal" ); + static QPixmap eP = SmallIcon( "newevent" ); + static QPixmap tP = SmallIcon( "newtodo" ); +#ifdef DESKTOP_VERSION + QIconSet icon; + if ( incidence->typeID() == todoID ) + icon = QIconSet ( tP ); + else if ( incidence->typeID() == eventID ) + icon = QIconSet ( eP ); + else if ( incidence->typeID() == journalID ) + icon = QIconSet ( jP ); + mPrintSelAction->setIconSet ( icon ); +#endif } @@ -1754,3 +1770,5 @@ void MainWindow::enableIncidenceActions( bool enabled ) mBeamAction->setEnabled( enabled ); -#endif +#else + mPrintSelAction->setEnabled( enabled ); +#endif mCancelAction->setEnabled( enabled ); diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 41d5807..d648f14 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -157,2 +157,3 @@ class MainWindow : public QMainWindow QAction *mCancelAction; + QAction *mPrintSelAction; |