r16316 by fschmid - Added preferences settings widget for arcs.

[scribus-commit]

Author: fschmid
Date: Sat Jan 29 10:42:34 2011
New Revision: 16316

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16316
Log:
Added preferences settings widget for arcs.

Added:
    trunk/Scribus/scribus/ui/arcwidget.cpp
    trunk/Scribus/scribus/ui/arcwidget.h
    trunk/Scribus/scribus/ui/arcwidgetbase.ui
Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/ui/prefs_itemtools.cpp
    trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16316&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sat Jan 29 10:42:34 2011
@@ -68,6 +68,7 @@
   ui/aboutplugins.ui
   ui/aligndistribute.ui
   ui/arcvectorbase.ui
+  ui/arcwidgetbase.ui
   ui/charselect.ui
   ui/charselectenhanced.ui
   ui/cmsprefsbase.ui
@@ -223,6 +224,7 @@
   ui/annot.h
   ui/annota.h
   ui/applytemplatedialog.h
+  ui/arcwidget.h
   ui/arcvectordialog.h
   ui/arrowchooser.h
   ui/autoform.h
@@ -604,6 +606,7 @@
   ui/annot.cpp
   ui/annota.cpp
   ui/applytemplatedialog.cpp
+  ui/arcwidget.cpp
   ui/arcvectordialog.cpp
   ui/arrowchooser.cpp
   ui/autoform.cpp

Modified: trunk/Scribus/scribus/ui/prefs_itemtools.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16316&path=/trunk/Scribus/scribus/ui/prefs_itemtools.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_itemtools.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_itemtools.cpp Sat Jan 29 10:42:34 2011
@@ -194,6 +194,9 @@
 	calPenAngleSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenAngle);
 	calPenWidthSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenWidth);
 
+	// Arc Tool
+	arcDisplay->restoreDefaults(&prefsData->itemToolPrefs);
+
 	enableSignals(true);
 }
 
@@ -312,6 +315,9 @@
 	prefsData->itemToolPrefs.calligrapicPenLineWidth = calPenLineWidthSpinBox->value();
 	prefsData->itemToolPrefs.calligrapicPenAngle = calPenAngleSpinBox->value();
 	prefsData->itemToolPrefs.calligrapicPenWidth = calPenWidthSpinBox->value();
+
+	//Arc Tool
+	arcDisplay->saveGuiToPrefs(&prefsData->itemToolPrefs);
 }
 
 void Prefs_ItemTools::enableSignals(bool on)

Modified: trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16316&path=/trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui (original)
+++ trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui Sat Jan 29 10:42:34 2011
@@ -79,8 +79,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>637</width>
-            <height>632</height>
+            <width>643</width>
+            <height>646</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -651,8 +651,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>637</width>
-            <height>632</height>
+            <width>643</width>
+            <height>646</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -1440,6 +1440,53 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_5">
+      <attribute name="title">
+       <string>Arc</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_10">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_11">
+         <item>
+          <widget class="ArcWidget" name="arcDisplay" native="true">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>100</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_17">
+           <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>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_12">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>10</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
@@ -1447,8 +1494,8 @@
  <customwidgets>
   <customwidget>
    <class>ScrSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">ui/scrspinbox.h</header>
+   <extends>QDoubleSpinBox</extends>
+   <header>ui/scrspinbox.h</header>
   </customwidget>
   <customwidget>
    <class>FontCombo</class>
@@ -1480,6 +1527,12 @@
    <class>LinkButton</class>
    <extends>QToolButton</extends>
    <header>ui/linkbutton.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ArcWidget</class>
+   <extends>QWidget</extends>
+   <header>ui/arcwidget.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>