r16317 by fschmid - Added preferences settings widget for spirals.

[scribus-commit]

Author: fschmid
Date: Sat Jan 29 11:56:20 2011
New Revision: 16317

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

Added:
    trunk/Scribus/scribus/ui/spiralwidget.cpp
    trunk/Scribus/scribus/ui/spiralwidget.h
    trunk/Scribus/scribus/ui/spiralwidgetbase.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=16317&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sat Jan 29 11:56:20 2011
@@ -130,6 +130,7 @@
   ui/smreplacedia.ui
   ui/smstyleimport.ui
   ui/spiralvectorbase.ui
+  ui/spiralwidgetbase.ui
   ui/stylemanager.ui
   ui/transformdialogbase.ui
   ui/transparencypalette.ui
@@ -377,6 +378,7 @@
   ui/smtextstyles.h
   ui/spalette.h
   ui/spiralvectordialog.h
+  ui/spiralwidget.h
   ui/storyeditor.h
   ui/stylemanager.h
   ui/styleselect.h
@@ -762,6 +764,7 @@
   ui/smtextstyles.cpp
   ui/spalette.cpp
   ui/spiralvectordialog.cpp
+  ui/spiralwidget.cpp
   ui/splash.cpp
   ui/storyeditor.cpp
   ui/stylemanager.cpp

Modified: trunk/Scribus/scribus/ui/prefs_itemtools.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16317&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 11:56:20 2011
@@ -196,6 +196,8 @@
 
 	// Arc Tool
 	arcDisplay->restoreDefaults(&prefsData->itemToolPrefs);
+	// Spiral Tool
+	spiralDisplay->restoreDefaults(&prefsData->itemToolPrefs);
 
 	enableSignals(true);
 }
@@ -318,6 +320,8 @@
 
 	//Arc Tool
 	arcDisplay->saveGuiToPrefs(&prefsData->itemToolPrefs);
+	//Spiral Tool
+	spiralDisplay->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=16317&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 11:56:20 2011
@@ -1487,6 +1487,46 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_6">
+      <attribute name="title">
+       <string>Spiral</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_11">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_12">
+         <item>
+          <widget class="SpiralWidget" name="spiralDisplay" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>100</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_18">
+           <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>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
@@ -1532,6 +1572,12 @@
    <class>ArcWidget</class>
    <extends>QWidget</extends>
    <header>ui/arcwidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>SpiralWidget</class>
+   <extends>QWidget</extends>
+   <header>ui/spiralwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>