[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 934
Date       : Tue May  2 14:04:04 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/Makefile.am
   M /Trunk/XaraLX/Kernel/main.cpp
   M /Trunk/XaraLX/Kernel/main3.cpp
   A /Trunk/XaraLX/wxOil/xrc/DEFAULT_PAGESIZES.res
   M /Trunk/XaraLX/wxOil/xrc/EN/pagesres-strings.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc

First attempt at the Options dialog


Diff:
Index: Trunk/XaraLX/Kernel/Makefile.am
===================================================================
--- Trunk/XaraLX/Kernel/Makefile.am	(revision 933)
+++ Trunk/XaraLX/Kernel/Makefile.am	(revision 934)
@@ -63,6 +63,9 @@
 	zdeflate.cpp jpgdest.cpp webparam.cpp bmpalint.cpp zdftrees.cpp animparams.cpp \
 	sglayer.cpp layermgr.cpp layergal.cpp backgrnd.cpp viewmenu.cpp renddlg.cpp \
 	sgcolour.cpp sgbitmap.cpp bmpsdlg.cpp ngcore.cpp ngitem.cpp ngscan.cpp \
-	ngsentry.cpp ngsetop.cpp ngdialog.cpp property.cpp
+	ngsentry.cpp ngsetop.cpp ngdialog.cpp property.cpp \
+	optsedit.cpp optsmisc.cpp optspntr.cpp optstune.cpp optsview.cpp optsgrid.cpp \
+	optspage.cpp optsundo.cpp optsscal.cpp optsunit.cpp pagesize.cpp radio.cpp
 
+
 AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/main3.cpp
===================================================================
--- Trunk/XaraLX/Kernel/main3.cpp	(revision 933)
+++ Trunk/XaraLX/Kernel/main3.cpp	(revision 934)
@@ -190,8 +190,8 @@
 			PhotoCDDlg::Init() &&				// Init the import PhotoCD options dialog
 #endif
 			RenderDemoDlg::Init() &&			// Init the Render Demo Dialog
+			AppPrefsDlg::Init() &&				// Init the application preference/options dialog
 #ifndef EXCLUDE_FROM_XARALX
-			AppPrefsDlg::Init() &&				// Init the application preference/options dialog
 			TemplateDialog::Init() &&
 			DocPrefsDlg::Init() &&				// Init the document preference/options dialog
 
Index: Trunk/XaraLX/Kernel/main.cpp
===================================================================
--- Trunk/XaraLX/Kernel/main.cpp	(revision 933)
+++ Trunk/XaraLX/Kernel/main.cpp	(revision 934)
@@ -133,6 +133,7 @@
 //#include "dlgcthlp.h"
 //#include "xpehost.h"
 #include "opfeathr.h"
+#include "appprefs.h"
 
 BOOL InitPreTools();
 BOOL InitPostTools1();
@@ -253,8 +254,6 @@
 	AttributeManager::Deinit();
 
 #if !defined(EXCLUDE_FROM_RALPH)
-PORTNOTE("dialogs", "Use of AppPrefsDlg removed")
-#if !defined(EXCLUDE_FROM_XARALX)
 	#ifndef STANDALONE
 		// Write out the preferences, only if the user has requested this
 		if ( AppPrefsDlg::IsSaveOnExitSet() )
@@ -265,7 +264,6 @@
 #else
 	Camelot.WritePreferences();
 #endif
-#endif
 
 PORTNOTE("other","Removed XPEHost usage")
 #ifndef EXCLUDE_FROM_XARALX
@@ -321,11 +319,8 @@
 #endif
 
 #ifndef STANDALONE
-PORTNOTE("other","Removed AppPrefsDlg usage")
-#ifndef EXCLUDE_FROM_XARALX
 	AppPrefsDlg::Deinit();				// Deinit the application preference/options dialog
 #endif
-#endif
 	Filter::DeinitFilters();
 #if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
 	ControlHelper::DeInit();
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc	(revision 933)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc	(revision 934)
@@ -275,6 +275,12 @@
 					<label>&amp;Feather bar;Toggle feather bar</label>
 				</object>
 			</object>
+			<object class="sizeritem">
+				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
+				<object class="wxStaticText" name="IDS_UTILOPTIONS">
+					<label>&amp;Options...;Invoke options dialog</label>
+				</object>
+			</object>
 		</object>
 	</object>
 </resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/pagesres-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/pagesres-strings.xrc	(revision 933)
+++ Trunk/XaraLX/wxOil/xrc/EN/pagesres-strings.xrc	(revision 934)
@@ -7,13 +7,13 @@
 			<object class="sizeritem">
 				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
 				<object class="wxStaticText" name="IDH_DEFAULT_PAGESIZES">
-					<label>DEFAULT_PAGESIZES</label>
+					<label>DEFAULT_PAGESIZES.res</label>
 				</object>
 			</object>
 			<object class="sizeritem">
 				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
 				<object class="wxStaticText" name="IDT_CAM_PAGESIZES_RES">
-					<label>CAMELOT_PAGESIZES</label>
+					<label>CAMELOT_PAGESIZES.res</label>
 				</object>
 			</object>
 			<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/DEFAULT_PAGESIZES.res
===================================================================
--- Trunk/XaraLX/wxOil/xrc/DEFAULT_PAGESIZES.res	(revision 0)
+++ Trunk/XaraLX/wxOil/xrc/DEFAULT_PAGESIZES.res	(revision 934)
@@ -0,0 +1,25 @@
+;-----------------------------------------------------------------------------
+; Page size definitions
+;
+; Syntax : PageSize		<PageName> <Hidth> <Height> {"MILLIMETRES" | "INCHES" } 
+;
+;	PageName 		The textual description of the page.
+;	Width			Width of page in specified units
+;	Height			Height of page in specified units
+;	
+;	MILLIMETRES if measurements are in millimetres
+;	INCHES if measurements are in inches
+
+PageSize	"A0"					840.0	1188.0	MILLIMETRES
+PageSize	"A1"					594.0	840.0	MILLIMETRES
+PageSize	"A2"					420.0	594.0	MILLIMETRES
+PageSize	"A3"					297.0	420.0	MILLIMETRES
+PageSize	"A4"					210.0	297.0	MILLIMETRES
+PageSize	"A5"					148.5	210.0	MILLIMETRES
+PageSize	"A6"					105.0	148.5	MILLIMETRES
+PageSize	"US Legal"				8.5		14		INCHES
+PageSize	"US Letter"				8.5		11		INCHES
+PageSize	"International Fanfold"	8.25	12		INCHES
+
+; Must be the last token in the file
+PageSizeEnd


Xara