summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt15
-rw-r--r--desktop/rpm/kdepim_rpm2
-rw-r--r--korganizer/calendarview.cpp11
-rw-r--r--korganizer/calendarview.h1
-rw-r--r--korganizer/kolistview.cpp3
-rw-r--r--korganizer/kotodoview.cpp4
-rw-r--r--korganizer/mainwindow.cpp171
-rw-r--r--korganizer/mainwindow.h1
-rw-r--r--version2
9 files changed, 128 insertions, 82 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 3daf215..2bfdb2f 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -304,17 +304,17 @@
304{ "Previous year","Vorheriges Jahr" }, 304{ "Previous year","Vorheriges Jahr" },
305{ "Previous Year","Vorheriges Jahr" }, 305{ "Previous Year","Vorheriges Jahr" },
306{ "Printing","Drucken" }, 306{ "Printing","Drucken" },
307{ "Priority:","Priorität:" }, 307{ "Priority:","Priorität:" },
308{ "Private","Privat" }, 308{ "Private","Privat" },
309{ "Proceed","Weiter" }, 309{ "Proceed","Weiter" },
310{ "Public","Öffentlich" }, 310{ "Public","Öffentlich" },
311{ "Purge","Entferne" }, 311{ "Purge","Entferne" },
312{ "Purge Completed","Entferne erledigte Todos" }, 312{ "Purge Completed...","Entferne erledigte Todos..." },
313{ "Purge Todos","Todos bereinigen" }, 313{ "Purge Todos","Todos bereinigen" },
314{ "read-only","schreibgeschützt" }, 314{ "read-only","schreibgeschützt" },
315{ "Recur every","Wiederh. alle" }, 315{ "Recur every","Wiederh. alle" },
316{ "Recur in the month of","Wiederh. im Monat" }, 316{ "Recur in the month of","Wiederh. im Monat" },
317{ "Recur on the","Wiederh. am" }, 317{ "Recur on the","Wiederh. am" },
318{ "Recur on this day","Wiederh. am diesen Tag" }, 318{ "Recur on this day","Wiederh. am diesen Tag" },
319{ "Recurrence Range...","Wiederholungs Zeitraum..." }, 319{ "Recurrence Range...","Wiederholungs Zeitraum..." },
320{ "Recurrence Range","Wiederholungs Zeitraum" }, 320{ "Recurrence Range","Wiederholungs Zeitraum" },
@@ -468,17 +468,17 @@
468{ "Event list view uses full window","Listenansicht nutzt Vollbild" }, 468{ "Event list view uses full window","Listenansicht nutzt Vollbild" },
469{ "Set agenda to DayBeginsAt on change","Setze Agenda auf TagBeginntUm bei Wechsel" }, 469{ "Set agenda to DayBeginsAt on change","Setze Agenda auf TagBeginntUm bei Wechsel" },
470{ "Set agenda to current time on change","Setze Agenda auf gegenw.Zeit bei Wechsel" }, 470{ "Set agenda to current time on change","Setze Agenda auf gegenw.Zeit bei Wechsel" },
471{ "Listview uses monthly timespan","Listenansicht zeigt monatliche Zeitspanne" }, 471{ "Listview uses monthly timespan","Listenansicht zeigt monatliche Zeitspanne" },
472{ "ViewChange","Ansichtswechsel" }, 472{ "ViewChange","Ansichtswechsel" },
473{ "Default alarm *.wav file:","Standard Alarm *.wav Datei:" }, 473{ "Default alarm *.wav file:","Standard Alarm *.wav Datei:" },
474{ "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" }, 474{ "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" },
475{ "File","Datei" }, 475{ "File","Datei" },
476{ "Clone...","Dupliziere.." }, 476{ "Clone...","Dupliziere..." },
477{ "Move...","Bewege..." }, 477{ "Move...","Bewege..." },
478{ "Beam...","Sende via IR..." }, 478{ "Beam...","Sende via IR..." },
479{ "&Clone...","Dupliziere.." }, 479{ "&Clone...","Dupliziere.." },
480{ "&Move...","Bewege..." }, 480{ "&Move...","Bewege..." },
481{ "&Beam...","Sende via IR..." }, 481{ "&Beam...","Sende via IR..." },
482{ "Show Completed","Zeige erledigte Todos" }, 482{ "Show Completed","Zeige erledigte Todos" },
483{ "Show Quick Todo","Zeige Quick Todo" }, 483{ "Show Quick Todo","Zeige Quick Todo" },
484{ "Unparent Todo","Un-sub Todo" }, 484{ "Unparent Todo","Un-sub Todo" },
@@ -540,17 +540,16 @@
540{ "Edit Categories","Editiere Kategorien" }, 540{ "Edit Categories","Editiere Kategorien" },
541{ " &Edit Categories "," &Editiere Kategorien " }, 541{ " &Edit Categories "," &Editiere Kategorien " },
542{ "Beam Options","Beam Einstellungen" }, 542{ "Beam Options","Beam Einstellungen" },
543{ " With timezone "," Mit Zeitzone " }, 543{ " With timezone "," Mit Zeitzone " },
544{ " Local time ", " Lokale Zeit " }, 544{ " Local time ", " Lokale Zeit " },
545{ "Manage new Categories","Verwalte neue Kategorien" }, 545{ "Manage new Categories","Verwalte neue Kategorien" },
546{ "Add to category list","Füge zur Kategorieliste hinzu" }, 546{ "Add to category list","Füge zur Kategorieliste hinzu" },
547{ "Remove from Events/Todos","Entferne von Terminen/Todos" }, 547{ "Remove from Events/Todos","Entferne von Terminen/Todos" },
548{ "After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n ","Nach dem Importieren/Laden/Syncen\nkann es neue Kategorien in den \nTerminen oder Todos geben, die nicht\nin der Kategorieliste enthalten sind.\nBitte wählen Sie, was passieren soll:\n " },
549{ "New categories not in list:","Kategorien, die nicht in der Liste sind:" }, 548{ "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
550{ "File format","Datei Format" }, 549{ "File format","Datei Format" },
551{ "Time format","Zeit Format" }, 550{ "Time format","Zeit Format" },
552{ "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." }, 551{ "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." },
553{ "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" }, 552{ "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" },
554{ "h","Std" }, 553{ "h","Std" },
555{ "min","Min" }, 554{ "min","Min" },
556{ "hou","Std" }, 555{ "hou","Std" },
@@ -1461,12 +1460,22 @@
1461{ "Cancel - do not start"," Abbrechen - Todo nicht starten" }, 1460{ "Cancel - do not start"," Abbrechen - Todo nicht starten" },
1462{ "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" }, 1461{ "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" },
1463{ "Reload","Neu laden" }, 1462{ "Reload","Neu laden" },
1464{ "Timezone settings","Zeitzoneneinstellung" }, 1463{ "Timezone settings","Zeitzoneneinstellung" },
1465{ "Title: ","Titel: " }, 1464{ "Title: ","Titel: " },
1466{ "Journal from: ","Journal vom: " }, 1465{ "Journal from: ","Journal vom: " },
1467{ "Journal: %1 from ","Journal: %1 vom " }, 1466{ "Journal: %1 from ","Journal: %1 vom " },
1468{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, 1467{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" },
1468{ "Selected Item","Ausgewähltes Item" },
1469{ "Select Date...","Wähle Datum..." },
1470{ "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" },
1471{ "Change category list now!","Ändere Kategorieliste jetzt!" },
1472{ "Edit category list...","Ändere Kategorieliste..." },
1473{ "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
1474{ "","" },
1475{ "","" },
1476{ "","" },
1477{ "","" },
1469{ "","" }, 1478{ "","" },
1470{ "","" }, 1479{ "","" },
1471{ "","" }, 1480{ "","" },
1472{ "","" }, \ No newline at end of file 1481{ "","" }, \ No newline at end of file
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 279bbd4..d29ab72 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,11 +1,11 @@
1Summary: A collection of PIM programs 1Summary: A collection of PIM programs
2Name: KDE-Pim-Pi 2Name: KDE-Pim-Pi
3Version: 2.1.11 3Version: 2.1.12
4Release: SuSE_9.2 4Release: SuSE_9.2
5Copyright:GPL 5Copyright:GPL
6Group: Productivity/Pim 6Group: Productivity/Pim
7Source:http://sourceforge.net/projects/kdepimpi/ 7Source:http://sourceforge.net/projects/kdepimpi/
8URL:http://sourceforge.net/projects/kdepimpi/ 8URL:http://sourceforge.net/projects/kdepimpi/
9Packager: zautrix 9Packager: zautrix
10 10
11%description 11%description
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index d0de233..c0f3be7 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -111,16 +111,17 @@
111#include "statusdialog.h" 111#include "statusdialog.h"
112#include "kdatenavigator.h" 112#include "kdatenavigator.h"
113#include "kotodoview.h" 113#include "kotodoview.h"
114#include "datenavigator.h" 114#include "datenavigator.h"
115#include "resourceview.h" 115#include "resourceview.h"
116#include "navigatorbar.h" 116#include "navigatorbar.h"
117#include "searchdialog.h" 117#include "searchdialog.h"
118#include "mainwindow.h" 118#include "mainwindow.h"
119#include "categoryeditdialog.h"
119 120
120#include "calendarview.h" 121#include "calendarview.h"
121#ifndef DESKTOP_VERSION 122#ifndef DESKTOP_VERSION
122#include <qtopia/alarmserver.h> 123#include <qtopia/alarmserver.h>
123#endif 124#endif
124#ifndef _WIN32_ 125#ifndef _WIN32_
125#include <stdlib.h> 126#include <stdlib.h>
126#include <stdio.h> 127#include <stdio.h>
@@ -308,25 +309,25 @@ class KOCatPrefs : public QDialog
308 public: 309 public:
309 KOCatPrefs( QWidget *parent=0, const char *name=0 ) : 310 KOCatPrefs( QWidget *parent=0, const char *name=0 ) :
310 QDialog( parent, name, true ) 311 QDialog( parent, name, true )
311 { 312 {
312 setCaption( i18n("Manage new Categories") ); 313 setCaption( i18n("Manage new Categories") );
313 QVBoxLayout* lay = new QVBoxLayout( this ); 314 QVBoxLayout* lay = new QVBoxLayout( this );
314 lay->setSpacing( 3 ); 315 lay->setSpacing( 3 );
315 lay->setMargin( 3 ); 316 lay->setMargin( 3 );
316 QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n "), this ); 317 QLabel * lab = new QLabel( i18n("After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:"), this );
317 lay->addWidget( lab ); 318 lay->addWidget( lab );
318 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); 319 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
319 lay->addWidget( format ); 320 lay->addWidget( format );
320 format->setExclusive ( true ) ; 321 format->setExclusive ( true ) ;
321 addCatBut = new QRadioButton(i18n("Add to category list"), format ); 322 addCatBut = new QRadioButton(i18n("Add to category list"), format );
322 new QRadioButton(i18n("Remove from Events/Todos"), format ); 323 new QRadioButton(i18n("Remove from Events/Todos"), format );
323 addCatBut->setChecked( true ); 324 addCatBut->setChecked( true );
324 QPushButton * ok = new QPushButton( i18n("OK"), this ); 325 QPushButton * ok = new QPushButton( i18n("Change category list now!"), this );
325 lay->addWidget( ok ); 326 lay->addWidget( ok );
326 QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); 327 QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
327 lay->addWidget( cancel ); 328 lay->addWidget( cancel );
328 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 329 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
329 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 330 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
330 resize( 200, 200 ); 331 resize( 200, 200 );
331 } 332 }
332 333
@@ -2813,16 +2814,22 @@ int CalendarView::addCategories()
2813 } 2814 }
2814 inc = incList.next(); 2815 inc = incList.next();
2815 } 2816 }
2816 catList.sort(); 2817 catList.sort();
2817 KOPrefs::instance()->mCustomCategories = catList; 2818 KOPrefs::instance()->mCustomCategories = catList;
2818 return count; 2819 return count;
2819} 2820}
2820 2821
2822void CalendarView::editCategories()
2823{
2824 qDebug("CalendarView::editCategories() ");
2825 KPIM::CategoryEditDialog ced (KOPrefs::instance(),this );
2826 ced.exec();
2827}
2821void CalendarView::manageCategories() 2828void CalendarView::manageCategories()
2822{ 2829{
2823 KOCatPrefs* cp = new KOCatPrefs(); 2830 KOCatPrefs* cp = new KOCatPrefs();
2824 cp->show(); 2831 cp->show();
2825 int w =cp->sizeHint().width() ; 2832 int w =cp->sizeHint().width() ;
2826 int h = cp->sizeHint().height() ; 2833 int h = cp->sizeHint().height() ;
2827 int dw = QApplication::desktop()->width(); 2834 int dw = QApplication::desktop()->width();
2828 int dh = QApplication::desktop()->height(); 2835 int dh = QApplication::desktop()->height();
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index f7e5366..3323a98 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -480,16 +480,17 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
480 void showDatePicker() ; 480 void showDatePicker() ;
481 void showDatePickerPopup() ; 481 void showDatePickerPopup() ;
482 void moveIncidence(Incidence *) ; 482 void moveIncidence(Incidence *) ;
483 void beamIncidence(Incidence *) ; 483 void beamIncidence(Incidence *) ;
484 void beamCalendar() ; 484 void beamCalendar() ;
485 void beamFilteredCalendar() ; 485 void beamFilteredCalendar() ;
486 void beamIncidenceList(QPtrList<Incidence>) ; 486 void beamIncidenceList(QPtrList<Incidence>) ;
487 void manageCategories(); 487 void manageCategories();
488 void editCategories();
488 int addCategories(); 489 int addCategories();
489 void removeCategories(); 490 void removeCategories();
490 void setSyncDevice( QString ); 491 void setSyncDevice( QString );
491 void setSyncName( QString ); 492 void setSyncName( QString );
492 void showDay( QDate ); 493 void showDay( QDate );
493 void undo_delete(); 494 void undo_delete();
494 protected slots: 495 protected slots:
495 void resetFocus(); 496 void resetFocus();
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 43e1113..517677c 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -433,17 +433,18 @@ void KOListView::setCalendar( int c )
433 mCalendar->reInitAlarmSettings(); 433 mCalendar->reInitAlarmSettings();
434 434
435} 435}
436void KOListView::populateCalPopup() 436void KOListView::populateCalPopup()
437{ 437{
438 mCalPopup->clear(); 438 mCalPopup->clear();
439 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); 439 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
440 while ( kkf ) { 440 while ( kkf ) {
441 mCalPopup->insertItem( kkf->mName, kkf->mCalNumber); 441 int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
442 mCalPopup->setItemEnabled( index, !kkf->isReadOnly );
442 kkf = KOPrefs::instance()->mCalendars.next(); 443 kkf = KOPrefs::instance()->mCalendars.next();
443 } 444 }
444} 445}
445void KOListView::updateList() 446void KOListView::updateList()
446{ 447{
447 // qDebug(" KOListView::updateList() "); 448 // qDebug(" KOListView::updateList() ");
448 449
449} 450}
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 873a776..8d354c8 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -596,30 +596,30 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
596 mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this, 596 mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
597 SLOT (newSubTodo())); 597 SLOT (newSubTodo()));
598 mItemPopupMenu->insertItem(i18n("Unparent Todo"), this, 598 mItemPopupMenu->insertItem(i18n("Unparent Todo"), this,
599 SLOT (unparentTodo()),0,21); 599 SLOT (unparentTodo()),0,21);
600 mItemPopupMenu->insertItem(i18n("Reparent Todo"), this, 600 mItemPopupMenu->insertItem(i18n("Reparent Todo"), this,
601 SLOT (reparentTodo()),0,22); 601 SLOT (reparentTodo()),0,22);
602 mItemPopupMenu->insertSeparator(); 602 mItemPopupMenu->insertSeparator();
603#if 0 603#if 0
604 mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed"), 604 mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed..."),
605 this, SLOT( purgeCompleted() ) ); 605 this, SLOT( purgeCompleted() ) );
606 mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"), 606 mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"),
607 this, SLOT( toggleCompleted() ),0, 33 ); 607 this, SLOT( toggleCompleted() ),0, 33 );
608 mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"), 608 mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
609 this, SLOT( toggleQuickTodo() ),0, 34 ); 609 this, SLOT( toggleQuickTodo() ),0, 34 );
610 mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), 610 mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
611 this, SLOT( toggleRunning() ),0, 35 ); 611 this, SLOT( toggleRunning() ),0, 35 );
612 612
613#endif 613#endif
614 mPopupMenu = new QPopupMenu(this); 614 mPopupMenu = new QPopupMenu(this);
615 mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this, 615 mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
616 SLOT (newTodo()),0,1); 616 SLOT (newTodo()),0,1);
617 mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed"), 617 mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed..."),
618 this, SLOT(purgeCompleted()),0,2); 618 this, SLOT(purgeCompleted()),0,2);
619 mPopupMenu->insertItem(i18n("Show Completed"), 619 mPopupMenu->insertItem(i18n("Show Completed"),
620 this, SLOT( toggleCompleted() ),0,3 ); 620 this, SLOT( toggleCompleted() ),0,3 );
621 mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"), 621 mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
622 this, SLOT( toggleRunning() ),0,5 ); 622 this, SLOT( toggleRunning() ),0,5 );
623 mPopupMenu->insertItem(i18n(" set all open","Display all opened"), 623 mPopupMenu->insertItem(i18n(" set all open","Display all opened"),
624 this, SLOT( setAllOpen() ),0,6 ); 624 this, SLOT( setAllOpen() ),0,6 );
625 mPopupMenu->insertItem(i18n(" set all close","Display all closed"), 625 mPopupMenu->insertItem(i18n(" set all close","Display all closed"),
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 23537a6..a5d8824 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -649,16 +649,21 @@ void MainWindow::initActions()
649{ 649{
650 //KOPrefs::instance()->mShowFullMenu 650 //KOPrefs::instance()->mShowFullMenu
651 iconToolBar->clear(); 651 iconToolBar->clear();
652 KOPrefs *p = KOPrefs::instance(); 652 KOPrefs *p = KOPrefs::instance();
653 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); 653 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
654 654
655 QPopupMenu *viewMenu = new QPopupMenu( this ); 655 QPopupMenu *viewMenu = new QPopupMenu( this );
656 QPopupMenu *actionMenu = new QPopupMenu( this ); 656 QPopupMenu *actionMenu = new QPopupMenu( this );
657#ifdef DESKTOP_VERSION
658 mCurrentItemMenu = actionMenu;
659#else
660 mCurrentItemMenu = new QPopupMenu ( this );
661#endif
657 QPopupMenu *importMenu = new QPopupMenu( this ); 662 QPopupMenu *importMenu = new QPopupMenu( this );
658 QPopupMenu *importMenu_X = new QPopupMenu( this ); 663 QPopupMenu *importMenu_X = new QPopupMenu( this );
659 QPopupMenu *exportMenu_X = new QPopupMenu( this ); 664 QPopupMenu *exportMenu_X = new QPopupMenu( this );
660 QPopupMenu *beamMenu_X = new QPopupMenu( this ); 665 QPopupMenu *beamMenu_X = new QPopupMenu( this );
661 selectFilterMenu = new QPopupMenu( this ); 666 selectFilterMenu = new QPopupMenu( this );
662 selectFilterMenu->setCheckable( true ); 667 selectFilterMenu->setCheckable( true );
663 syncMenu = new QPopupMenu( this ); 668 syncMenu = new QPopupMenu( this );
664 configureAgendaMenu = new QPopupMenu( this ); 669 configureAgendaMenu = new QPopupMenu( this );
@@ -760,60 +765,104 @@ void MainWindow::initActions()
760 int iii ; 765 int iii ;
761 for ( iii = 1;iii<= 10 ;++iii ){ 766 for ( iii = 1;iii<= 10 ;++iii ){
762 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); 767 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
763 } 768 }
764 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); 769 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu );
765 770
766 connect( configureAgendaMenu, SIGNAL( aboutToShow()), 771 connect( configureAgendaMenu, SIGNAL( aboutToShow()),
767 this, SLOT( showConfigureAgenda( ) ) ); 772 this, SLOT( showConfigureAgenda( ) ) );
773 icon = loadPixmap( pathString + "today" );
774 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
775 today_action->addTo( actionMenu );
776 connect( today_action, SIGNAL( activated() ),
777 mView, SLOT( goToday() ) );
778
779 icon = loadPixmap( pathString + "picker" );
780 QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
781 dPickerAction->addTo( actionMenu );
782 connect( dPickerAction, SIGNAL( activated() ),
783 mView, SLOT( showDatePicker() ) );
784
785 icon = loadPixmap( pathString + "search" );
786 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
787 search_action->addTo( actionMenu );
788 connect( search_action, SIGNAL( activated() ),
789 mView->dialogManager(), SLOT( showSearchDialog() ) );
768 790
769 icon = loadPixmap( pathString + "configure" );
770 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
771 action->addTo( actionMenu );
772 connect( action, SIGNAL( activated() ),
773 mView, SLOT( edit_options() ) );
774 icon = loadPixmap( pathString + "configure" );
775 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
776 action->addTo( actionMenu );
777 connect( action, SIGNAL( activated() ),
778 mView, SLOT( edit_global_options() ) );
779 actionMenu->insertSeparator(); 791 actionMenu->insertSeparator();
792
793
780 794
781 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 795 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
782 action->addTo( actionMenu ); 796 action->addTo( actionMenu );
783 connect( action, SIGNAL( activated() ), 797 connect( action, SIGNAL( activated() ),
784 mView, SLOT( undo_delete() ) ); 798 mView, SLOT( undo_delete() ) );
785 actionMenu->insertSeparator();
786 799
787 icon = loadPixmap( pathString + "newevent" ); 800 icon = loadPixmap( pathString + "newevent" );
788 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 801 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
789 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 802 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
790 configureToolBarMenu->insertSeparator(); 803 configureToolBarMenu->insertSeparator();
791 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 804 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
792 configureToolBarMenu->insertSeparator(); 805 configureToolBarMenu->insertSeparator();
793 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 806 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
794 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 807 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
808
809#ifndef DESKTOP_VERSION
810 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
811#endif
812 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
813 mShowAction->addTo( mCurrentItemMenu );
814 connect( mShowAction, SIGNAL( activated() ),
815 mView, SLOT( showIncidence() ) );
816
817 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
818 mEditAction->addTo( mCurrentItemMenu );
819 connect( mEditAction, SIGNAL( activated() ),
820 mView, SLOT( editIncidence() ) );
821
822 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
823 mDeleteAction->addTo( mCurrentItemMenu );
824 connect( mDeleteAction, SIGNAL( activated() ),
825 mView, SLOT( deleteIncidence() ) );
826
827
828 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
829 mCloneAction->addTo( mCurrentItemMenu );
830 connect( mCloneAction, SIGNAL( activated() ),
831 mView, SLOT( cloneIncidence() ) );
832 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
833 mMoveAction->addTo( mCurrentItemMenu );
834 connect( mMoveAction, SIGNAL( activated() ),
835 mView, SLOT( moveIncidence() ) );
836 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
837 mBeamAction->addTo(mCurrentItemMenu );
838 connect( mBeamAction, SIGNAL( activated() ),
839 mView, SLOT( beamIncidence() ) );
840 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
841 mCancelAction->addTo( mCurrentItemMenu );
842 connect( mCancelAction, SIGNAL( activated() ),
843 mView, SLOT( toggleCancelIncidence() ) );
844#ifdef DESKTOP_VERSION
845 actionMenu->insertSeparator();
846#endif
847
848
795 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 849 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
796 ne_action->addTo( actionMenu ); 850 ne_action->addTo( actionMenu );
797 connect( ne_action, SIGNAL( activated() ), 851 connect( ne_action, SIGNAL( activated() ),
798 mView, SLOT( newEvent() ) ); 852 mView, SLOT( newEvent() ) );
799 icon = loadPixmap( pathString + "newtodo" ); 853 icon = loadPixmap( pathString + "newtodo" );
800 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 854 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
801 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 855 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
802 nt_action->addTo( actionMenu ); 856 nt_action->addTo( actionMenu );
803 connect( nt_action, SIGNAL( activated() ), 857 connect( nt_action, SIGNAL( activated() ),
804 mView, SLOT( newTodo() ) ); 858 mView, SLOT( newTodo() ) );
805 859
806 icon = loadPixmap( pathString + "today" ); 860
807 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
808 today_action->addTo( viewMenu );
809 connect( today_action, SIGNAL( activated() ),
810 mView, SLOT( goToday() ) );
811 viewMenu->insertSeparator();
812 861
813 // *********************** 862 // ***********************
814 if ( KOPrefs::instance()->mVerticalScreen ) { 863 if ( KOPrefs::instance()->mVerticalScreen ) {
815 icon = SmallIcon( "1updownarrow" ); 864 icon = SmallIcon( "1updownarrow" );
816 } else { 865 } else {
817 icon = SmallIcon("1leftrightarrow" ); 866 icon = SmallIcon("1leftrightarrow" );
818 } 867 }
819 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); 868 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
@@ -850,23 +899,18 @@ void MainWindow::initActions()
850 mToggleNav, SLOT( setEnabled ( bool ) ) ); 899 mToggleNav, SLOT( setEnabled ( bool ) ) );
851 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 900 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
852 // mToggleFilter, SLOT( setEnabled ( bool ) ) ); 901 // mToggleFilter, SLOT( setEnabled ( bool ) ) );
853 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 902 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
854 mToggleAllday, SLOT( setEnabled ( bool ) ) ); 903 mToggleAllday, SLOT( setEnabled ( bool ) ) );
855 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 904 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
856 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); 905 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) );
857 906
858 viewMenu->insertSeparator(); 907
859 icon = loadPixmap( pathString + "picker" ); 908 dPickerAction->addTo( iconToolBar );
860 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
861 action->addTo( viewMenu );
862 connect( action, SIGNAL( activated() ),
863 mView, SLOT( showDatePicker() ) );
864 action->addTo( iconToolBar );
865 viewMenu->insertSeparator(); 909 viewMenu->insertSeparator();
866 910
867 if ( p-> mShowIconToggleFull ) 911 if ( p-> mShowIconToggleFull )
868 FSaction->addTo( iconToolBar ); 912 FSaction->addTo( iconToolBar );
869 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); 913 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
870 914
871 //******************** 915 //********************
872 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); 916 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
@@ -955,69 +999,50 @@ void MainWindow::initActions()
955#endif 999#endif
956 1000
957 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, 1001 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
958 this ); 1002 this );
959 mNewSubTodoAction->addTo( actionMenu ); 1003 mNewSubTodoAction->addTo( actionMenu );
960 connect( mNewSubTodoAction, SIGNAL( activated() ), 1004 connect( mNewSubTodoAction, SIGNAL( activated() ),
961 mView, SLOT( newSubTodo() ) ); 1005 mView, SLOT( newSubTodo() ) );
962 1006
963 actionMenu->insertSeparator(); 1007 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
964 1008 this );
965 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 1009 action->addTo( actionMenu );
966 mShowAction->addTo( actionMenu ); 1010 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
967 connect( mShowAction, SIGNAL( activated() ),
968 mView, SLOT( showIncidence() ) );
969 1011
970 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 1012
971 mEditAction->addTo( actionMenu ); 1013 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
972 connect( mEditAction, SIGNAL( activated() ),
973 mView, SLOT( editIncidence() ) );
974 1014
975 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
976 mDeleteAction->addTo( actionMenu );
977 connect( mDeleteAction, SIGNAL( activated() ),
978 mView, SLOT( deleteIncidence() ) );
979 1015
980 1016
981 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
982 mCloneAction->addTo( actionMenu );
983 connect( mCloneAction, SIGNAL( activated() ),
984 mView, SLOT( cloneIncidence() ) );
985 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
986 mMoveAction->addTo( actionMenu );
987 connect( mMoveAction, SIGNAL( activated() ),
988 mView, SLOT( moveIncidence() ) );
989 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
990 mBeamAction->addTo( actionMenu );
991 connect( mBeamAction, SIGNAL( activated() ),
992 mView, SLOT( beamIncidence() ) );
993 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
994 mCancelAction->addTo( actionMenu );
995 connect( mCancelAction, SIGNAL( activated() ),
996 mView, SLOT( toggleCancelIncidence() ) );
997
998 actionMenu->insertSeparator(); 1017 actionMenu->insertSeparator();
999 1018 action = new QAction( "manage cat", i18n("Edit category list..."), 0,
1000 action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
1001 this ); 1019 this );
1002 action->addTo( actionMenu ); 1020 action->addTo( actionMenu );
1003 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); 1021 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
1004 1022
1005 icon = loadPixmap( pathString + "search" ); 1023 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1006 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); 1024 this );
1007 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); 1025 action->addTo( actionMenu );
1008 search_action->addTo( actionMenu ); 1026 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1009 connect( search_action, SIGNAL( activated() ),
1010 mView->dialogManager(), SLOT( showSearchDialog() ) );
1011 1027
1012
1013 1028
1029 actionMenu->insertSeparator();
1030 icon = loadPixmap( pathString + "configure" );
1031 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
1032 action->addTo( actionMenu );
1033 connect( action, SIGNAL( activated() ),
1034 mView, SLOT( edit_options() ) );
1035 icon = loadPixmap( pathString + "configure" );
1036 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
1037 action->addTo( actionMenu );
1038 connect( action, SIGNAL( activated() ),
1039 mView, SLOT( edit_global_options() ) );
1014 if ( KOPrefs::instance()->mShowFullMenu ) { 1040 if ( KOPrefs::instance()->mShowFullMenu ) {
1015 actionMenu->insertSeparator();
1016 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 1041 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
1017 1042
1018 } 1043 }
1019 // actionMenu->insertSeparator(); 1044 // actionMenu->insertSeparator();
1020 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, 1045 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
1021 this ); 1046 this );
1022 action->addTo( importMenu_X ); 1047 action->addTo( importMenu_X );
1023 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); 1048 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
@@ -1119,21 +1144,17 @@ void MainWindow::initActions()
1119 1144
1120 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); 1145 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
1121 action->addTo( beamMenu_X ); 1146 action->addTo( beamMenu_X );
1122 connect( action, SIGNAL( activated() ), 1147 connect( action, SIGNAL( activated() ),
1123 mView, SLOT( slotprintSelInc() ) ); 1148 mView, SLOT( slotprintSelInc() ) );
1124 1149
1125 importMenu->insertItem( i18n("Print"), beamMenu_X ); 1150 importMenu->insertItem( i18n("Print"), beamMenu_X );
1126#endif 1151#endif
1127 importMenu->insertSeparator(); 1152
1128 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1129 this );
1130 action->addTo( importMenu );
1131 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1132 importMenu->insertSeparator(); 1153 importMenu->insertSeparator();
1133 action = new QAction( "beam all", i18n("Save"), 0, 1154 action = new QAction( "beam all", i18n("Save"), 0,
1134 this ); 1155 this );
1135 action->addTo( importMenu ); 1156 action->addTo( importMenu );
1136 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 1157 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
1137 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 1158 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
1138 this ); 1159 this );
1139 action->addTo( importMenu ); 1160 action->addTo( importMenu );
@@ -1709,24 +1730,29 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
1709 mShowAction->setText( i18n("Delete...") ); 1730 mShowAction->setText( i18n("Delete...") );
1710 1731
1711 mNewSubTodoAction->setEnabled( false ); 1732 mNewSubTodoAction->setEnabled( false );
1712 } 1733 }
1713} 1734}
1714 1735
1715void MainWindow::enableIncidenceActions( bool enabled ) 1736void MainWindow::enableIncidenceActions( bool enabled )
1716{ 1737{
1738
1739#ifndef DESKTOP_VERSION
1740 mCurrentItemMenu->setEnabled( enabled );
1741#else
1717 mShowAction->setEnabled( enabled ); 1742 mShowAction->setEnabled( enabled );
1718 mEditAction->setEnabled( enabled ); 1743 mEditAction->setEnabled( enabled );
1719 mDeleteAction->setEnabled( enabled ); 1744 mDeleteAction->setEnabled( enabled );
1720 1745
1721 mCloneAction->setEnabled( enabled ); 1746 mCloneAction->setEnabled( enabled );
1722 mMoveAction->setEnabled( enabled ); 1747 mMoveAction->setEnabled( enabled );
1723 mBeamAction->setEnabled( enabled ); 1748 mBeamAction->setEnabled( enabled );
1724 mCancelAction->setEnabled( enabled ); 1749 mCancelAction->setEnabled( enabled );
1750#endif
1725} 1751}
1726 1752
1727void MainWindow::importOL() 1753void MainWindow::importOL()
1728{ 1754{
1729#ifdef _OL_IMPORT_ 1755#ifdef _OL_IMPORT_
1730 mView->clearAllViews(); 1756 mView->clearAllViews();
1731 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); 1757 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
1732 id->exec(); 1758 id->exec();
@@ -2269,16 +2295,17 @@ void MainWindow::configureToolBar( int item )
2269 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); 2295 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
2270 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); 2296 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
2271 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); 2297 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
2272 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); 2298 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
2273 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); 2299 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
2274 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); 2300 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
2275 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); 2301 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
2276 // initActions(); 2302 // initActions();
2303 setCaption ( i18n("Toolbar changes needs a restart!") );
2277} 2304}
2278void MainWindow::setCaption ( const QString & c ) 2305void MainWindow::setCaption ( const QString & c )
2279{ 2306{
2280 QString cap = c; 2307 QString cap = c;
2281 cap.replace( QRegExp("\n"), " " ); 2308 cap.replace( QRegExp("\n"), " " );
2282 cap = cap.stripWhiteSpace(); 2309 cap = cap.stripWhiteSpace();
2283 if ( cap.isEmpty() ) 2310 if ( cap.isEmpty() )
2284 cap = "KO/Pi"; 2311 cap = "KO/Pi";
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index a4d0523..953774f 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -124,16 +124,17 @@ class MainWindow : public QMainWindow
124 bool mFlagKeyPressed; 124 bool mFlagKeyPressed;
125 bool mBlockAtStartup; 125 bool mBlockAtStartup;
126 QPEToolBar *iconToolBar; 126 QPEToolBar *iconToolBar;
127 QPEToolBar *viewToolBar; 127 QPEToolBar *viewToolBar;
128 QPEToolBar *navigatorToolBar; 128 QPEToolBar *navigatorToolBar;
129 QPEToolBar *filterToolBar; 129 QPEToolBar *filterToolBar;
130 QMenuBar *filterMenubar; 130 QMenuBar *filterMenubar;
131 QPopupMenu * filterPopupMenu; 131 QPopupMenu * filterPopupMenu;
132 QPopupMenu * mCurrentItemMenu;
132 void initActions(); 133 void initActions();
133 void setDefaultPreferences(); 134 void setDefaultPreferences();
134 void resizeEvent( QResizeEvent* e); 135 void resizeEvent( QResizeEvent* e);
135 void keyPressEvent ( QKeyEvent * ) ; 136 void keyPressEvent ( QKeyEvent * ) ;
136 void keyReleaseEvent ( QKeyEvent * ) ; 137 void keyReleaseEvent ( QKeyEvent * ) ;
137 QPopupMenu *configureToolBarMenu; 138 QPopupMenu *configureToolBarMenu;
138 QPopupMenu *selectFilterMenu; 139 QPopupMenu *selectFilterMenu;
139 QPopupMenu *selectFilterMenuTB; 140 QPopupMenu *selectFilterMenuTB;
diff --git a/version b/version
index 6a9a414..8ab3bd7 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "2.1.11"; version = "2.1.12";