[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/gwenview
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2010-11-10 23:31:07
Message-ID: 20101110233107.18984AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195403 by gateau:

Remember default export plugin

 M  +11 -4     app/kipiexportaction.cpp  
 M  +4 -0      lib/gwenviewconfig.kcfg  


--- trunk/KDE/kdegraphics/gwenview/app/kipiexportaction.cpp #1195402:1195403
@@ -29,6 +29,7 @@
 #include <klocale.h>
 
 // Local
+#include <lib/gwenviewconfig.h>
 #include "kipiinterface.h"
 
 namespace Gwenview {
@@ -37,17 +38,21 @@
 struct KIPIExportActionPrivate {
 	KIPIExportAction* q;
 	KIPIInterface* mKIPIInterface;
+	QString mDefaultActionText;
 	QAction* mDefaultAction;
-	QString mDefaultActionText;
 
 	void initFromStoredDefaultAction() {
-		// FIXME: Init mDefaultActionText, q->text() and q->icon() from config
+		mDefaultActionText = GwenviewConfig::defaultExportPluginText();
+		if (!mDefaultActionText.isEmpty()) {
+			q->setText(mDefaultActionText);
+			q->setIcon(KIcon(GwenviewConfig::defaultExportPluginIconName()));
+		}
 		mDefaultAction = 0;
 		updateButtonBehavior();
 	}
 
 	void updateButtonBehavior() {
-		bool splitButton = mDefaultAction != 0;
+		bool splitButton = !mDefaultActionText.isEmpty() || mDefaultAction != 0;
 		q->setDelayed(splitButton);
 		q->setStickyMenu(splitButton);
 	}
@@ -111,7 +116,9 @@
 	d->mDefaultAction = action;
 	setIcon(action->icon());
 	setText(action->text());
-	// FIXME: Store action->text() and action->icon().name() in config
+
+	GwenviewConfig::setDefaultExportPluginText(action->text());
+	GwenviewConfig::setDefaultExportPluginIconName(action->icon().name());
 }
 
 
--- trunk/KDE/kdegraphics/gwenview/lib/gwenviewconfig.kcfg #1195402:1195403
@@ -65,6 +65,10 @@
 			<default>false</default>
 		</entry>
 
+		<entry name="DefaultExportPluginText" type="String">
+		</entry>
+		<entry name="DefaultExportPluginIconName" type="String">
+		</entry>
 	</group>
 
 	<group name="FullScreen">
[prev in list] [next in list] [prev in thread] [next in thread]