this checkin does not work yet

1 files changed, 16 insertions, 1 deletions

diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index bd07c80..cd56399 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -111,315 +111,330 @@ enum {
         BUTTON_POPUP_OPTIONS_CONFIG = 0
 };
 // Button IDs for "export" popup menu (in "file" popup menu)
 enum {
         BUTTON_POPUP_EXPORT_TEXT = 0,
         BUTTON_POPUP_EXPORT_GPASMAN
 #ifdef CONFIG_KWALLETIF
         ,BUTTON_POPUP_EXPORT_KWALLET
 #endif
 };
 // Button IDs for "import" popup menu (in "file" popup menu)
 enum {
         BUTTON_POPUP_IMPORT_TEXT = 0,
         BUTTON_POPUP_IMPORT_GPASMAN
 #ifdef CONFIG_KWALLETIF
         ,BUTTON_POPUP_IMPORT_KWALLET
 #endif
 };
 
 #ifdef PWM_EMBEDDED
 // Button IDs for "help" popup menu
 enum {
         BUTTON_POPUP_HELP_LICENSE = 0,
         BUTTON_POPUP_HELP_FAQ,
         BUTTON_POPUP_HELP_ABOUT
 };
 #endif
 
 // Button IDs for toolbar
 enum {
         BUTTON_TOOL_NEW = 0,
         BUTTON_TOOL_OPEN,
         BUTTON_TOOL_SAVE,
         BUTTON_TOOL_SAVEAS,
         BUTTON_TOOL_PRINT,
         BUTTON_TOOL_ADD,
         BUTTON_TOOL_EDIT,
         BUTTON_TOOL_DEL,
         BUTTON_TOOL_FIND,
         BUTTON_TOOL_LOCK,
         BUTTON_TOOL_DEEPLOCK,
         BUTTON_TOOL_UNLOCK
 };
 
 
 PwM::PwM(PwMInit *_init, PwMDoc *doc,
          bool virginity,
          QWidget *parent, const char *name)
  : KMainWindow(parent, name)
  , forceQuit (false)
  , forceMinimizeToTray (false)
 {
         init = _init;
         connect(doc, SIGNAL(docClosed(PwMDoc *)),
                 this, SLOT(docClosed(PwMDoc *)));
         initMenubar();
         initToolbar();
         initMetrics();
         setVirgin(virginity);
         setFocusPolicy(QWidget::WheelFocus);
 #ifndef PWM_EMBEDDED
         statusBar()->show();
 #endif
         view = makeNewListView(doc);
         setCentralWidget(view);
         updateCaption();
         showStatMsg(i18n("Ready."));
 }
 
 PwM::~PwM()
 {
         disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)),
                    this, SLOT(docClosed(PwMDoc *)));
         conf()->confWndMainWndSize(size());
         emit closed(this);
         delete view;
 }
 
 void PwM::initMenubar()
 {
   KIconLoader* picons;
 #ifndef PWM_EMBEDDED
         KIconLoader icons;
         picons = &icons;
 #else
         picons = KGlobal::iconLoader();
 #endif
         filePopup = new KPopupMenu(this);
         importPopup = new KPopupMenu(filePopup);
         exportPopup = new KPopupMenu(filePopup);
         managePopup = new KPopupMenu(this);
 #ifdef CONFIG_KEYCARD
         chipcardPopup = new KPopupMenu(this);
 #endif // CONFIG_KEYCARD
         viewPopup = new KPopupMenu(this);
         optionsPopup = new KPopupMenu(this);
-
+#ifdef PWM_EMBEDDED
+        syncPopup = new KPopupMenu(this);
+#endif
 // "file" popup menu
         filePopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)),
                               i18n("&New"), this,
                               SLOT(new_slot()), 0, BUTTON_POPUP_FILE_NEW);
         filePopup->insertItem(QIconSet(picons->loadIcon("fileopen", KIcon::Small)),
                               i18n("&Open"), this,
                               SLOT(open_slot()), 0, BUTTON_POPUP_FILE_OPEN);
         filePopup->insertItem(QIconSet(picons->loadIcon("fileclose", KIcon::Small)),
                               i18n("&Close"), this,
                               SLOT(close_slot()), 0, BUTTON_POPUP_FILE_CLOSE);
         filePopup->insertSeparator();
         filePopup->insertItem(QIconSet(picons->loadIcon("filesave", KIcon::Small)),
                               i18n("&Save"), this,
                               SLOT(save_slot()), 0, BUTTON_POPUP_FILE_SAVE);
         filePopup->insertItem(QIconSet(picons->loadIcon("filesaveas", KIcon::Small)),
                               i18n("Save &as..."),
                               this, SLOT(saveAs_slot()), 0,
                               BUTTON_POPUP_FILE_SAVEAS);
         filePopup->insertSeparator();
         // "file/export" popup menu
         exportPopup->insertItem(i18n("&Text-file..."), this,
                                 SLOT(exportToText()), 0, BUTTON_POPUP_EXPORT_TEXT);
         exportPopup->insertItem(i18n("&Gpasman / Kpasman ..."), this,
                                 SLOT(exportToGpasman()), 0, BUTTON_POPUP_EXPORT_GPASMAN);
 #ifdef CONFIG_KWALLETIF
         exportPopup->insertItem(i18n("&KWallet..."), this,
                                 SLOT(exportToKWallet()), 0, BUTTON_POPUP_EXPORT_KWALLET);
 #endif
         filePopup->insertItem(QIconSet(picons->loadIcon("fileexport", KIcon::Small)),
                               i18n("E&xport"), exportPopup,
                               BUTTON_POPUP_FILE_EXPORT);
         // "file/import" popup menu
         importPopup->insertItem(i18n("&Text-file..."), this,
                                 SLOT(importFromText()), 0, BUTTON_POPUP_IMPORT_TEXT);
         importPopup->insertItem(i18n("&Gpasman / Kpasman ..."), this,
                                 SLOT(importFromGpasman()), 0, BUTTON_POPUP_IMPORT_GPASMAN);
 #ifdef CONFIG_KWALLETIF
         importPopup->insertItem(i18n("&KWallet..."), this,
                                 SLOT(importKWallet()), 0, BUTTON_POPUP_IMPORT_KWALLET);
 #endif
         filePopup->insertItem(QIconSet(picons->loadIcon("fileimport", KIcon::Small)),
                               i18n("I&mport"), importPopup,
                               BUTTON_POPUP_FILE_IMPORT);
         filePopup->insertSeparator();
         filePopup->insertItem(QIconSet(picons->loadIcon("fileprint", KIcon::Small)),
                               i18n("&Print..."), this,
                               SLOT(print_slot()), 0, BUTTON_POPUP_FILE_PRINT);
         filePopup->insertSeparator();
         filePopup->insertItem(QIconSet(picons->loadIcon("exit", KIcon::Small)),
                               i18n("&Quit"), this,
                               SLOT(quitButton_slot()), 0, BUTTON_POPUP_FILE_QUIT);
         menuBar()->insertItem(i18n("&File"), filePopup);
 // "manage" popup menu
         managePopup->insertItem(QIconSet(picons->loadIcon("pencil", KIcon::Small)),
                                 i18n("&Add password"), this,
                                 SLOT(addPwd_slot()), 0,
                                 BUTTON_POPUP_MANAGE_ADD);
         managePopup->insertItem(QIconSet(picons->loadIcon("edit", KIcon::Small)),
                                 i18n("&Edit"), this, SLOT(editPwd_slot()), 0,
                                 BUTTON_POPUP_MANAGE_EDIT);
         managePopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)),
                                 i18n("&Delete"), this, SLOT(deletePwd_slot()),
                                 0, BUTTON_POPUP_MANAGE_DEL);
         managePopup->insertSeparator();
         managePopup->insertItem(QIconSet(picons->loadIcon("rotate", KIcon::Small)),
                                 i18n("Change &Master Password"), this,
                                 SLOT(changeMasterPwd_slot()), 0,
                                 BUTTON_POPUP_MANAGE_CHANGEMP);
         menuBar()->insertItem(i18n("&Manage"), managePopup);
 // "chipcard" popup menu
 #ifdef CONFIG_KEYCARD
         chipcardPopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)),
                                   i18n("&Generate new key-card"), this,
                                   SLOT(genNewCard_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_GENNEW);
         chipcardPopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)),
                                   i18n("&Erase key-card"), this,
                                   SLOT(eraseCard_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_DEL);
         chipcardPopup->insertItem(QIconSet(picons->loadIcon("", KIcon::Small)),
                                   i18n("Read card-&ID"), this,
                                   SLOT(readCardId_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_READID);
         chipcardPopup->insertSeparator();
         chipcardPopup->insertItem(QIconSet(picons->loadIcon("2rightarrow", KIcon::Small)),
                                   i18n("&Make card backup-image"), this,
                                   SLOT(makeCardBackup_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_SAVEBACKUP);
         chipcardPopup->insertItem(QIconSet(picons->loadIcon("2leftarrow", KIcon::Small)),
                                   i18n("&Replay card backup-image"), this,
                                   SLOT(replayCardBackup_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_REPLAYBACKUP);
         menuBar()->insertItem(i18n("&Chipcard manager"), chipcardPopup);
 #endif // CONFIG_KEYCARD
 // "view" popup menu
         viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)),
                                 i18n("&Find"), this,
                                 SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND);
         viewPopup->insertSeparator();
         viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)),
                                 i18n("&Lock all entries"), this,
                                 SLOT(lockWnd_slot()), 0,
                                 BUTTON_POPUP_VIEW_LOCK);
         viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)),
                                 i18n("&Deep-lock all entries"), this,
                                 SLOT(deepLockWnd_slot()), 0,
                                 BUTTON_POPUP_VIEW_DEEPLOCK);
         viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)),
                                 i18n("&Unlock all entries"), this,
                                 SLOT(unlockWnd_slot()), 0,
                                 BUTTON_POPUP_VIEW_UNLOCK);
         menuBar()->insertItem(i18n("&View"), viewPopup);
 // "options" popup menu
         optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
                                  i18n("&Configure..."), this,
                                  SLOT(config_slot()),
                                  BUTTON_POPUP_OPTIONS_CONFIG);
         menuBar()->insertItem(i18n("&Options"), optionsPopup);
 // "help" popup menu
 #ifndef PWM_EMBEDDED
         helpPopup = helpMenu(QString::null, false);
 #else
