View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0010225 | Scribus | User Interface | public | 2011-08-28 11:31 | 2024-10-23 18:42 |
| Reporter | JLuc | Assigned To | nitramr | ||
| Priority | normal | Severity | minor | Reproducibility | always |
| Status | closed | Resolution | fixed | ||
| Platform | PC | OS | 7 | ||
| Product Version | 1.4.0svn | ||||
| Fixed in Version | 1.7.0.svn | ||||
| Summary | 0010225: PP : "Shape" pane content moves to "Group" pane for grouped object | ||||
| Description | When grouping object, the shape pane is grayed out in the Property Palette. However its functions can be accessed, but under the "Group" pane of the PP. Request is : "Shape" properties of a grouped object should be accessible under "Shape" pane of the PP. | ||||
| Steps To Reproduce | - group objects - goto PP - see grayed "Shape" pane - open "group" pane : "shape" pane is there ! | ||||
| Tags | discussion | ||||
| Patch | No | ||||
|
|
bug10225.diff (77,831 bytes)
Index: scribus/ui/propertiespalette_shapebase.ui
===================================================================
--- scribus/ui/propertiespalette_shapebase.ui (revision 17400)
+++ scribus/ui/propertiespalette_shapebase.ui (working copy)
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>280</width>
- <height>281</height>
+ <height>320</height>
</rect>
</property>
<property name="windowTitle">
@@ -332,15 +332,15 @@
</widget>
<customwidgets>
<customwidget>
+ <class>Autoforms</class>
+ <extends>QToolButton</extends>
+ <header>ui/autoform.h</header>
+ </customwidget>
+ <customwidget>
<class>ScrSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>ui/scrspinbox.h</header>
</customwidget>
- <customwidget>
- <class>Autoforms</class>
- <extends>QToolButton</extends>
- <header>ui/autoform.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
Index: scribus/ui/propertiespalette.cpp
===================================================================
--- scribus/ui/propertiespalette.cpp (revision 17400)
+++ scribus/ui/propertiespalette.cpp (working copy)
@@ -295,7 +295,6 @@
if (!m_ScMW || m_ScMW->scriptIsRunning() || !m_haveItem)
return;
shapePal->displayTextFlowMode(mode);
- groupPal->displayTextFlowMode(mode);
}
PageItem* PropertiesPalette::currentItemFromSelection()
@@ -304,7 +303,7 @@
if (m_doc)
{
- currentItem = m_doc->m_Selection->itemAt(0);
+ currentItem = m_doc->m_Selection->itemAt(0);
/* if (m_doc->m_Selection->count() > 1)
{
int lowestItem = 999999;
@@ -385,8 +384,8 @@
if ((m_item->isGroup()) && (!m_item->isSingleSel))
{
TabStack->setItemEnabled(idXYZItem, true);
- TabStack->setItemEnabled(idShapeItem, false);
- TabStack->setItemEnabled(idGroupItem, true);
+ TabStack->setItemEnabled(idShapeItem, true);
+ TabStack->setItemEnabled(idGroupItem, true);
TabStack->setItemEnabled(idLineItem, false);
TabStack->setItemEnabled(idColorsItem, false);
TabStack->setItemEnabled(idTextItem, false);
@@ -860,7 +859,6 @@
xyzPal->languageChange();
shapePal->languageChange();
- groupPal->languageChange();
imagePal->languageChange();
linePal->languageChange();
textPal->languageChange();
@@ -933,4 +931,4 @@
VGradient vg(Tpal->gradEdit->gradient());
m_doc->itemSelection_SetMaskGradient(vg);
}
-}
\ No newline at end of file
+}
Index: scribus/ui/propertiespalette_group.h
===================================================================
--- scribus/ui/propertiespalette_group.h (revision 17400)
+++ scribus/ui/propertiespalette_group.h (working copy)
@@ -27,8 +27,6 @@
virtual void changeEvent(QEvent *e);
- void displayTextFlowMode(PageItem::TextFlowMode mode);
-
void updateColorList();
void updateColorSpecialGradient();
@@ -60,7 +58,6 @@
void handleSelectionChanged();
void handleUpdateRequest(int);
- void languageChange();
void unitChange();
private slots:
@@ -72,13 +69,6 @@
void handleGroupPatternMask(QString pattern);
void handleGroupPatternMaskProps(double, double, double, double, double, double, double, bool, bool);
- void handleTextFlow();
- void handleNewShape(int f, int c, qreal *vals);
-
- void handleFillRule();
- void handleShapeEdit();
- void handleShapeEditEnded();
-
void handleSpecialGradient(double, double, double, double, double, double, double, double );
void handleGradientEdit();
Index: scribus/ui/propertiespalette_tablebase.ui
===================================================================
--- scribus/ui/propertiespalette_tablebase.ui (revision 17400)
+++ scribus/ui/propertiespalette_tablebase.ui (working copy)
@@ -1,506 +1,506 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PropertiesPalette_TableBase</class>
- <widget class="QWidget" name="PropertiesPalette_TableBase">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>343</width>
- <height>464</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Styles</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="labelTable">
- <property name="text">
- <string>Table</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="TableStyleComboBox" name="tableStyleCombo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QToolButton" name="buttonClearTableStyle">
- <property name="text">
- <string/>
- </property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="labelCells">
- <property name="text">
- <string>Cells</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="CellStyleComboBox" name="cellStyleCombo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QToolButton" name="buttonClearCellStyle">
- <property name="text">
- <string/>
- </property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="bordersLayout">
- <property name="title">
- <string>Borders</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="bordesLayout1">
- <item>
- <layout class="QVBoxLayout" name="bordersLayout1_1">
- <item>
- <widget class="QPushButton" name="addBorderLineButton">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="removeBorderLineButton">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="buttonSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QListWidget" name="borderLineList">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>50</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <widget class="TableSideSelector" name="sideSelector">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>80</width>
- <height>80</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="bordersLayout2" stretch="0,0">
- <item>
- <layout class="QFormLayout" name="bordersLayout2_1">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="borderLineWidthLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Width:</string>
- </property>
- <property name="buddy">
- <cstring>borderLineWidth</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="borderLineColorLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Color:</string>
- </property>
- <property name="buddy">
- <cstring>borderLineColor</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ColorCombo" name="borderLineColor">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="ScrSpinBox" name="borderLineWidth">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QFormLayout" name="bordersLayout2_2">
- <item row="0" column="0">
- <widget class="QLabel" name="borderLineStyleLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Type:</string>
- </property>
- <property name="buddy">
- <cstring>borderLineStyle</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="LineCombo" name="borderLineStyle">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="borderLineShadeLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Shade:</string>
- </property>
- <property name="buddy">
- <cstring>borderLineShade</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="borderLineShade">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>100</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="fillLayout">
- <property name="title">
- <string>Fill</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QHBoxLayout" name="fillLayout1" stretch="0,0">
- <item>
- <layout class="QFormLayout" name="fillLayout1_1">
- <item row="0" column="0">
- <widget class="QLabel" name="fillColorLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Color:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="ColorCombo" name="fillColor">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QFormLayout" name="fillLayout1_2">
- <item row="0" column="0">
- <widget class="QLabel" name="fillShadeLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Shade:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="fillShade">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="value">
- <number>100</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="bottomSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>1000</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>TableSideSelector</class>
- <extends>QFrame</extends>
- <header>ui/tablesideselector.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>LineCombo</class>
- <extends>QComboBox</extends>
- <header>ui/linecombo.h</header>
- </customwidget>
- <customwidget>
- <class>ColorCombo</class>
- <extends>QComboBox</extends>
- <header>ui/colorcombo.h</header>
- </customwidget>
- <customwidget>
- <class>ScrSpinBox</class>
- <extends>QDoubleSpinBox</extends>
- <header>ui/scrspinbox.h</header>
- </customwidget>
- <customwidget>
- <class>TableStyleComboBox</class>
- <extends>QComboBox</extends>
- <header>ui/spalette.h</header>
- </customwidget>
- <customwidget>
- <class>CellStyleComboBox</class>
- <extends>QComboBox</extends>
- <header>ui/spalette.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PropertiesPalette_TableBase</class>
+ <widget class="QWidget" name="PropertiesPalette_TableBase">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>343</width>
+ <height>464</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Styles</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="labelTable">
+ <property name="text">
+ <string>Table</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="TableStyleComboBox" name="tableStyleCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QToolButton" name="buttonClearTableStyle">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="labelCells">
+ <property name="text">
+ <string>Cells</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="CellStyleComboBox" name="cellStyleCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QToolButton" name="buttonClearCellStyle">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="bordersLayout">
+ <property name="title">
+ <string>Borders</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="bordesLayout1">
+ <item>
+ <layout class="QVBoxLayout" name="bordersLayout1_1">
+ <item>
+ <widget class="QPushButton" name="addBorderLineButton">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="removeBorderLineButton">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="buttonSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QListWidget" name="borderLineList">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>50</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="TableSideSelector" name="sideSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>80</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="bordersLayout2" stretch="0,0">
+ <item>
+ <layout class="QFormLayout" name="bordersLayout2_1">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="borderLineWidthLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Width:</string>
+ </property>
+ <property name="buddy">
+ <cstring>borderLineWidth</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="borderLineColorLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Color:</string>
+ </property>
+ <property name="buddy">
+ <cstring>borderLineColor</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ColorCombo" name="borderLineColor">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="ScrSpinBox" name="borderLineWidth">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="bordersLayout2_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="borderLineStyleLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Type:</string>
+ </property>
+ <property name="buddy">
+ <cstring>borderLineStyle</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="LineCombo" name="borderLineStyle">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="borderLineShadeLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Shade:</string>
+ </property>
+ <property name="buddy">
+ <cstring>borderLineShade</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="borderLineShade">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="fillLayout">
+ <property name="title">
+ <string>Fill</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QHBoxLayout" name="fillLayout1" stretch="0,0">
+ <item>
+ <layout class="QFormLayout" name="fillLayout1_1">
+ <item row="0" column="0">
+ <widget class="QLabel" name="fillColorLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="ColorCombo" name="fillColor">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="fillLayout1_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="fillShadeLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Shade:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="fillShade">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="bottomSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>1000</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>TableSideSelector</class>
+ <extends>QFrame</extends>
+ <header>ui/tablesideselector.h</header>
+ <container>1</container>
+ </customwidget>
+ <customwidget>
+ <class>LineCombo</class>
+ <extends>QComboBox</extends>
+ <header>ui/linecombo.h</header>
+ </customwidget>
+ <customwidget>
+ <class>ColorCombo</class>
+ <extends>QComboBox</extends>
+ <header>ui/colorcombo.h</header>
+ </customwidget>
+ <customwidget>
+ <class>ScrSpinBox</class>
+ <extends>QDoubleSpinBox</extends>
+ <header>ui/scrspinbox.h</header>
+ </customwidget>
+ <customwidget>
+ <class>TableStyleComboBox</class>
+ <extends>QComboBox</extends>
+ <header>ui/spalette.h</header>
+ </customwidget>
+ <customwidget>
+ <class>CellStyleComboBox</class>
+ <extends>QComboBox</extends>
+ <header>ui/spalette.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
Index: scribus/ui/propertiespalette_xyzbase.ui
===================================================================
--- scribus/ui/propertiespalette_xyzbase.ui (revision 17400)
+++ scribus/ui/propertiespalette_xyzbase.ui (working copy)
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PropertiesPalette_XYZBase</class>
- <widget class="QWidget" name="PropertiesPalette_XYZBase">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>280</width>
- <height>325</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QGroupBox" name="nameGroup">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Name</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <property name="spacing">
- <number>2</number>
- </property>
- <property name="margin">
- <number>2</number>
- </property>
- <item>
- <widget class="NameWidget" name="nameEdit">
- <property name="focusPolicy">
- <enum>Qt::ClickFocus</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="geoGroup">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Geometry</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="margin">
- <number>2</number>
- </property>
- <item>
- <layout class="QGridLayout" name="geoGroupLayout">
- <property name="margin">
- <number>5</number>
- </property>
- <property name="spacing">
- <number>4</number>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="xposLabel">
- <property name="text">
- <string>&X-Pos:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="ScrSpinBox" name="xposSpin">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="widthLabel">
- <property name="text">
- <string>&Width:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="yposLabel">
- <property name="text">
- <string>&Y-Pos:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ScrSpinBox" name="yposSpin"/>
- </item>
- <item row="2" column="1">
- <widget class="ScrSpinBox" name="widthSpin"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="heightLabel">
- <property name="text">
- <string>&Height:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="ScrSpinBox" name="heightSpin"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="rotationLabel">
- <property name="text">
- <string>&Rotation:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="ScrSpinBox" name="rotationSpin">
- <property name="wrapping">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="basepointLabel">
- <property name="text">
- <string>Basepoint:</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="BasePointWidget" name="basePointWidget" native="true"/>
- </item>
- <item row="2" column="2" rowspan="2">
- <widget class="LinkButton" name="keepFrameWHRatioButton">
- <property name="maximumSize">
- <size>
- <width>15</width>
- <height>32767</height>
- </size>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QGroupBox" name="levelGroup">
- <property name="title">
- <string>Level</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <property name="margin">
- <number>5</number>
- </property>
- <property name="spacing">
- <number>4</number>
- </property>
- <item row="0" column="0">
- <widget class="QToolButton" name="levelUp">
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QToolButton" name="levelDown">
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QToolButton" name="levelTop">
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QToolButton" name="levelBottom">
- <property name="maximumSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="2" rowspan="2">
- <widget class="QLabel" name="levelLabel">
- <property name="text">
- <string>0</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <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>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QToolButton" name="doGroup">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QToolButton" name="doUnGroup">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QToolButton" name="flipH">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QToolButton" name="flipV">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QToolButton" name="doLock">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QToolButton" name="noPrint">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QToolButton" name="noResize">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>NameWidget</class>
- <extends>QLineEdit</extends>
- <header>ui/propertiespalette_utils.h</header>
- </customwidget>
- <customwidget>
- <class>ScrSpinBox</class>
- <extends>QDoubleSpinBox</extends>
- <header>ui/scrspinbox.h</header>
- </customwidget>
- <customwidget>
- <class>BasePointWidget</class>
- <extends>QWidget</extends>
- <header>ui/basepointwidget.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>LinkButton</class>
- <extends>QToolButton</extends>
- <header>ui/linkbutton.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PropertiesPalette_XYZBase</class>
+ <widget class="QWidget" name="PropertiesPalette_XYZBase">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>280</width>
+ <height>325</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>5</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="nameGroup">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Name</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>2</number>
+ </property>
+ <property name="margin">
+ <number>2</number>
+ </property>
+ <item>
+ <widget class="NameWidget" name="nameEdit">
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="geoGroup">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Geometry</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="margin">
+ <number>2</number>
+ </property>
+ <item>
+ <layout class="QGridLayout" name="geoGroupLayout">
+ <property name="margin">
+ <number>5</number>
+ </property>
+ <property name="spacing">
+ <number>4</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="xposLabel">
+ <property name="text">
+ <string>&X-Pos:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="ScrSpinBox" name="xposSpin">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="widthLabel">
+ <property name="text">
+ <string>&Width:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="yposLabel">
+ <property name="text">
+ <string>&Y-Pos:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="yposSpin"/>
+ </item>
+ <item row="2" column="1">
+ <widget class="ScrSpinBox" name="widthSpin"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="heightLabel">
+ <property name="text">
+ <string>&Height:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="ScrSpinBox" name="heightSpin"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="rotationLabel">
+ <property name="text">
+ <string>&Rotation:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="ScrSpinBox" name="rotationSpin">
+ <property name="wrapping">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="basepointLabel">
+ <property name="text">
+ <string>Basepoint:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="BasePointWidget" name="basePointWidget" native="true"/>
+ </item>
+ <item row="2" column="2" rowspan="2">
+ <widget class="LinkButton" name="keepFrameWHRatioButton">
+ <property name="maximumSize">
+ <size>
+ <width>15</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QGroupBox" name="levelGroup">
+ <property name="title">
+ <string>Level</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="margin">
+ <number>5</number>
+ </property>
+ <property name="spacing">
+ <number>4</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QToolButton" name="levelUp">
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QToolButton" name="levelDown">
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QToolButton" name="levelTop">
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QToolButton" name="levelBottom">
+ <property name="maximumSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" rowspan="2">
+ <widget class="QLabel" name="levelLabel">
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <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>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QToolButton" name="doGroup">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QToolButton" name="doUnGroup">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QToolButton" name="flipH">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QToolButton" name="flipV">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QToolButton" name="doLock">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QToolButton" name="noPrint">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QToolButton" name="noResize">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>NameWidget</class>
+ <extends>QLineEdit</extends>
+ <header>ui/propertiespalette_utils.h</header>
+ </customwidget>
+ <customwidget>
+ <class>ScrSpinBox</class>
+ <extends>QDoubleSpinBox</extends>
+ <header>ui/scrspinbox.h</header>
+ </customwidget>
+ <customwidget>
+ <class>BasePointWidget</class>
+ <extends>QWidget</extends>
+ <header>ui/basepointwidget.h</header>
+ <container>1</container>
+ </customwidget>
+ <customwidget>
+ <class>LinkButton</class>
+ <extends>QToolButton</extends>
+ <header>ui/linkbutton.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
Index: scribus/ui/propertiespalette_groupbase.ui
===================================================================
--- scribus/ui/propertiespalette_groupbase.ui (revision 17400)
+++ scribus/ui/propertiespalette_groupbase.ui (working copy)
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>212</width>
- <height>387</height>
+ <height>191</height>
</rect>
</property>
<property name="windowTitle">
@@ -21,268 +21,6 @@
<number>2</number>
</property>
<item>
- <widget class="QGroupBox" name="shapeGroup">
- <property name="title">
- <string>Shape</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="margin">
- <number>2</number>
- </property>
- <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="Autoforms" name="customShape">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="editShape">
- <property name="text">
- <string>&Edit...</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="textFlowGroup">
- <property name="title">
- <string>Text Flow Around Frame</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>2</number>
- </property>
- <property name="margin">
- <number>2</number>
- </property>
- <item>
- <widget class="QToolButton" name="textFlowDisabled">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Disabled</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="textFlowUsesFrameShape">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Use &Frame Shape</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="textFlowUsesBoundingBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Use &Bounding Box</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="textFlowUsesContourLine">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&Use Contour Line</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="textFlowUsesImageClipping">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Use Image Clip Path</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextBesideIcon</enum>
- </property>
- <attribute name="buttonGroup">
- <string>textFlowBtnGroup</string>
- </attribute>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="fillRuleGroup">
- <property name="title">
- <string>Fill Rule</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="margin">
- <number>2</number>
- </property>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QRadioButton" name="evenOdd">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Even-Odd</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="nonZero">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Non Zero</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<widget class="QGroupBox" name="transparencyGroup">
<property name="title">
<string>Transparency</string>
@@ -298,33 +36,18 @@
<number>2</number>
</property>
<item>
- <widget class="Tpalette" name="transPalWidget" native="true"/>
+ <widget class="Tpalette" name="transPalWidget" native="true">
+ <zorder>verticalSpacer</zorder>
+ <zorder>verticalSpacer</zorder>
+ </widget>
</item>
</layout>
</widget>
</item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<customwidgets>
<customwidget>
- <class>Autoforms</class>
- <extends>QToolButton</extends>
- <header>ui/autoform.h</header>
- </customwidget>
- <customwidget>
<class>Tpalette</class>
<extends>QWidget</extends>
<header>ui/transparencypalette.h</header>
Index: scribus/ui/propertiespalette_group.cpp
===================================================================
--- scribus/ui/propertiespalette_group.cpp (revision 17400)
+++ scribus/ui/propertiespalette_group.cpp (working copy)
@@ -79,28 +79,8 @@
setupUi(this);
setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
- 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(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(evenOdd , SIGNAL(clicked()) , this, SLOT(handleFillRule()) );
- connect(nonZero , SIGNAL(clicked()) , this, SLOT(handleFillRule()) );
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 )));
}
@@ -208,8 +188,8 @@
bool widgetEnabled = false;
if (m_haveItem && m_item)
{
- if ((m_item->isGroup()) && (!m_item->isSingleSel))
- widgetEnabled = true;
+ if ((m_item->isGroup()) && (!m_item->isSingleSel))
+ widgetEnabled = true;
}
setEnabled(widgetEnabled);
}
@@ -284,28 +264,13 @@
m_item->patternFlip(mirrorX, mirrorY);
transPalWidget->setCurrentItem(m_item);
- nonZero->setChecked(!m_item->fillRule);
- evenOdd->setChecked(m_item->fillRule);
if ((m_item->isGroup()) && (!m_item->isSingleSel))
{
setEnabled(true);
- if (m_item->FrameType == 0)
- customShape->setIcon(customShape->getIconPixmap(0));
- if (m_item->FrameType == 1)
- customShape->setIcon(customShape->getIconPixmap(1));
- if (m_item->FrameType > 3)
- 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
{
@@ -320,57 +285,19 @@
}
if (m_item->asSymbolFrame())
{
- setEnabled(true);
- if (m_item->FrameType == 0)
- customShape->setIcon(customShape->getIconPixmap(0));
- if (m_item->FrameType == 1)
- customShape->setIcon(customShape->getIconPixmap(1));
- if (m_item->FrameType > 3)
- customShape->setIcon(customShape->getIconPixmap(m_item->FrameType-2));
+ setEnabled(true);
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);
}
- displayTextFlowMode(m_item->textFlowMode());
}
-void PropertiesPalette_Group::displayTextFlowMode(PageItem::TextFlowMode mode)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning() || !m_haveItem)
- return;
- if (m_item->isGroup())
- {
- if (mode == PageItem::TextFlowDisabled)
- textFlowDisabled->setChecked(true);
- else if (mode == PageItem::TextFlowUsesFrameShape)
- textFlowUsesFrameShape->setChecked(true);
- else if (mode == PageItem::TextFlowUsesBoundingBox)
- textFlowUsesBoundingBox->setChecked(true);
- else if (mode == PageItem::TextFlowUsesContourLine)
- textFlowUsesContourLine->setChecked(true);
- else if (mode == PageItem::TextFlowUsesImageClipping)
- textFlowUsesImageClipping->setChecked(true);
- if ((m_item->asImageFrame()) && (m_item->imageClip.size() != 0))
- textFlowUsesImageClipping->setEnabled(true);
- else
- textFlowUsesImageClipping->setEnabled(false);
- }
-}
-
void PropertiesPalette_Group::updateColorList()
{
if (!m_haveDoc || !m_ScMW || m_ScMW->scriptIsRunning())
return;
transPalWidget->setColors(m_doc->PageColors);
transPalWidget->setPatterns(&m_doc->docPatterns);
- transPalWidget->setGradients(&m_doc->docGradients);
+ transPalWidget->setGradients(&m_doc->docGradients);
}
void PropertiesPalette_Group::updateColorSpecialGradient()
@@ -457,53 +384,6 @@
}
}
-void PropertiesPalette_Group::handleNewShape(int frameType, int count, qreal *points)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((m_haveDoc) && (m_haveItem))
- {
- if ((m_item->itemType() == PageItem::PolyLine) || (m_item->itemType() == PageItem::PathText))
- return;
-
- m_doc->item_setFrameShape(m_item, frameType, count, points);
- m_doc->invalidateAll();
- m_doc->regionsChanged()->update(QRect());
-
- //ScribusDoc::changed() is called in item_setFrameShape()
- //Hope this is enough
- //emit DocChanged();
- emit shapeChanged(frameType);
- }
-}
-
-void PropertiesPalette_Group::handleTextFlow()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((m_haveDoc) && (m_haveItem))
- {
- PageItem::TextFlowMode mode = PageItem::TextFlowDisabled;
- if (m_item->isGroup())
- {
- if (textFlowDisabled->isChecked())
- mode = PageItem::TextFlowDisabled;
- if (textFlowUsesFrameShape->isChecked())
- mode = PageItem::TextFlowUsesFrameShape;
- if (textFlowUsesBoundingBox->isChecked())
- mode = PageItem::TextFlowUsesBoundingBox;
- if (textFlowUsesContourLine->isChecked())
- mode = PageItem::TextFlowUsesContourLine;
- if (textFlowUsesImageClipping->isChecked())
- mode = PageItem::TextFlowUsesImageClipping;
- }
- m_item->setTextFlowMode(mode);
- m_doc->changed();
- m_doc->invalidateAll();
- m_doc->regionsChanged()->update(QRect());
- }
-}
-
void PropertiesPalette_Group::handleGradientEdit()
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
@@ -559,50 +439,6 @@
}
}
-void PropertiesPalette_Group::handleFillRule()
-{
- if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- m_item->fillRule = evenOdd->isChecked();
- m_item->update();
-}
-
-void PropertiesPalette_Group::handleShapeEdit()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((m_haveDoc) && (m_haveItem))
- {
- m_tmpSelection->clear();
- m_tmpSelection->copy(*m_doc->m_Selection, true);
- m_doc->m_Selection->clear();
- m_doc->m_Selection->addItem(m_item);
- m_item->isSingleSel = true;
- m_item->update();
- m_ScMW->view->requestMode(modeEditClip);
- m_ScMW->scrActions["itemUngroup"]->setEnabled(false);
- connect(m_ScMW->nodePalette, SIGNAL(paletteClosed()), this, SLOT(handleShapeEditEnded()));
- emit shapeEditStarted();
- }
-}
-
-void PropertiesPalette_Group::handleShapeEditEnded()
-{
- disconnect(m_ScMW->nodePalette, SIGNAL(paletteClosed()), this, SLOT(handleShapeEditEnded()));
- if ((m_haveDoc) && (m_haveItem))
- {
- if (m_tmpSelection->count() > 0)
- {
- m_doc->m_Selection->copy(*m_tmpSelection, false);
- m_doc->m_Selection->connectItemToGUI();
- }
- m_tmpSelection->clear();
-// m_ScMW->propertiesPalette->setCurrentItem(m_doc->m_Selection->itemAt(0));
-// m_ScMW->scrActions["itemGroup"]->setEnabled(true);
-// m_ScMW->propertiesPalette->xyzPal->doUnGroup->setEnabled(true);
- }
-}
-
void PropertiesPalette_Group::changeEvent(QEvent *e)
{
if (e->type() == QEvent::LanguageChange)
@@ -613,26 +449,6 @@
QWidget::changeEvent(e);
}
-
-void PropertiesPalette_Group::languageChange()
-{
- 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()
{
if (!m_doc)
|
|
|
Kind of makes sense. If a group of objects is selected the options of the Shape tab that are greyed out are the same options that are in the group tab. So why not make them both available? Or better a solution that will solve both issues: automatically trigger the Group tab to open when activating a grouped object |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2011-08-28 11:31 | JLuc | New Issue | |
| 2012-03-27 19:04 | dan.lincan | File Added: bug10225.diff | |
| 2016-04-26 23:43 | Kunda | Note Added: 0040528 | |
| 2016-04-26 23:43 | Kunda | Tag Attached: discussion | |
| 2016-05-14 06:56 | JLuc | Patch | => No |
| 2016-05-14 06:56 | JLuc | Summary | PP : Shape pane on grouped object has moved to "Group" pane => PP : "Shape" pane content moves to "Group" pane for grouped object |
| 2024-10-22 20:57 | cbradney | Assigned To | => nitramr |
| 2024-10-22 20:57 | cbradney | Status | new => resolved |
| 2024-10-22 20:57 | cbradney | Resolution | open => fixed |
| 2024-10-22 20:57 | cbradney | Fixed in Version | => 1.7.0.svn |
| 2024-10-23 18:42 | cbradney | Status | resolved => closed |
