/branches/ScribusOIF/scribus/ui/propertywidget_group.h |
---|
File deleted |
/branches/ScribusOIF/scribus/ui/propertywidget_groupshape.h |
---|
File deleted |
/branches/ScribusOIF/scribus/ui/propertywidget_group.cpp |
---|
File deleted |
/branches/ScribusOIF/scribus/ui/propertywidget_groupshape.cpp |
---|
File deleted |
/branches/ScribusOIF/scribus/ui/propertiespalette_content.h |
---|
15,7 → 15,6 |
class QAbstractButton; |
class PageItem; |
class PropertyWidget_Group; |
class PropertyWidget_Image; |
class PropertyWidget_Text; |
class ScribusDoc; |
46,7 → 45,6 |
void setCurrentItem(PageItem *i); |
private: |
PropertyWidget_Group* groupWidget; |
PropertyWidget_Image* imageWidget; |
PropertyWidget_Text* textWidget; |
/branches/ScribusOIF/scribus/ui/propertiespalette_content.cpp |
---|
16,7 → 16,6 |
#include "commonstrings.h" |
#include "pageitem.h" |
#include "propertiespalette_content.h" |
#include "propertywidget_group.h" |
#include "propertywidget_image.h" |
#include "propertywidget_text.h" |
#include "scribus.h" |
72,13 → 71,6 |
textButton->setText(""); |
hboxLayout->addWidget(textButton); |
QToolButton* groupButton = new QToolButton(widget); |
groupButton->setObjectName(QString::fromUtf8("groupButton")); |
groupButton->setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); |
//groupButton->setIcon( loadIcon("16/insert-table.png") ); |
groupButton->setText(""); |
hboxLayout->addWidget(groupButton); |
QToolButton* tableButton = new QToolButton(widget); |
tableButton->setObjectName(QString::fromUtf8("tableButton")); |
tableButton->setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); |
90,7 → 82,6 |
buttonGroup->addButton(imageButton); |
buttonGroup->addButton(textButton); |
buttonGroup->addButton(groupButton); |
buttonGroup->addButton(tableButton); |
imageButton->setChecked(true); |
104,10 → 95,6 |
textWidget = new PropertyWidget_Text(widgetStack); |
textWidget->setObjectName(QString::fromUtf8("textPropsWidget")); |
widgetStack->addWidget(textWidget); |
groupWidget = new PropertyWidget_Group(widgetStack); |
groupWidget->setObjectName(QString::fromUtf8("groupPropsWidget")); |
widgetStack->addWidget(groupWidget); |
vboxLayout->addWidget(widgetStack); |
127,8 → 114,6 |
widgetStack->setCurrentIndex(0); |
if (button->objectName() == "textButton") |
widgetStack->setCurrentIndex(1); |
if (button->objectName() == "groupButton") |
widgetStack->setCurrentIndex(2); |
} |
void PropertiesPalette_Content::connectSignals() |
160,7 → 145,6 |
setParent(m_ScMW); |
move(p2); |
groupWidget->setMainWindow(mw); |
imageWidget->setMainWindow(mw); |
textWidget->setMainWindow(mw); |
} |
179,7 → 163,6 |
m_doc = d; |
m_item = NULL; |
groupWidget->setDoc(m_doc); |
imageWidget->setDoc(m_doc); |
textWidget->setDoc(m_doc); |
247,7 → 230,6 |
{ |
setWindowTitle( tr("Content Properties")); |
groupWidget->languageChange(); |
imageWidget->languageChange(); |
textWidget->languageChange(); |
} |
260,7 → 242,6 |
m_unitRatio = m_doc->unitRatio(); |
m_unitIndex = m_doc->unitIndex(); |
groupWidget->unitChange(); |
imageWidget->unitChange(); |
textWidget->unitChange(); |
} |
/branches/ScribusOIF/scribus/ui/propertiespalette.cpp |
---|
246,7 → 246,7 |
connect(this, SIGNAL(DocChanged()), m_ScMW, SLOT(slotDocCh())); |
//connect(this->Cpal, SIGNAL(gradientChanged()), m_ScMW, SLOT(updtGradFill())); |
//connect(this->Cpal, SIGNAL(strokeGradientChanged()), m_ScMW, SLOT(updtGradStroke())); |
connect(this->Tpal, SIGNAL(gradientChanged()), this, SLOT(handleGradientChanged())); |
connect(this->Tpal, SIGNAL(gradientChanged()), m_ScMW, SLOT(updtGradMask())); |
} |
void PropertiesPalette::SelTab(int t) |
673,6 → 673,13 |
repaint(); |
} |
void PropertiesPalette::NewAlignement(int a) |
{ |
if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning()) |
return; |
m_doc->itemSelection_SetAlignment(a); |
} |
void PropertiesPalette::handleNewShape(int frameType) |
{ |
if (!m_ScMW || m_ScMW->scriptIsRunning()) |
931,6 → 938,16 |
tablePal->languageChange(); |
} |
const VGradient PropertiesPalette::getMaskGradient() |
{ |
return Tpal->gradEdit->gradient(); |
} |
const VGradient PropertiesPalette::getMaskGradientGroup() |
{ |
return groupPal->getMaskGradientGroup(); |
} |
void PropertiesPalette::setGradientEditMode(bool on) |
{ |
Cpal->gradEditButton->setChecked(on); |
987,14 → 1004,3 |
shapePal->setRoundRectEnabled(false); |
} |
} |
void PropertiesPalette::handleGradientChanged() |
{ |
if (!m_ScMW || m_ScMW->scriptIsRunning()) |
return; |
if ((m_haveDoc) && (m_haveItem)) |
{ |
VGradient vg(Tpal->gradEdit->gradient()); |
m_doc->itemSelection_SetMaskGradient(vg); |
} |
} |
/branches/ScribusOIF/scribus/ui/propertiespalette.h |
---|
59,6 → 59,8 |
void endPatchAdd(); |
void updateColorSpecialGradient(); |
const VGradient getMaskGradient(); |
const VGradient getMaskGradientGroup(); |
void updateColorList(); |
void setGradientEditMode(bool); |
void setTextFlowMode(PageItem::TextFlowMode mode); |
103,7 → 105,7 |
void SelTab(int t); |
void NewLineMode(int mode); |
void handleGradientChanged(); |
void NewAlignement(int a); |
void handleNewShape(int frameType); |
void NewSpGradient(double x1, double y1, double x2, double y2, double fx, double fy, double sg, double sk, double cx, double cy); |
void toggleGradientEdit(int); |
/branches/ScribusOIF/scribus/ui/propertywidget_imagebase.ui |
---|
100,9 → 100,6 |
<property name="title"> |
<string>Scaling</string> |
</property> |
<property name="flat"> |
<bool>true</bool> |
</property> |
<layout class="QGridLayout" name="gridLayout_2"> |
<item row="2" column="0"> |
<widget class="QLabel" name="xscaleLabel"> |
225,9 → 222,6 |
<property name="title"> |
<string>Color Management</string> |
</property> |
<property name="flat"> |
<bool>true</bool> |
</property> |
<layout class="QGridLayout" name="gridLayout_4"> |
<item row="0" column="0"> |
<widget class="QLabel" name="inputProfLabel"> |
264,9 → 258,6 |
<property name="title"> |
<string>PDF Compression</string> |
</property> |
<property name="flat"> |
<bool>true</bool> |
</property> |
<layout class="QGridLayout" name="gridLayout_3"> |
<item row="0" column="0"> |
<widget class="QLabel" name="compressionMethodLabel"> |
/branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp |
---|
125,7 → 125,7 |
{ |
m_ScMW = mw; |
connect(this->transPalWidget, SIGNAL(gradientChanged()), this, SLOT(handleGradientChanged())); |
connect(this->transPalWidget, SIGNAL(gradientChanged()), m_ScMW, SLOT(updtGradMaskGroup())); |
connect(this , SIGNAL(DocChanged()) , m_ScMW, SLOT(slotDocCh())); |
connect(m_ScMW, SIGNAL(UpdateRequest(int)), this, SLOT(handleUpdateRequest(int))); |
} |
361,6 → 361,11 |
} |
} |
const VGradient PropertiesPalette_Group::getMaskGradientGroup() |
{ |
return transPalWidget->gradEdit->gradient(); |
} |
void PropertiesPalette_Group::updateColorList() |
{ |
if (!m_haveDoc || !m_ScMW || m_ScMW->scriptIsRunning()) |
397,15 → 402,6 |
} |
} |
void PropertiesPalette_Group::handleGradientChanged() |
{ |
if (m_haveDoc) |
{ |
VGradient vg(transPalWidget->gradEdit->gradient()); |
m_doc->itemSelection_SetMaskGradient(vg); |
} |
} |
void PropertiesPalette_Group::handleGroupTransparency(double trans) |
{ |
if ((m_haveDoc) && (m_haveItem)) |
/branches/ScribusOIF/scribus/ui/propertiespalette_group.h |
---|
27,6 → 27,8 |
virtual void changeEvent(QEvent *e); |
const VGradient getMaskGradientGroup(); |
void displayTextFlowMode(PageItem::TextFlowMode mode); |
void updateColorList(); |
65,7 → 67,6 |
private slots: |
void handleGradientChanged(); |
void handleGroupTransparency(double trans); |
void handleGroupBlending(int blend); |
void handleGroupGradMask(int typ); |
/branches/ScribusOIF/scribus/ui/transparencypalette.h |
---|
54,7 → 54,6 |
friend class PropertiesPalette; |
friend class PropertiesPalette_Group; |
friend class PropertyWidget_Group; |
public: |
Tpalette(QWidget* parent); |
/branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp |
---|
44,7 → 44,6 |
m_item = 0; |
m_lineMode = false; |
m_oldRotation = 0; |
m_unitIndex = 0; |
m_unitRatio = 1.0; |
setupUi(this); |
/branches/ScribusOIF/scribus/ui/propertywidget_shape.cpp |
---|
57,6 → 57,13 |
languageChange(); |
connect(textFlowBtnGroup, SIGNAL(buttonClicked(int)) , this, SLOT(handleTextFlow())); |
connect(editShape , SIGNAL(clicked()) , this, SLOT(handleShapeEdit())); |
connect(roundRect , SIGNAL(valueChanged(double)) , this, SLOT(handleCornerRadius())); |
connect(evenOdd , SIGNAL(clicked()) , this, SLOT(handleFillRule()) ); |
connect(nonZero , SIGNAL(clicked()) , this, SLOT(handleFillRule()) ); |
connect(customShape, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(handleNewShape(int, int, qreal *))); |
roundRect->showValue(0); |
fillRuleLabel->setEnabled(false); |
evenOdd->setEnabled(false); |
483,7 → 490,7 |
customShape->setToolTip( tr("Choose the shape of frame...")); |
roundRect->setToolTip( tr("Set radius of corner rounding")); |
textFlowLabel->setText( tr("Text Wrap")); |
textFlowLabel->setText( tr("Text &Flow Around Frame")); |
textFlowDisabled->setToolTip( tr("Disabled")); |
textFlowUsesFrameShape->setToolTip( tr("Use Frame Shape")); |
textFlowUsesBoundingBox->setToolTip( tr("Use Bounding Box")); |
/branches/ScribusOIF/scribus/ui/propertywidget_shape.h |
---|
17,7 → 17,7 |
class ScribusMainWindow; |
class Selection; |
class SCRIBUS_API PropertyWidget_Shape : public QGroupBox, protected Ui::PropertyWidget_ShapeBase, |
class SCRIBUS_API PropertyWidget_Shape : public QGroupBox, Ui::PropertyWidget_ShapeBase, |
public PropertyWidgetBase |
{ |
Q_OBJECT |
/branches/ScribusOIF/scribus/scribus.cpp |
---|
7438,6 → 7438,22 |
} |
} |
void ScribusMainWindow::updtGradMask() |
{ |
if (!HaveDoc) |
return; |
VGradient vg(propertiesPalette->getMaskGradient()); |
doc->itemSelection_SetMaskGradient(vg); |
} |
void ScribusMainWindow::updtGradMaskGroup() |
{ |
if (!HaveDoc) |
return; |
VGradient vg(propertiesPalette->getMaskGradientGroup()); |
doc->itemSelection_SetMaskGradient(vg); |
} |
//CB-->?? |
void ScribusMainWindow::MakeFrame(int f, int c, double *vals) |
{ |
/branches/ScribusOIF/scribus/CMakeLists.txt |
---|
393,8 → 393,6 |
ui/propertywidget_colortrans.h |
ui/propertywidget_distance.h |
ui/propertywidget_flop.h |
ui/propertywidget_group.h |
ui/propertywidget_groupshape.h |
ui/propertywidget_image.h |
ui/propertywidget_line.h |
ui/propertywidget_optmargins.h |
828,8 → 826,6 |
ui/propertywidget_distance.cpp |
ui/propertywidget_flop.cpp |
ui/propertywidget_image.cpp |
ui/propertywidget_group.cpp |
ui/propertywidget_groupshape.cpp |
ui/propertywidget_line.cpp |
ui/propertywidget_optmargins.cpp |
ui/propertywidget_orphans.cpp |
/branches/ScribusOIF/scribus/scribus.h |
---|
455,7 → 455,21 |
/** Color Replacement */ |
void slotReplaceColors(); |
/** Style Manager */ |
/* |
// Setzt den Pen-Tonwert |
void setPenShade(int sh); |
// Setzt den Brush-Tonwert |
void setBrushShade(int sh); |
void setGradFill(int typ); |
*/ |
void updtGradMask(); |
void updtGradMaskGroup(); |
/* |
// Setzt die Pen-Farbe |
void setPenFarbe(QString farbe); |
// Setzt die Brush-Farbe |
void setBrushFarbe(QString farbe); |
*/ |
//CB: void setCSMenu(); |
/** Erzeugt einen Rahmen */ |
void MakeFrame(int f, int c, double *vals); |
/branches/ScribusOIF/win32/vc9/scribus-main/Scribus.vcproj |
---|
1483,14 → 1483,6 |
> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\propertywidget_group.cpp" |
> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\propertywidget_groupshape.cpp" |
> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\propertywidget_image.cpp" |
> |
</File> |
6370,42 → 6362,6 |
</FileConfiguration> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\propertywidget_group.h" |
> |
<FileConfiguration |
Name="Debug-cairo|Win32" |
> |
<Tool |
Name="moc.exe" |
/> |
</FileConfiguration> |
<FileConfiguration |
Name="Release-cairo|Win32" |
> |
<Tool |
Name="moc.exe" |
/> |
</FileConfiguration> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\propertywidget_groupshape.h" |
> |
<FileConfiguration |
Name="Debug-cairo|Win32" |
> |
<Tool |
Name="moc.exe" |
/> |
</FileConfiguration> |
<FileConfiguration |
Name="Release-cairo|Win32" |
> |
<Tool |
Name="moc.exe" |
/> |
</FileConfiguration> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\propertywidget_image.h" |
> |
<FileConfiguration |
9073,11 → 9029,11 |
> |
</File> |
<File |
RelativePath="..\..\..\..\scribus-1.5.x-svn\Scribus\scribus\ui\ui_propertywidget_imagebase.h" |
RelativePath="..\..\..\scribus\ui\ui_propertywidget_imagebase.h" |
> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\ui_propertywidget_imagebase.h" |
RelativePath="..\..\..\..\scribus-1.5.x-svn\Scribus\scribus\ui\ui_propertywidget_imagebase.h" |
> |
</File> |
<File |
10002,14 → 9958,6 |
> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\moc_propertywidget_group.cpp" |
> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\moc_propertywidget_groupshape.cpp" |
> |
</File> |
<File |
RelativePath="..\..\..\scribus\ui\moc_propertywidget_image.cpp" |
> |
</File> |