r16166 by jghali - new property widgets for color, transparencies and lines

scribus-commit scribus-commit at lists.scribus.net
Mon Dec 27 04:49:37 CET 2010


Author: jghali
Date: Mon Dec 27 03:49:37 2010
New Revision: 16166

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16166
Log:
new property widgets for color, transparencies and lines

Added:
    branches/ScribusOIF/scribus/ui/propertywidget_color.cpp
    branches/ScribusOIF/scribus/ui/propertywidget_color.h
    branches/ScribusOIF/scribus/ui/propertywidget_colorbase.ui
    branches/ScribusOIF/scribus/ui/propertywidget_colortrans.cpp
    branches/ScribusOIF/scribus/ui/propertywidget_colortrans.h
    branches/ScribusOIF/scribus/ui/propertywidget_colortransbase.ui
    branches/ScribusOIF/scribus/ui/propertywidget_line.cpp
    branches/ScribusOIF/scribus/ui/propertywidget_line.h
    branches/ScribusOIF/scribus/ui/propertywidget_linebase.ui
    branches/ScribusOIF/scribus/ui/propertywidget_transparency.cpp
    branches/ScribusOIF/scribus/ui/propertywidget_transparency.h
    branches/ScribusOIF/scribus/ui/propertywidget_transparency.ui
Modified:
    branches/ScribusOIF/scribus/CMakeLists.txt
    branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_frame.h
    branches/ScribusOIF/win32/vc8/Scribus.vcproj

Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16166&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Mon Dec 27 03:49:37 2010
@@ -129,13 +129,17 @@
   ui/propertiespalette_textbase.ui
   ui/propertiespalette_xyzbase.ui
   ui/propertywidget_advancedbase.ui
+  ui/propertywidget_colorbase.ui
+  ui/propertywidget_colortransbase.ui
   ui/propertywidget_distancebase.ui
   ui/propertywidget_flopbase.ui
+  ui/propertywidget_linebase.ui
   ui/propertywidget_optmarginsbase.ui
   ui/propertywidget_pathtextbase.ui
   ui/propertywidget_posbase.ui
   ui/propertywidget_shapebase.ui
   ui/propertywidget_textcolorbase.ui
+  ui/propertywidget_transparency.ui
   ui/replacecolors.ui
   ui/replaceonecolor.ui
   ui/selectobjects.ui
@@ -368,13 +372,17 @@
   ui/propertiespalette_utils.h
   ui/propertiespalette_xyz.h
   ui/propertywidget_advanced.h
+  ui/propertywidget_color.h
+  ui/propertywidget_colortrans.h
   ui/propertywidget_distance.h
   ui/propertywidget_flop.h
+  ui/propertywidget_line.h
   ui/propertywidget_optmargins.h
   ui/propertywidget_pathtext.h
   ui/propertywidget_pos.h
   ui/propertywidget_shape.h
   ui/propertywidget_textcolor.h
+  ui/propertywidget_transparency.h
   ui/query.h
 #  ui/reformdoc.h
   ui/replacecolors.h
@@ -782,13 +790,17 @@
   ui/propertiespalette_utils.cpp
   ui/propertiespalette_xyz.cpp
   ui/propertywidget_advanced.cpp
+  ui/propertywidget_color.cpp
+  ui/propertywidget_colortrans.cpp
   ui/propertywidget_distance.cpp
   ui/propertywidget_flop.cpp
+  ui/propertywidget_line.cpp
   ui/propertywidget_optmargins.cpp
   ui/propertywidget_pathtext.cpp
   ui/propertywidget_pos.cpp
   ui/propertywidget_shape.cpp
   ui/propertywidget_textcolor.cpp
+  ui/propertywidget_transparency.cpp
   ui/propertywidgetbase.cpp
   ui/query.cpp
 #  ui/reformdoc.cpp

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16166&path=/branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_frame.cpp Mon Dec 27 03:49:37 2010
@@ -14,6 +14,8 @@
 #include "commonstrings.h"
 #include "pageitem.h"
 #include "propertiespalette_frame.h"
+#include "propertywidget_colortrans.h"
+#include "propertywidget_line.h"
 #include "propertywidget_pos.h"
 #include "propertywidget_shape.h"
 #include "scribus.h"
@@ -55,6 +57,12 @@
 	shapeWidget = new PropertyWidget_Shape(widget);
 	vboxLayout->addWidget(shapeWidget);
 
+	lineWidget = new PropertyWidget_Line(widget);
+	vboxLayout->addWidget(lineWidget);
+
+	//colorTransWidget = new PropertyWidget_ColorTrans(widget);
+	//vboxLayout->addWidget(colorTransWidget);
+
 	setWidget(widget);
 
 	languageChange();
@@ -89,6 +97,8 @@
 	setParent(m_ScMW);
 	move(p2);
 
+	//this->colorTransWidget->setMainWindow(mw);
+	this->lineWidget->setMainWindow(mw);
 	this->posWidget->setMainWindow(mw);
 	this->shapeWidget->setMainWindow(mw);
 }
