r21295 by fschmid -

[scribus-commit]

Author: fschmid
Date: Sat May  7 07:38:36 2016
New Revision: 21295

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21295
Log:
Improvements to Bug #13978: Regression: Docked palettes position is not saved between sessions
Note you must have Qt 5.6.x for that.

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21295&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Sat May  7 07:38:36 2016
@@ -6745,6 +6745,39 @@
 			}
 		}
 	}
+#else
+	if (!m_prefsManager->appPrefs.uiPrefs.tabbedPalettes.isEmpty())
+	{
+		for (int a = 0; a < m_prefsManager->appPrefs.uiPrefs.tabbedPalettes.count(); a++)
+		{
+			QStringList actTab = m_prefsManager->appPrefs.uiPrefs.tabbedPalettes[a].palettes;
+			QDockWidget *container = findChild<QDockWidget *>(actTab[0]);
+			QList<QTabBar *> bars = findChildren<QTabBar *>(QString());
+			bool found = false;
+			for (int i = 0; i < bars.count(); ++i)
+			{
+				QTabBar *bar = bars[i];
+				for (int ii = 0; ii < bar->count(); ii++)
+				{
+					QObject *obj = (QObject*)bar->tabData(ii).toULongLong();
+					if (obj != NULL)
+					{
+						if (obj->objectName() == container->objectName())
+						{
+							if (m_prefsManager->appPrefs.uiPrefs.tabbedPalettes[a].activeTab > -1)
+							{
+								bar->setCurrentIndex(m_prefsManager->appPrefs.uiPrefs.tabbedPalettes[a].activeTab);
+								found = true;
+								break;
+							}
+						}
+					}
+				}
+				if (found)
+					break;
+			}
+		}
+	}
 #endif
 	move(m_prefsManager->appPrefs.uiPrefs.mainWinSettings.xPosition, m_prefsManager->appPrefs.uiPrefs.mainWinSettings.yPosition);
 	resize(m_prefsManager->appPrefs.uiPrefs.mainWinSettings.width, m_prefsManager->appPrefs.uiPrefs.mainWinSettings.height);