r15844 by jghali - make properties palette dockable

[scribus-commit]

Author: jghali
Date: Sat Nov 13 00:59:34 2010
New Revision: 15844

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15844
Log:
make properties palette dockable

Added:
    branches/ScribusOIF/scribus/ui/scdockpalette.cpp
    branches/ScribusOIF/scribus/ui/scdockpalette.h
Modified:
    branches/ScribusOIF/scribus/CMakeLists.txt
    branches/ScribusOIF/scribus/ui/propertiespalette.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette.h
    branches/ScribusOIF/win32/vc8/Scribus.vcproj

Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15844&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Sat Nov 13 00:59:34 2010
@@ -357,6 +357,7 @@
   ui/replacecolors.h
   ui/replaceonecolor.h
   ui/rulermover.h
+  ui/scdockpalette.h
   ui/scfilewidget.h
   ui/scinputdialog.h
   ui/scmenu.h
@@ -761,6 +762,7 @@
   ui/replaceonecolor.cpp
   ui/rulermover.cpp
   ui/sccombobox.cpp
+  ui/scdockpalette.cpp
   ui/scfilewidget.cpp
   ui/scinputdialog.cpp
   ui/scmenu.cpp

Modified: branches/ScribusOIF/scribus/ui/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15844&path=/branches/ScribusOIF/scribus/ui/propertiespalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.cpp Sat Nov 13 00:59:34 2010
@@ -83,7 +83,7 @@
 
 //using namespace std;
 
-PropertiesPalette::PropertiesPalette( QWidget* parent) : ScrPaletteBase( parent, "PropertiesPalette", false, 0)
+PropertiesPalette::PropertiesPalette( QWidget* parent) : ScDockPalette( parent, "PropertiesPalette", 0)
 {
 	m_ScMW=0;
 	m_doc=0;
@@ -96,7 +96,7 @@
 	MpalLayout = new QVBoxLayout( this );
 	MpalLayout->setMargin(5);
 	MpalLayout->setSpacing(1);
-	setOrientation(Qt::Vertical);
+	//setOrientation(Qt::Vertical);
 	QFont f(font());
 	f.setPointSize(f.pointSize()-1);
 	setFont(f);
@@ -191,6 +191,8 @@
 
 	MpalLayout->addWidget( TabStack );
 
+	setWidget( TabStack );
+
 	languageChange();
 
 	connect(linePal, SIGNAL(lineModeChanged(int)), this, SLOT(NewLineMode(int)));
@@ -226,7 +228,7 @@
 			}
 		}
 	}
-	ScrPaletteBase::closeEvent(closeEvent);
+	ScDockPalette::closeEvent(closeEvent);
 }
 
 void PropertiesPalette::setMainWindow(ScribusMainWindow* mw)

Modified: branches/ScribusOIF/scribus/ui/propertiespalette.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15844&path=/branches/ScribusOIF/scribus/ui/propertiespalette.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.h Sat Nov 13 00:59:34 2010
@@ -33,8 +33,8 @@
 class QWidget;
 
 #include "scribusapi.h"
+#include "scdockpalette.h"
 #include "scguardedptr.h"
-#include "scrpalettebase.h"
 #include "scrspinbox.h"
 #include "pageitem.h"
 #include "page.h"
@@ -60,7 +60,7 @@
 class Selection;
 class Tpalette;
 
-class SCRIBUS_API PropertiesPalette : public ScrPaletteBase
+class SCRIBUS_API PropertiesPalette : public ScDockPalette
 {
 	Q_OBJECT
 

Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15844&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Sat Nov 13 00:59:34 2010
@@ -663,10 +663,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\scribus\canvasmode_legacy.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\scribus\canvasmode_magnifier.cpp"
 				>
 			</File>
@@ -1572,6 +1568,10 @@
 			</File>
 			<File
 				RelativePath="..\..\scribus\ui\sccombobox.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\scdockpalette.cpp"
 				>
 			</File>
 			<File
@@ -2896,38 +2896,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\scribus\canvasmode_legacy.h"
-				>
-				<FileConfiguration
-					Name="Debug-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug-arthur|Win32"
-					>
-					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-arthur|Win32"
-					>
-					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\..\scribus\canvasmode_magnifier.h"
 				>
 			</File>
@@ -8596,6 +8564,38 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\scdockpalette.h"
+				>
+				<FileConfiguration
+					Name="Debug-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug-arthur|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-arthur|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\scribus\scdocoutput.h"
 				>
 			</File>
@@ -11878,10 +11878,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\scribus\moc_canvasmode_legacy.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\scribus\moc_canvasmode_measurements.cpp"
 				>
 			</File>
@@ -12523,6 +12519,10 @@
 			</File>
 			<File
 				RelativePath="..\..\scribus\moc_sampleitem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\moc_scdockpalette.cpp"
 				>
 			</File>
 			<File