r14618 by cbradney - Move Shortwords preferences pane to shortwords plugin
scribus-commit
scribus-commit at lists.scribus.net
Mon Feb 1 22:20:59 CET 2010
Revision: 14618
Author: cbradney
Date: 2010-02-01T21:12:38.868279Z
Commit message: Move Shortwords preferences pane to shortwords plugin
Changeset:
M /trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
A /trunk/Scribus/scribus/plugins/short-words/prefs_shortwords.cpp
D /trunk/Scribus/scribus/ui/prefs_shortwords.cpp
M /trunk/Scribus/scribus/CMakeLists.txt
A /trunk/Scribus/scribus/plugins/short-words/prefs_shortwords.h
M /trunk/Scribus/scribus/ui/preferencesdialog.cpp
A /trunk/Scribus/scribus/plugins/short-words/prefs_shortwordsbase.ui
D /trunk/Scribus/scribus/ui/prefs_shortwords.h
D /trunk/Scribus/scribus/ui/prefs_shortwordsbase.ui
M /trunk/Scribus/scribus/ui/preferencesdialog.h
Diffs:
Index: scribus/ui/prefs_shortwords.h
===================================================================
--- scribus/ui/prefs_shortwords.h (revision 14617)
+++ scribus/ui/prefs_shortwords.h (revision 14618)
@@ -1,23 +0,0 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-
-#ifndef PREFS_SHORTWORDS_H
-#define PREFS_SHORTWORDS_H
-
-#include "ui_prefs_shortwordsbase.h"
-#include "scribusapi.h"
-
-class SCRIBUS_API Prefs_ShortWords : public QWidget, Ui::Prefs_ShortWords
-{
- Q_OBJECT
-
- public:
- Prefs_ShortWords(QWidget* parent=0);
- ~Prefs_ShortWords();
-};
-
-#endif // PREFS_SHORTWORDS_H
Index: scribus/ui/prefs_shortwords.cpp
===================================================================
--- scribus/ui/prefs_shortwords.cpp (revision 14617)
+++ scribus/ui/prefs_shortwords.cpp (revision 14618)
@@ -1,20 +0,0 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-
-#include "prefs_shortwords.h"
-
-Prefs_ShortWords::Prefs_ShortWords(QWidget* parent)
- : QWidget(parent)
-{
- setupUi(this);
-
-}
-
-Prefs_ShortWords::~Prefs_ShortWords()
-{
-}
-
Index: scribus/ui/prefs_shortwordsbase.ui
===================================================================
--- scribus/ui/prefs_shortwordsbase.ui (revision 14617)
+++ scribus/ui/prefs_shortwordsbase.ui (revision 14618)
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Prefs_ShortWords</class>
- <widget class="QWidget" name="Prefs_ShortWords">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>691</width>
- <height>420</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="titleLabel">
- <property name="font">
- <font>
- <pointsize>14</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Short Words</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QTextEdit" name="textEdit"/>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="saveButton">
- <property name="text">
- <string>Save</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="resetButton">
- <property name="text">
- <string>Reset</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
Index: scribus/ui/preferencesdialog.h
===================================================================
--- scribus/ui/preferencesdialog.h (revision 14617)
+++ scribus/ui/preferencesdialog.h (revision 14618)
@@ -31,7 +31,7 @@
#include "ui/prefs_preflightverifier.h"
#include "ui/prefs_scripter.h"
#include "ui/prefs_scrapbook.h"
-#include "ui/prefs_shortwords.h"
+//#include "ui/prefs_shortwords.h"
#include "ui/prefs_typography.h"
#include "ui/prefs_itemtools.h"
#include "ui/prefs_operatortools.h"
@@ -95,7 +95,7 @@
Prefs_PreflightVerifier *prefs_PreflightVerifier;
Prefs_Scripter *prefs_Scripter;
Prefs_Scrapbook *prefs_Scrapbook;
- Prefs_ShortWords *prefs_ShortWords;
+ //Prefs_ShortWords *prefs_ShortWords;
Prefs_Typography *prefs_Typography;
Prefs_ItemTools *prefs_ItemTools;
Prefs_OperatorTools *prefs_OperatorTools;
Index: scribus/ui/preferencesdialog.cpp
===================================================================
--- scribus/ui/preferencesdialog.cpp (revision 14617)
+++ scribus/ui/preferencesdialog.cpp (revision 14618)
@@ -73,8 +73,8 @@
addItem( tr("Miscellaneous"), loadIcon("misc.png"), prefs_Miscellaneous);
prefs_Plugins = new Prefs_Plugins(this);
addItem( tr("Plugins"), loadIcon("plugins.png"), prefs_Plugins);
- prefs_ShortWords = new Prefs_ShortWords(this);
- addItem( tr("Short Words"), loadIcon("tools.png"), prefs_ShortWords);
+// prefs_ShortWords = new Prefs_ShortWords(this);
+// addItem( tr("Short Words"), loadIcon("tools.png"), prefs_ShortWords);
prefs_Scripter = new Prefs_Scripter(this);
addItem( tr("Scripter"), loadIcon("tools.png"), prefs_Scripter);
prefs_ImageCache = new Prefs_ImageCache(this);
Index: scribus/plugins/short-words/prefs_shortwordsbase.ui
===================================================================
--- scribus/plugins/short-words/prefs_shortwordsbase.ui (revision 0)
+++ scribus/plugins/short-words/prefs_shortwordsbase.ui (revision 14618)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Prefs_ShortWords</class>
+ <widget class="QWidget" name="Prefs_ShortWords">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>691</width>
+ <height>420</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="titleLabel">
+ <property name="font">
+ <font>
+ <pointsize>14</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Short Words</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTextEdit" name="textEdit"/>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="saveButton">
+ <property name="text">
+ <string>Save</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="resetButton">
+ <property name="text">
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
Index: scribus/plugins/short-words/prefs_shortwords.cpp
===================================================================
--- scribus/plugins/short-words/prefs_shortwords.cpp (revision 0)
+++ scribus/plugins/short-words/prefs_shortwords.cpp (revision 14618)
@@ -0,0 +1,20 @@
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#include "prefs_shortwords.h"
+
+Prefs_ShortWords::Prefs_ShortWords(QWidget* parent)
+ : QWidget(parent)
+{
+ setupUi(this);
+
+}
+
+Prefs_ShortWords::~Prefs_ShortWords()
+{
+}
+
Index: scribus/plugins/short-words/prefs_shortwords.h
===================================================================
--- scribus/plugins/short-words/prefs_shortwords.h (revision 0)
+++ scribus/plugins/short-words/prefs_shortwords.h (revision 14618)
@@ -0,0 +1,23 @@
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#ifndef PREFS_SHORTWORDS_H
+#define PREFS_SHORTWORDS_H
+
+#include "ui_prefs_shortwordsbase.h"
+#include "scribusapi.h"
+
+class SCRIBUS_API Prefs_ShortWords : public QWidget, Ui::Prefs_ShortWords
+{
+ Q_OBJECT
+
+ public:
+ Prefs_ShortWords(QWidget* parent=0);
+ ~Prefs_ShortWords();
+};
+
+#endif // PREFS_SHORTWORDS_H
Index: scribus/plugins/short-words/CMakeLists.txt
===================================================================
--- scribus/plugins/short-words/CMakeLists.txt (revision 14617)
+++ scribus/plugins/short-words/CMakeLists.txt (revision 14618)
@@ -5,11 +5,13 @@
SET(SHORTWORDS_PLUGIN_UI_SRC
swdialog.ui
+ prefs_shortwordsbase.ui
)
SET(SHORTWORDS_PLUGIN_MOC_CLASSES
configuration.h
parse.h
+ prefs_shortwords.h
shortwords.h
swprefsgui.h
vlnadialog.h
@@ -18,6 +20,7 @@
SET(SHORTWORDS_PLUGIN_SOURCES
configuration.cpp
parse.cpp
+ prefs_shortwords.cpp
shortwords.cpp
swprefsgui.cpp
vlnadialog.cpp
Index: scribus/CMakeLists.txt
===================================================================
--- scribus/CMakeLists.txt (revision 14617)
+++ scribus/CMakeLists.txt (revision 14618)
@@ -114,7 +114,6 @@
ui/prefs_printerbase.ui
ui/prefs_scripterbase.ui
ui/prefs_scrapbookbase.ui
- ui/prefs_shortwordsbase.ui
ui/prefs_typographybase.ui
ui/prefs_userinterfacebase.ui
ui/prefs_itemtoolsbase.ui
@@ -307,7 +306,6 @@
ui/prefs_printer.h
ui/prefs_scrapbook.h
ui/prefs_scripter.h
- ui/prefs_shortwords.h
ui/prefs_typography.h
ui/prefs_userinterface.h
ui/prefs_itemtools.h
@@ -624,7 +622,6 @@
ui/prefs_printer.cpp
ui/prefs_scrapbook.cpp
ui/prefs_scripter.cpp
- ui/prefs_shortwords.cpp
ui/prefs_typography.cpp
ui/prefs_userinterface.cpp
ui/prefs_itemtools.cpp
More information about the scribus-commit
mailing list