r18063 by jghali - #11343: [FIX] max/min value of Paragraph Effect offset
scribus-commit
scribus-commit at lists.scribus.net
Sun Jan 6 21:27:43 UTC 2013
Author: jghali
Date: Sun Jan 6 21:27:42 2013
New Revision: 18063
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18063
Log:
#11343: [FIX] max/min value of Paragraph Effect offset
Modified:
trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18063&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Sun Jan 6 21:27:42 2013
@@ -372,7 +372,7 @@
newStyle.setHasBullet(false);
newStyle.setHasNum(false);
}
- newStyle.setParEffectOffset(peOffset_->value());
+ newStyle.setParEffectOffset(peOffset_->value() / m_unitRatio);
newStyle.setParEffectIndent(peIndent_->isChecked());
handleChanges(m_item, newStyle);
}
@@ -495,7 +495,7 @@
if (!m_doc || !m_item)
return;
ParagraphStyle newStyle;
- newStyle.setParEffectOffset(offset);
+ newStyle.setParEffectOffset(offset / m_unitRatio);
handleChanges(m_item, newStyle);
}
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18063&path=/trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui Sun Jan 6 21:27:42 2013
@@ -1,349 +1,349 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PropertyWidget_ParEffectBase</class>
- <widget class="QFrame" name="PropertyWidget_ParEffectBase">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>270</width>
- <height>429</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QGridLayout" name="gridLayout" columnstretch="0,0">
- <item row="12" column="0" colspan="2">
- <widget class="QGroupBox" name="peGroup">
- <property name="title">
- <string>Effect Parameters</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="6" column="0">
- <widget class="QLabel" name="peCharStyleLabel">
- <property name="text">
- <string>Char Style</string>
- </property>
- <property name="buddy">
- <cstring>peCharStyleCombo</cstring>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <widget class="CharStyleComboBox" name="peCharStyleCombo"/>
- </item>
- <item row="1" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QCheckBox" name="peIndent_">
- <property name="text">
- <string>AutoIndent</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_5">
- <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="QLabel" name="peOffsetLabel">
- <property name="text">
- <string>Offset</string>
- </property>
- <property name="buddy">
- <cstring>peOffset_</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="ScrSpinBox" name="peOffset_">
- <property name="minimum">
- <double>-999.990000000000009</double>
- </property>
- <property name="maximum">
- <double>999.990000000000009</double>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item row="4" column="0" colspan="2">
- <widget class="QGroupBox" name="dropCapsGroup">
- <property name="title">
- <string>Drop Caps</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="dropCapLinesLabel">
- <property name="toolTip">
- <string>Number of lines used by the drop cap</string>
- </property>
- <property name="text">
- <string>Lines</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="dropCapLines">
- <property name="minimum">
- <number>2</number>
- </property>
- </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>
- </layout>
- </widget>
- </item>
- <item row="8" column="0" rowspan="2" colspan="2">
- <widget class="QGroupBox" name="numGroup">
- <property name="title">
- <string>Numbered List</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="3" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="numLevelLabel">
- <property name="text">
- <string>Level</string>
- </property>
- <property name="buddy">
- <cstring>numLevelSpin</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="numLevelSpin">
- <property name="minimum">
- <number>1</number>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <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="QLabel" name="numStartLabel">
- <property name="text">
- <string>Start</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="numStart">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>999</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="0" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLabel" name="numComboLabel">
- <property name="text">
- <string>Set</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="numComboBox">
- <property name="currentIndex">
- <number>-1</number>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <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="QLabel" name="numFormatLabel">
- <property name="text">
- <string>Format</string>
- </property>
- <property name="buddy">
- <cstring>numFormatCombo</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="numFormatCombo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="4" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLabel" name="numPrefixLabel">
- <property name="text">
- <string>Prefix</string>
- </property>
- <property name="buddy">
- <cstring>numPrefix</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="numPrefix"/>
- </item>
- <item>
- <spacer name="horizontalSpacer_4">
- <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="QLabel" name="numSuffixLabel">
- <property name="text">
- <string>Suffix</string>
- </property>
- <property name="buddy">
- <cstring>numSuffix</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="numSuffix"/>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QComboBox" name="peCombo"/>
- </item>
- <item row="7" column="0" colspan="2">
- <widget class="QGroupBox" name="bullGroup">
- <property name="title">
- <string>Bulleted List</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="1">
- <widget class="QComboBox" name="bulletStrEdit_">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>50</width>
- <height>0</height>
- </size>
- </property>
- <property name="editable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="bulletCharLabel">
- <property name="text">
- <string>Bullet Char(s)</string>
- </property>
- <property name="buddy">
- <cstring>bulletStrEdit_</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QPushButton" name="bulletCharTableButton_">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Char Table</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>ScrSpinBox</class>
- <extends>QDoubleSpinBox</extends>
- <header location="global">ui/scrspinbox.h</header>
- </customwidget>
- <customwidget>
- <class>CharStyleComboBox</class>
- <extends>QComboBox</extends>
- <header location="global">ui/spalette.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PropertyWidget_ParEffectBase</class>
+ <widget class="QFrame" name="PropertyWidget_ParEffectBase">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>270</width>
+ <height>429</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout" columnstretch="0,0">
+ <item row="12" column="0" colspan="2">
+ <widget class="QGroupBox" name="peGroup">
+ <property name="title">
+ <string>Effect Parameters</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="6" column="0">
+ <widget class="QLabel" name="peCharStyleLabel">
+ <property name="text">
+ <string>Char Style</string>
+ </property>
+ <property name="buddy">
+ <cstring>peCharStyleCombo</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="CharStyleComboBox" name="peCharStyleCombo"/>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QCheckBox" name="peIndent_">
+ <property name="text">
+ <string>AutoIndent</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <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="QLabel" name="peOffsetLabel">
+ <property name="text">
+ <string>Offset</string>
+ </property>
+ <property name="buddy">
+ <cstring>peOffset_</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="ScrSpinBox" name="peOffset_">
+ <property name="minimum">
+ <double>-3000.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>3000.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="4" column="0" colspan="2">
+ <widget class="QGroupBox" name="dropCapsGroup">
+ <property name="title">
+ <string>Drop Caps</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="dropCapLinesLabel">
+ <property name="toolTip">
+ <string>Number of lines used by the drop cap</string>
+ </property>
+ <property name="text">
+ <string>Lines</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="dropCapLines">
+ <property name="minimum">
+ <number>2</number>
+ </property>
+ </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>
+ </layout>
+ </widget>
+ </item>
+ <item row="8" column="0" rowspan="2" colspan="2">
+ <widget class="QGroupBox" name="numGroup">
+ <property name="title">
+ <string>Numbered List</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="3" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="numLevelLabel">
+ <property name="text">
+ <string>Level</string>
+ </property>
+ <property name="buddy">
+ <cstring>numLevelSpin</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="numLevelSpin">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <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="QLabel" name="numStartLabel">
+ <property name="text">
+ <string>Start</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="numStart">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>999</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="numComboLabel">
+ <property name="text">
+ <string>Set</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="numComboBox">
+ <property name="currentIndex">
+ <number>-1</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <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="QLabel" name="numFormatLabel">
+ <property name="text">
+ <string>Format</string>
+ </property>
+ <property name="buddy">
+ <cstring>numFormatCombo</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="numFormatCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="4" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLabel" name="numPrefixLabel">
+ <property name="text">
+ <string>Prefix</string>
+ </property>
+ <property name="buddy">
+ <cstring>numPrefix</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="numPrefix"/>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <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="QLabel" name="numSuffixLabel">
+ <property name="text">
+ <string>Suffix</string>
+ </property>
+ <property name="buddy">
+ <cstring>numSuffix</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="numSuffix"/>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QComboBox" name="peCombo"/>
+ </item>
+ <item row="7" column="0" colspan="2">
+ <widget class="QGroupBox" name="bullGroup">
+ <property name="title">
+ <string>Bulleted List</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="1">
+ <widget class="QComboBox" name="bulletStrEdit_">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="bulletCharLabel">
+ <property name="text">
+ <string>Bullet Char(s)</string>
+ </property>
+ <property name="buddy">
+ <cstring>bulletStrEdit_</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QPushButton" name="bulletCharTableButton_">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Char Table</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>ScrSpinBox</class>
+ <extends>QDoubleSpinBox</extends>
+ <header location="global">ui/scrspinbox.h</header>
+ </customwidget>
+ <customwidget>
+ <class>CharStyleComboBox</class>
+ <extends>QComboBox</extends>
+ <header location="global">ui/spalette.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
More information about the scribus-commit
mailing list