@@ -107,6 +117,8 @@
 	m_doc = d;
 	m_item = NULL;
 
+	//this->colorTransWidget->setDoc(m_doc);
+	this->lineWidget->setDoc(m_doc);
 	this->posWidget->setDoc(m_doc);
 	this->shapeWidget->setDoc(m_doc);
 
@@ -175,7 +187,10 @@
 {
 	setWindowTitle( tr("Frame Properties"));
 
+	//colorTransWidget->languageChange();
+	lineWidget->languageChange();
 	posWidget->languageChange();
+	shapeWidget->languageChange();
 }
 
 void PropertiesPalette_Frame::unitChange()
@@ -186,5 +201,8 @@
 	m_unitRatio = m_doc->unitRatio();
 	m_unitIndex = m_doc->unitIndex();
 
+	//colorTransWidget->unitChange();
+	lineWidget->unitChange();
 	posWidget->unitChange();
-}
+	shapeWidget->unitChange();
+}

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_frame.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16166&path=/branches/ScribusOIF/scribus/ui/propertiespalette_frame.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_frame.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_frame.h Mon Dec 27 03:49:37 2010
@@ -13,6 +13,8 @@
 #include "scdockpalette.h"
 
 class PageItem;
+class PropertyWidget_ColorTrans;
+class PropertyWidget_Line;
 class PropertyWidget_Position;
 class PropertyWidget_Shape;
 class ScribusDoc;
@@ -43,8 +45,10 @@
 	void setCurrentItem(PageItem *i);
 	
 private:
-	PropertyWidget_Position* posWidget;
-	PropertyWidget_Shape*  shapeWidget;
+	//PropertyWidget_ColorTrans* colorTransWidget;
+	PropertyWidget_Line*       lineWidget;
+	PropertyWidget_Position*   posWidget;
+	PropertyWidget_Shape*      shapeWidget;
 	
 public slots:
 	void setDoc(ScribusDoc *d);

Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16166&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Mon Dec 27 03:49:37 2010
@@ -1523,6 +1523,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\propertywidget_color.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\propertywidget_colortrans.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\propertywidget_distance.cpp"
 				>
 			</File>
@@ -1531,6 +1539,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\propertywidget_line.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\propertywidget_optmargins.cpp"
 				>
 			</File>
@@ -1548,6 +1560,10 @@
 			</File>
 			<File
 				RelativePath="..\..\scribus\ui\propertywidget_textcolor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\propertywidget_transparency.cpp"
 				>
 			</File>
 			<File
@@ -8404,6 +8420,70 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\propertywidget_color.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\ui\propertywidget_colortrans.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\ui\propertywidget_distance.h"
 				>
 				<FileConfiguration
@@ -8468,6 +8548,38 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\propertywidget_line.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\ui\propertywidget_optmargins.h"
 				>
 				<FileConfiguration
@@ -8597,6 +8709,38 @@
 			</File>
 			<File
 				RelativePath="..\..\scribus\ui\propertywidget_textcolor.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\ui\propertywidget_transparency.h"
 				>
 				<FileConfiguration
 					Name="Debug-cairo|Win32"
@@ -12069,6 +12213,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\ui_propertywidget_colorbase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\ui_propertywidget_colortransbase.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\ui_propertywidget_distancebase.h"
 				>
 			</File>
@@ -12077,6 +12229,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\ui_propertywidget_linebase.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\ui_propertywidget_optmarginsbase.h"
 				>
 			</File>
@@ -12094,6 +12250,10 @@
 			</File>
 			<File
 				RelativePath="..\..\scribus\ui\ui_propertywidget_textcolorbase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\ui_propertywidget_transparency.h"
 				>
 			</File>
 			<File
@@ -12858,6 +13018,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\moc_propertywidget_color.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\moc_propertywidget_colortrans.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\moc_propertywidget_distance.cpp"
 				>
 			</File>
@@ -12866,6 +13034,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\moc_propertywidget_line.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\moc_propertywidget_optmargins.cpp"
 				>
 			</File>
@@ -12883,6 +13055,10 @@
 			</File>
 			<File
 				RelativePath="..\..\scribus\ui\moc_propertywidget_textcolor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\moc_propertywidget_transparency.cpp"
 				>
 			</File>
 			<File
@@ -13471,6 +13647,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\propertywidget_colorbase.ui"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\propertywidget_colortransbase.ui"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\propertywidget_distancebase.ui"
 				>
 			</File>
@@ -13479,6 +13663,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\propertywidget_linebase.ui"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\propertywidget_optmarginsbase.ui"
 				>
 			</File>
@@ -13496,6 +13684,10 @@
 			</File>
 			<File
 				RelativePath="..\..\scribus\ui\propertywidget_textcolorbase.ui"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\ui\propertywidget_transparency.ui"
 				>
 			</File>
 			<File




More information about the scribus-commit mailing list