author | zautrix <zautrix> | 2004-10-29 23:21:45 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-29 23:21:45 (UTC) |
commit | 920a91e2248f805f39d5b1a65d9f0dde6060bf7c (patch) (unidiff) | |
tree | 5218069e54750a078490fd485d7b6aa7be302f44 | |
parent | da80b510e4643fa3f78cf3f97af108e87097583d (diff) | |
download | kdepimpi-920a91e2248f805f39d5b1a65d9f0dde6060bf7c.zip kdepimpi-920a91e2248f805f39d5b1a65d9f0dde6060bf7c.tar.gz kdepimpi-920a91e2248f805f39d5b1a65d9f0dde6060bf7c.tar.bz2 |
fix in parameter list of popup menu
-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index 9642a43..d9fbfc9 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp | |||
@@ -312,106 +312,106 @@ void PwM::initMenubar() | |||
312 | BUTTON_POPUP_MANAGE_CHANGEMP); | 312 | BUTTON_POPUP_MANAGE_CHANGEMP); |
313 | menuBar()->insertItem(i18n("&Manage"), managePopup); | 313 | menuBar()->insertItem(i18n("&Manage"), managePopup); |
314 | // "chipcard" popup menu | 314 | // "chipcard" popup menu |
315 | #ifdef CONFIG_KEYCARD | 315 | #ifdef CONFIG_KEYCARD |
316 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)), | 316 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)), |
317 | i18n("&Generate new key-card"), this, | 317 | i18n("&Generate new key-card"), this, |
318 | SLOT(genNewCard_slot()), 0, | 318 | SLOT(genNewCard_slot()), 0, |
319 | BUTTON_POPUP_CHIPCARD_GENNEW); | 319 | BUTTON_POPUP_CHIPCARD_GENNEW); |
320 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)), | 320 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)), |
321 | i18n("&Erase key-card"), this, | 321 | i18n("&Erase key-card"), this, |
322 | SLOT(eraseCard_slot()), 0, | 322 | SLOT(eraseCard_slot()), 0, |
323 | BUTTON_POPUP_CHIPCARD_DEL); | 323 | BUTTON_POPUP_CHIPCARD_DEL); |
324 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("", KIcon::Small)), | 324 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("", KIcon::Small)), |
325 | i18n("Read card-&ID"), this, | 325 | i18n("Read card-&ID"), this, |
326 | SLOT(readCardId_slot()), 0, | 326 | SLOT(readCardId_slot()), 0, |
327 | BUTTON_POPUP_CHIPCARD_READID); | 327 | BUTTON_POPUP_CHIPCARD_READID); |
328 | chipcardPopup->insertSeparator(); | 328 | chipcardPopup->insertSeparator(); |
329 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("2rightarrow", KIcon::Small)), | 329 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("2rightarrow", KIcon::Small)), |
330 | i18n("&Make card backup-image"), this, | 330 | i18n("&Make card backup-image"), this, |
331 | SLOT(makeCardBackup_slot()), 0, | 331 | SLOT(makeCardBackup_slot()), 0, |
332 | BUTTON_POPUP_CHIPCARD_SAVEBACKUP); | 332 | BUTTON_POPUP_CHIPCARD_SAVEBACKUP); |
333 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("2leftarrow", KIcon::Small)), | 333 | chipcardPopup->insertItem(QIconSet(picons->loadIcon("2leftarrow", KIcon::Small)), |
334 | i18n("&Replay card backup-image"), this, | 334 | i18n("&Replay card backup-image"), this, |
335 | SLOT(replayCardBackup_slot()), 0, | 335 | SLOT(replayCardBackup_slot()), 0, |
336 | BUTTON_POPUP_CHIPCARD_REPLAYBACKUP); | 336 | BUTTON_POPUP_CHIPCARD_REPLAYBACKUP); |
337 | menuBar()->insertItem(i18n("&Chipcard manager"), chipcardPopup); | 337 | menuBar()->insertItem(i18n("&Chipcard manager"), chipcardPopup); |
338 | #endif // CONFIG_KEYCARD | 338 | #endif // CONFIG_KEYCARD |
339 | // "view" popup menu | 339 | // "view" popup menu |
340 | viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)), | 340 | viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)), |
341 | i18n("&Find"), this, | 341 | i18n("&Find"), this, |
342 | SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND); | 342 | SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND); |
343 | viewPopup->insertSeparator(); | 343 | viewPopup->insertSeparator(); |
344 | viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)), | 344 | viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)), |
345 | i18n("&Lock all entries"), this, | 345 | i18n("&Lock all entries"), this, |
346 | SLOT(lockWnd_slot()), 0, | 346 | SLOT(lockWnd_slot()), 0, |
347 | BUTTON_POPUP_VIEW_LOCK); | 347 | BUTTON_POPUP_VIEW_LOCK); |
348 | viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)), | 348 | viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)), |
349 | i18n("&Deep-lock all entries"), this, | 349 | i18n("&Deep-lock all entries"), this, |
350 | SLOT(deepLockWnd_slot()), 0, | 350 | SLOT(deepLockWnd_slot()), 0, |
351 | BUTTON_POPUP_VIEW_DEEPLOCK); | 351 | BUTTON_POPUP_VIEW_DEEPLOCK); |
352 | viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)), | 352 | viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)), |
353 | i18n("&Unlock all entries"), this, | 353 | i18n("&Unlock all entries"), this, |
354 | SLOT(unlockWnd_slot()), 0, | 354 | SLOT(unlockWnd_slot()), 0, |
355 | BUTTON_POPUP_VIEW_UNLOCK); | 355 | BUTTON_POPUP_VIEW_UNLOCK); |
356 | menuBar()->insertItem(i18n("&View"), viewPopup); | 356 | menuBar()->insertItem(i18n("&View"), viewPopup); |
357 | // "options" popup menu | 357 | // "options" popup menu |
358 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), | 358 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), |
359 | i18n("&Configure..."), this, | 359 | i18n("&Configure..."), this, |
360 | SLOT(config_slot()), | 360 | SLOT(config_slot()),0, |
361 | BUTTON_POPUP_OPTIONS_CONFIG); | 361 | BUTTON_POPUP_OPTIONS_CONFIG); |
362 | menuBar()->insertItem(i18n("&Options"), optionsPopup); | 362 | menuBar()->insertItem(i18n("&Options"), optionsPopup); |
363 | // "help" popup menu | 363 | // "help" popup menu |
364 | #ifndef PWM_EMBEDDED | 364 | #ifndef PWM_EMBEDDED |
365 | helpPopup = helpMenu(QString::null, false); | 365 | helpPopup = helpMenu(QString::null, false); |
366 | #else | 366 | #else |
367 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), | 367 | optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)), |
368 | i18n("C&ategories..."), this, | 368 | i18n("C&ategories..."), this, |
369 | SLOT(category_slot()), | 369 | SLOT(category_slot()),0, |
370 | BUTTON_POPUP_OPTIONS_CATEGORY); | 370 | BUTTON_POPUP_OPTIONS_CATEGORY); |
371 | 371 | ||
372 | 372 | ||
373 | menuBar()->insertItem(i18n("&Sync"), syncPopup); | 373 | menuBar()->insertItem(i18n("&Sync"), syncPopup); |
374 | 374 | ||
375 | 375 | ||
376 | 376 | ||
377 | 377 | ||
378 | 378 | ||
379 | helpPopup = new KPopupMenu(this); | 379 | helpPopup = new KPopupMenu(this); |
380 | 380 | ||
381 | 381 | ||
382 | helpPopup->insertItem(i18n("&License"), this, | 382 | helpPopup->insertItem(i18n("&License"), this, |
383 | SLOT(showLicense_slot()), 0, | 383 | SLOT(showLicense_slot()), 0, |
384 | BUTTON_POPUP_HELP_LICENSE); | 384 | BUTTON_POPUP_HELP_LICENSE); |
385 | 385 | ||
386 | helpPopup->insertItem(i18n("&Faq"), this, | 386 | helpPopup->insertItem(i18n("&Faq"), this, |
387 | SLOT(faq_slot()), 0, | 387 | SLOT(faq_slot()), 0, |
388 | BUTTON_POPUP_HELP_FAQ); | 388 | BUTTON_POPUP_HELP_FAQ); |
389 | 389 | ||
390 | helpPopup->insertItem(i18n("&About PwManager"), this, | 390 | helpPopup->insertItem(i18n("&About PwManager"), this, |
391 | SLOT(createAboutData_slot()), 0, | 391 | SLOT(createAboutData_slot()), 0, |
392 | BUTTON_POPUP_HELP_ABOUT); | 392 | BUTTON_POPUP_HELP_ABOUT); |
393 | 393 | ||
394 | helpPopup->insertItem(i18n("&Sync HowTo"), this, | 394 | helpPopup->insertItem(i18n("&Sync HowTo"), this, |
395 | SLOT(syncHowTo_slot()), 0, | 395 | SLOT(syncHowTo_slot()), 0, |
396 | BUTTON_POPUP_HELP_SYNC); | 396 | BUTTON_POPUP_HELP_SYNC); |
397 | 397 | ||
398 | helpPopup->insertItem(i18n("&What's New"), this, | 398 | helpPopup->insertItem(i18n("&What's New"), this, |
399 | SLOT(whatsnew_slot()), 0, | 399 | SLOT(whatsnew_slot()), 0, |
400 | BUTTON_POPUP_HELP_WHATSNEW); | 400 | BUTTON_POPUP_HELP_WHATSNEW); |
401 | 401 | ||
402 | #endif | 402 | #endif |
403 | menuBar()->insertItem(i18n("&Help"), helpPopup); | 403 | menuBar()->insertItem(i18n("&Help"), helpPopup); |
404 | 404 | ||
405 | } | 405 | } |
406 | 406 | ||
407 | void PwM::initToolbar() | 407 | void PwM::initToolbar() |
408 | { | 408 | { |
409 | KIconLoader* picons; | 409 | KIconLoader* picons; |
410 | #ifndef PWM_EMBEDDED | 410 | #ifndef PWM_EMBEDDED |
411 | KIconLoader icons; | 411 | KIconLoader icons; |
412 | picons = &icons; | 412 | picons = &icons; |
413 | #else | 413 | #else |
414 | picons = KGlobal::iconLoader(); | 414 | picons = KGlobal::iconLoader(); |
415 | #endif | 415 | #endif |
416 | 416 | ||
417 | #ifdef PWM_EMBEDDED | 417 | #ifdef PWM_EMBEDDED |