-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 6 | ||||
-rw-r--r-- | korganizer/kodialogmanager.cpp | 87 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 59 | ||||
-rw-r--r-- | libkdepim/kdatepicker.cpp | 4 |
4 files changed, 84 insertions, 72 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index b526df9..246ab3d 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1248,59 +1248,59 @@ | |||
1248 | { "Remote port number:","Ferne Port Nummer:" }, | 1248 | { "Remote port number:","Ferne Port Nummer:" }, |
1249 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, | 1249 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, |
1250 | { "Remote from: ","Fern von: " }, | 1250 | { "Remote from: ","Fern von: " }, |
1251 | { "Local from: ","Lokal von: " }, | 1251 | { "Local from: ","Lokal von: " }, |
1252 | { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" }, | 1252 | { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" }, |
1253 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, | 1253 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, |
1254 | { "Write back","Schreibe zurück" }, | 1254 | { "Write back","Schreibe zurück" }, |
1255 | { "KO/Pi Synchronization","KO/Pi Synchronisation" }, | 1255 | { "KO/Pi Synchronization","KO/Pi Synchronisation" }, |
1256 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, | 1256 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, |
1257 | { "Received sync request","Sync Anfrage erhalten" }, | 1257 | { "Received sync request","Sync Anfrage erhalten" }, |
1258 | { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." }, | 1258 | { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." }, |
1259 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, | 1259 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, |
1260 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, | 1260 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, |
1261 | { "Sending file...","Sende Datei..." }, | 1261 | { "Sending file...","Sende Datei..." }, |
1262 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, | 1262 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, |
1263 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, | 1263 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, |
1264 | { "Received %1 bytes","%1 Bytes erhalten" }, | 1264 | { "Received %1 bytes","%1 Bytes erhalten" }, |
1265 | { "Writing file to disk...","Speichere Datei..." }, | 1265 | { "Writing file to disk...","Speichere Datei..." }, |
1266 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, | 1266 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, |
1267 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, | 1267 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, |
1268 | { "Synchronize!","Synchronisiere!" }, | 1268 | { "Synchronize!","Synchronisiere!" }, |
1269 | { "High clock skew!","Großer Uhrzeitunterschied!" }, | 1269 | { "High clock skew!","Großer Uhrzeitunterschied!" }, |
1270 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, | 1270 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, |
1271 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, | 1271 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, |
1272 | { "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." }, | 1272 | { "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." }, |
1273 | { "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" }, | 1273 | { "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" }, |
1274 | { "List week view","Listenwochenansicht" }, | 1274 | { "List week view","Listenwochenansicht" }, |
1275 | { "List week","Listenwochenansicht" }, | 1275 | { "List week","Listenwochenansicht" }, |
1276 | { "Next Week","Nächste Woche" }, | 1276 | { "Next Week","Nächste Woche" }, |
1277 | { "Previous Week","Vorherige Woche" }, | 1277 | { "Previous Week","Vorherige Woche" }, |
1278 | { "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." }, | 1278 | { "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." }, |
1279 | { "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" }, | 1279 | { "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" }, |
1280 | { "Details","Details" }, | 1280 | { "Details","Details" }, |
1281 | { "Created time","Erstellt Zeit" }, | 1281 | { "Created time","Erstellt Zeit" }, |
1282 | { "Last modified time","Geändert Zeit" }, | 1282 | { "Last modified time","Geändert Zeit" }, |
1283 | { "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" }, | 1283 | { "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" }, |
1284 | { "View Options","Anzeige Optionen" }, | 1284 | { "View Options","Anzeige Optionen" }, |
1285 | { "<b>Created: ","<b>Erstellt am: " }, | 1285 | { "<b>Created: ","<b>Erstellt am: " }, |
1286 | { "<b>Last modified: ","<b>Zuletzt geändert am: " }, | 1286 | { "<b>Last modified: ","<b>Zuletzt geändert am: " }, |
1287 | { "Journal: ","Journal: " }, | 1287 | { "Journal: ","Journal: " }, |
1288 | { "yearly","jährlich" }, | 1288 | { "yearly","jährlich" }, |
1289 | { "(%1) ","%1-" }, | 1289 | { "(%1) ","%1-" }, |
1290 | { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" }, | 1290 | { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" }, |
1291 | { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" }, | 1291 | { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" }, |
1292 | { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" }, | 1292 | { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" }, |
1293 | { "Summary/Loc.","Titel/Ort" }, | 1293 | { "Summary/Loc.","Titel/Ort" }, |
1294 | { "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." }, | 1294 | { "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." }, |
1295 | { "Week Number","Wochennummer" }, | 1295 | { "Week Number","Wochennummer" }, |
1296 | { "","" }, | 1296 | { "Import","Importiere" }, |
1297 | { "","" }, | 1297 | { "Export","Exportiere" }, |
1298 | { "","" }, | 1298 | { "Beam","Beame" }, |
1299 | { "","" }, | 1299 | { "","" }, |
1300 | { "","" }, | 1300 | { "","" }, |
1301 | { "","" }, | 1301 | { "","" }, |
1302 | { "","" }, | 1302 | { "","" }, |
1303 | { "","" }, | 1303 | { "","" }, |
1304 | { "","" }, | 1304 | { "","" }, |
1305 | { "","" }, | 1305 | { "","" }, |
1306 | 1306 | ||
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 41a4dc1..1af9dad 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -122,143 +122,146 @@ void KODialogManager::showOutgoingDialog() | |||
122 | mOutgoingDialog->raise(); | 122 | mOutgoingDialog->raise(); |
123 | } | 123 | } |
124 | 124 | ||
125 | IncomingDialog *KODialogManager::incomingDialog() | 125 | IncomingDialog *KODialogManager::incomingDialog() |
126 | { | 126 | { |
127 | createOutgoingDialog(); | 127 | createOutgoingDialog(); |
128 | if (!mIncomingDialog) { | 128 | if (!mIncomingDialog) { |
129 | mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView); | 129 | mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView); |
130 | connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)), | 130 | connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)), |
131 | mMainView,SIGNAL(numIncomingChanged(int))); | 131 | mMainView,SIGNAL(numIncomingChanged(int))); |
132 | connect(mIncomingDialog,SIGNAL(calendarUpdated()), | 132 | connect(mIncomingDialog,SIGNAL(calendarUpdated()), |
133 | mMainView,SLOT(updateView())); | 133 | mMainView,SLOT(updateView())); |
134 | } | 134 | } |
135 | return mIncomingDialog; | 135 | return mIncomingDialog; |
136 | } | 136 | } |
137 | 137 | ||
138 | void KODialogManager::createIncomingDialog() | 138 | void KODialogManager::createIncomingDialog() |
139 | { | 139 | { |
140 | createOutgoingDialog(); | 140 | createOutgoingDialog(); |
141 | if (!mIncomingDialog) { | 141 | if (!mIncomingDialog) { |
142 | mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView); | 142 | mIncomingDialog = new IncomingDialog(mMainView->calendar(),mOutgoingDialog,mMainView); |
143 | connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)), | 143 | connect(mIncomingDialog,SIGNAL(numMessagesChanged(int)), |
144 | mMainView,SIGNAL(numIncomingChanged(int))); | 144 | mMainView,SIGNAL(numIncomingChanged(int))); |
145 | connect(mIncomingDialog,SIGNAL(calendarUpdated()), | 145 | connect(mIncomingDialog,SIGNAL(calendarUpdated()), |
146 | mMainView,SLOT(updateView())); | 146 | mMainView,SLOT(updateView())); |
147 | } | 147 | } |
148 | } | 148 | } |
149 | 149 | ||
150 | void KODialogManager::showIncomingDialog() | 150 | void KODialogManager::showIncomingDialog() |
151 | { | 151 | { |
152 | createIncomingDialog(); | 152 | createIncomingDialog(); |
153 | mIncomingDialog->show(); | 153 | mIncomingDialog->show(); |
154 | mIncomingDialog->raise(); | 154 | mIncomingDialog->raise(); |
155 | } | 155 | } |
156 | /* | 156 | /* |
157 | void KODialogManager::showCategoryEditDialog() | 157 | void KODialogManager::showCategoryEditDialog() |
158 | { | 158 | { |
159 | mCategoryEditDialog->show(); | 159 | mCategoryEditDialog->show(); |
160 | } | 160 | } |
161 | */ | 161 | */ |
162 | void KODialogManager::hideSearchDialog() | 162 | void KODialogManager::hideSearchDialog() |
163 | { | 163 | { |
164 | if (mSearchDialog) | 164 | if (mSearchDialog) |
165 | mSearchDialog->hide(); | 165 | mSearchDialog->hide(); |
166 | } | 166 | } |
167 | 167 | ||
168 | void KODialogManager::showSearchDialog() | 168 | void KODialogManager::showSearchDialog() |
169 | { | 169 | { |
170 | if (!mSearchDialog) { | 170 | if (!mSearchDialog) { |
171 | mSearchDialog = new SearchDialog(mMainView->calendar(),mMainView); | 171 | mSearchDialog = new SearchDialog(mMainView->calendar(),mMainView); |
172 | KOListView * lview = mSearchDialog->listview(); | 172 | KOListView * lview = mSearchDialog->listview(); |
173 | 173 | ||
174 | connect(lview, SIGNAL(showIncidenceSignal(Incidence *)), | 174 | connect(lview, SIGNAL(showIncidenceSignal(Incidence *)), |
175 | mMainView, SLOT(showIncidence(Incidence *))); | 175 | mMainView, SLOT(showIncidence(Incidence *))); |
176 | connect(lview, SIGNAL(editIncidenceSignal(Incidence *)), | 176 | connect(lview, SIGNAL(editIncidenceSignal(Incidence *)), |
177 | mMainView, SLOT(editIncidence(Incidence *))); | 177 | mMainView, SLOT(editIncidence(Incidence *))); |
178 | connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)), | 178 | connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)), |
179 | mMainView, SLOT(deleteIncidence(Incidence *))); | 179 | mMainView, SLOT(deleteIncidence(Incidence *))); |
180 | connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)), | 180 | connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)), |
181 | mMainView, SLOT(cloneIncidence(Incidence *))); | 181 | mMainView, SLOT(cloneIncidence(Incidence *))); |
182 | connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)), | 182 | connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)), |
183 | mMainView, SLOT(beamIncidence(Incidence *))); | 183 | mMainView, SLOT(beamIncidence(Incidence *))); |
184 | connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)), | 184 | connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)), |
185 | mMainView, SLOT(moveIncidence(Incidence *))); | 185 | mMainView, SLOT(moveIncidence(Incidence *))); |
186 | connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )), | 186 | connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )), |
187 | mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> ))); | 187 | mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> ))); |
188 | 188 | ||
189 | connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig())); | 189 | connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig())); |
190 | connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList())); | 190 | connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList())); |
191 | // connect( lview, SIGNAL( incidenceSelected( Incidence * ) ), | 191 | // connect( lview, SIGNAL( incidenceSelected( Incidence * ) ), |
192 | // mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 192 | // mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
193 | #ifndef DESKTOP_VERSION | 193 | #ifndef DESKTOP_VERSION |
194 | mSearchDialog->setMaximumSize( QApplication::desktop()->size()); | 194 | mSearchDialog->setMaximumSize( QApplication::desktop()->size()); |
195 | //mSearchDialog->setGeometry( 40,40, 400, 300); | 195 | mSearchDialog->showMaximized(); |
196 | mSearchDialog->showMaximized(); | ||
197 | #else | 196 | #else |
198 | KConfig *config = KOGlobals::config(); | 197 | KConfig *config = KOGlobals::config(); |
199 | config->setGroup("WidgetLayout"); | 198 | config->setGroup("WidgetLayout"); |
200 | QStringList list; | 199 | QStringList list; |
201 | list = config->readListEntry("SearchLayout"); | 200 | list = config->readListEntry("SearchLayout"); |
202 | int x,y,w,h; | 201 | int x,y,w,h; |
203 | if ( ! list.isEmpty() ) { | 202 | if ( ! list.isEmpty() ) { |
204 | x = list[0].toInt(); | 203 | x = list[0].toInt(); |
205 | y = list[1].toInt(); | 204 | y = list[1].toInt(); |
206 | w = list[2].toInt(); | 205 | w = list[2].toInt(); |
207 | h = list[3].toInt(); | 206 | h = list[3].toInt(); |
208 | mSearchDialog->setGeometry(x,y,w,h); | 207 | mSearchDialog->setGeometry(x,y,w,h); |
209 | 208 | ||
210 | } | 209 | } |
211 | 210 | ||
212 | #endif | 211 | #endif |
213 | } | 212 | } |
214 | // make sure the widget is on top again | 213 | // make sure the widget is on top again |
215 | mSearchDialog->show(); | 214 | #ifdef DESKTOP_VERSION |
216 | mSearchDialog->raise(); | 215 | mSearchDialog->show(); |
216 | #else | ||
217 | mSearchDialog->showMaximized(); | ||
218 | #endif | ||
219 | mSearchDialog->raise(); | ||
217 | } | 220 | } |
218 | 221 | ||
219 | SearchDialog * KODialogManager::getSearchDialog() | 222 | SearchDialog * KODialogManager::getSearchDialog() |
220 | { | 223 | { |
221 | return mSearchDialog; | 224 | return mSearchDialog; |
222 | } | 225 | } |
223 | void KODialogManager::showArchiveDialog() | 226 | void KODialogManager::showArchiveDialog() |
224 | { | 227 | { |
225 | #ifndef KORG_NOARCHIVE | 228 | #ifndef KORG_NOARCHIVE |
226 | if (!mArchiveDialog) { | 229 | if (!mArchiveDialog) { |
227 | mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView); | 230 | mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView); |
228 | connect(mArchiveDialog,SIGNAL(eventsDeleted()), | 231 | connect(mArchiveDialog,SIGNAL(eventsDeleted()), |
229 | mMainView,SLOT(updateView())); | 232 | mMainView,SLOT(updateView())); |
230 | } | 233 | } |
231 | mArchiveDialog->show(); | 234 | mArchiveDialog->show(); |
232 | mArchiveDialog->raise(); | 235 | mArchiveDialog->raise(); |
233 | 236 | ||
234 | // Workaround. | 237 | // Workaround. |
235 | QApplication::restoreOverrideCursor(); | 238 | QApplication::restoreOverrideCursor(); |
236 | #endif | 239 | #endif |
237 | } | 240 | } |
238 | 241 | ||
239 | void KODialogManager::showFilterEditDialog(QPtrList<CalFilter> *filters) | 242 | void KODialogManager::showFilterEditDialog(QPtrList<CalFilter> *filters) |
240 | { | 243 | { |
241 | if (!mFilterEditDialog) { | 244 | if (!mFilterEditDialog) { |
242 | mFilterEditDialog = new FilterEditDialog(filters,mMainView); | 245 | mFilterEditDialog = new FilterEditDialog(filters,mMainView); |
243 | connect(mFilterEditDialog,SIGNAL(filterChanged()), | 246 | connect(mFilterEditDialog,SIGNAL(filterChanged()), |
244 | mMainView,SLOT(filterEdited())); | 247 | mMainView,SLOT(filterEdited())); |
245 | 248 | ||
246 | } | 249 | } |
247 | 250 | ||
248 | #ifndef DESKTOP_VERSION | 251 | #ifndef DESKTOP_VERSION |
249 | mFilterEditDialog->showMaximized(); | 252 | mFilterEditDialog->showMaximized(); |
250 | #else | 253 | #else |
251 | mFilterEditDialog->show(); | 254 | mFilterEditDialog->show(); |
252 | #endif | 255 | #endif |
253 | mFilterEditDialog->raise(); | 256 | mFilterEditDialog->raise(); |
254 | } | 257 | } |
255 | 258 | ||
256 | void KODialogManager::showPluginDialog() | 259 | void KODialogManager::showPluginDialog() |
257 | { | 260 | { |
258 | #ifndef KORG_NOPLUGINS | 261 | #ifndef KORG_NOPLUGINS |
259 | if (!mPluginDialog) { | 262 | if (!mPluginDialog) { |
260 | mPluginDialog = new PluginDialog(mMainView); | 263 | mPluginDialog = new PluginDialog(mMainView); |
261 | connect(mPluginDialog,SIGNAL(configChanged()), | 264 | connect(mPluginDialog,SIGNAL(configChanged()), |
262 | mMainView,SLOT(updateConfig())); | 265 | mMainView,SLOT(updateConfig())); |
263 | } | 266 | } |
264 | mPluginDialog->show(); | 267 | mPluginDialog->show(); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 019f41f..4f71788 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -468,103 +468,105 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | |||
468 | mView->viewManager()->showWorkWeekView(); | 468 | mView->viewManager()->showWorkWeekView(); |
469 | } | 469 | } |
470 | else if ( msg == "-ringSync" ) { | 470 | else if ( msg == "-ringSync" ) { |
471 | mSyncManager->multiSync( false ); | 471 | mSyncManager->multiSync( false ); |
472 | } | 472 | } |
473 | else if ( msg == "-showWeek" ) { | 473 | else if ( msg == "-showWeek" ) { |
474 | mView->viewManager()->showWeekView(); | 474 | mView->viewManager()->showWeekView(); |
475 | } | 475 | } |
476 | else if ( msg == "-showTodo" ) { | 476 | else if ( msg == "-showTodo" ) { |
477 | mView->viewManager()->showTodoView(); | 477 | mView->viewManager()->showTodoView(); |
478 | } | 478 | } |
479 | else if ( msg == "-showJournal" ) { | 479 | else if ( msg == "-showJournal" ) { |
480 | mView->dateNavigator()->selectDates( 1 ); | 480 | mView->dateNavigator()->selectDates( 1 ); |
481 | mView->dateNavigator()->selectToday(); | 481 | mView->dateNavigator()->selectToday(); |
482 | mView->viewManager()->showJournalView(); | 482 | mView->viewManager()->showJournalView(); |
483 | } | 483 | } |
484 | else if ( msg == "-showKO" ) { | 484 | else if ( msg == "-showKO" ) { |
485 | mView->viewManager()->showNextXView(); | 485 | mView->viewManager()->showNextXView(); |
486 | } | 486 | } |
487 | else if ( msg == "-showWNext" || msg == "nextView()" ) { | 487 | else if ( msg == "-showWNext" || msg == "nextView()" ) { |
488 | mView->viewManager()->showWhatsNextView(); | 488 | mView->viewManager()->showWhatsNextView(); |
489 | } | 489 | } |
490 | else if ( msg == "-showNextXView" ) { | 490 | else if ( msg == "-showNextXView" ) { |
491 | mView->viewManager()->showNextXView(); | 491 | mView->viewManager()->showNextXView(); |
492 | } | 492 | } |
493 | 493 | ||
494 | 494 | ||
495 | } | 495 | } |
496 | 496 | ||
497 | showMaximized(); | 497 | showMaximized(); |
498 | raise(); | 498 | raise(); |
499 | } | 499 | } |
500 | 500 | ||
501 | QPixmap MainWindow::loadPixmap( QString name ) | 501 | QPixmap MainWindow::loadPixmap( QString name ) |
502 | { | 502 | { |
503 | return SmallIcon( name ); | 503 | return SmallIcon( name ); |
504 | 504 | ||
505 | } | 505 | } |
506 | void MainWindow::initActions() | 506 | void MainWindow::initActions() |
507 | { | 507 | { |
508 | //KOPrefs::instance()->mShowFullMenu | 508 | //KOPrefs::instance()->mShowFullMenu |
509 | iconToolBar->clear(); | 509 | iconToolBar->clear(); |
510 | KOPrefs *p = KOPrefs::instance(); | 510 | KOPrefs *p = KOPrefs::instance(); |
511 | //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); | 511 | //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); |
512 | 512 | ||
513 | QPopupMenu *viewMenu = new QPopupMenu( this ); | 513 | QPopupMenu *viewMenu = new QPopupMenu( this ); |
514 | QPopupMenu *actionMenu = new QPopupMenu( this ); | 514 | QPopupMenu *actionMenu = new QPopupMenu( this ); |
515 | QPopupMenu *importMenu = new QPopupMenu( this ); | 515 | QPopupMenu *importMenu = new QPopupMenu( this ); |
516 | QPopupMenu *importMenu_X = new QPopupMenu( this ); | ||
517 | QPopupMenu *exportMenu_X = new QPopupMenu( this ); | ||
518 | QPopupMenu *beamMenu_X = new QPopupMenu( this ); | ||
516 | selectFilterMenu = new QPopupMenu( this ); | 519 | selectFilterMenu = new QPopupMenu( this ); |
517 | selectFilterMenu->setCheckable( true ); | 520 | selectFilterMenu->setCheckable( true ); |
518 | syncMenu = new QPopupMenu( this ); | 521 | syncMenu = new QPopupMenu( this ); |
519 | configureAgendaMenu = new QPopupMenu( this ); | 522 | configureAgendaMenu = new QPopupMenu( this ); |
520 | configureToolBarMenu = new QPopupMenu( this ); | 523 | configureToolBarMenu = new QPopupMenu( this ); |
521 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 524 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
522 | |||
523 | QIconSet icon; | 525 | QIconSet icon; |
524 | int pixWid = 22, pixHei = 22; | 526 | int pixWid = 22, pixHei = 22; |
525 | QString pathString = ""; | 527 | QString pathString = ""; |
526 | if ( !p->mToolBarMiniIcons ) { | 528 | if ( !p->mToolBarMiniIcons ) { |
527 | if ( QApplication::desktop()->width() < 480 ) { | 529 | if ( QApplication::desktop()->width() < 480 ) { |
528 | pathString += "icons16/"; | 530 | pathString += "icons16/"; |
529 | pixWid = 18; pixHei = 16; | 531 | pixWid = 18; pixHei = 16; |
530 | } | 532 | } |
531 | } else { | 533 | } else { |
532 | pathString += "iconsmini/"; | 534 | pathString += "iconsmini/"; |
533 | pixWid = 18; pixHei = 16; | 535 | pixWid = 18; pixHei = 16; |
534 | } | 536 | } |
535 | if ( KOPrefs::instance()->mShowFullMenu ) { | 537 | if ( KOPrefs::instance()->mShowFullMenu ) { |
536 | QMenuBar *menuBar1; | 538 | QMenuBar *menuBar1; |
537 | menuBar1 = menuBar(); | 539 | menuBar1 = menuBar(); |
538 | menuBar1->insertItem( i18n("File"), importMenu ); | 540 | menuBar1->insertItem( i18n("File"), importMenu ); |
539 | menuBar1->insertItem( i18n("View"), viewMenu ); | 541 | menuBar1->insertItem( i18n("View"), viewMenu ); |
540 | menuBar1->insertItem( i18n("Actions"), actionMenu ); | 542 | menuBar1->insertItem( i18n("Actions"), actionMenu ); |
541 | #ifdef DESKTOP_VERSION | 543 | #ifdef DESKTOP_VERSION |
542 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); | 544 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); |
543 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 545 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
544 | #else | 546 | #else |
545 | menuBar1->insertItem( i18n("Sync"), syncMenu ); | 547 | menuBar1->insertItem( i18n("Sync"), syncMenu ); |
546 | menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); | 548 | menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); |
547 | #endif | 549 | #endif |
548 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 550 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
549 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); | 551 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); |
550 | menuBar1->insertItem( i18n("Help"), helpMenu ); | 552 | menuBar1->insertItem( i18n("Help"), helpMenu ); |
551 | } else { | 553 | } else { |
552 | QPEMenuBar *menuBar1; | 554 | QPEMenuBar *menuBar1; |
553 | menuBar1 = new QPEMenuBar( iconToolBar ); | 555 | menuBar1 = new QPEMenuBar( iconToolBar ); |
554 | QPopupMenu *menuBar = new QPopupMenu( this ); | 556 | QPopupMenu *menuBar = new QPopupMenu( this ); |
555 | icon = loadPixmap( pathString + "z_menu" ); | 557 | icon = loadPixmap( pathString + "z_menu" ); |
556 | menuBar1->insertItem( icon.pixmap(), menuBar); | 558 | menuBar1->insertItem( icon.pixmap(), menuBar); |
557 | //menuBar1->insertItem( i18n("ME"), menuBar); | 559 | //menuBar1->insertItem( i18n("ME"), menuBar); |
558 | menuBar->insertItem( i18n("File"), importMenu ); | 560 | menuBar->insertItem( i18n("File"), importMenu ); |
559 | menuBar->insertItem( i18n("View"), viewMenu ); | 561 | menuBar->insertItem( i18n("View"), viewMenu ); |
560 | menuBar->insertItem( i18n("Actions"), actionMenu ); | 562 | menuBar->insertItem( i18n("Actions"), actionMenu ); |
561 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); | 563 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); |
562 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 564 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
563 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 565 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
564 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); | 566 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); |
565 | menuBar->insertItem( i18n("Help"), helpMenu ); | 567 | menuBar->insertItem( i18n("Help"), helpMenu ); |
566 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); | 568 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); |
567 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); | 569 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); |
568 | } | 570 | } |
569 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); | 571 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); |
570 | connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); | 572 | connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); |
@@ -780,188 +782,193 @@ void MainWindow::initActions() | |||
780 | 782 | ||
781 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); | 783 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); |
782 | mDeleteAction->addTo( actionMenu ); | 784 | mDeleteAction->addTo( actionMenu ); |
783 | connect( mDeleteAction, SIGNAL( activated() ), | 785 | connect( mDeleteAction, SIGNAL( activated() ), |
784 | mView, SLOT( deleteIncidence() ) ); | 786 | mView, SLOT( deleteIncidence() ) ); |
785 | 787 | ||
786 | 788 | ||
787 | mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); | 789 | mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); |
788 | mCloneAction->addTo( actionMenu ); | 790 | mCloneAction->addTo( actionMenu ); |
789 | connect( mCloneAction, SIGNAL( activated() ), | 791 | connect( mCloneAction, SIGNAL( activated() ), |
790 | mView, SLOT( cloneIncidence() ) ); | 792 | mView, SLOT( cloneIncidence() ) ); |
791 | mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); | 793 | mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); |
792 | mMoveAction->addTo( actionMenu ); | 794 | mMoveAction->addTo( actionMenu ); |
793 | connect( mMoveAction, SIGNAL( activated() ), | 795 | connect( mMoveAction, SIGNAL( activated() ), |
794 | mView, SLOT( moveIncidence() ) ); | 796 | mView, SLOT( moveIncidence() ) ); |
795 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); | 797 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); |
796 | mBeamAction->addTo( actionMenu ); | 798 | mBeamAction->addTo( actionMenu ); |
797 | connect( mBeamAction, SIGNAL( activated() ), | 799 | connect( mBeamAction, SIGNAL( activated() ), |
798 | mView, SLOT( beamIncidence() ) ); | 800 | mView, SLOT( beamIncidence() ) ); |
799 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); | 801 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); |
800 | mCancelAction->addTo( actionMenu ); | 802 | mCancelAction->addTo( actionMenu ); |
801 | connect( mCancelAction, SIGNAL( activated() ), | 803 | connect( mCancelAction, SIGNAL( activated() ), |
802 | mView, SLOT( toggleCancelIncidence() ) ); | 804 | mView, SLOT( toggleCancelIncidence() ) ); |
803 | 805 | ||
804 | actionMenu->insertSeparator(); | 806 | actionMenu->insertSeparator(); |
805 | 807 | ||
806 | action = new QAction( "purge_completed", i18n("Purge Completed"), 0, | 808 | action = new QAction( "purge_completed", i18n("Purge Completed"), 0, |
807 | this ); | 809 | this ); |
808 | action->addTo( actionMenu ); | 810 | action->addTo( actionMenu ); |
809 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); | 811 | connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); |
810 | 812 | ||
811 | icon = loadPixmap( pathString + "search" ); | 813 | icon = loadPixmap( pathString + "search" ); |
812 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); | 814 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); |
813 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4); | 815 | configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4); |
814 | search_action->addTo( actionMenu ); | 816 | search_action->addTo( actionMenu ); |
815 | connect( search_action, SIGNAL( activated() ), | 817 | connect( search_action, SIGNAL( activated() ), |
816 | mView->dialogManager(), SLOT( showSearchDialog() ) ); | 818 | mView->dialogManager(), SLOT( showSearchDialog() ) ); |
817 | 819 | ||
818 | 820 | ||
819 | 821 | ||
820 | if ( KOPrefs::instance()->mShowFullMenu ) { | 822 | if ( KOPrefs::instance()->mShowFullMenu ) { |
821 | actionMenu->insertSeparator(); | 823 | actionMenu->insertSeparator(); |
822 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); | 824 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); |
823 | 825 | ||
824 | } | 826 | } |
825 | // actionMenu->insertSeparator(); | 827 | // actionMenu->insertSeparator(); |
826 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 828 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
827 | this ); | 829 | this ); |
828 | action->addTo( importMenu ); | 830 | action->addTo( importMenu_X ); |
829 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); | 831 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); |
830 | action = new QAction( "import_quick", i18n("Import last file"), 0, | 832 | action = new QAction( "import_quick", i18n("Import last file"), 0, |
831 | this ); | 833 | this ); |
832 | action->addTo( importMenu ); | 834 | action->addTo( importMenu_X ); |
833 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); | 835 | connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); |
834 | importMenu->insertSeparator(); | 836 | importMenu_X->insertSeparator(); |
835 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, | 837 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, |
836 | this ); | 838 | this ); |
837 | action->addTo( importMenu ); | 839 | action->addTo( importMenu_X ); |
838 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); | 840 | connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); |
839 | //#ifndef DESKTOP_VERSION | 841 | //#ifndef DESKTOP_VERSION |
840 | importMenu->insertSeparator(); | 842 | importMenu_X->insertSeparator(); |
841 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, | 843 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, |
842 | this ); | 844 | this ); |
843 | action->addTo( importMenu ); | 845 | action->addTo( importMenu_X ); |
844 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); | 846 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); |
845 | //#else | 847 | //#else |
846 | #ifdef _OL_IMPORT_ | 848 | #ifdef _OL_IMPORT_ |
847 | importMenu->insertSeparator(); | 849 | importMenu_X->insertSeparator(); |
848 | action = new QAction( "import_ol", i18n("Import from OL"), 0, | 850 | action = new QAction( "import_ol", i18n("Import from OL"), 0, |
849 | this ); | 851 | this ); |
850 | action->addTo( importMenu ); | 852 | action->addTo( importMenu_X ); |
851 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); | 853 | connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); |
852 | #endif | 854 | #endif |
853 | //#endif | 855 | //#endif |
854 | 856 | ||
855 | importMenu->insertSeparator(); | 857 | //importMenu->insertSeparator(); |
856 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, | 858 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, |
857 | this ); | 859 | this ); |
858 | action->addTo( importMenu ); | 860 | action->addTo( importMenu ); |
859 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); | 861 | connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); |
860 | 862 | ||
861 | action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, | 863 | action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, |
862 | this ); | 864 | this ); |
863 | action->addTo( importMenu ); | 865 | action->addTo( importMenu ); |
864 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); | 866 | connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); |
865 | |||
866 | importMenu->insertSeparator(); | 867 | importMenu->insertSeparator(); |
868 | importMenu->insertItem( i18n("Import"), importMenu_X ); | ||
869 | //importMenu->insertSeparator(); | ||
867 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, | 870 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, |
868 | this ); | 871 | this ); |
869 | action->addTo( importMenu ); connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); | 872 | action->addTo( exportMenu_X ); |
873 | connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); | ||
870 | 874 | ||
871 | 875 | ||
872 | //LR | 876 | //LR |
873 | QPopupMenu *ex2phone = new QPopupMenu( this ); | 877 | QPopupMenu *ex2phone = new QPopupMenu( this ); |
874 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 878 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
875 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 879 | ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
876 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); | 880 | connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); |
877 | importMenu->insertItem( i18n("Export to phone"), ex2phone ); | 881 | exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); |
878 | 882 | ||
879 | importMenu->insertSeparator(); | 883 | importMenu->insertItem( i18n("Export"), exportMenu_X ); |
880 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | ||
881 | this ); | ||
882 | action->addTo( importMenu ); | ||
883 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | ||
884 | #ifndef DESKTOP_VERSION | 884 | #ifndef DESKTOP_VERSION |
885 | importMenu->insertSeparator(); | 885 | //importMenu->insertSeparator(); |
886 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, | 886 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, |
887 | this ); | 887 | this ); |
888 | brAction->addTo( importMenu ); | 888 | brAction->addTo( beamMenu_X ); |
889 | brAction->setToggleAction (true ) ; | 889 | brAction->setToggleAction (true ) ; |
890 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); | 890 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); |
891 | 891 | ||
892 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, | 892 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, |
893 | this ); | 893 | this ); |
894 | action->addTo( importMenu ); | 894 | action->addTo( beamMenu_X ); |
895 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); | 895 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); |
896 | 896 | ||
897 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, | 897 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, |
898 | this ); | 898 | this ); |
899 | action->addTo( importMenu ); | 899 | action->addTo( beamMenu_X ); |
900 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); | 900 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); |
901 | importMenu->insertItem( i18n("Beam"), beamMenu_X ); | ||
901 | #else | 902 | #else |
902 | importMenu->insertSeparator(); | 903 | //importMenu->insertSeparator(); |
903 | icon = loadPixmap( pathString + "print" ); | 904 | icon = loadPixmap( pathString + "print" ); |
904 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 905 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
905 | action->addTo( importMenu ); | 906 | action->addTo( beamMenu_X ); |
906 | connect( action, SIGNAL( activated() ), | 907 | connect( action, SIGNAL( activated() ), |
907 | this, SLOT( printCal() ) ); | 908 | this, SLOT( printCal() ) ); |
908 | 909 | ||
909 | icon = loadPixmap( pathString + "print" ); | 910 | icon = loadPixmap( pathString + "print" ); |
910 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 911 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |
911 | action->addTo( importMenu ); | 912 | action->addTo( beamMenu_X ); |
912 | connect( action, SIGNAL( activated() ), | 913 | connect( action, SIGNAL( activated() ), |
913 | this, SLOT( printSel() ) ); | 914 | this, SLOT( printSel() ) ); |
914 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); | 915 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); |
915 | action->addTo( importMenu ); | 916 | action->addTo( beamMenu_X ); |
916 | connect( action, SIGNAL( activated() ), | 917 | connect( action, SIGNAL( activated() ), |
917 | mView->viewManager(), SIGNAL( printWNV() ) ); | 918 | mView->viewManager(), SIGNAL( printWNV() ) ); |
919 | importMenu->insertItem( i18n("Print"), beamMenu_X ); | ||
918 | #endif | 920 | #endif |
919 | importMenu->insertSeparator(); | 921 | importMenu->insertSeparator(); |
922 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | ||
923 | this ); | ||
924 | action->addTo( importMenu ); | ||
925 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | ||
926 | importMenu->insertSeparator(); | ||
920 | action = new QAction( "beam all", i18n("Save"), 0, | 927 | action = new QAction( "beam all", i18n("Save"), 0, |
921 | this ); | 928 | this ); |
922 | action->addTo( importMenu ); | 929 | action->addTo( importMenu ); |
923 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 930 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
924 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 931 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
925 | this ); | 932 | this ); |
926 | action->addTo( importMenu ); | 933 | action->addTo( importMenu ); |
927 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); | 934 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); |
928 | 935 | ||
929 | //menuBar->insertItem( "Configure",configureMenu ); | 936 | //menuBar->insertItem( "Configure",configureMenu ); |
930 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); | 937 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); |
931 | icon = loadPixmap( "korganizer/korganizer" ); | 938 | icon = loadPixmap( "korganizer/korganizer" ); |
932 | 939 | ||
933 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | 940 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); |
934 | action->addTo( helpMenu ); | 941 | action->addTo( helpMenu ); |
935 | connect( action, SIGNAL( activated() ), | 942 | connect( action, SIGNAL( activated() ), |
936 | SLOT( whatsNew() ) ); | 943 | SLOT( whatsNew() ) ); |
937 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); | 944 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); |
938 | action->addTo( helpMenu ); | 945 | action->addTo( helpMenu ); |
939 | connect( action, SIGNAL( activated() ), | 946 | connect( action, SIGNAL( activated() ), |
940 | SLOT( features() ) ); | 947 | SLOT( features() ) ); |
941 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | 948 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); |
942 | action->addTo( helpMenu ); | 949 | action->addTo( helpMenu ); |
943 | connect( action, SIGNAL( activated() ), | 950 | connect( action, SIGNAL( activated() ), |
944 | SLOT( keyBindings() ) ); | 951 | SLOT( keyBindings() ) ); |
945 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | 952 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); |
946 | action->addTo( helpMenu ); | 953 | action->addTo( helpMenu ); |
947 | connect( action, SIGNAL( activated() ), | 954 | connect( action, SIGNAL( activated() ), |
948 | SLOT( synchowto() ) ); | 955 | SLOT( synchowto() ) ); |
949 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); | 956 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); |
950 | action->addTo( helpMenu ); | 957 | action->addTo( helpMenu ); |
951 | connect( action, SIGNAL( activated() ), | 958 | connect( action, SIGNAL( activated() ), |
952 | SLOT( kdesynchowto() ) ); | 959 | SLOT( kdesynchowto() ) ); |
953 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); | 960 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); |
954 | action->addTo( helpMenu ); | 961 | action->addTo( helpMenu ); |
955 | connect( action, SIGNAL( activated() ), | 962 | connect( action, SIGNAL( activated() ), |
956 | SLOT( multisynchowto() ) ); | 963 | SLOT( multisynchowto() ) ); |
957 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 964 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
958 | action->addTo( helpMenu ); | 965 | action->addTo( helpMenu ); |
959 | connect( action, SIGNAL( activated() ), | 966 | connect( action, SIGNAL( activated() ), |
960 | SLOT( aboutAutoSaving() ) ); | 967 | SLOT( aboutAutoSaving() ) ); |
961 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 968 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); |
962 | action->addTo( helpMenu ); | 969 | action->addTo( helpMenu ); |
963 | connect( action, SIGNAL( activated() ), | 970 | connect( action, SIGNAL( activated() ), |
964 | SLOT( aboutKnownBugs() ) ); | 971 | SLOT( aboutKnownBugs() ) ); |
965 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 972 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); |
966 | action->addTo( helpMenu ); | 973 | action->addTo( helpMenu ); |
967 | connect( action, SIGNAL( activated() ), | 974 | connect( action, SIGNAL( activated() ), |
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp index 77793c4..6cb432b 100644 --- a/libkdepim/kdatepicker.cpp +++ b/libkdepim/kdatepicker.cpp | |||
@@ -433,54 +433,56 @@ KDatePicker::setFontSize(int s) | |||
433 | }; | 433 | }; |
434 | const int NoOfButtons=sizeof(buttons)/sizeof(buttons[0]); | 434 | const int NoOfButtons=sizeof(buttons)/sizeof(buttons[0]); |
435 | int count; | 435 | int count; |
436 | QFont font; | 436 | QFont font; |
437 | QRect r; | 437 | QRect r; |
438 | // ----- | 438 | // ----- |
439 | fontsize=s; | 439 | fontsize=s; |
440 | for(count=0; count<NoOfButtons; ++count) | 440 | for(count=0; count<NoOfButtons; ++count) |
441 | { | 441 | { |
442 | font=buttons[count]->font(); | 442 | font=buttons[count]->font(); |
443 | font.setPointSize(s); | 443 | font.setPointSize(s); |
444 | buttons[count]->setFont(font); | 444 | buttons[count]->setFont(font); |
445 | } | 445 | } |
446 | QFontMetrics metrics(selectMonth->fontMetrics()); | 446 | QFontMetrics metrics(selectMonth->fontMetrics()); |
447 | for(int i=1; i <= 12; ++i) | 447 | for(int i=1; i <= 12; ++i) |
448 | { // maxMonthRect is used by sizeHint() | 448 | { // maxMonthRect is used by sizeHint() |
449 | r=metrics.boundingRect(KGlobal::locale()->monthName(i, false)); | 449 | r=metrics.boundingRect(KGlobal::locale()->monthName(i, false)); |
450 | maxMonthRect.setWidth(QMAX(r.width(), maxMonthRect.width())); | 450 | maxMonthRect.setWidth(QMAX(r.width(), maxMonthRect.width())); |
451 | maxMonthRect.setHeight(QMAX(r.height(), maxMonthRect.height())); | 451 | maxMonthRect.setHeight(QMAX(r.height(), maxMonthRect.height())); |
452 | } | 452 | } |
453 | table->setFontSize(s); | 453 | table->setFontSize(s); |
454 | } | 454 | } |
455 | 455 | ||
456 | void KDatePicker::virtual_hook( int id, void* data ) | 456 | void KDatePicker::virtual_hook( int id, void* data ) |
457 | { /*BASE::virtual_hook( id, data );*/ } | 457 | { /*BASE::virtual_hook( id, data );*/ } |
458 | 458 | ||
459 | void KDatePicker::keyPressEvent ( QKeyEvent * e ) | 459 | void KDatePicker::keyPressEvent ( QKeyEvent * e ) |
460 | { | 460 | { |
461 | switch ( e->key() ) { | 461 | switch ( e->key() ) { |
462 | case Qt::Key_Right: | 462 | case Qt::Key_Right: |
463 | monthForwardClicked(); | 463 | monthForwardClicked(); |
464 | break; | 464 | break; |
465 | case Qt::Key_Left: | 465 | case Qt::Key_Left: |
466 | monthBackwardClicked(); | 466 | monthBackwardClicked(); |
467 | break; | 467 | break; |
468 | 468 | ||
469 | case Qt::Key_Down: | 469 | case Qt::Key_Down: |
470 | yearForwardClicked(); | 470 | yearForwardClicked(); |
471 | 471 | ||
472 | break; | 472 | break; |
473 | 473 | ||
474 | case Qt::Key_Up: | 474 | case Qt::Key_Up: |
475 | yearBackwardClicked(); | 475 | yearBackwardClicked(); |
476 | break; | 476 | break; |
477 | 477 | ||
478 | case Qt::Key_Return: | 478 | case Qt::Key_Return: |
479 | tableClickedSlot(); | 479 | tableClickedSlot(); |
480 | break; | 480 | break; |
481 | 481 | case Qt::Key_Escape: | |
482 | e->ignore(); | ||
483 | break; | ||
482 | default: | 484 | default: |
483 | break; | 485 | break; |
484 | } | 486 | } |
485 | 487 | ||
486 | } | 488 | } |