r17030 by jghali - - add drop cap options to text properties widgets
scribus-commit
scribus-commit at lists.scribus.net
Sat Nov 26 17:07:24 UTC 2011
Author: jghali
Date: Sat Nov 26 17:07:24 2011
New Revision: 17030
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17030
Log:
- add drop cap options to text properties widgets
- move changeEvent to protected section as it should be
Modified:
branches/ScribusOIF/scribus/ui/propertywidget_advanced.h
branches/ScribusOIF/scribus/ui/propertywidget_color.h
branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h
branches/ScribusOIF/scribus/ui/propertywidget_distance.cpp
branches/ScribusOIF/scribus/ui/propertywidget_distance.h
branches/ScribusOIF/scribus/ui/propertywidget_dropcap.cpp
branches/ScribusOIF/scribus/ui/propertywidget_dropcap.h
branches/ScribusOIF/scribus/ui/propertywidget_flop.h
branches/ScribusOIF/scribus/ui/propertywidget_image.h
branches/ScribusOIF/scribus/ui/propertywidget_line.h
branches/ScribusOIF/scribus/ui/propertywidget_optmargins.h
branches/ScribusOIF/scribus/ui/propertywidget_orphans.cpp
branches/ScribusOIF/scribus/ui/propertywidget_orphans.h
branches/ScribusOIF/scribus/ui/propertywidget_pathtext.h
branches/ScribusOIF/scribus/ui/propertywidget_pos.h
branches/ScribusOIF/scribus/ui/propertywidget_shape.h
branches/ScribusOIF/scribus/ui/propertywidget_text.cpp
branches/ScribusOIF/scribus/ui/propertywidget_text.h
branches/ScribusOIF/scribus/ui/propertywidget_textcolor.h
branches/ScribusOIF/scribus/ui/propertywidget_textstyles.h
branches/ScribusOIF/scribus/ui/propertywidget_transparency.h
Modified: branches/ScribusOIF/scribus/ui/propertywidget_advanced.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_advanced.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_advanced.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_advanced.h Sat Nov 26 17:07:24 2011
@@ -25,8 +25,6 @@
PropertyWidget_Advanced(QWidget* parent);
~PropertyWidget_Advanced() {};
- virtual void changeEvent(QEvent *e);
-
protected:
void connectSignals();
void disconnectSignals();
@@ -39,6 +37,8 @@
void enableFromSelection(void);
void setCurrentItem(PageItem *i);
+
+ virtual void changeEvent(QEvent *e);
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: branches/ScribusOIF/scribus/ui/propertywidget_color.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_color.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_color.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_color.h Sat Nov 26 17:07:24 2011
@@ -50,8 +50,6 @@
public:
PropertyWidget_Color(QWidget* parent);
~PropertyWidget_Color() {};
-
- virtual void changeEvent(QEvent *e);
void setDoc(ScribusDoc* doc);
@@ -67,6 +65,8 @@
void setCurrentItem(PageItem* item);
void updateFromItem();
+
+ virtual void changeEvent(QEvent *e);
public slots:
Modified: branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h Sat Nov 26 17:07:24 2011
@@ -25,11 +25,12 @@
public:
PropertyWidget_ColorTrans(QWidget* parent);
~PropertyWidget_ColorTrans() {};
-
- virtual void changeEvent(QEvent *e);
void setDoc(ScribusDoc* doc);
void setMainWindow(ScribusMainWindow * mw) {};
+
+protected:
+ virtual void changeEvent(QEvent *e);
public slots:
Modified: branches/ScribusOIF/scribus/ui/propertywidget_distance.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_distance.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_distance.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_distance.cpp Sat Nov 26 17:07:24 2011
@@ -17,6 +17,8 @@
PropertyWidget_Distance::PropertyWidget_Distance(QWidget* parent) : QFrame(parent)
{
+ m_ScMW = 0;
+
setupUi(this);
setFrameStyle(QFrame::Box | QFrame::Plain);
Modified: branches/ScribusOIF/scribus/ui/propertywidget_distance.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_distance.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_distance.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_distance.h Sat Nov 26 17:07:24 2011
@@ -23,8 +23,6 @@
PropertyWidget_Distance(QWidget* parent);
~PropertyWidget_Distance() {};
- virtual void changeEvent(QEvent *e);
-
protected:
void connectSignals();
void disconnectSignals();
@@ -37,6 +35,8 @@
void enableFromSelection(void);
void setCurrentItem(PageItem *item);
+
+ virtual void changeEvent(QEvent *e);
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: branches/ScribusOIF/scribus/ui/propertywidget_dropcap.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_dropcap.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_dropcap.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_dropcap.cpp Sat Nov 26 17:07:24 2011
@@ -12,6 +12,8 @@
PropertyWidget_DropCap::PropertyWidget_DropCap(QWidget *parent) : QFrame(parent)
{
+ m_ScMW = 0;
+
setupUi(this);
setFrameStyle(QFrame::Box | QFrame::Plain);
setLineWidth(1);
@@ -21,6 +23,13 @@
if (!m_doc) return;
dropCapCharStyleCombo->updateFormatList();
+}
+
+void PropertyWidget_DropCap::setMainWindow(ScribusMainWindow* mw)
+{
+ m_ScMW = mw;
+
+ connect(m_ScMW, SIGNAL(UpdateRequest(int)), this , SLOT(handleUpdateRequest(int)));
}
void PropertyWidget_DropCap::setDoc(ScribusDoc *doc)
@@ -129,6 +138,14 @@
m_doc->itemSelection_ApplyParagraphStyle(newStyle);
}
+void PropertyWidget_DropCap::handleUpdateRequest(int updateFlags)
+{
+ if (updateFlags & reqCharStylesUpdate)
+ updateCharStyles();
+ if (updateFlags & reqStyleComboDocUpdate)
+ setDoc(m_doc ? m_doc : 0);
+}
+
void PropertyWidget_DropCap::changeEvent(QEvent *e)
{
if (e->type() == QEvent::LanguageChange)
Modified: branches/ScribusOIF/scribus/ui/propertywidget_dropcap.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_dropcap.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_dropcap.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_dropcap.h Sat Nov 26 17:07:24 2011
@@ -6,6 +6,7 @@
#include "propertywidgetbase.h"
class ParagraphStyle;
+class ScribusMainWindow;
class PropertyWidget_DropCap : public QFrame, private Ui::PropertyWidget_DropCapBase, public PropertyWidgetBase
{
@@ -17,17 +18,26 @@
void updateStyle(const ParagraphStyle& newCurrent);
void updateCharStyles();
- void setDoc(ScribusDoc *doc);
+
void displayCharStyle(const QString& name);
protected:
double m_unitRatio;
int m_unitIndex;
- void changeEvent(QEvent *e);
+
+ ScribusMainWindow* m_ScMW;
+
+ virtual void changeEvent(QEvent *e);
public slots:
+ void setMainWindow(ScribusMainWindow *mw);
+ void setDoc(ScribusDoc *doc);
+
+ void handleUpdateRequest(int);
+
void languageChange();
void unitChange();
+
void handleDropCapUse();
void handleDropCapLines();
void handleDropCapOffset();
Modified: branches/ScribusOIF/scribus/ui/propertywidget_flop.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_flop.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_flop.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_flop.h Sat Nov 26 17:07:24 2011
@@ -29,11 +29,11 @@
PropertyWidget_Flop(QWidget* parent);
~PropertyWidget_Flop() {};
- virtual void changeEvent(QEvent *e);
-
protected:
ScGuardedPtr<ScribusDoc> m_doc;
+
+ virtual void changeEvent(QEvent *e);
public slots:
Modified: branches/ScribusOIF/scribus/ui/propertywidget_image.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_image.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_image.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_image.h Sat Nov 26 17:07:24 2011
@@ -24,8 +24,6 @@
PropertyWidget_Image(QWidget* parent);
~PropertyWidget_Image() {};
- virtual void changeEvent(QEvent *e);
-
bool userActionOn();
void updateProfileList();
@@ -47,6 +45,8 @@
UserActionSniffer *userActionSniffer;
void installSniffer(ScrSpinBox *spinBox);
+
+ virtual void changeEvent(QEvent *e);
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: branches/ScribusOIF/scribus/ui/propertywidget_line.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_line.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_line.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_line.h Sat Nov 26 17:07:24 2011
@@ -29,12 +29,16 @@
PropertyWidget_Line(QWidget* parent);
~PropertyWidget_Line() {};
- virtual void changeEvent(QEvent *e);
-
void updateLineStyles();
void updateArrowStyles();
protected:
+ bool m_lineMode;
+ double m_unitRatio;
+ int m_unitIndex;
+
+ PageItem *m_item;
+ ScribusMainWindow* m_ScMW;
void connectSignals();
void disconnectSignals();
@@ -42,12 +46,7 @@
void enableFromSelection(void);
void setCurrentItem(PageItem *i);
- bool m_lineMode;
- double m_unitRatio;
- int m_unitIndex;
-
- PageItem *m_item;
- ScribusMainWindow* m_ScMW;
+ virtual void changeEvent(QEvent *e);
private:
Modified: branches/ScribusOIF/scribus/ui/propertywidget_optmargins.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_optmargins.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_optmargins.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_optmargins.h Sat Nov 26 17:07:24 2011
@@ -24,8 +24,6 @@
PropertyWidget_OptMargins(QWidget* parent);
~PropertyWidget_OptMargins() {};
- virtual void changeEvent(QEvent *e);
-
void updateStyle(const ParagraphStyle& newCurrent);
protected:
@@ -37,6 +35,8 @@
void enableFromSelection(void);
void setCurrentItem(PageItem *item);
+
+ virtual void changeEvent(QEvent *e);
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: branches/ScribusOIF/scribus/ui/propertywidget_orphans.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_orphans.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_orphans.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_orphans.cpp Sat Nov 26 17:07:24 2011
@@ -71,8 +71,8 @@
void PropertyWidget_Orphans::updateStyle(const ParagraphStyle& newCurrent)
{
disconnectSignals ();
- keepLinesStart->setValue (newCurrent.keepLinesStart());
- keepLinesEnd->setValue (newCurrent.keepLinesEnd());
+ keepLinesStart->setValue (newCurrent.keepLinesStart());
+ keepLinesEnd->setValue (newCurrent.keepLinesEnd());
keepTogether->setChecked (newCurrent.keepTogether());
keepWithNext->setChecked (newCurrent.keepWithNext());
connectSignals ();
Modified: branches/ScribusOIF/scribus/ui/propertywidget_orphans.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_orphans.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_orphans.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_orphans.h Sat Nov 26 17:07:24 2011
@@ -22,11 +22,12 @@
PropertyWidget_Orphans(QWidget* parent);
~PropertyWidget_Orphans() {};
+ void updateStyle(const ParagraphStyle& newCurrent);
+
+protected:
virtual void changeEvent(QEvent *e);
- void updateStyle(const ParagraphStyle& newCurrent);
public slots:
-
void languageChange();
void handleKeepLinesStart();
void handleKeepLinesEnd();
Modified: branches/ScribusOIF/scribus/ui/propertywidget_pathtext.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_pathtext.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_pathtext.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_pathtext.h Sat Nov 26 17:07:24 2011
@@ -23,8 +23,6 @@
PropertyWidget_PathText(QWidget* parent);
~PropertyWidget_PathText() {};
- virtual void changeEvent(QEvent *e);
-
protected:
PageItem * m_item;
ScribusMainWindow* m_ScMW;
@@ -37,6 +35,8 @@
void enableFromSelection(void);
void setCurrentItem(PageItem *item);
+
+ virtual void changeEvent(QEvent *e);
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: branches/ScribusOIF/scribus/ui/propertywidget_pos.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_pos.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_pos.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_pos.h Sat Nov 26 17:07:24 2011
@@ -28,8 +28,6 @@
public:
PropertyWidget_Position(QWidget* parent);
~PropertyWidget_Position() {};
-
- virtual void changeEvent(QEvent *e);
/** @brief Returns true if there is a user action going on at the moment of call. */
bool userActionOn(); // not yet implemented!!! This is needed badly.
@@ -40,12 +38,6 @@
void setLineMode(int lineMode);
protected:
- void connectSignals();
- void disconnectSignals();
-
- void enableFromSelection(void);
- void setCurrentItem(PageItem *i);
-
PageItem* m_item;
ScribusMainWindow* m_ScMW;
@@ -55,9 +47,17 @@
double m_oldRotation;
+ void connectSignals();
+ void disconnectSignals();
+
+ void enableFromSelection(void);
+ void setCurrentItem(PageItem *i);
+
bool _userActionOn;
UserActionSniffer *userActionSniffer;
void installSniffer(ScrSpinBox *spinBox);
+
+ virtual void changeEvent(QEvent *e);
public slots:
Modified: branches/ScribusOIF/scribus/ui/propertywidget_shape.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_shape.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_shape.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_shape.h Sat Nov 26 17:07:24 2011
@@ -26,22 +26,22 @@
PropertyWidget_Shape(QWidget* parent);
~PropertyWidget_Shape() {};
- virtual void changeEvent(QEvent *e);
-
void setCustomShapeIcon(int submode);
void setLocked(bool isLocked);
void setRoundRectEnabled(bool enabled);
void displayTextFlowMode(PageItem::TextFlowMode mode);
protected:
- void connectSignals();
- void disconnectSignals();
-
double m_unitRatio;
int m_unitIndex;
PageItem *m_item;
Selection* m_tmpSelection;
+
+ void connectSignals();
+ void disconnectSignals();
+
+ virtual void changeEvent(QEvent *e);
protected:
ScribusMainWindow *m_ScMW;
Modified: branches/ScribusOIF/scribus/ui/propertywidget_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_text.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_text.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_text.cpp Sat Nov 26 17:07:24 2011
@@ -15,6 +15,7 @@
#include "propertiespalette_utils.h"
#include "propertywidget_advanced.h"
#include "propertywidget_distance.h"
+#include "propertywidget_dropcap.h"
#include "propertywidget_flop.h"
#include "propertywidget_optmargins.h"
#include "propertywidget_orphans.h"
@@ -46,6 +47,9 @@
orphanBox = new PropertyWidget_Orphans(textTree);
orphanItem = textTree->addWidget( tr("Orphans and Widows"), orphanBox);
+ dropCapBox = new PropertyWidget_DropCap(textTree);
+ dropCapItem = textTree->addWidget( tr("Drop Cap"), dropCapBox);
+
distanceWidgets = new PropertyWidget_Distance(textTree);
distanceItem = textTree->addWidget( tr("Columns & Text Distances"), distanceWidgets);
@@ -70,8 +74,9 @@
m_ScMW = mw;
advancedWidgets->setMainWindow(mw);
+ colorWidgets->setMainWindow(mw);
+ dropCapBox->setMainWindow(mw);
distanceWidgets->setMainWindow(mw);
- colorWidgets->setMainWindow(mw);
optMargins->setMainWindow(mw);
pathTextWidgets->setMainWindow(mw);
styleWidgets->setMainWindow(mw);
@@ -112,6 +117,7 @@
advancedWidgets->setDoc(m_doc);
colorWidgets->setDoc(m_doc);
distanceWidgets->setDoc(m_doc);
+ dropCapBox->setDoc(m_doc);
flopBox->setDoc(m_doc);
optMargins->setDoc(m_doc);
orphanBox->setDoc(m_doc);
@@ -353,6 +359,7 @@
advancedWidgets->updateStyle(newCurrent);
colorWidgets->updateStyle(newCurrent);
+ dropCapBox->updateStyle(newCurrent);
optMargins->updateStyle (newCurrent);
orphanBox->updateStyle (newCurrent);
@@ -403,6 +410,7 @@
advancedWidgets->languageChange();
colorWidgets->languageChange();
distanceWidgets->languageChange();
+ dropCapBox->languageChange();
flopBox->languageChange();
optMargins->languageChange();
orphanBox->languageChange();
@@ -421,6 +429,7 @@
advancedWidgets->unitChange();
colorWidgets->unitChange();
distanceWidgets->unitChange();
+ dropCapBox->unitChange();
flopBox->unitChange();
optMargins->unitChange();
pathTextWidgets->unitChange();
Modified: branches/ScribusOIF/scribus/ui/propertywidget_text.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_text.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_text.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_text.h Sat Nov 26 17:07:24 2011
@@ -13,6 +13,7 @@
class PropertyWidget_Advanced;
class PropertyWidget_Distance;
+class PropertyWidget_DropCap;
class PropertyWidget_Flop;
class PropertyWidget_OptMargins;
class PropertyWidget_Orphans;
@@ -29,20 +30,20 @@
PropertyWidget_Text(QWidget* parent);
~PropertyWidget_Text() {};
- virtual void changeEvent(QEvent *e);
-
protected:
- void connectSignals();
- void disconnectSignals();
-
PageItem * m_item;
ScribusMainWindow* m_ScMW;
double m_unitRatio;
int m_unitIndex;
+
+ void connectSignals();
+ void disconnectSignals();
void enableFromSelection(void);
void setCurrentItem(PageItem *item);
+
+ virtual void changeEvent(QEvent *e);
PropertyWidget_Distance* distanceWidgets;
QTreeWidgetItem* distanceItem;
@@ -55,6 +56,9 @@
PropertyWidget_Flop* flopBox;
QTreeWidgetItem* flopItem;
+
+ PropertyWidget_DropCap* dropCapBox;
+ QTreeWidgetItem* dropCapItem;
PropertyWidget_Orphans* orphanBox;
QTreeWidgetItem* orphanItem;
Modified: branches/ScribusOIF/scribus/ui/propertywidget_textcolor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_textcolor.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_textcolor.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_textcolor.h Sat Nov 26 17:07:24 2011
@@ -23,19 +23,19 @@
PropertyWidget_TextColor(QWidget* parent);
~PropertyWidget_TextColor() {};
- virtual void changeEvent(QEvent *e);
-
void updateColorList();
protected:
+ PageItem * m_item;
+ ScribusMainWindow* m_ScMW;
+
void connectSignals();
void disconnectSignals();
- PageItem * m_item;
- ScribusMainWindow* m_ScMW;
-
void enableFromSelection(void);
void setCurrentItem(PageItem *i);
+
+ virtual void changeEvent(QEvent *e);
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: branches/ScribusOIF/scribus/ui/propertywidget_textstyles.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_textstyles.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_textstyles.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_textstyles.h Sat Nov 26 17:07:24 2011
@@ -25,17 +25,17 @@
PropertyWidget_TextStyles(QWidget* parent);
~PropertyWidget_TextStyles() {};
- virtual void changeEvent(QEvent *e);
+protected:
+ PageItem * m_item;
+ ScribusMainWindow* m_ScMW;
-protected:
void connectSignals();
void disconnectSignals();
- PageItem * m_item;
- ScribusMainWindow* m_ScMW;
-
void enableFromSelection(void);
void setCurrentItem(PageItem *item);
+
+ virtual void changeEvent(QEvent *e);
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: branches/ScribusOIF/scribus/ui/propertywidget_transparency.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17030&path=/branches/ScribusOIF/scribus/ui/propertywidget_transparency.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_transparency.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_transparency.h Sat Nov 26 17:07:24 2011
@@ -53,8 +53,6 @@
public:
PropertyWidget_Transparency(QWidget* parent);
~PropertyWidget_Transparency() {};
-
- virtual void changeEvent(QEvent *e);
void setDoc(ScribusDoc* doc);
@@ -73,6 +71,8 @@
void updateFromItem();
void enablePatterns(bool enable);
+
+ virtual void changeEvent(QEvent *e);
PageItem* m_item;
More information about the scribus-commit
mailing list