r16077 by jghali - group tab uification
scribus-commit
scribus-commit at lists.scribus.net
Tue Dec 7 23:22:18 CET 2010
Author: jghali
Date: Tue Dec 7 22:22:18 2010
New Revision: 16077
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16077
Log:
group tab uification
Added:
branches/ScribusOIF/scribus/ui/propertiespalette_groupbase.ui
Modified:
branches/ScribusOIF/scribus/CMakeLists.txt
branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
branches/ScribusOIF/scribus/ui/propertiespalette_group.h
branches/ScribusOIF/win32/vc8/Scribus.vcproj
Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16077&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Tue Dec 7 22:22:18 2010
@@ -122,6 +122,7 @@
ui/prefs_tableofcontentsbase.ui
ui/prefs_documentitemattributesbase.ui
ui/printdialogbase.ui
+ ui/propertiespalette_groupbase.ui
ui/propertiespalette_imagebase.ui
ui/propertiespalette_linebase.ui
ui/propertiespalette_shapebase.ui
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16077&path=/branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp Tue Dec 7 22:22:18 2010
@@ -74,88 +74,30 @@
m_tmpSelection = new Selection(this, false);
m_tmpSelection->clear();
- page_group_layout = new QVBoxLayout( this );
- page_group_layout->setSpacing( 5 );
- page_group_layout->setMargin( 0 );
-
- ShapeGroup2 = new QGroupBox( this );
- ShapeGroupLayout2 = new QHBoxLayout( ShapeGroup2 );
- ShapeGroupLayout2->setSpacing( 2 );
- ShapeGroupLayout2->setMargin( 0 );
- ShapeGroupLayout2->setAlignment( Qt::AlignTop );
- SRect2 = new QLabel( "Shape:", ShapeGroup2 );
- ShapeGroupLayout2->addWidget( SRect2 );
- SCustom2 = new Autoforms( ShapeGroup2 );
- ShapeGroupLayout2->addWidget( SCustom2 );
- EditShape2 = new QToolButton( ShapeGroup2 );
- ShapeGroupLayout2->addWidget( EditShape2 );
- page_group_layout->addWidget( ShapeGroup2 );
-
- textFlowOptions2 = new QGroupBox( this );
- textFlowOptionsLayout2 = new QVBoxLayout( textFlowOptions2 );
- textFlowOptionsLayout2->setSpacing( 5 );
- textFlowOptionsLayout2->setMargin( 5 );
- textFlowOptionsLayout2->setAlignment( Qt::AlignTop );
- textFlowDisabled2 = new QToolButton( textFlowOptions2 );
- textFlowDisabled2->setCheckable( true );
- textFlowDisabled2->setAutoExclusive(true);
- textFlowDisabled2->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
- textFlowDisabled2->setText( "Disabled" );
- textFlowDisabled2->setIcon(QIcon(loadIcon("flow-none.png")));
- textFlowOptionsLayout2->addWidget( textFlowDisabled2 );
- textFlowUsesFrameShape2 = new QToolButton( textFlowOptions2 );
- textFlowUsesFrameShape2->setCheckable( true );
- textFlowUsesFrameShape2->setAutoExclusive(true);
- textFlowUsesFrameShape2->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
- textFlowUsesFrameShape2->setText( "Use &Frame Shape" );
- textFlowUsesFrameShape2->setIcon(QIcon(loadIcon("flow-frame.png")));
- textFlowOptionsLayout2->addWidget( textFlowUsesFrameShape2 );
- textFlowUsesBoundingBox2 = new QToolButton( textFlowOptions2 );
- textFlowUsesBoundingBox2->setCheckable( true );
- textFlowUsesBoundingBox2->setAutoExclusive(true);
- textFlowUsesBoundingBox2->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
- textFlowUsesBoundingBox2->setText( "Use &Bounding Box" );
- textFlowUsesBoundingBox2->setIcon(QIcon(loadIcon("flow-bounding.png")));
- textFlowOptionsLayout2->addWidget( textFlowUsesBoundingBox2 );
- textFlowUsesContourLine2 = new QToolButton( textFlowOptions2 );
- textFlowUsesContourLine2->setCheckable( true );
- textFlowUsesContourLine2->setAutoExclusive(true);
- textFlowUsesContourLine2->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
- textFlowUsesContourLine2->setText( "&Use Contour Line" );
- textFlowUsesContourLine2->setIcon(QIcon(loadIcon("flow-contour.png")));
- textFlowOptionsLayout2->addWidget( textFlowUsesContourLine2 );
- textFlowUsesImageClipping2 = new QToolButton( textFlowOptions2 );
- textFlowUsesImageClipping2->setCheckable( true );
- textFlowUsesImageClipping2->setAutoExclusive(true);
- textFlowUsesImageClipping2->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
- textFlowUsesImageClipping2->setText( "Use Image Clip Path" );
- textFlowUsesImageClipping2->setIcon(QIcon(loadIcon("flow-contour.png")));
- textFlowOptionsLayout2->addWidget( textFlowUsesImageClipping2 );
- page_group_layout->addWidget( textFlowOptions2 );
- textFlowDisabled2->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
- textFlowUsesFrameShape2->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
- textFlowUsesBoundingBox2->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
- textFlowUsesContourLine2->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
- textFlowUsesImageClipping2->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
- textFlowOptionsB2 = new QButtonGroup( this );
- textFlowOptionsB2->addButton(textFlowDisabled2, 0);
- textFlowOptionsB2->addButton(textFlowUsesFrameShape2, 1);
- textFlowOptionsB2->addButton(textFlowUsesBoundingBox2, 2);
- textFlowOptionsB2->addButton(textFlowUsesContourLine2, 3);
- textFlowOptionsB2->addButton(textFlowUsesImageClipping2, 4);
-
- TpalGroup = new Tpalette(this);
- TpalGroup->hideSelectionButtons();
- page_group_layout->addWidget( TpalGroup );
+ setupUi(this);
+
+ textFlowDisabled->setIcon(QIcon(loadIcon("flow-none.png")));
+ textFlowUsesFrameShape->setIcon(QIcon(loadIcon("flow-frame.png")));
+ textFlowUsesBoundingBox->setIcon(QIcon(loadIcon("flow-bounding.png")));
+ textFlowUsesContourLine->setIcon(QIcon(loadIcon("flow-contour.png")));
+ textFlowUsesImageClipping->setIcon(QIcon(loadIcon("flow-contour.png")));
+
+ textFlowDisabled->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+ textFlowUsesFrameShape->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+ textFlowUsesBoundingBox->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+ textFlowUsesContourLine->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+ textFlowUsesImageClipping->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+
+ transPalWidget->hideSelectionButtons();
languageChange();
- connect(textFlowOptionsB2, SIGNAL(buttonClicked(int)), this, SLOT(handleTextFlow()));
-
- connect(SCustom2 , SIGNAL(FormSel(int, int, qreal *)), this, SLOT(handleNewShape(int, int, qreal *)));
- connect(EditShape2, SIGNAL(clicked()) , this, SLOT(handleShapeEdit()));
- connect(TpalGroup , SIGNAL(editGradient()) , this, SLOT(handleGradientEdit()));
- connect(TpalGroup , SIGNAL(NewSpecial(double, double, double, double, double, double, double, double, double, double)), this, SLOT(handleSpecialGradient(double, double, double, double, double, double, double, double )));
+ connect(textFlowBtnGroup, SIGNAL(buttonClicked(int)), this, SLOT(handleTextFlow()));
+
+ connect(customShape , SIGNAL(FormSel(int, int, qreal *)), this, SLOT(handleNewShape(int, int, qreal *)));
+ connect(editShape, SIGNAL(clicked()) , this, SLOT(handleShapeEdit()));
+ connect(transPalWidget , SIGNAL(editGradient()) , this, SLOT(handleGradientEdit()));
+ connect(transPalWidget , SIGNAL(NewSpecial(double, double, double, double, double, double, double, double, double, double)), this, SLOT(handleSpecialGradient(double, double, double, double, double, double, double, double )));
}
PageItem* PropertiesPalette_Group::currentItemFromSelection()
@@ -187,7 +129,7 @@
{
m_ScMW = mw;
- connect(this->TpalGroup, SIGNAL(gradientChanged()), m_ScMW, SLOT(updtGradMaskGroup()));
+ connect(this->transPalWidget, SIGNAL(gradientChanged()), m_ScMW, SLOT(updtGradMaskGroup()));
connect(this , SIGNAL(DocChanged()) , m_ScMW, SLOT(slotDocCh()));
}
@@ -202,11 +144,11 @@
disconnect(m_doc , SIGNAL(docChanged()) , this, SLOT(handleSelectionChanged()));
}
- disconnect(this->TpalGroup, SIGNAL(NewTrans(double)), 0, 0);
- disconnect(this->TpalGroup, SIGNAL(NewBlend(int)), 0, 0);
- disconnect(this->TpalGroup, SIGNAL(NewGradient(int)), 0, 0);
- disconnect(this->TpalGroup, SIGNAL(NewPattern(QString)), 0, 0);
- disconnect(this->TpalGroup, SIGNAL(NewPatternProps(double, double, double, double, double, double, double, bool, bool)), 0, 0);
+ disconnect(this->transPalWidget, SIGNAL(NewTrans(double)), 0, 0);
+ disconnect(this->transPalWidget, SIGNAL(NewBlend(int)), 0, 0);
+ disconnect(this->transPalWidget, SIGNAL(NewGradient(int)), 0, 0);
+ disconnect(this->transPalWidget, SIGNAL(NewPattern(QString)), 0, 0);
+ disconnect(this->transPalWidget, SIGNAL(NewPatternProps(double, double, double, double, double, double, double, bool, bool)), 0, 0);
m_doc = d;
m_item = NULL;
@@ -216,17 +158,17 @@
double maxXYWHVal = 16777215 * m_unitRatio;
double minXYVal = -16777215 * m_unitRatio;
- TpalGroup->setDocument(m_doc);
- TpalGroup->setCurrentItem(NULL);
+ transPalWidget->setDocument(m_doc);
+ transPalWidget->setCurrentItem(NULL);
m_haveDoc = true;
m_haveItem = false;
- connect(this->TpalGroup, SIGNAL(NewTrans(double)) , this, SLOT(handleGroupTransparency(double)));
- connect(this->TpalGroup, SIGNAL(NewBlend(int)) , this, SLOT(handleGroupBlending(int)));
- connect(this->TpalGroup, SIGNAL(NewGradient(int)) , this, SLOT(handleGroupGradMask(int)));
- connect(this->TpalGroup, SIGNAL(NewPattern(QString)), this, SLOT(handleGroupPatternMask(QString)));
- connect(this->TpalGroup, SIGNAL(NewPatternProps(double, double, double, double, double, double, double, bool, bool)), this, SLOT(handleGroupPatternMaskProps(double, double, double, double, double, double, double, bool, bool)));
+ connect(this->transPalWidget, SIGNAL(NewTrans(double)) , this, SLOT(handleGroupTransparency(double)));
+ connect(this->transPalWidget, SIGNAL(NewBlend(int)) , this, SLOT(handleGroupBlending(int)));
+ connect(this->transPalWidget, SIGNAL(NewGradient(int)) , this, SLOT(handleGroupGradMask(int)));
+ connect(this->transPalWidget, SIGNAL(NewPattern(QString)), this, SLOT(handleGroupPatternMask(QString)));
+ connect(this->transPalWidget, SIGNAL(NewPatternProps(double, double, double, double, double, double, double, bool, bool)), this, SLOT(handleGroupPatternMaskProps(double, double, double, double, double, double, double, bool, bool)));
connect(m_doc->m_Selection, SIGNAL(selectionChanged()), this, SLOT(handleSelectionChanged()));
connect(m_doc , SIGNAL(docChanged()) , this, SLOT(handleSelectionChanged()));
@@ -245,8 +187,8 @@
m_doc = NULL;
m_item = NULL;
- TpalGroup->setDocument(NULL);
- TpalGroup->setCurrentItem(NULL);
+ transPalWidget->setDocument(NULL);
+ transPalWidget->setCurrentItem(NULL);
setEnabled(false);
}
@@ -255,7 +197,7 @@
{
m_haveItem = false;
m_item = NULL;
- TpalGroup->setCurrentItem(NULL);
+ transPalWidget->setCurrentItem(NULL);
handleSelectionChanged();
}
@@ -336,27 +278,27 @@
m_item->patternTransform(patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY);
m_item->patternFlip(mirrorX, mirrorY);
- TpalGroup->setCurrentItem(m_item);
+ transPalWidget->setCurrentItem(m_item);
if ((m_item->isGroupControl) || ((m_item->Groups.count() != 0) && (!m_item->isSingleSel)))
{
setEnabled(true);
if (m_item->FrameType == 0)
- SCustom2->setIcon(SCustom2->getIconPixmap(0));
+ customShape->setIcon(customShape->getIconPixmap(0));
if (m_item->FrameType == 1)
- SCustom2->setIcon(SCustom2->getIconPixmap(1));
+ customShape->setIcon(customShape->getIconPixmap(1));
if (m_item->FrameType > 3)
- SCustom2->setIcon(SCustom2->getIconPixmap(m_item->FrameType-2));
- TpalGroup->updateFromItem();
- TpalGroup->setActPattern(m_item->patternMask(), patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY, mirrorX, mirrorY);
- SCustom2->setEnabled(true);
- EditShape2->setEnabled(true);
- SRect2->setEnabled(true);
- textFlowDisabled2->setEnabled(true);
- textFlowUsesFrameShape2->setEnabled(true);
- textFlowUsesBoundingBox2->setEnabled(true);
- textFlowUsesContourLine2->setEnabled(true);
- textFlowUsesImageClipping2->setEnabled(false);
+ customShape->setIcon(customShape->getIconPixmap(m_item->FrameType-2));
+ transPalWidget->updateFromItem();
+ transPalWidget->setActPattern(m_item->patternMask(), patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY, mirrorX, mirrorY);
+ customShape->setEnabled(true);
+ editShape->setEnabled(true);
+ shapeGroup->setEnabled(true);
+ textFlowDisabled->setEnabled(true);
+ textFlowUsesFrameShape->setEnabled(true);
+ textFlowUsesBoundingBox->setEnabled(true);
+ textFlowUsesContourLine->setEnabled(true);
+ textFlowUsesImageClipping->setEnabled(false);
}
else
{
@@ -373,21 +315,21 @@
{
setEnabled(true);
if (m_item->FrameType == 0)
- SCustom2->setIcon(SCustom2->getIconPixmap(0));
+ customShape->setIcon(customShape->getIconPixmap(0));
if (m_item->FrameType == 1)
- SCustom2->setIcon(SCustom2->getIconPixmap(1));
+ customShape->setIcon(customShape->getIconPixmap(1));
if (m_item->FrameType > 3)
- SCustom2->setIcon(SCustom2->getIconPixmap(m_item->FrameType-2));
- TpalGroup->updateFromItem();
- TpalGroup->setActPattern(m_item->patternMask(), patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY, mirrorX, mirrorY);
- SCustom2->setEnabled(true);
- EditShape2->setEnabled(true);
- SRect2->setEnabled(true);
- textFlowDisabled2->setEnabled(true);
- textFlowUsesFrameShape2->setEnabled(true);
- textFlowUsesBoundingBox2->setEnabled(true);
- textFlowUsesContourLine2->setEnabled(true);
- textFlowUsesImageClipping2->setEnabled(false);
+ customShape->setIcon(customShape->getIconPixmap(m_item->FrameType-2));
+ transPalWidget->updateFromItem();
+ transPalWidget->setActPattern(m_item->patternMask(), patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY, mirrorX, mirrorY);
+ customShape->setEnabled(true);
+ editShape->setEnabled(true);
+ shapeGroup->setEnabled(true);
+ textFlowDisabled->setEnabled(true);
+ textFlowUsesFrameShape->setEnabled(true);
+ textFlowUsesBoundingBox->setEnabled(true);
+ textFlowUsesContourLine->setEnabled(true);
+ textFlowUsesImageClipping->setEnabled(false);
}
}
@@ -398,34 +340,34 @@
if (m_item->isGroupControl)
{
if (mode == PageItem::TextFlowDisabled)
- textFlowDisabled2->setChecked(true);
+ textFlowDisabled->setChecked(true);
else if (mode == PageItem::TextFlowUsesFrameShape)
- textFlowUsesFrameShape2->setChecked(true);
+ textFlowUsesFrameShape->setChecked(true);
else if (mode == PageItem::TextFlowUsesBoundingBox)
- textFlowUsesBoundingBox2->setChecked(true);
+ textFlowUsesBoundingBox->setChecked(true);
else if (mode == PageItem::TextFlowUsesContourLine)
- textFlowUsesContourLine2->setChecked(true);
+ textFlowUsesContourLine->setChecked(true);
else if (mode == PageItem::TextFlowUsesImageClipping)
- textFlowUsesImageClipping2->setChecked(true);
+ textFlowUsesImageClipping->setChecked(true);
if ((m_item->asImageFrame()) && (m_item->imageClip.size() != 0))
- textFlowUsesImageClipping2->setEnabled(true);
+ textFlowUsesImageClipping->setEnabled(true);
else
- textFlowUsesImageClipping2->setEnabled(false);
+ textFlowUsesImageClipping->setEnabled(false);
}
}
const VGradient PropertiesPalette_Group::getMaskGradientGroup()
{
- return TpalGroup->gradEdit->gradient();
+ return transPalWidget->gradEdit->gradient();
}
void PropertiesPalette_Group::updateColorList()
{
if (!m_haveDoc || !m_ScMW || m_ScMW->scriptIsRunning())
return;
- TpalGroup->setColors(m_doc->PageColors);
- TpalGroup->setPatterns(&m_doc->docPatterns);
- TpalGroup->setGradients(&m_doc->docGradients);
+ transPalWidget->setColors(m_doc->PageColors);
+ transPalWidget->setPatterns(&m_doc->docPatterns);
+ transPalWidget->setGradients(&m_doc->docGradients);
}
void PropertiesPalette_Group::updateColorSpecialGradient()
@@ -450,7 +392,7 @@
break;
default:
if (currItem->isGroupControl)
- TpalGroup->setSpecialGradient(currItem->GrMaskStartX * ratio, currItem->GrMaskStartY * ratio, currItem->GrMaskEndX * ratio, currItem->GrMaskEndY * ratio, currItem->GrMaskFocalX * ratio, currItem->GrMaskFocalY * ratio, currItem->GrMaskScale, currItem->GrMaskSkew);
+ transPalWidget->setSpecialGradient(currItem->GrMaskStartX * ratio, currItem->GrMaskStartY * ratio, currItem->GrMaskEndX * ratio, currItem->GrMaskEndY * ratio, currItem->GrMaskFocalX * ratio, currItem->GrMaskFocalY * ratio, currItem->GrMaskScale, currItem->GrMaskSkew);
}
}
}
@@ -535,15 +477,15 @@
PageItem::TextFlowMode mode = PageItem::TextFlowDisabled;
if (m_item->isGroupControl)
{
- if (textFlowDisabled2->isChecked())
+ if (textFlowDisabled->isChecked())
mode = PageItem::TextFlowDisabled;
- if (textFlowUsesFrameShape2->isChecked())
+ if (textFlowUsesFrameShape->isChecked())
mode = PageItem::TextFlowUsesFrameShape;
- if (textFlowUsesBoundingBox2->isChecked())
+ if (textFlowUsesBoundingBox->isChecked())
mode = PageItem::TextFlowUsesBoundingBox;
- if (textFlowUsesContourLine2->isChecked())
+ if (textFlowUsesContourLine->isChecked())
mode = PageItem::TextFlowUsesContourLine;
- if (textFlowUsesImageClipping2->isChecked())
+ if (textFlowUsesImageClipping->isChecked())
mode = PageItem::TextFlowUsesImageClipping;
}
m_item->setTextFlowMode(mode);
@@ -559,7 +501,7 @@
if ((m_haveDoc) && (m_haveItem))
{
m_ScMW->view->editStrokeGradient = 2;
- if (TpalGroup->gradEditButton->isChecked())
+ if (transPalWidget->gradEditButton->isChecked())
m_ScMW->view->requestMode(modeEditGradientVectors);
else
m_ScMW->view->requestMode(modeNormal);
@@ -652,21 +594,21 @@
void PropertiesPalette_Group::languageChange()
{
- EditShape2->setText( tr("&Edit..."));
- SRect2->setText( tr("Shape:"));
-
- textFlowOptions2->setTitle( tr("Text &Flow Around Frame"));
- textFlowDisabled2->setText( tr("Disabled"));
- textFlowUsesFrameShape2->setText( tr("Use Frame &Shape"));
- textFlowUsesBoundingBox2->setText( tr("Use &Bounding Box"));
- textFlowUsesContourLine2->setText( tr("&Use Contour Line"));
- textFlowUsesImageClipping2->setText( tr("Use Image Clip Path"));
-
- textFlowDisabled2->setToolTip( tr("Disable text flow from lower frames around object"));
- textFlowUsesFrameShape2->setToolTip( tr("Use the frame shape for text flow of text frames below the object."));
- textFlowUsesBoundingBox2->setToolTip( "<qt>" + tr("Use the bounding box, which is always rectangular, instead of the frame's shape for text flow of text frames below the object. ") + "</qt>" );
- textFlowUsesContourLine2->setToolTip( "<qt>" + tr("When chosen, the contour line can be edited with the Edit Shape Tool on the palette further above. When edited via the shape palette, this becomes a second separate line originally based on the frame's shape for text flow of text frames below the object.") + "</qt>" );
- textFlowUsesImageClipping2->setToolTip( "<qt>" + tr("Use the clipping path of the image") + "</qt>" );
+ editShape->setText( tr("&Edit..."));
+ shapeGroup->setTitle( tr("Shape"));
+
+ textFlowGroup->setTitle( tr("Text &Flow Around Frame"));
+ textFlowDisabled->setText( tr("Disabled"));
+ textFlowUsesFrameShape->setText( tr("Use Frame &Shape"));
+ textFlowUsesBoundingBox->setText( tr("Use &Bounding Box"));
+ textFlowUsesContourLine->setText( tr("&Use Contour Line"));
+ textFlowUsesImageClipping->setText( tr("Use Image Clip Path"));
+
+ textFlowDisabled->setToolTip( tr("Disable text flow from lower frames around object"));
+ textFlowUsesFrameShape->setToolTip( tr("Use the frame shape for text flow of text frames below the object."));
+ textFlowUsesBoundingBox->setToolTip( "<qt>" + tr("Use the bounding box, which is always rectangular, instead of the frame's shape for text flow of text frames below the object. ") + "</qt>" );
+ textFlowUsesContourLine->setToolTip( "<qt>" + tr("When chosen, the contour line can be edited with the Edit Shape Tool on the palette further above. When edited via the shape palette, this becomes a second separate line originally based on the frame's shape for text flow of text frames below the object.") + "</qt>" );
+ textFlowUsesImageClipping->setToolTip( "<qt>" + tr("Use the clipping path of the image") + "</qt>" );
}
void PropertiesPalette_Group::unitChange()
@@ -678,7 +620,7 @@
m_unitRatio = m_doc->unitRatio();
m_unitIndex = m_doc->unitIndex();
- TpalGroup->blockSignals(true);
- TpalGroup->unitChange(oldRatio, m_unitRatio, m_doc->unitIndex());
- TpalGroup->blockSignals(false);
+ transPalWidget->blockSignals(true);
+ transPalWidget->unitChange(oldRatio, m_unitRatio, m_doc->unitIndex());
+ transPalWidget->blockSignals(false);
}
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_group.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16077&path=/branches/ScribusOIF/scribus/ui/propertiespalette_group.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_group.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_group.h Tue Dec 7 22:22:18 2010
@@ -7,50 +7,17 @@
#ifndef PROPERTIESPALETTE_GROUP_H
#define PROPERTIESPALETTE_GROUP_H
-#include <QListWidgetItem>
-#include <QLineEdit>
-
-class QButtonGroup;
-class QCheckBox;
-class QCloseEvent;
-class QComboBox;
-class QEvent;
-class QEvent;
-class QFocusEvent;
-class QFrame;
-class QGridLayout;
-class QGroupBox;
-class QHBoxLayout;
-class QLabel;
-class QMenu;
-class QPushButton;
-class QRadioButton;
-class QSpinBox;
-class QStackedWidget;
-class QToolBox;
-class QVBoxLayout;
-class QWidget;
-
+#include "ui_propertiespalette_groupbase.h"
#include "scribusapi.h"
-#include "scrpalettebase.h"
-#include "scrspinbox.h"
#include "pageitem.h"
-#include "sclistboxpixmap.h"
#include "scguardedptr.h"
-#include "sctreewidget.h"
-#include "ui/shadebutton.h"
-
-class Autoforms;
-class ScComboBox;
class ScribusDoc;
class ScribusMainWindow;
class Selection;
-class Tpalette;
-class UserActionSniffer;
-class SCRIBUS_API PropertiesPalette_Group : public QWidget
+class SCRIBUS_API PropertiesPalette_Group : public QWidget, Ui::PropertiesPalette_GroupBase
{
Q_OBJECT
@@ -66,8 +33,6 @@
void updateColorList();
void updateColorSpecialGradient();
-
- Tpalette* TpalGroup;
protected:
@@ -116,29 +81,6 @@
void handleSpecialGradient(double, double, double, double, double, double, double, double );
void handleGradientEdit();
-protected:
-
- QHBoxLayout* ShapeGroupLayout2;
-
- QVBoxLayout* page_group_layout;
- QVBoxLayout* textFlowOptionsLayout2;
-
- QButtonGroup* textFlowOptionsB2;
-
- QGroupBox* ShapeGroup2;
- QGroupBox* textFlowOptions2;
-
- QLabel* SRect2;
-
- QToolButton* EditShape2;
- QToolButton* textFlowDisabled2;
- QToolButton* textFlowUsesFrameShape2;
- QToolButton* textFlowUsesBoundingBox2;
- QToolButton* textFlowUsesContourLine2;
- QToolButton* textFlowUsesImageClipping2;
-
- Autoforms* SCustom2;
-
signals:
void DocChanged();
void shapeChanged(int);
Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16077&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Tue Dec 7 22:22:18 2010
@@ -11709,6 +11709,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\ui_propertiespalette_groupbase.h"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\ui_propertiespalette_imagebase.h"
>
</File>
@@ -13039,6 +13043,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\propertiespalette_groupbase.ui"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\propertiespalette_imagebase.ui"
>
</File>
More information about the scribus-commit
mailing list