summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp27
1 files changed, 17 insertions, 10 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 45775c5..94bc4c1 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -193,63 +193,63 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
193 } 193 }
194 else { 194 else {
195 if ( p->mToolBarUp ) 195 if ( p->mToolBarUp )
196 tbd = Right; 196 tbd = Right;
197 else 197 else
198 tbd = Left; 198 tbd = Left;
199 } 199 }
200 if ( KOPrefs::instance()->mUseAppColors ) 200 if ( KOPrefs::instance()->mUseAppColors )
201 QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); 201 QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
202 globalFlagBlockStartup = 1; 202 globalFlagBlockStartup = 1;
203 iconToolBar = new QPEToolBar( this ); 203 iconToolBar = new QPEToolBar( this );
204 addToolBar (iconToolBar , tbd ); 204 addToolBar (iconToolBar , tbd );
205 205
206#ifdef DESKTOP_VERSION 206#ifdef DESKTOP_VERSION
207 if ( KOPrefs::instance()->mShowIconFilter ) 207 if ( KOPrefs::instance()->mShowIconFilter )
208#else 208#else
209 if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) 209 if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) )
210#endif 210#endif
211 211
212{ 212{
213 if ( p->mToolBarHorF ) { 213 if ( p->mToolBarHorF ) {
214 if ( p->mToolBarUpF ) 214 if ( p->mToolBarUpF )
215 tbd = Bottom; 215 tbd = Bottom;
216 else 216 else
217 tbd = Top; 217 tbd = Top;
218 } 218 }
219 else { 219 else {
220 if ( p->mToolBarUpF ) 220 if ( p->mToolBarUpF )
221 tbd = Right; 221 tbd = Right;
222 else 222 else
223 tbd = Left; 223 tbd = Left;
224 } 224 }
225 filterToolBar = new QPEToolBar ( this ); 225 filterToolBar = new QPEToolBar ( this );
226 filterMenubar = new KMenuBar( 0 ); 226 filterMenubar = new KMenuBar( 0 );
227 QFontMetrics fm ( filterMenubar->font() ); 227 QFontMetrics fm ( filterMenubar->font() );
228#ifndef DESKTOP_VERSION 228#ifndef DESKTOP_VERSION
229 filterToolBar->setFocusPolicy( NoFocus ); 229 filterToolBar->setFocusPolicy( NoFocus );
230 filterMenubar->setFocusPolicy( NoFocus ); 230 filterMenubar->setFocusPolicy( NoFocus );
231#endif 231#endif
232 filterPopupMenu = new QPopupMenu( this ); 232 filterPopupMenu = new QPopupMenu( this );
233 filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); 233 filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 );
234 QString addTest = "A"; 234 QString addTest = "A";
235 filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); 235 filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
236#ifdef DESKTOP_VERSION 236#ifdef DESKTOP_VERSION
237 addTest = "AAABBBCCCx"; 237 addTest = "AAAAAABBBCCCx";
238#else 238#else
239 addTest = "AAx"; 239 addTest = "AAAAAx";
240#endif 240#endif
241 filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); 241 filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) );
242 addToolBar (filterToolBar , tbd ); 242 addToolBar (filterToolBar , tbd );
243 connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); 243 connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) );
244 connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); 244 connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
245 if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar ) 245 if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
246 filterToolBar->hide(); 246 filterToolBar->hide();
247 } else { 247 } else {
248 filterToolBar = 0; 248 filterToolBar = 0;
249 filterMenubar = 0; 249 filterMenubar = 0;
250 filterPopupMenu = 0; 250 filterPopupMenu = 0;
251 } 251 }
252 if ( p->mShowIconOnetoolbar ) { 252 if ( p->mShowIconOnetoolbar ) {
253 viewToolBar = iconToolBar ; 253 viewToolBar = iconToolBar ;
254 navigatorToolBar = iconToolBar ; 254 navigatorToolBar = iconToolBar ;
255 } else { 255 } else {
@@ -824,52 +824,53 @@ void MainWindow::initActions()
824 connect( action, SIGNAL( activated() ), 824 connect( action, SIGNAL( activated() ),
825 mView, SLOT( conflictAllday() ) ); 825 mView, SLOT( conflictAllday() ) );
826 826
827 action = new QAction( "Undo Delete", i18n("Events with time"), 0, this ); 827 action = new QAction( "Undo Delete", i18n("Events with time"), 0, this );
828 action->addTo( nextConflictMenu ); 828 action->addTo( nextConflictMenu );
829 connect( action, SIGNAL( activated() ), 829 connect( action, SIGNAL( activated() ),
830 mView, SLOT( conflictNotAll() ) ); 830 mView, SLOT( conflictNotAll() ) );
831 831
832 actionMenu->insertSeparator(); 832 actionMenu->insertSeparator();
833 833
834 icon = loadPixmap( pathString + "newevent" ); 834 icon = loadPixmap( pathString + "newevent" );
835 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 835 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
836 ne_action->addTo( mCurrentItemMenu ); 836 ne_action->addTo( mCurrentItemMenu );
837 connect( ne_action, SIGNAL( activated() ), 837 connect( ne_action, SIGNAL( activated() ),
838 mView, SLOT( newEvent() ) ); 838 mView, SLOT( newEvent() ) );
839 icon = loadPixmap( pathString + "newtodo" ); 839 icon = loadPixmap( pathString + "newtodo" );
840 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
841 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 840 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
842 nt_action->addTo( mCurrentItemMenu ); 841 nt_action->addTo( mCurrentItemMenu );
843 connect( nt_action, SIGNAL( activated() ), 842 connect( nt_action, SIGNAL( activated() ),
844 mView, SLOT( newTodo() ) ); 843 mView, SLOT( newTodo() ) );
845 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, 844 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
846 this ); 845 this );
847 mNewSubTodoAction->addTo( mCurrentItemMenu ); 846 mNewSubTodoAction->addTo( mCurrentItemMenu );
848 connect( mNewSubTodoAction, SIGNAL( activated() ), 847 connect( mNewSubTodoAction, SIGNAL( activated() ),
849 mView, SLOT( newSubTodo() ) ); 848 mView, SLOT( newSubTodo() ) );
850 849
851 mCurrentItemMenu->insertSeparator(); 850 mCurrentItemMenu->insertSeparator();
852 icon = loadPixmap( pathString + "newevent" ); 851 icon = loadPixmap( pathString + "newevent" );
853 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 852 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
854 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 853 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
855 configureToolBarMenu->insertSeparator(); 854 configureToolBarMenu->insertSeparator();
856 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 855 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
857 configureToolBarMenu->insertSeparator(); 856 configureToolBarMenu->insertSeparator();
858 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 857 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
859 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 858 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
859 icon = loadPixmap( pathString + "newtodo" );
860 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
860 861
861 //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); 862 //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
862 mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this ); 863 mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
863 mShowAction->addTo( mCurrentItemMenu ); 864 mShowAction->addTo( mCurrentItemMenu );
864 connect( mShowAction, SIGNAL( activated() ), 865 connect( mShowAction, SIGNAL( activated() ),
865 mView, SLOT( showIncidence() ) ); 866 mView, SLOT( showIncidence() ) );
866 867
867 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 868 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
868 mEditAction->addTo( mCurrentItemMenu ); 869 mEditAction->addTo( mCurrentItemMenu );
869 connect( mEditAction, SIGNAL( activated() ), 870 connect( mEditAction, SIGNAL( activated() ),
870 mView, SLOT( editIncidence() ) ); 871 mView, SLOT( editIncidence() ) );
871 872
872 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); 873 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
873 mDeleteAction->addTo( mCurrentItemMenu ); 874 mDeleteAction->addTo( mCurrentItemMenu );
874 connect( mDeleteAction, SIGNAL( activated() ), 875 connect( mDeleteAction, SIGNAL( activated() ),
875 mView, SLOT( deleteIncidence() ) ); 876 mView, SLOT( deleteIncidence() ) );
@@ -1035,32 +1036,33 @@ void MainWindow::initActions()
1035 1036
1036#if 0 1037#if 0
1037 action = new QAction( "view_timespan", "Time Span", 0, this ); 1038 action = new QAction( "view_timespan", "Time Span", 0, this );
1038 action->addTo( viewMenu ); 1039 action->addTo( viewMenu );
1039 connect( action, SIGNAL( activated() ), 1040 connect( action, SIGNAL( activated() ),
1040 mView->viewManager(), SLOT( showTimeSpanView() ) ); 1041 mView->viewManager(), SLOT( showTimeSpanView() ) );
1041#endif 1042#endif
1042 1043
1043 1044
1044 1045
1045 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0, 1046 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
1046 this ); 1047 this );
1047 action->addTo( actionMenu ); 1048 action->addTo( actionMenu );
1048 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); 1049 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
1049 1050
1050 1051
1052 icon = loadPixmap( pathString + "search" );
1051 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); 1053 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
1052 1054
1053 1055
1054 1056
1055 actionMenu->insertSeparator(); 1057 actionMenu->insertSeparator();
1056 action = new QAction( "manage cat", i18n("Edit category list..."), 0, 1058 action = new QAction( "manage cat", i18n("Edit category list..."), 0,
1057 this ); 1059 this );
1058 action->addTo( actionMenu ); 1060 action->addTo( actionMenu );
1059 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) ); 1061 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
1060 1062
1061 action = new QAction( "manage cat", i18n("Manage new categories..."), 0, 1063 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1062 this ); 1064 this );
1063 action->addTo( actionMenu ); 1065 action->addTo( actionMenu );
1064 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); 1066 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1065 1067
1066 1068
@@ -2312,33 +2314,36 @@ void MainWindow::selectFilter( int fil )
2312 if ( !mView->filterView()->filtersEnabled() ) { 2314 if ( !mView->filterView()->filtersEnabled() ) {
2313 mView->filterView()->blockSignals( true ); 2315 mView->filterView()->blockSignals( true );
2314 mView->toggleFilerEnabled( ); 2316 mView->toggleFilerEnabled( );
2315 mView->filterView()->blockSignals( false ); 2317 mView->filterView()->blockSignals( false );
2316 } 2318 }
2317 mView->selectFilter( fil-2 ); 2319 mView->selectFilter( fil-2 );
2318 } 2320 }
2319} 2321}
2320void MainWindow::updateFilterToolbar() 2322void MainWindow::updateFilterToolbar()
2321{ 2323{
2322 if ( filterMenubar ) { 2324 if ( filterMenubar ) {
2323 if ( !mView->filterView()->filtersEnabled() ) { 2325 if ( !mView->filterView()->filtersEnabled() ) {
2324 filterMenubar->changeItem( 0, i18n("No Filter") ); 2326 filterMenubar->changeItem( 0, i18n("No Filter") );
2325 } else { 2327 } else {
2326 CalFilter *curfilter = mView->filterView()->selectedFilter(); 2328 CalFilter *curfilter = mView->filterView()->selectedFilter();
2327 if ( curfilter ) { 2329 if ( curfilter ) {
2328 filterMenubar->changeItem( 0, curfilter->name() ); 2330 QString name = curfilter->name();
2331 if ( name.length() > 12 )
2332 name = name.left(10)+"...";
2333 filterMenubar->changeItem( 0, name );
2329 } 2334 }
2330 } 2335 }
2331 } 2336 }
2332} 2337}
2333void MainWindow::selectFilterPopup( int fil ) 2338void MainWindow::selectFilterPopup( int fil )
2334{ 2339{
2335 selectFilter( fil + 1 ); 2340 selectFilter( fil + 1 );
2336 2341
2337} 2342}
2338void MainWindow::configureToolBar( int item ) 2343void MainWindow::configureToolBar( int item )
2339{ 2344{
2340 2345
2341 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); 2346 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
2342 KOPrefs *p = KOPrefs::instance(); 2347 KOPrefs *p = KOPrefs::instance();
2343 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); 2348 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
2344 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 ); 2349 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 );
@@ -2649,25 +2654,27 @@ void MainWindow::weekAction()
2649 2654
2650void MainWindow::hideEvent ( QHideEvent * ) 2655void MainWindow::hideEvent ( QHideEvent * )
2651{ 2656{
2652 QString message; 2657 QString message;
2653 QDateTime nextA = mCalendar->nextAlarmEventDateTime(); 2658 QDateTime nextA = mCalendar->nextAlarmEventDateTime();
2654 if ( nextA.isValid() ) { 2659 if ( nextA.isValid() ) {
2655 QString sum = mCalendar->nextSummary(); 2660 QString sum = mCalendar->nextSummary();
2656 2661
2657 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false)); 2662 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false));
2658 setCaption( message ); 2663 setCaption( message );
2659 } 2664 }
2660} 2665}
2661 2666
2662void MainWindow::resizeEvent( QResizeEvent* e) 2667void MainWindow::resizeEvent( QResizeEvent* e)
2663{ 2668{
2664#ifndef DESKTOP_VERSION 2669#ifndef DESKTOP_VERSION
2665 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) { 2670 if ( filterToolBar ) {
2666 if (QApplication::desktop()->width() > QApplication::desktop()->height() ) 2671 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
2667 filterToolBar->hide(); 2672 if (QApplication::desktop()->width() > QApplication::desktop()->height() )
2668 else 2673 filterToolBar->hide();
2669 filterToolBar->show(); 2674 else
2675 filterToolBar->show();
2676 }
2670 } 2677 }
2671#endif 2678#endif
2672 QMainWindow::resizeEvent( e); 2679 QMainWindow::resizeEvent( e);
2673} 2680}