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
@@ -183,49 +183,51 @@ PwM::~PwM()
 		   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);
@@ -306,48 +308,61 @@ void PwM::initMenubar()
 	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