r18624 by fschmid - Fixed Bug #11872: Add "Insert Barcode" to the Icon Bar

[scribus-commit]

Author: fschmid
Date: Thu Dec  5 20:37:27 2013
New Revision: 18624

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18624
Log:
Fixed Bug #11872: Add "Insert Barcode" to the Icon Bar

Added:
    trunk/Scribus/resources/icons/16/insert-barcode.png   (with props)
    trunk/Scribus/resources/icons/22/insert-barcode.png   (with props)
Modified:
    trunk/Scribus/scribus/pluginmanager.cpp
    trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
    trunk/Scribus/scribus/ui/sctoolbar.cpp

Modified: trunk/Scribus/scribus/pluginmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18624&path=/trunk/Scribus/scribus/pluginmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.cpp (original)
+++ trunk/Scribus/scribus/pluginmanager.cpp Thu Dec  5 20:37:27 2013
@@ -338,7 +338,7 @@
 			}
 			if (!ai.toolbar.isEmpty())
 			{
-				QString tbName = QString("ToolBar-%1").arg(ai.toolbar);
+				QString tbName = ai.toolbar;
 				if (mw->scrToolBars.contains(tbName))
 					mw->scrToolBars[tbName]->addAction(mw->scrActions[ai.name]);
 				else

Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18624&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcode.cpp Thu Dec  5 20:37:27 2013
@@ -8,6 +8,7 @@
 #include "barcode.h"
 #include "barcodegenerator.h"
 #include "scribusstructs.h"
+#include "util_icon.h"
 
 Barcode::Barcode() : ScActionPlugin()
 {
@@ -22,6 +23,9 @@
 	m_actionInfo.text = tr("Insert Barcode");
 	m_actionInfo.menu = "Insert";
 	m_actionInfo.menuAfterName = "toolsInsertRenderFrame";
+	m_actionInfo.toolbar = "Tools";
+	m_actionInfo.icon1 = loadIcon("16/insert-barcode.png");
+	m_actionInfo.icon2 = loadIcon("22/insert-barcode.png");
 	m_actionInfo.enabledOnStartup = false;
 	m_actionInfo.forAppMode.append(modeNormal);
 	m_actionInfo.needsNumObjects = -1;

Modified: trunk/Scribus/scribus/ui/sctoolbar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18624&path=/trunk/Scribus/scribus/ui/sctoolbar.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/sctoolbar.cpp (original)
+++ trunk/Scribus/scribus/ui/sctoolbar.cpp Thu Dec  5 20:37:27 2013
@@ -43,7 +43,7 @@
   m_name(QString("ToolBar-%1").arg(prefName))
 {
 	m_prefs=PrefsManager::instance()->prefsFile->getContext(m_name);
-	setObjectName(name);
+	setObjectName(prefName);
 // 	hide();
 	parentMW=parent;