r19157 by craig - #12193: Stop sorting the items in the style manager new style menu, move Line Styles to the bottom of the list

[scribus-commit]

Author: craig
Date: Thu May 29 20:45:27 2014
New Revision: 19157

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19157
Log:
#12193: Stop sorting the items in the style manager new style menu, move Line Styles to the bottom of the list

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/stylemanager.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19157&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu May 29 20:45:27 2014
@@ -656,12 +656,12 @@
 
 	// initializing style manager here too even it's not strictly a palette
 	styleManager = new StyleManager(this, "styleManager");
-	styleManager->addStyle(new SMLineStyle());
 	SMCharacterStyle *tmpCS = new SMCharacterStyle();
 	styleManager->addStyle(new SMParagraphStyle(tmpCS->tmpStyles()));
 	styleManager->addStyle(tmpCS);
 	styleManager->addStyle(new SMTableStyle());
 	styleManager->addStyle(new SMCellStyle());
+	styleManager->addStyle(new SMLineStyle());
 	connect( scrActions["editStyles"], SIGNAL(toggled(bool)), styleManager, SLOT(setPaletteShown(bool)) );
 	connect( styleManager, SIGNAL(paletteShown(bool)), scrActions["editStyles"], SLOT(setChecked(bool)));
 	styleManager->installEventFilter(this);

Modified: trunk/Scribus/scribus/ui/stylemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19157&path=/trunk/Scribus/scribus/ui/stylemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/stylemanager.cpp Thu May 29 20:45:27 2014
@@ -146,7 +146,8 @@
 		m_styleClassesPS[m_items.at(i)->typeNamePlural()] = m_items.at(i)->typeNameSingular();
 		m_styleClassesSP[m_items.at(i)->typeNameSingular()] = m_items.at(i)->typeNamePlural();
 	}
-	popupStrings.sort();
+	//12193 turn off sort
+	//popupStrings.sort();
 	for (int i = 0; i < popupStrings.count(); ++i)
 		m_newPopup->addAction(popupStrings[i]);