make "Auto-Save on Program Close" setting persistant

new "Advanced Add Bookmark in Konqueror" setting
(also the enabler for bookmark menu right click editing)

svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=221009

keditbookmarks/keditbookmarksui.rc

@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="keditbookmarks" version="21">
+<kpartgui name="keditbookmarks" version="22">
 
 <MenuBar>
 
@@ -58,6 +58,7 @@
 <Menu name="settings"><text>&amp;Settings</text>
   <Action name="settings_showNS" append="save_merge"/>
   <Action name="settings_saveonclose" append="save_merge"/>
+  <Action name="settings_advancedaddbookmark" append="save_merge"/>
 </Menu>
 
 </MenuBar>
@@ -127,6 +128,7 @@
     <Action name="importMoz"/>
     <Action name="settings_showNS"/>
     <Action name="settings_saveonclose"/>
+    <Action name="settings_advancedaddbookmark"/>
   </enable>
 </State>
 
@@ -169,8 +171,9 @@
     <Action name="openlink"/>
     <Action name="rename"/>
     <Action name="setastoolbar"/>
-    <Action name="settings_saveonclose"/>
     <Action name="settings_showNS"/>
+    <Action name="settings_saveonclose"/>
+    <Action name="settings_advancedaddbookmark"/>
     <Action name="sort"/>
     <Action name="testall"/>
     <Action name="testlink"/>

keditbookmarks/toplevel.cpp

@@ -166,7 +166,6 @@ KEBApp::KEBApp(const QString & bookmarksFile, bool readonly, const QString &addr
 
    m_bookmarksFilename = bookmarksFile;
    m_readOnly = readonly;
-   m_saveOnClose = true;
    m_cmdHistory = new CmdHistory(actionCollection());
 
    s_topLevel = this;
@@ -212,6 +211,7 @@ void KEBApp::construct() {
 
    slotClipboardDataChanged();
 
+   readConfig();
    resetActions();
    updateActions();
 
@@ -242,7 +242,10 @@ void KEBApp::createActions() {
    (void) new KToggleAction(
                       i18n("&Auto-Save on Program Close"), 0,
                       this, SLOT( slotSaveOnClose() ), actionCollection(), "settings_saveonclose");
-
+   (void) new KToggleAction(
+                      i18n("Advanced Add Bookmark in Konqueror"), 0,
+                      this, SLOT( slotAdvancedAddBookmark() ), actionCollection(), 
+                      "settings_advancedaddbookmark");
    (void) new KToggleAction(
                       i18n("&Show Netscape Bookmarks in Konqueror Windows"), 0,
                       actn, SLOT( slotShowNS() ), actionCollection(), "settings_showNS");
@@ -316,12 +319,32 @@ void KEBApp::resetActions() {
    }
 
    getToggleAction("settings_saveonclose")->setChecked(m_saveOnClose);
-   getToggleAction("settings_showNS")
-      ->setChecked(CurrentMgr::self()->showNSBookmarks());
+   getToggleAction("settings_advancedaddbookmark")->setChecked(m_advancedAddBookmark);
+   getToggleAction("settings_showNS")->setChecked(CurrentMgr::self()->showNSBookmarks());
+}
+
+void KEBApp::readConfig() {
+   KConfig config("kbookmarkrc", false, false);
+   config.setGroup("Bookmarks");
+   m_advancedAddBookmark = config.readBoolEntry("AdvancedAddBookmark", false);
+
+   KConfig appconfig("keditbookmarksrc", false, false);
+   appconfig.setGroup("General");
+   m_saveOnClose = appconfig.readBoolEntry("Save On Close", false);
+}
+
+void KEBApp::slotAdvancedAddBookmark() {
+   m_advancedAddBookmark = getToggleAction("settings_advancedaddbookmark")->isChecked();
+   KConfig config("kbookmarkrc", false, false);
+   config.setGroup("Bookmarks");
+   config.writeEntry("AdvancedAddBookmark", m_advancedAddBookmark);
 }
 
 void KEBApp::slotSaveOnClose() {
    m_saveOnClose = getToggleAction("settings_saveonclose")->isChecked();
+   KConfig appconfig("keditbookmarksrc", false, false);
+   appconfig.setGroup("General");
+   appconfig.writeEntry("Save On Close", m_saveOnClose);
 }
 
 bool KEBApp::nsShown() {

keditbookmarks/toplevel.h

@@ -125,6 +125,7 @@ public slots:
    void slotSave();
    void slotSaveAs();
    void slotSaveOnClose();
+   void slotAdvancedAddBookmark();
    void slotConfigureKeyBindings();
    void slotConfigureToolbars();
 
@@ -134,6 +135,7 @@ protected slots:
 
 private:
    void construct();
+   void readConfig();
    void resetActions();
    void createActions();
 
@@ -148,6 +150,7 @@ private:
    KBookmarkEditorIface *m_dcopIface;
    QString m_bookmarksFilename;
    bool m_saveOnClose;
+   bool m_advancedAddBookmark;
 
    static KEBApp *s_topLevel;
 };