-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 14 | ||||
-rw-r--r-- | korganizer/koeventpopupmenu.cpp | 2 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 17 |
4 files changed, 16 insertions, 19 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 5fece5b..bd946fd 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -39,17 +39,17 @@ | |||
39 | { "8th","8." }, | 39 | { "8th","8." }, |
40 | { "9th","9." }, | 40 | { "9th","9." }, |
41 | { "About...","Über..." }, | 41 | { "About...","Über..." }, |
42 | { "&Accept","&Akzeptieren" }, | 42 | { "&Accept","&Akzeptieren" }, |
43 | { "Accept","Akzeptieren" }, | 43 | { "Accept","Akzeptieren" }, |
44 | { "Accept A&ll","A&lles Akzepieren" }, | 44 | { "Accept A&ll","A&lles Akzepieren" }, |
45 | { "Access:","Zugriff:" }, | 45 | { "Access:","Zugriff:" }, |
46 | { "A corresponding event is missing in your calendar!","Ein zugehöriger Termin fehlt in ihrem Kalender!" }, | 46 | { "A corresponding event is missing in your calendar!","Ein zugehöriger Termin fehlt in ihrem Kalender!" }, |
47 | { "Actions","Aktionen" }, | 47 | { "Action","Aktion" }, |
48 | { "Add Filter","Filter Hinzufügen" }, | 48 | { "Add Filter","Filter Hinzufügen" }, |
49 | { "&Add","Hinzufügen" }, | 49 | { "&Add","Hinzufügen" }, |
50 | { "Add","Hinzufügen" }, | 50 | { "Add","Hinzufügen" }, |
51 | { "Additional email addresses:","Zusätzliche E-Mail Adressen:" }, | 51 | { "Additional email addresses:","Zusätzliche E-Mail Adressen:" }, |
52 | { "Additional email address:","Zusätzliche E-Mail Adresse:" }, | 52 | { "Additional email address:","Zusätzliche E-Mail Adresse:" }, |
53 | { "&Addressbook","&Adressbuch" }, | 53 | { "&Addressbook","&Adressbuch" }, |
54 | { "Address &Book...","Adress&buch..." }, | 54 | { "Address &Book...","Adress&buch..." }, |
55 | { "Agenda Size","Agende Größe" }, | 55 | { "Agenda Size","Agende Größe" }, |
@@ -125,34 +125,33 @@ | |||
125 | { "Default event color:","Standard Terminfarbe:" }, | 125 | { "Default event color:","Standard Terminfarbe:" }, |
126 | { "Default","Standard" }, | 126 | { "Default","Standard" }, |
127 | { "Def. duration of new app.:","Standard Termin Länge:" }, | 127 | { "Def. duration of new app.:","Standard Termin Länge:" }, |
128 | { "Delete All","Lösche alles" }, | 128 | { "Delete All","Lösche alles" }, |
129 | { "Delete all selected","Lösche alle Selektierten" }, | 129 | { "Delete all selected","Lösche alle Selektierten" }, |
130 | { "Delete Current","Aktuellen löschen" }, | 130 | { "Delete Current","Aktuellen löschen" }, |
131 | { "Delete Event...","Lösche Termin..." }, | 131 | { "Delete Event...","Lösche Termin..." }, |
132 | { "Delete Event","Lösche Termin" }, | 132 | { "Delete Event","Lösche Termin" }, |
133 | { "&Delete","Löschen" }, | 133 | { "&Delete...","Löschen..." }, |
134 | { "Delete...","Löschen..." }, | 134 | { "Delete...","Löschen..." }, |
135 | { "Delete","Löschen" }, | 135 | { "Delete","Löschen" }, |
136 | { "Delete Todo...","Lösche Todo..." }, | 136 | { "Delete Todo...","Lösche Todo..." }, |
137 | { "Delete To-Do","Lösche Todo" }, | 137 | { "Delete To-Do","Lösche Todo" }, |
138 | { "Deleting item %d ...","Lösche Eintrag %d..." }, | 138 | { "Deleting item %d ...","Lösche Eintrag %d..." }, |
139 | { "Descriptions","Beschreibungen" }, | 139 | { "Descriptions","Beschreibungen" }, |
140 | { "Deselect all","Deselektiere Alle" }, | 140 | { "Deselect all","Deselektiere Alle" }, |
141 | { "Details","Details" }, | 141 | { "Details","Details" }, |
142 | { "Dinner","Abendessen" }, | 142 | { "Dinner","Abendessen" }, |
143 | { "Do you really want\nto close KO/Pi?","Möchten Sie wirklich\nKO/PI verlassen?" }, | 143 | { "Do you really want\nto close KO/Pi?","Möchten Sie wirklich\nKO/PI verlassen?" }, |
144 | { "Due Date","Fällig am" }, | 144 | { "Due Date","Fällig am" }, |
145 | { "Due: ","Fällig: "}, | 145 | { "Due: ","Fällig: "}, |
146 | { "Due Time","Fällig um" }, | 146 | { "Due Time","Fällig um" }, |
147 | { "Due:","Fällig:"}, | 147 | { "Due:","Fällig:"}, |
148 | { "Duration: ","Dauer: " }, | 148 | { "Duration: ","Dauer: " }, |
149 | { "Edit...","Bearbeite..." }, | 149 | { "Edit...","Bearbeite..." }, |
150 | { "Edit","Bearbeite" }, | ||
151 | { "Edit Event...","Bearbeite Termin..." }, | 150 | { "Edit Event...","Bearbeite Termin..." }, |
152 | { "Edit Event","Bearbeite Termin" }, | 151 | { "Edit Event","Bearbeite Termin" }, |
153 | { "Edit exceptions","Bearbeite Ausnahmen" }, | 152 | { "Edit exceptions","Bearbeite Ausnahmen" }, |
154 | { "EditorBox:","Editor Fenster:" }, | 153 | { "EditorBox:","Editor Fenster:" }, |
155 | { "Edit Recurrence Range","Bearbeite Wiederholung" }, | 154 | { "Edit Recurrence Range","Bearbeite Wiederholung" }, |
156 | { "Edit Todo...","Berabeite Todo..." }, | 155 | { "Edit Todo...","Berabeite Todo..." }, |
157 | { "Edit To-Do","Todo bearbeiten" }, | 156 | { "Edit To-Do","Todo bearbeiten" }, |
158 | { "E&mail address:","E&mail Adresse:" }, | 157 | { "E&mail address:","E&mail Adresse:" }, |
@@ -215,17 +214,17 @@ | |||
215 | { "KO/Pi is starting ... "," KO/Pi startet ... \n... Zeit für eine Kaffeepause ..." }, | 214 | { "KO/Pi is starting ... "," KO/Pi startet ... \n... Zeit für eine Kaffeepause ..." }, |
216 | { "Language:(needs restart)","Sprache (Neustart!)" }, | 215 | { "Language:(needs restart)","Sprache (Neustart!)" }, |
217 | { "Language:","Sprache" }, | 216 | { "Language:","Sprache" }, |
218 | { "Large","Etwas mehr" }, | 217 | { "Large","Etwas mehr" }, |
219 | { "List View:","Listenansicht:" }, | 218 | { "List View:","Listenansicht:" }, |
220 | { "List View","Listenansicht" }, | 219 | { "List View","Listenansicht" }, |
221 | { "Load/Save","Laden/Speichern" }, | 220 | { "Load/Save","Laden/Speichern" }, |
222 | { "Load Template","Lade Vorlage" }, | 221 | { "Load Template","Lade Vorlage" }, |
223 | { "Locale","Localisation" }, | 222 | { "Locale","Lokalisation" }, |
224 | { "Local temp file:","Lokale temp. Datei:" }, | 223 | { "Local temp file:","Lokale temp. Datei:" }, |
225 | { "Location: ","Ort: " }, | 224 | { "Location: ","Ort: " }, |
226 | { "Location:","Ort:" }, | 225 | { "Location:","Ort:" }, |
227 | { "Mail client","Mail Programm" }, | 226 | { "Mail client","Mail Programm" }, |
228 | { "Mail Client","Mail Programm" }, | 227 | { "Mail Client","Mail Programm" }, |
229 | { "March","März" }, | 228 | { "March","März" }, |
230 | { "Mar","Mär" }, | 229 | { "Mar","Mär" }, |
231 | { "May","Mai" }, | 230 | { "May","Mai" }, |
@@ -471,26 +470,26 @@ | |||
471 | { "Listview uses monthly timespan","Listenansicht zeigt monatliche Zeitspanne" }, | 470 | { "Listview uses monthly timespan","Listenansicht zeigt monatliche Zeitspanne" }, |
472 | { "ViewChange","Ansichtswechsel" }, | 471 | { "ViewChange","Ansichtswechsel" }, |
473 | { "Default alarm *.wav file:","Standard Alarm *.wav Datei:" }, | 472 | { "Default alarm *.wav file:","Standard Alarm *.wav Datei:" }, |
474 | { "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" }, | 473 | { "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" }, |
475 | { "File","Datei" }, | 474 | { "File","Datei" }, |
476 | { "Clone...","Dupliziere..." }, | 475 | { "Clone...","Dupliziere..." }, |
477 | { "Move...","Bewege..." }, | 476 | { "Move...","Bewege..." }, |
478 | { "Beam...","Sende via IR..." }, | 477 | { "Beam...","Sende via IR..." }, |
479 | { "&Clone...","Dupliziere.." }, | 478 | { "&Clone...","Dupliziere..." }, |
480 | { "&Move...","Bewege..." }, | 479 | { "&Move...","Bewege..." }, |
481 | { "&Beam...","Sende via IR..." }, | 480 | { "&Beam...","Sende via IR..." }, |
482 | { "Show Completed","Zeige erledigte Todos" }, | 481 | { "Show Completed","Zeige erledigte Todos" }, |
483 | { "Show Quick Todo","Zeige Quick Todo" }, | 482 | { "Show Quick Todo","Zeige Quick Todo" }, |
484 | { "Unparent Todo","Un-sub Todo" }, | 483 | { "Unparent Todo","Un-sub Todo" }, |
485 | { "Save selected to file...","Speichere Selektierte..." }, | 484 | { "Save selected to file...","Speichere Selektierte..." }, |
486 | { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." }, | 485 | { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." }, |
487 | { "Set Categ. for selected...","Setze Kateg. für Selekt." }, | 486 | { "Set Categ. for selected...","Setze Kateg. für Selekt." }, |
488 | { "Beam via IR","Sende via IR" }, | 487 | { "Beam via IR...","Sende via IR..." }, |
489 | { "Search","Suchen" }, | 488 | { "Search","Suchen" }, |
490 | { "Date Picker","Datum auswählen" }, | 489 | { "Date Picker","Datum auswählen" }, |
491 | { "Day View","Tagesansicht" }, | 490 | { "Day View","Tagesansicht" }, |
492 | { "Work Week","Arbeitswoche" }, | 491 | { "Work Week","Arbeitswoche" }, |
493 | { "Week","Wochenansicht" }, | 492 | { "Week","Wochenansicht" }, |
494 | { "Month","Monatsansicht" }, | 493 | { "Month","Monatsansicht" }, |
495 | { "Todo View","Todo Liste" }, | 494 | { "Todo View","Todo Liste" }, |
496 | { "Journal","Journal" }, | 495 | { "Journal","Journal" }, |
@@ -1092,17 +1091,17 @@ | |||
1092 | { "From: %1 To: %2 %3","Von: %1 Bis: %2 %3" }, | 1091 | { "From: %1 To: %2 %3","Von: %1 Bis: %2 %3" }, |
1093 | { "Restore","Wiederherstellen" }, | 1092 | { "Restore","Wiederherstellen" }, |
1094 | { "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklich\nwiederherstellen?" }, | 1093 | { "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklich\nwiederherstellen?" }, |
1095 | { "% completed","% erledigt" }, | 1094 | { "% completed","% erledigt" }, |
1096 | { "%d item(s) found.","%d Item(s) gefunden." }, | 1095 | { "%d item(s) found.","%d Item(s) gefunden." }, |
1097 | { "Set complete","Setze auf erledigt" }, | 1096 | { "Set complete","Setze auf erledigt" }, |
1098 | { "(cancelled)","(gecancelt)" }, | 1097 | { "(cancelled)","(gecancelt)" }, |
1099 | { "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" }, | 1098 | { "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" }, |
1100 | { " Local time "," Locale Zeit " }, | 1099 | { " Local time "," Lokale Zeit " }, |
1101 | { "Form2","Form2" }, | 1100 | { "Form2","Form2" }, |
1102 | { "Filter enabled","Filter angeschaltet" }, | 1101 | { "Filter enabled","Filter angeschaltet" }, |
1103 | { "Edit Filters","Ändere Filter" }, | 1102 | { "Edit Filters","Ändere Filter" }, |
1104 | { "Print What's Next View...","Drucke What's Next Ansicht..." }, | 1103 | { "Print What's Next View...","Drucke What's Next Ansicht..." }, |
1105 | { "Agenda","Agenda" }, | 1104 | { "Agenda","Agenda" }, |
1106 | { " ("," (" }, | 1105 | { " ("," (" }, |
1107 | { "<p><b>Due on:</b> %1</p>","<p><b>Fällig am:</b> %1</p>" }, | 1106 | { "<p><b>Due on:</b> %1</p>","<p><b>Fällig am:</b> %1</p>" }, |
1108 | { "Print","Print" }, | 1107 | { "Print","Print" }, |
@@ -1483,14 +1482,15 @@ | |||
1483 | { "Set categories","Setze Kategorien" }, | 1482 | { "Set categories","Setze Kategorien" }, |
1484 | { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" }, | 1483 | { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" }, |
1485 | { "Reset","Neu setzen" }, | 1484 | { "Reset","Neu setzen" }, |
1486 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, | 1485 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, |
1487 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, | 1486 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, |
1488 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, | 1487 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, |
1489 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, | 1488 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, |
1490 | { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, | 1489 | { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, |
1490 | { "Edit","Edit" }, | ||
1491 | { "","" }, | 1491 | { "","" }, |
1492 | { "","" }, | 1492 | { "","" }, |
1493 | { "","" }, | 1493 | { "","" }, |
1494 | { "","" }, | 1494 | { "","" }, |
1495 | { "","" }, | 1495 | { "","" }, |
1496 | { "","" }, | 1496 | { "","" }, |
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 41d331a..0b0fe8e 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp | |||
@@ -35,17 +35,17 @@ | |||
35 | KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() | 35 | KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() |
36 | { | 36 | { |
37 | mCurrentIncidence = 0; | 37 | mCurrentIncidence = 0; |
38 | mHasAdditionalItems = false; | 38 | mHasAdditionalItems = false; |
39 | 39 | ||
40 | 40 | ||
41 | mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow()))); | 41 | mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow()))); |
42 | mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit()))); | 42 | mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit()))); |
43 | mEditOnlyItems.append(insertItem (i18n("&Delete"), | 43 | mEditOnlyItems.append(insertItem (i18n("&Delete..."), |
44 | this,SLOT(popupDelete()))); | 44 | this,SLOT(popupDelete()))); |
45 | mEditOnlyItems.append(insertItem (i18n("&Clone..."), | 45 | mEditOnlyItems.append(insertItem (i18n("&Clone..."), |
46 | this,SLOT(popupClone()))); | 46 | this,SLOT(popupClone()))); |
47 | mEditOnlyItems.append(insertItem (i18n("&Move..."), | 47 | mEditOnlyItems.append(insertItem (i18n("&Move..."), |
48 | this,SLOT(popupMove()))); | 48 | this,SLOT(popupMove()))); |
49 | #ifndef DESKTOP_VERSION | 49 | #ifndef DESKTOP_VERSION |
50 | mEditOnlyItems.append(insertItem (i18n("&Beam..."), | 50 | mEditOnlyItems.append(insertItem (i18n("&Beam..."), |
51 | this,SLOT(popupBeam()))); | 51 | this,SLOT(popupBeam()))); |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index cdcbbf0..ea037a9 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -342,17 +342,17 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
342 | SLOT(saveDescriptionToFile())); | 342 | SLOT(saveDescriptionToFile())); |
343 | // mPopupMenu->insertSeparator(); | 343 | // mPopupMenu->insertSeparator(); |
344 | // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 344 | // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
345 | // i18n("Add Categ. to selected..."),this, | 345 | // i18n("Add Categ. to selected..."),this, |
346 | // SLOT(addCat()),true); | 346 | // SLOT(addCat()),true); |
347 | //mPopupMenu->insertSeparator(); | 347 | //mPopupMenu->insertSeparator(); |
348 | #ifndef DESKTOP_VERSION | 348 | #ifndef DESKTOP_VERSION |
349 | selPopup->insertSeparator(); | 349 | selPopup->insertSeparator(); |
350 | selPopup->insertItem( i18n("Beam via IR"),this, | 350 | selPopup->insertItem( i18n("Beam via IR..."),this, |
351 | SLOT(beamSelected())); | 351 | SLOT(beamSelected())); |
352 | #if 0 | 352 | #if 0 |
353 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 353 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
354 | i18n("Beam via IR"),this, | 354 | i18n("Beam via IR"),this, |
355 | SLOT(beamSelected()),true); | 355 | SLOT(beamSelected()),true); |
356 | #endif | 356 | #endif |
357 | #endif | 357 | #endif |
358 | /* | 358 | /* |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index f68f032..7a5f3e5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -670,17 +670,18 @@ void MainWindow::initActions() | |||
670 | pathString += "iconsmini/"; | 670 | pathString += "iconsmini/"; |
671 | pixWid = 18; pixHei = 16; | 671 | pixWid = 18; pixHei = 16; |
672 | } | 672 | } |
673 | if ( KOPrefs::instance()->mShowFullMenu ) { | 673 | if ( KOPrefs::instance()->mShowFullMenu ) { |
674 | QMenuBar *menuBar1; | 674 | QMenuBar *menuBar1; |
675 | menuBar1 = menuBar(); | 675 | menuBar1 = menuBar(); |
676 | menuBar1->insertItem( i18n("File"), importMenu ); | 676 | menuBar1->insertItem( i18n("File"), importMenu ); |
677 | menuBar1->insertItem( i18n("View"), viewMenu ); | 677 | menuBar1->insertItem( i18n("View"), viewMenu ); |
678 | menuBar1->insertItem( i18n("Actions"), actionMenu ); | 678 | menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu ); |
679 | menuBar1->insertItem( i18n("Action"), actionMenu ); | ||
679 | #ifdef DESKTOP_VERSION | 680 | #ifdef DESKTOP_VERSION |
680 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); | 681 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); |
681 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 682 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
682 | #else | 683 | #else |
683 | menuBar1->insertItem( i18n("Sync"), syncMenu ); | 684 | menuBar1->insertItem( i18n("Sync"), syncMenu ); |
684 | menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); | 685 | menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); |
685 | #endif | 686 | #endif |
686 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 687 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
@@ -690,17 +691,18 @@ void MainWindow::initActions() | |||
690 | QPEMenuBar *menuBar1; | 691 | QPEMenuBar *menuBar1; |
691 | menuBar1 = new QPEMenuBar( iconToolBar ); | 692 | menuBar1 = new QPEMenuBar( iconToolBar ); |
692 | QPopupMenu *menuBar = new QPopupMenu( this ); | 693 | QPopupMenu *menuBar = new QPopupMenu( this ); |
693 | icon = loadPixmap( pathString + "z_menu" ); | 694 | icon = loadPixmap( pathString + "z_menu" ); |
694 | menuBar1->insertItem( icon.pixmap(), menuBar); | 695 | menuBar1->insertItem( icon.pixmap(), menuBar); |
695 | //menuBar1->insertItem( i18n("ME"), menuBar); | 696 | //menuBar1->insertItem( i18n("ME"), menuBar); |
696 | menuBar->insertItem( i18n("File"), importMenu ); | 697 | menuBar->insertItem( i18n("File"), importMenu ); |
697 | menuBar->insertItem( i18n("View"), viewMenu ); | 698 | menuBar->insertItem( i18n("View"), viewMenu ); |
698 | menuBar->insertItem( i18n("Actions"), actionMenu ); | 699 | menuBar->insertItem( i18n("Edit"), mCurrentItemMenu ); |
700 | menuBar->insertItem( i18n("Action"), actionMenu ); | ||
699 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); | 701 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); |
700 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 702 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
701 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 703 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
702 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); | 704 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); |
703 | menuBar->insertItem( i18n("Help"), helpMenu ); | 705 | menuBar->insertItem( i18n("Help"), helpMenu ); |
704 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); | 706 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); |
705 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); | 707 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); |
706 | } | 708 | } |
@@ -777,30 +779,30 @@ void MainWindow::initActions() | |||
777 | connect( search_action, SIGNAL( activated() ), | 779 | connect( search_action, SIGNAL( activated() ), |
778 | mView->dialogManager(), SLOT( showSearchDialog() ) ); | 780 | mView->dialogManager(), SLOT( showSearchDialog() ) ); |
779 | 781 | ||
780 | actionMenu->insertSeparator(); | 782 | actionMenu->insertSeparator(); |
781 | 783 | ||
782 | 784 | ||
783 | 785 | ||
784 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); | 786 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); |
785 | action->addTo( actionMenu ); | 787 | action->addTo( mCurrentItemMenu ); |
786 | connect( action, SIGNAL( activated() ), | 788 | connect( action, SIGNAL( activated() ), |
787 | mView, SLOT( undo_delete() ) ); | 789 | mView, SLOT( undo_delete() ) ); |
788 | 790 | mCurrentItemMenu->insertSeparator(); | |
789 | icon = loadPixmap( pathString + "newevent" ); | 791 | icon = loadPixmap( pathString + "newevent" ); |
790 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); | 792 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); |
791 | configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); | 793 | configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); |
792 | configureToolBarMenu->insertSeparator(); | 794 | configureToolBarMenu->insertSeparator(); |
793 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); | 795 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); |
794 | configureToolBarMenu->insertSeparator(); | 796 | configureToolBarMenu->insertSeparator(); |
795 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); | 797 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); |
796 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); | 798 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); |
797 | 799 | ||
798 | actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); | 800 | //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); |
799 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); | 801 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); |
800 | mShowAction->addTo( mCurrentItemMenu ); | 802 | mShowAction->addTo( mCurrentItemMenu ); |
801 | connect( mShowAction, SIGNAL( activated() ), | 803 | connect( mShowAction, SIGNAL( activated() ), |
802 | mView, SLOT( showIncidence() ) ); | 804 | mView, SLOT( showIncidence() ) ); |
803 | 805 | ||
804 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); | 806 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); |
805 | mEditAction->addTo( mCurrentItemMenu ); | 807 | mEditAction->addTo( mCurrentItemMenu ); |
806 | connect( mEditAction, SIGNAL( activated() ), | 808 | connect( mEditAction, SIGNAL( activated() ), |
@@ -1717,29 +1719,24 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1717 | mShowAction->setText( i18n("Delete...") ); | 1719 | mShowAction->setText( i18n("Delete...") ); |
1718 | 1720 | ||
1719 | mNewSubTodoAction->setEnabled( false ); | 1721 | mNewSubTodoAction->setEnabled( false ); |
1720 | } | 1722 | } |
1721 | } | 1723 | } |
1722 | 1724 | ||
1723 | void MainWindow::enableIncidenceActions( bool enabled ) | 1725 | void MainWindow::enableIncidenceActions( bool enabled ) |
1724 | { | 1726 | { |
1725 | |||
1726 | #ifndef DESKTOP_VERSION | ||
1727 | mCurrentItemMenu->setEnabled( enabled ); | ||
1728 | #else | ||
1729 | mShowAction->setEnabled( enabled ); | 1727 | mShowAction->setEnabled( enabled ); |
1730 | mEditAction->setEnabled( enabled ); | 1728 | mEditAction->setEnabled( enabled ); |
1731 | mDeleteAction->setEnabled( enabled ); | 1729 | mDeleteAction->setEnabled( enabled ); |
1732 | 1730 | ||
1733 | mCloneAction->setEnabled( enabled ); | 1731 | mCloneAction->setEnabled( enabled ); |
1734 | mMoveAction->setEnabled( enabled ); | 1732 | mMoveAction->setEnabled( enabled ); |
1735 | mBeamAction->setEnabled( enabled ); | 1733 | mBeamAction->setEnabled( enabled ); |
1736 | mCancelAction->setEnabled( enabled ); | 1734 | mCancelAction->setEnabled( enabled ); |
1737 | #endif | ||
1738 | } | 1735 | } |
1739 | 1736 | ||
1740 | void MainWindow::importOL() | 1737 | void MainWindow::importOL() |
1741 | { | 1738 | { |
1742 | #ifdef _OL_IMPORT_ | 1739 | #ifdef _OL_IMPORT_ |
1743 | mView->clearAllViews(); | 1740 | mView->clearAllViews(); |
1744 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); | 1741 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); |
1745 | id->exec(); | 1742 | id->exec(); |