r16548 by jghali - merge trunk revisions up to r16546

[scribus-commit]

Author: jghali
Date: Sun Apr  3 16:11:48 2011
New Revision: 16548

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16548
Log:
merge trunk revisions up to r16546

Modified:
    branches/ScribusOIF/scribus/canvasmode_nodeedit.cpp
    branches/ScribusOIF/scribus/canvasmode_nodeedit.h
    branches/ScribusOIF/scribus/scribusdoc.cpp
    branches/ScribusOIF/scribus/ui/colorpalette.ui
    branches/ScribusOIF/scribus/ui/pagepalette.cpp
    branches/ScribusOIF/scribus/undogui.cpp

Modified: branches/ScribusOIF/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16548&path=/branches/ScribusOIF/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_nodeedit.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_nodeedit.cpp Sun Apr  3 16:11:48 2011
@@ -17,6 +17,7 @@
 
 #include <QMenu>
 #include <QMouseEvent>
+#include <QPainter>
 
 #include "canvas.h"
 #include "canvasgesture_rectselect.h"

Modified: branches/ScribusOIF/scribus/canvasmode_nodeedit.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16548&path=/branches/ScribusOIF/scribus/canvasmode_nodeedit.h
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_nodeedit.h (original)
+++ branches/ScribusOIF/scribus/canvasmode_nodeedit.h Sun Apr  3 16:11:48 2011
@@ -22,6 +22,8 @@
 
 #include <QTransform>
 #include <QRect>
+
+class QPainter;
 
 class PageItem;
 class RectSelect;

Modified: branches/ScribusOIF/scribus/scribusdoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16548&path=/branches/ScribusOIF/scribus/scribusdoc.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusdoc.cpp (original)
+++ branches/ScribusOIF/scribus/scribusdoc.cpp Sun Apr  3 16:11:48 2011
@@ -2101,15 +2101,14 @@
 		{
 			sourceSelection.addItem(itemToCopy);
 		}
-		if (sourceSelection.count() != 0)
-		{
-			ScriXmlDoc *ss = new ScriXmlDoc();
-			QString dataS = ss->WriteElem(this, &sourceSelection);
-			ss->ReadElemToLayer(dataS, appPrefsData.fontPrefs.AvailFonts, this, Pages->at(0)->xOffset(), Pages->at(0)->yOffset(), false, true, appPrefsData.fontPrefs.GFontSub, whereToInsert);
-			delete ss;
-		}
-		sourceSelection.clear();
-	}
+	}
+	if (sourceSelection.count() != 0)
+	{
+		ScriXmlDoc ss;
+		QString dataS = ss.WriteElem(this, &sourceSelection);
+		ss.ReadElemToLayer(dataS, appPrefsData.fontPrefs.AvailFonts, this, Pages->at(0)->xOffset(), Pages->at(0)->yOffset(), false, true, appPrefsData.fontPrefs.GFontSub, whereToInsert);
+	}
+	sourceSelection.clear();
 }
 
 

Modified: branches/ScribusOIF/scribus/ui/colorpalette.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16548&path=/branches/ScribusOIF/scribus/ui/colorpalette.ui
==============================================================================
--- branches/ScribusOIF/scribus/ui/colorpalette.ui (original)
+++ branches/ScribusOIF/scribus/ui/colorpalette.ui Sun Apr  3 16:11:48 2011
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>238</width>
+    <width>258</width>
     <height>360</height>
    </rect>
   </property>
@@ -48,6 +48,13 @@
         </layout>
        </item>
        <item>
+        <widget class="Line" name="line">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
         <widget class="QStackedWidget" name="fillModeStack">
          <property name="currentIndex">
           <number>0</number>
@@ -132,6 +139,9 @@
               <widget class="QToolButton" name="gradEditButton">
                <property name="text">
                 <string>Move Vector</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
                </property>
               </widget>
              </item>
@@ -603,6 +613,13 @@
         </layout>
        </item>
        <item>
+        <widget class="Line" name="line_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
         <widget class="QStackedWidget" name="strokeModeStack">
          <property name="currentIndex">
           <number>0</number>
@@ -672,6 +689,9 @@
               <widget class="QToolButton" name="gradEditButtonStroke">
                <property name="text">
                 <string>Move Vector</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
                </property>
               </widget>
              </item>

Modified: branches/ScribusOIF/scribus/ui/pagepalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16548&path=/branches/ScribusOIF/scribus/ui/pagepalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/pagepalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/pagepalette.cpp Sun Apr  3 16:11:48 2011
@@ -17,7 +17,7 @@
 #include <QMenu>
 #include <QMimeData>
 #include <QMessageBox>
-
+#include <QPainter>
 
 #include "commonstrings.h"
 #include "page.h"

Modified: branches/ScribusOIF/scribus/undogui.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16548&path=/branches/ScribusOIF/scribus/undogui.cpp
==============================================================================
--- branches/ScribusOIF/scribus/undogui.cpp (original)
+++ branches/ScribusOIF/scribus/undogui.cpp Sun Apr  3 16:11:48 2011
@@ -23,10 +23,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <QCheckBox>
 #include <QDebug>
 #include <QEvent>
+#include <QPainter>
 #include <QPushButton>
-#include <QCheckBox>
 #include <QVBoxLayout>
 
 #include "undogui.h"