-rw-r--r-- | korganizer/mainwindow.cpp | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index bfae1b5..5249300 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1115,12 +1115,13 @@ void MainWindow::initActions() | |||
1115 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1115 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
1116 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 1116 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
1117 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); | 1117 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); |
1118 | exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); | 1118 | exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); |
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(); |
1123 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, | 1124 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, |
1124 | this ); | 1125 | this ); |
1125 | brAction->addTo( beamMenu_X ); | 1126 | brAction->addTo( beamMenu_X ); |
1126 | brAction->setToggleAction (true ) ; | 1127 | brAction->setToggleAction (true ) ; |
@@ -1141,34 +1142,36 @@ void MainWindow::initActions() | |||
1141 | icon = loadPixmap( pathString + "print" ); | 1142 | icon = loadPixmap( pathString + "print" ); |
1142 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 1143 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
1143 | action->addTo( beamMenu_X ); | 1144 | action->addTo( beamMenu_X ); |
1144 | connect( action, SIGNAL( activated() ), | 1145 | connect( action, SIGNAL( activated() ), |
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 ); |
1154 | connect( action, SIGNAL( activated() ), | 1156 | connect( action, SIGNAL( activated() ), |
1155 | mView->viewManager(), SLOT( slotprintWNV() ) ); | 1157 | mView->viewManager(), SLOT( slotprintWNV() ) ); |
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 ); |
1161 | connect( action, SIGNAL( activated() ), | 1163 | connect( action, SIGNAL( activated() ), |
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 |
1171 | 1174 | ||
1172 | importMenu->insertSeparator(); | 1175 | importMenu->insertSeparator(); |
1173 | action = new QAction( "beam all", i18n("Save"), 0, | 1176 | action = new QAction( "beam all", i18n("Save"), 0, |
1174 | this ); | 1177 | this ); |
@@ -1737,25 +1740,40 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1737 | mShowAction->setMenuText( i18n("Show Todo") ); | 1740 | mShowAction->setMenuText( i18n("Show Todo") ); |
1738 | mNewSubTodoAction->setEnabled( true ); | 1741 | mNewSubTodoAction->setEnabled( true ); |
1739 | } else { | 1742 | } else { |
1740 | mShowAction->setMenuText( i18n("Show") ); | 1743 | mShowAction->setMenuText( i18n("Show") ); |
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 | ||
1745 | void MainWindow::enableIncidenceActions( bool enabled ) | 1761 | void MainWindow::enableIncidenceActions( bool enabled ) |
1746 | { | 1762 | { |
1747 | mShowAction->setEnabled( enabled ); | 1763 | mShowAction->setEnabled( enabled ); |
1748 | mEditAction->setEnabled( enabled ); | 1764 | mEditAction->setEnabled( enabled ); |
1749 | mDeleteAction->setEnabled( enabled ); | 1765 | mDeleteAction->setEnabled( enabled ); |
1750 | 1766 | ||
1751 | mCloneAction->setEnabled( enabled ); | 1767 | mCloneAction->setEnabled( enabled ); |
1752 | mMoveAction->setEnabled( enabled ); | 1768 | mMoveAction->setEnabled( 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 | } |
1758 | 1776 | ||
1759 | void MainWindow::importOL() | 1777 | void MainWindow::importOL() |
1760 | { | 1778 | { |
1761 | #ifdef _OL_IMPORT_ | 1779 | #ifdef _OL_IMPORT_ |