r24566 by jghali - Fix change of icon set not being applied in text properties

[scribus-commit]

Author: jghali
Date: Mon Mar 15 20:34:11 2021
New Revision: 24566

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24566
Log:
Fix change of icon set not being applied in text properties

Modified:
    trunk/Scribus/scribus/ui/propertiespalette_text.cpp
    trunk/Scribus/scribus/ui/propertiespalette_text.h

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24566&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp	Mon Mar 15 20:34:11 2021
@@ -56,15 +56,8 @@
 	setupUi(this);
 
 	fontSize->setPrefix( "" );
-	fontSizeLabel->setPixmap(IconManager::instance().loadPixmap("zeichen.png"));
-	lineSpacingLabel->setPixmap(IconManager::instance().loadPixmap("linespacing2.png"));
-	textAlignmentLabel->setPixmap(IconManager::instance().loadPixmap("22/text-align.png"));
-	langLabel->setPixmap(IconManager::instance().loadPixmap("22/language.png"));
-	paraStyleLabel->setPixmap(IconManager::instance().loadPixmap("22/paragraph-style.png"));
-	charStyleLabel->setPixmap(IconManager::instance().loadPixmap("22/character-style.png"));
-
-	paraStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png"));
-	charStyleClear->setIcon(IconManager::instance().loadPixmap("16/edit-clear.png"));
+	
+	iconSetChange();
 
 	colorWidgets = new PropertyWidget_TextColor(textTree);
 	colorWidgetsItem = textTree->addItem( colorWidgets, tr("Color && Effects") );
@@ -118,7 +111,9 @@
 	connect(fontfeaturesWidget, SIGNAL(needsRelayout()), this, SLOT(updateTreeLayout()));
 	connect(parEffectWidgets,   SIGNAL(needsRelayout()), this, SLOT(updateTreeLayout()));
 
+	connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
 	connect(ScQApp, SIGNAL(localeChanged()), this, SLOT(localeChange()));
+
 	setEnabled(false);
 }
 
@@ -357,6 +352,21 @@
 	}
 }
 
+void PropertiesPalette_Text::iconSetChange()
+{
+	IconManager& iconManager = IconManager::instance();
+
+	fontSizeLabel->setPixmap(iconManager.loadPixmap("zeichen.png"));
+	lineSpacingLabel->setPixmap(iconManager.loadPixmap("linespacing2.png"));
+	textAlignmentLabel->setPixmap(iconManager.loadPixmap("22/text-align.png"));
+	langLabel->setPixmap(iconManager.loadPixmap("22/language.png"));
+	paraStyleLabel->setPixmap(iconManager.loadPixmap("22/paragraph-style.png"));
+	charStyleLabel->setPixmap(iconManager.loadPixmap("22/character-style.png"));
+
+	paraStyleClear->setIcon(iconManager.loadPixmap("16/edit-clear.png"));
+	charStyleClear->setIcon(iconManager.loadPixmap("16/edit-clear.png"));
+}
+
 void PropertiesPalette_Text::unitChange()
 {
 	if (!m_haveDoc)

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24566&path=/trunk/Scribus/scribus/ui/propertiespalette_text.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.h	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.h	Mon Mar 15 20:34:11 2021
@@ -72,6 +72,7 @@
 	void handleSelectionChanged();
 	void handleUpdateRequest(int);
 
+	void iconSetChange();
 	void languageChange();
 	void unitChange();
 	void localeChange();