summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-08 12:15:38 (UTC)
committer zautrix <zautrix>2005-07-08 12:15:38 (UTC)
commit3e94cf2e8a14c7d40aea28a0fe5538abcd211746 (patch) (unidiff)
tree04b5095d96824d5c3d4e01c144e2968dc99e46d8
parente1ed9342934d027f8b72a97eb710a52abe53b719 (diff)
downloadkdepimpi-3e94cf2e8a14c7d40aea28a0fe5538abcd211746.zip
kdepimpi-3e94cf2e8a14c7d40aea28a0fe5538abcd211746.tar.gz
kdepimpi-3e94cf2e8a14c7d40aea28a0fe5538abcd211746.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.cpp2
-rw-r--r--korganizer/mainwindow.cpp26
-rw-r--r--korganizer/mainwindow.h1
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
@@ -265,5 +265,5 @@ KOPrefs::KOPrefs() :
265 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true); 265 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
266 addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true); 266 addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
267 addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,true); 267 addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,false);
268 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); 268 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
269 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false); 269 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index bfae1b5..5249300 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1119,4 +1119,5 @@ void MainWindow::initActions()
1119 1119
1120 importMenu->insertItem( i18n("Export"), exportMenu_X ); 1120 importMenu->insertItem( i18n("Export"), exportMenu_X );
1121 mPrintSelAction = 0;
1121#ifndef DESKTOP_VERSION 1122#ifndef DESKTOP_VERSION
1122 //importMenu->insertSeparator(); 1123 //importMenu->insertSeparator();
@@ -1145,9 +1146,10 @@ void MainWindow::initActions()
1145 this, SLOT( printCal() ) ); 1146 this, SLOT( printCal() ) );
1146 1147
1147 icon = loadPixmap( pathString + "print" ); 1148 icon = loadPixmap( pathString + "week" );
1148 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 1149 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
1149 action->addTo( beamMenu_X ); 1150 action->addTo( beamMenu_X );
1150 connect( action, SIGNAL( activated() ), 1151 connect( action, SIGNAL( activated() ),
1151 this, SLOT( printSel() ) ); 1152 this, SLOT( printSel() ) );
1153 icon = loadPixmap( pathString + "whatsnext" );
1152 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); 1154 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
1153 action->addTo( beamMenu_X ); 1155 action->addTo( beamMenu_X );
@@ -1156,5 +1158,5 @@ void MainWindow::initActions()
1156 1158
1157 1159
1158 icon = loadPixmap( pathString + "print" ); 1160 icon = loadPixmap( pathString + "list" );
1159 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); 1161 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
1160 action->addTo( beamMenu_X ); 1162 action->addTo( beamMenu_X );
@@ -1162,9 +1164,10 @@ void MainWindow::initActions()
1162 this, SLOT( printListView() ) ); 1164 this, SLOT( printListView() ) );
1163 1165
1166 icon = loadPixmap( pathString + "newevent" );
1164 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); 1167 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
1165 action->addTo( beamMenu_X ); 1168 action->addTo( beamMenu_X );
1166 connect( action, SIGNAL( activated() ), 1169 connect( action, SIGNAL( activated() ),
1167 mView, SLOT( slotprintSelInc() ) ); 1170 mView, SLOT( slotprintSelInc() ) );
1168 1171 mPrintSelAction = action;
1169 importMenu->insertItem( i18n("Print"), beamMenu_X ); 1172 importMenu->insertItem( i18n("Print"), beamMenu_X );
1170#endif 1173#endif
@@ -1741,4 +1744,17 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
1741 mNewSubTodoAction->setEnabled( false ); 1744 mNewSubTodoAction->setEnabled( false );
1742 } 1745 }
1746 static QPixmap jP = SmallIcon( "journal" );
1747 static QPixmap eP = SmallIcon( "newevent" );
1748 static QPixmap tP = SmallIcon( "newtodo" );
1749#ifdef DESKTOP_VERSION
1750 QIconSet icon;
1751 if ( incidence->typeID() == todoID )
1752 icon = QIconSet ( tP );
1753 else if ( incidence->typeID() == eventID )
1754 icon = QIconSet ( eP );
1755 else if ( incidence->typeID() == journalID )
1756 icon = QIconSet ( jP );
1757 mPrintSelAction->setIconSet ( icon );
1758#endif
1743} 1759}
1744 1760
@@ -1753,5 +1769,7 @@ void MainWindow::enableIncidenceActions( bool enabled )
1753#ifndef DESKTOP_VERSION 1769#ifndef DESKTOP_VERSION
1754 mBeamAction->setEnabled( enabled ); 1770 mBeamAction->setEnabled( enabled );
1755#endif 1771#else
1772 mPrintSelAction->setEnabled( enabled );
1773#endif
1756 mCancelAction->setEnabled( enabled ); 1774 mCancelAction->setEnabled( enabled );
1757} 1775}
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 41d5807..d648f14 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -156,4 +156,5 @@ class MainWindow : public QMainWindow
156 QAction *mBeamAction; 156 QAction *mBeamAction;
157 QAction *mCancelAction; 157 QAction *mCancelAction;
158 QAction *mPrintSelAction;
158 159
159 QAction *mToggleNav; 160 QAction *mToggleNav;