r21538 by craig - Fix oops commit

[scribus-commit]

Author: craig
Date: Thu Nov 24 21:53:30 2016
New Revision: 21538

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21538
Log:
Fix oops commit

Modified:
    trunk/Scribus/scribus/prefsfile.cpp
    trunk/Scribus/scribus/prefsmanager.cpp

Modified: trunk/Scribus/scribus/prefsfile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21538&path=/trunk/Scribus/scribus/prefsfile.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsfile.cpp	(original)
+++ trunk/Scribus/scribus/prefsfile.cpp	Thu Nov 24 21:53:30 2016
@@ -88,7 +88,6 @@
 {
 	if ((!m_ioEnabled) || ((m_contexts.size() == 0) && (m_pluginContexts.size() == 0)))
 		return; // No prefs file path set -> can't write or no prefs to write
-	qDebug()<<"write"<<m_prefsFilePath;
 	QFile* prefsXML = new QFile(m_prefsFilePath);
 	if (prefsXML->open(QIODevice::WriteOnly))
 	{

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21538&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp	(original)
+++ trunk/Scribus/scribus/prefsmanager.cpp	Thu Nov 24 21:53:30 2016
@@ -933,7 +933,7 @@
 		if (userprefsContext)
 		{
 			appPrefs.uiPrefs.language = userprefsContext->get("gui_language","");
-			appPrefs.uiPrefs.mainWinState = QByteArray::fromHex(userprefsContext->get("mainwinstate","").toLatin1());
+			appPrefs.uiPrefs.mainWinState = QByteArray::fromBase64(userprefsContext->get("mainwinstate","").toLatin1());
 			appPrefs.uiPrefs.tabbedPalettes.clear();
 			PrefsTable *tabsTable = userprefsContext->getTable("tabbedPalettes");
 			PrefsTable *actTabsTable = userprefsContext->getTable("activeTabs");
@@ -1003,7 +1003,7 @@
 		if (userprefsContext)
 		{
 			userprefsContext->set("gui_language", appPrefs.uiPrefs.language);
-			userprefsContext->set("mainwinstate", QString::fromLatin1(appPrefs.uiPrefs.mainWinState.toHex()));
+			userprefsContext->set("mainwinstate", QString::fromLatin1(appPrefs.uiPrefs.mainWinState.toBase64()));
 			if (!appPrefs.uiPrefs.tabbedPalettes.isEmpty())
 			{
 				int maxCols = 0;