r15623 by craig - Correct case of PaintManager class, and now that PM is used by barcodegenerator, add scribus binary as a dependency of the barcodemanager plugin
scribus-commit
scribus-commit at lists.scribus.net
Sat Oct 23 00:23:56 CEST 2010
Author: craig
Date: Fri Oct 22 22:23:56 2010
New Revision: 15623
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15623
Log:
Correct case of PaintManager class, and now that PM is used by barcodegenerator, add scribus binary as a dependency of the barcodemanager plugin
Added:
trunk/Scribus/scribus/ui/paintmanagerbase.ui
- copied, changed from r15622, trunk/Scribus/scribus/ui/paintmanager.ui
Removed:
trunk/Scribus/scribus/ui/paintmanager.ui
Modified:
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/ui/paintmanager.cpp
trunk/Scribus/scribus/ui/paintmanager.h
Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15623&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Fri Oct 22 22:23:56 2010
@@ -88,7 +88,7 @@
ui/nftdialog.ui
ui/nftwidget.ui
ui/pageitemattributes.ui
- ui/paintmanager.ui
+ ui/paintmanagerbase.ui
ui/patterndialog.ui
ui/picsearch.ui
ui/picsearchoptions.ui
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15623&path=/trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt Fri Oct 22 22:23:56 2010
@@ -36,4 +36,6 @@
DESTINATION ${SHAREDIR}/plugins
)
+ADD_DEPENDENCIES(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${EXE_NAME})
+
# SET_TARGET_PROPERTIES(${SCRIBUS_BARCODEGENERATOR_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15623&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp Fri Oct 22 22:23:56 2010
@@ -218,7 +218,7 @@
void BarcodeGenerator::bgColorButton_pressed()
{
- paintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
+ PaintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
if (!d.exec())
return;
bgColor = d.selectedColor();
@@ -229,7 +229,7 @@
void BarcodeGenerator::lnColorButton_pressed()
{
- paintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
+ PaintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
if (!d.exec())
return;
lnColor = d.selectedColor();
@@ -240,7 +240,7 @@
void BarcodeGenerator::txtColorButton_pressed()
{
- paintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
+ PaintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
if (!d.exec())
return;
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15623&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Fri Oct 22 22:23:56 2010
@@ -9934,7 +9934,7 @@
edc = prefsManager->colorSet();
}
undoManager->setUndoEnabled(false);
- paintManagerDialog *dia = new paintManagerDialog(this, Gradients, edc, prefsManager->colorSetName(), prefsManager->appPrefs.colorPrefs.CustomColorSets, doc, this);
+ PaintManagerDialog *dia = new PaintManagerDialog(this, Gradients, edc, prefsManager->colorSetName(), prefsManager->appPrefs.colorPrefs.CustomColorSets, doc, this);
if (dia->exec())
{
if (HaveDoc)
Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15623&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Fri Oct 22 22:23:56 2010
@@ -54,7 +54,7 @@
#include <QDebug>
-paintManagerDialog::paintManagerDialog(QWidget* parent, QMap<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QStringList custColSet, ScribusDoc *doc, ScribusMainWindow *scMW) : QDialog(parent)
+PaintManagerDialog::PaintManagerDialog(QWidget* parent, QMap<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QStringList custColSet, ScribusDoc *doc, ScribusMainWindow *scMW) : QDialog(parent)
{
setupUi(this);
setModal(true);
@@ -126,7 +126,7 @@
connect(LoadColSet, SIGNAL(activated(const QString &)), this, SLOT(loadDefaults(const QString&)));
}
-QTreeWidgetItem* paintManagerDialog::updateGradientList(QString addedName)
+QTreeWidgetItem* PaintManagerDialog::updateGradientList(QString addedName)
{
QList<QTreeWidgetItem*> lg = gradientItems->takeChildren();
for (int a = 0; a < lg.count(); a++)
@@ -163,7 +163,7 @@
return ret;
}
-QTreeWidgetItem* paintManagerDialog::updateColorList(QString addedName)
+QTreeWidgetItem* PaintManagerDialog::updateColorList(QString addedName)
{
QList<QTreeWidgetItem*> lg = colorItems->takeChildren();
for (int a = 0; a < lg.count(); a++)
@@ -185,7 +185,7 @@
return ret;
}
-void paintManagerDialog::selEditColor(QTreeWidgetItem *it)
+void PaintManagerDialog::selEditColor(QTreeWidgetItem *it)
{
if ((it) && (!paletteLocked))
{
@@ -204,7 +204,7 @@
}
}
-void paintManagerDialog::itemSelected(QTreeWidgetItem* it)
+void PaintManagerDialog::itemSelected(QTreeWidgetItem* it)
{
if ((it) && (!paletteLocked))
{
@@ -252,7 +252,7 @@
}
}
-void paintManagerDialog::createNew()
+void PaintManagerDialog::createNew()
{
if (paletteLocked)
return;
@@ -300,7 +300,7 @@
}
}
-void paintManagerDialog::editColorItem()
+void PaintManagerDialog::editColorItem()
{
if (paletteLocked)
return;
@@ -365,7 +365,7 @@
}
}
-void paintManagerDialog::duplicateColorItem()
+void PaintManagerDialog::duplicateColorItem()
{
if (paletteLocked)
return;
@@ -434,7 +434,7 @@
}
}
-void paintManagerDialog::removeColorItem()
+void PaintManagerDialog::removeColorItem()
{
if (paletteLocked)
return;
@@ -515,7 +515,7 @@
}
}
-void paintManagerDialog::removeUnusedColorItem()
+void PaintManagerDialog::removeUnusedColorItem()
{
if (paletteLocked)
return;
@@ -562,7 +562,7 @@
}
}
-void paintManagerDialog::importColorItems()
+void PaintManagerDialog::importColorItems()
{
QTreeWidgetItem* it = dataTree->currentItem();
if (it)
@@ -627,7 +627,7 @@
}
}
-ColorList paintManagerDialog::getGradientColors()
+ColorList PaintManagerDialog::getGradientColors()
{
ColorList colorList;
QMap<QString,VGradient>::Iterator itg;
@@ -643,7 +643,7 @@
return colorList;
}
-void paintManagerDialog::updateGradientColors(QString newName, QString oldName)
+void PaintManagerDialog::updateGradientColors(QString newName, QString oldName)
{
QMap<QString,VGradient>::Iterator itg;
for (itg = dialogGradients.begin(); itg != dialogGradients.end(); ++itg)
@@ -661,7 +661,7 @@
}
}
-void paintManagerDialog::loadGimpFormat(QString fileName)
+void PaintManagerDialog::loadGimpFormat(QString fileName)
{
QFile f(fileName);
if (f.open(QIODevice::ReadOnly))
@@ -781,7 +781,7 @@
*/
}
-void paintManagerDialog::addGimpColor(QString &colorName, double r, double g, double b)
+void PaintManagerDialog::addGimpColor(QString &colorName, double r, double g, double b)
{
ScColor lf = ScColor();
bool found = false;
@@ -810,7 +810,7 @@
}
}
-void paintManagerDialog::loadScribusFormat(QString fileName)
+void PaintManagerDialog::loadScribusFormat(QString fileName)
{
QFile f(fileName);
if(!f.open(QIODevice::ReadOnly))
@@ -891,7 +891,7 @@
}
}
-void paintManagerDialog::loadDefaults(const QString &txt)
+void PaintManagerDialog::loadDefaults(const QString &txt)
{
int c = LoadColSet->currentIndex();
setCurrentComboItem(LoadColSet, txt);
@@ -960,7 +960,7 @@
itemSelected(0);
}
-void paintManagerDialog::saveDefaults()
+void PaintManagerDialog::saveDefaults()
{
QString Cpfad = QDir::convertSeparators(ScPaths::getApplicationDataDir());
QString Name = LoadColSet->currentText();
@@ -1034,12 +1034,12 @@
}
}
-QString paintManagerDialog::getColorSetName()
+QString PaintManagerDialog::getColorSetName()
{
return LoadColSet->currentText();
}
-ScColor paintManagerDialog::selectedColor()
+ScColor PaintManagerDialog::selectedColor()
{
QTreeWidgetItem* it = dataTree->currentItem();
if (it)
@@ -1050,7 +1050,7 @@
return ScColor();
}
-QString paintManagerDialog::selectedColorName()
+QString PaintManagerDialog::selectedColorName()
{
QTreeWidgetItem* it = dataTree->currentItem();
if (it)
Modified: trunk/Scribus/scribus/ui/paintmanager.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15623&path=/trunk/Scribus/scribus/ui/paintmanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.h (original)
+++ trunk/Scribus/scribus/ui/paintmanager.h Fri Oct 22 22:23:56 2010
@@ -25,7 +25,7 @@
***************************************************************************/
#ifndef PAINTMANAGER_H
#define PAINTMANAGER_H
-#include "ui_paintmanager.h"
+#include "ui_paintmanagerbase.h"
#include "colorsetmanager.h"
#include "sccolor.h"
#include "scribusapi.h"
@@ -33,13 +33,13 @@
#include "scribus.h"
#include "vgradient.h"
-class SCRIBUS_API paintManagerDialog : public QDialog, Ui::paintManager
+class SCRIBUS_API PaintManagerDialog : public QDialog, Ui::PaintManagerBase
{
Q_OBJECT
public:
- paintManagerDialog(QWidget* parent, QMap<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QStringList custColSet, ScribusDoc *doc, ScribusMainWindow* scMW);
- ~paintManagerDialog() {};
+ PaintManagerDialog(QWidget* parent, QMap<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QStringList custColSet, ScribusDoc *doc, ScribusMainWindow* scMW);
+ ~PaintManagerDialog() {};
/*! \brief Returns the name of the current/selected color set.
\retval QString selected name. */
QString getColorSetName();
More information about the scribus-commit
mailing list