From ecd4ae2eef2ed8225adc32d5956827229989c89c Mon Sep 17 00:00:00 2001
From: Szymon Tomasz Stefanek
Date: Sat, 9 Oct 2010 02:50:31 +0000
Subject: Remove the "save configuration" menu entry. KVIrc *must* take care of
 the user's configuration.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5049 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/kvirc/ui/kvi_menubar.cpp          |  7 +++++--
 src/modules/options/libkvioptions.cpp | 11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index 5f7eb35ba..0d3d9ce7f 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -184,8 +184,11 @@ void KviMenuBar::setupSettingsPopup()
 	ACTION_POPUP_ITEM(KVI_COREACTION_MANAGETHEMES,opt)
 	ACTION_POPUP_ITEM(KVI_COREACTION_MANAGEADDONS,opt)
 
-	opt->insertSeparator();
-	opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,SLOT(saveConfiguration()));
+	// In 2010 this is not professional :D
+	// The app must take care of saving user options whenever they are changed.
+	// 
+	//opt->insertSeparator();
+	//opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,SLOT(saveConfiguration()));
 }
 
 void KviMenuBar::setupScriptingPopup()
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index e8ea29254..24d3b15f2 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -52,17 +52,22 @@ extern int g_iOptionWidgetInstances;
 	@title:
 		options.save
 	@short:
-		Saves the options to disk
+		Saves the configuration to disk
 	@syntax:
 		options.save
 	@description:
 		Saves the options to disk; this includes aliases, popups,
-		events and user preferences.
+		events and all user preferences. You shouldn't need to
+		call this as KVIrc *should* save the relevant part of
+		configuration when it's changed. However you might want it
+		in a debugging session or when testing an unstable version
+		where crashes are possible.
 */
 
 static bool options_kvs_cmd_save(KviKvsModuleCommandCall *)
 {
-	g_pApp->saveOptions();
+	//g_pApp->saveOptions();
+	g_pApp->saveConfiguration();
 	return true;
 }
 
-- 
cgit v1.3.1-10-gc9f91