+        Popup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+                                 i18n("&Configure..."), this,
+                                 SLOT(config_slot()),
+                                 BUTTON_POPUP_OPTIONS_CONFIG);
+ connect ( syncMenu, SIGNAL( activated ( int )  ), this, SLOT (slotSyncMenu( int ) ) );
+ fillSyncMenu();
+
+        menuBar()->insertItem(i18n("&Syncronize"), syncPopup);
+
+
+
+
+
         helpPopup = new KPopupMenu(this);
 
 
         helpPopup->insertItem(i18n("&License"), this,
                                 SLOT(showLicense_slot()), 0,
                                 BUTTON_POPUP_HELP_LICENSE);
 
         helpPopup->insertItem(i18n("&Faq"), this,
                                 SLOT(faq_slot()), 0,
                                 BUTTON_POPUP_HELP_FAQ);
 
         helpPopup->insertItem(i18n("&About PwManager"), this,
                                 SLOT(createAboutData_slot()), 0,
                                 BUTTON_POPUP_HELP_ABOUT);
 
 #endif
         menuBar()->insertItem(i18n("&Help"), helpPopup);
 
 }
 
 void PwM::initToolbar()
 {
   KIconLoader* picons;
 #ifndef PWM_EMBEDDED
         KIconLoader icons;
         picons = &icons;
 #else
         picons = KGlobal::iconLoader();
 #endif
 
 #ifdef PWM_EMBEDDED
     if ( QApplication::desktop()->width() > 320 )
 #endif
     {
         toolBar()->insertButton(picons->loadIcon("filenew", KIcon::Toolbar),
                                 BUTTON_TOOL_NEW, SIGNAL(clicked(int)), this,
                                 SLOT(new_slot()), true, i18n("New"));
         toolBar()->insertButton(picons->loadIcon("fileopen", KIcon::Toolbar),
                                 BUTTON_TOOL_OPEN, SIGNAL(clicked(int)), this,
                                 SLOT(open_slot()), true, i18n("Open"));
         toolBar()->insertSeparator();
             }
         toolBar()->insertButton(picons->loadIcon("filesave", KIcon::Toolbar),
                                 BUTTON_TOOL_SAVE, SIGNAL(clicked(int)), this,
                                 SLOT(save_slot()), true, i18n("Save"));
         toolBar()->insertButton(picons->loadIcon("filesaveas", KIcon::Toolbar),
                                 BUTTON_TOOL_SAVEAS, SIGNAL(clicked(int)), this,
                                 SLOT(saveAs_slot()), true, i18n("Save as"));
         toolBar()->insertButton(picons->loadIcon("fileprint", KIcon::Toolbar),
                                 BUTTON_TOOL_PRINT, SIGNAL(clicked(int)), this,
                                 SLOT(print_slot()), true, i18n("Print..."));
         toolBar()->insertSeparator();
         toolBar()->insertButton(picons->loadIcon("pencil", KIcon::Toolbar),
                                 BUTTON_TOOL_ADD, SIGNAL(clicked(int)), this,
                                 SLOT(addPwd_slot()), true,
                                 i18n("Add password"));
         toolBar()->insertButton(picons->loadIcon("edit", KIcon::Toolbar),
                                 BUTTON_TOOL_EDIT, SIGNAL(clicked(int)), this,
                                 SLOT(editPwd_slot()), true,
                                 i18n("Edit password"));
         toolBar()->insertButton(picons->loadIcon("editdelete", KIcon::Toolbar),
                                 BUTTON_TOOL_DEL, SIGNAL(clicked(int)), this,
                                 SLOT(deletePwd_slot()), true,
                                 i18n("Delete password"));
         toolBar()->insertSeparator();
         toolBar()->insertButton(picons->loadIcon("find", KIcon::Toolbar),
                                 BUTTON_TOOL_FIND, SIGNAL(clicked(int)), this,
                                 SLOT(find_slot()), true, i18n("Find entry"));
         toolBar()->insertSeparator();
         toolBar()->insertButton(picons->loadIcon("halfencrypted", KIcon::Toolbar),
                                 BUTTON_TOOL_LOCK, SIGNAL(clicked(int)), this,
                                 SLOT(lockWnd_slot()), true,
                                 i18n("Lock all entries"));
         toolBar()->insertButton(picons->loadIcon("encrypted", KIcon::Toolbar),
                                 BUTTON_TOOL_DEEPLOCK, SIGNAL(clicked(int)), this,
                                 SLOT(deepLockWnd_slot()), true,
                                 i18n("Deep-Lock all entries"));
         toolBar()->insertButton(picons->loadIcon("decrypted", KIcon::Toolbar),
                                 BUTTON_TOOL_UNLOCK, SIGNAL(clicked(int)), this,
                                 SLOT(unlockWnd_slot()), true,
                                 i18n("Unlock all entries"));
 }
 
 void PwM::initMetrics()
 {
         QSize s = conf()->confWndMainWndSize();
         if (s.isValid())
                 resize(s);
         else
                 resize(DEFAULT_SIZE);
 }
 
 void PwM::updateCaption()
 {
         setPlainCaption(curDoc()->getTitle() + " - " PROG_NAME " " PACKAGE_VER);
 }