[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]

[XaraXtreme-commits] Commit Complete



Commit by  : alex
Repository : xara
Revision   : 1334
Date       : Sat Jun 17 10:43:38 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/tracedlg.cpp
   M /Trunk/XaraLX/Scripts/rc2xml.pl
   M /Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/bezbar.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/webster.xrc

Make tracer sliders not work backwards
Add static text to dialogs that had been omitted as not left aligned


Diff:
Index: Trunk/XaraLX/Kernel/tracedlg.cpp
===================================================================
--- Trunk/XaraLX/Kernel/tracedlg.cpp	(revision 1333)
+++ Trunk/XaraLX/Kernel/tracedlg.cpp	(revision 1334)
@@ -581,12 +581,12 @@
 BOOL TraceDlg::LoadSettings(INT32 * pSettings)
 {
 	SetLongGadgetValue(_R(IDC_TRACER_PASSESNUM), 		pSettings[0]);
-	SetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER), 		100-pSettings[1]); 
-	SetLongGadgetValue(_R(IDC_TRACER_MINAREASLIDER),	50- pSettings[2]); 
-	SetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), 		100-pSettings[3]); 
-	SetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), 		100-pSettings[4]); 
-	SetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER), 	100-pSettings[5]); 
-	SetLongGadgetValue(_R(IDC_TRACER_SMOOTHSLIDER), 	100-pSettings[6]); 
+	SetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER), 		pSettings[1]); 
+	SetLongGadgetValue(_R(IDC_TRACER_MINAREASLIDER),	pSettings[2]); 
+	SetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), 		pSettings[3]); 
+	SetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), 		pSettings[4]); 
+	SetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER), 	pSettings[5]); 
+	SetLongGadgetValue(_R(IDC_TRACER_SMOOTHSLIDER), 	pSettings[6]); 
 	return ReadParams();
 }
 
@@ -606,13 +606,13 @@
 *******************************************************************************************/
 BOOL TraceDlg::SaveSettings(INT32 * pSettings)
 {
-	pSettings[0]=    (INT32)GetLongGadgetValue(_R(IDC_TRACER_PASSESNUM) 		,0, 100, 0, NULL);
-	pSettings[1]=100-(INT32)GetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER) 		,0, 100, 0, NULL); 
-	pSettings[2]=50- (INT32)GetLongGadgetValue(_R(IDC_TRACER_MINAREASLIDER)	,0, 100, 0, NULL); 
-	pSettings[3]=100-(INT32)GetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER) 		,0, 100, 0, NULL); 
-	pSettings[4]=100-(INT32)GetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER) 		,0, 100, 0, NULL); 
-	pSettings[5]=100-(INT32)GetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER) 	,0, 100, 0, NULL); 
-	pSettings[6]=100-(INT32)GetLongGadgetValue(_R(IDC_TRACER_SMOOTHSLIDER) 	,0, 100, 0, NULL); 
+	pSettings[0]=(INT32)GetLongGadgetValue(_R(IDC_TRACER_PASSESNUM) 		,0, 100, 0, NULL);
+	pSettings[1]=(INT32)GetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER) 		,0, 100, 0, NULL); 
+	pSettings[2]=(INT32)GetLongGadgetValue(_R(IDC_TRACER_MINAREASLIDER)	,0, 100, 0, NULL); 
+	pSettings[3]=(INT32)GetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER) 		,0, 100, 0, NULL); 
+	pSettings[4]=(INT32)GetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER) 		,0, 100, 0, NULL); 
+	pSettings[5]=(INT32)GetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER) 	,0, 100, 0, NULL); 
+	pSettings[6]=(INT32)GetLongGadgetValue(_R(IDC_TRACER_SMOOTHSLIDER) 	,0, 100, 0, NULL); 
 	return TRUE;
 }
 
@@ -702,12 +702,12 @@
 
 BOOL TraceDlg::ReadParams()
 {
-	SetLongGadgetValue(_R(IDC_TRACER_BLURNUM), 100-GetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER), 0, 100, 0, NULL));
-	SetLongGadgetValue(_R(IDC_TRACER_MINAREANUM), 50-GetLongGadgetValue(_R(IDC_TRACER_MINAREASLIDER), 0, 100, 0, NULL));
-	SetLongGadgetValue(_R(IDC_TRACER_ACCURACYNUM), 100-GetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER), 0, 100, 0, NULL));
-	SetLongGadgetValue(_R(IDC_TRACER_ICTNUM), 100-GetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), 0, 100, 0, NULL));
-	SetLongGadgetValue(_R(IDC_TRACER_FCTNUM), 100-GetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), 0, 100, 0, NULL));
-	SetLongGadgetValue(_R(IDC_TRACER_SMOOTHNUM), 100-GetLongGadgetValue(_R(IDC_TRACER_SMOOTHSLIDER), 0, 100, 0, NULL));
+	SetLongGadgetValue(_R(IDC_TRACER_BLURNUM),    GetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER), 0, 100, 0, NULL));
+	SetLongGadgetValue(_R(IDC_TRACER_MINAREANUM), GetLongGadgetValue(_R(IDC_TRACER_MINAREASLIDER), 0, 100, 0, NULL));
+	SetLongGadgetValue(_R(IDC_TRACER_ACCURACYNUM),GetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER), 0, 100, 0, NULL));
+	SetLongGadgetValue(_R(IDC_TRACER_ICTNUM),     GetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), 0, 100, 0, NULL));
+	SetLongGadgetValue(_R(IDC_TRACER_FCTNUM),     GetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), 0, 100, 0, NULL));
+	SetLongGadgetValue(_R(IDC_TRACER_SMOOTHNUM),  GetLongGadgetValue(_R(IDC_TRACER_SMOOTHSLIDER), 0, 100, 0, NULL));
 	TraceMethod Method=GetTraceMethod();
 	BOOL Mono=(Method == TRACEMETHOD_MONO);
 //	BOOL Limited=(Method == TRACEMETHOD_GREYSCALE) || (Method==TRACEMETHOD_256COL);
@@ -774,14 +774,14 @@
 								);
 
 
-	MinimumArea 						= 50-GetLongGadgetValue  (_R(IDC_TRACER_MINAREASLIDER),	0, 100, 0, NULL);	
-	MaximumInitialAreaErrorThreshold 	= 0.01+0.003*(double)(100-GetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER),		0, 100, 0, NULL));
-	MinimumInitialAreaErrorThreshold 	= 0.01+0.003*(double)(100-GetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER),		0, 100, 0, NULL));
-	MaxPixelError 						= 0.45+0.16*(double)(/*100-*/GetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER),    	0, 100, 0, NULL));
+	MinimumArea 						= GetLongGadgetValue  (_R(IDC_TRACER_MINAREASLIDER),	0, 100, 0, NULL);	
+	MaximumInitialAreaErrorThreshold 	= 0.01+0.003*(double)(GetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER),		0, 100, 0, NULL));
+	MinimumInitialAreaErrorThreshold 	= 0.01+0.003*(double)(GetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER),		0, 100, 0, NULL));
+	MaxPixelError 						= 0.45+0.16*(double)(100-GetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER),    	0, 100, 0, NULL)); // Inversion intentional
 	MinPixelError = MaxPixelError;
-	Blur 								= (double)(100-GetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER),    	0, 100, 0, NULL));
-	Smooth 								= (double)(100-GetLongGadgetValue(_R(IDC_TRACER_SMOOTHSLIDER),    	0, 100, 0, NULL));
-	QuantColours					 	= 0.01*(double)(/*100-*/GetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER),	0, 100, 0, NULL));
+	Blur 								= (double)(GetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER),    	0, 100, 0, NULL));
+	Smooth 								= (double)(GetLongGadgetValue(_R(IDC_TRACER_SMOOTHSLIDER),    	0, 100, 0, NULL));
+	QuantColours					 	= 0.01*(double)(GetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER),	0, 100, 0, NULL)); // Inversion intentional
 	
 	if (QuantColours<0) QuantColours=0;
 	QuantColours=QuantColours*QuantColours; // spread it out a little at the low end (i.e. high end on the slider)
@@ -1104,23 +1104,23 @@
 
 				SetGadgetRange    (_R(IDC_TRACER_BLURSLIDER), 0, 100, 1);
 				SetGadgetBitmaps  (_R(IDC_TRACER_BLURSLIDER), _R(IDB_QUALITYBASE), _R(IDB_QUALITYSLIDER));
-//				SetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER), 100-50); 
+//				SetLongGadgetValue(_R(IDC_TRACER_BLURSLIDER), 50); 
 
 				SetGadgetRange    (_R(IDC_TRACER_ACCURACYSLIDER), 0, 100, 1);
 				SetGadgetBitmaps  (_R(IDC_TRACER_ACCURACYSLIDER), _R(IDB_QUALITYBASE), _R(IDB_QUALITYSLIDER));
-//				SetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER), 100-50); 
+//				SetLongGadgetValue(_R(IDC_TRACER_ACCURACYSLIDER), 50); 
 
 				SetGadgetRange    (_R(IDC_TRACER_MINAREASLIDER), 0, 50, 1);
 				SetGadgetBitmaps  (_R(IDC_TRACER_MINAREASLIDER), _R(IDB_QUALITYBASE), _R(IDB_QUALITYSLIDER));
-//				SetLongGadgetValue(_R(IDC_TRACER_MINAREASLIDER), 50-25); 
+//				SetLongGadgetValue(_R(IDC_TRACER_MINAREASLIDER), 25); 
 
 				SetGadgetRange    (_R(IDC_TRACER_ICTSLIDER), 0, 100, 1);
 				SetGadgetBitmaps  (_R(IDC_TRACER_ICTSLIDER), _R(IDB_QUALITYBASE), _R(IDB_QUALITYSLIDER));
-//				SetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), 100-35); 
+//				SetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), 35); 
 
 				SetGadgetRange    (_R(IDC_TRACER_FCTSLIDER), 0, 100, 1);
 				SetGadgetBitmaps  (_R(IDC_TRACER_FCTSLIDER), _R(IDB_QUALITYBASE), _R(IDB_QUALITYSLIDER));
-//				SetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), 100-25); 
+//				SetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), 25); 
 
 				SetGadgetRange    (_R(IDC_TRACER_SMOOTHSLIDER), 0, 100, 1);
 				SetGadgetBitmaps  (_R(IDC_TRACER_SMOOTHSLIDER), _R(IDB_QUALITYBASE), _R(IDB_QUALITYSLIDER));
@@ -1170,8 +1170,8 @@
 					if (!OurMessage && (Msg->GadgetID == _R(IDC_TRACER_ICTSLIDER) || Msg->GadgetID == _R(IDC_TRACER_FCTSLIDER)))
 					{
 						// We must fix sliders
-						INT32 CurrentInit = 100-GetLongGadgetValue  (_R(IDC_TRACER_ICTSLIDER),	0, 100, 0, NULL);
-						INT32 CurrentFinal = 100-GetLongGadgetValue  (_R(IDC_TRACER_FCTSLIDER),	0, 100, 0, NULL);
+						INT32 CurrentInit = GetLongGadgetValue  (_R(IDC_TRACER_ICTSLIDER),	0, 100, 0, NULL);
+						INT32 CurrentFinal = GetLongGadgetValue  (_R(IDC_TRACER_FCTSLIDER),	0, 100, 0, NULL);
 
 						OurMessage++;
 
@@ -1179,22 +1179,22 @@
 						{
 							if (Passes<=1)
 							{
-								SetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), 100-CurrentFinal);
+								SetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), CurrentFinal);
 							}
 							else if (CurrentInit<=CurrentFinal)
 							{
-								SetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), 100-((CurrentFinal>=100)?100:CurrentFinal+1));
+								SetLongGadgetValue(_R(IDC_TRACER_ICTSLIDER), ((CurrentFinal>=100)?100:CurrentFinal+1));
 							}
 						}
 						else
 						{
 							if (Passes<=1)
 							{
-								SetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), 100-CurrentInit);
+								SetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), CurrentInit);
 							}
 							else if (CurrentInit<=CurrentFinal)
 							{
-								SetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), 100-((CurrentInit<=0)?0:CurrentInit-1));
+								SetLongGadgetValue(_R(IDC_TRACER_FCTSLIDER), ((CurrentInit<=0)?0:CurrentInit-1));
 							}
 						}
 
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl	(revision 1333)
+++ Trunk/XaraLX/Scripts/rc2xml.pl	(revision 1334)
@@ -493,10 +493,13 @@
 
 
 # LTEXT           "Radius",IDC_STATIC,9,67,23,8
+# CTEXT           "Radius",IDC_STATIC,9,67,23,8
+# RTEXT           "Radius",IDC_STATIC,9,67,23,8
 sub ParseStaticText
 {
     my $phrase = shift @_;
     my $varname = shift @_;
+    my $type = shift @_;
     my $token = PeekToken ();
     while ($token !~ /^\d+$/ )
     {
@@ -511,6 +514,8 @@
     print OUTPUT "		<object class=\"wxStaticText\"";
     WriteBasicInfo (@rect, $varname);
     WriteLabel ($phrase);
+    WriteStyle ("wxALIGN_CENTRE") if ($type eq "CTEXT");
+    WriteStyle ("wxALIGN_RIGHT") if ($type eq "RTEXT");
     print OUTPUT "		</object>
";
 }
 
@@ -999,11 +1004,11 @@
 	    $varname = GetToken ();
 	    ParseRadioButton ($label, $varname);
 	}
-	elsif ($token eq "LTEXT")
+	elsif (($token eq "LTEXT") || ($token eq "CTEXT") || ($token eq "RTEXT"))
 	{
 	    $label = GetQuoteField ();
 	    $varname = GetToken ();
-	    ParseStaticText ($label, $varname);
+	    ParseStaticText ($label, $varname, $token);
 	}
 	elsif ($token eq "EDITTEXT")
 	{
Index: Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc	(revision 1334)
@@ -34,10 +34,20 @@
 			 <pos>10,100d</pos> <size>10,8d</size>
 			<label>0%</label>
 		</object>
+		<object class="wxStaticText" name="IDC_WEBOPTS_100PERCENT">
+			 <pos>74,100d</pos> <size>20,8d</size>
+			<label>100%</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxSlider" name="IDC_WEBOPTS_QUALITY">
 			 <pos>10,111d</pos> <size>73,15d</size>
 			<style>wxSL_HORIZONTAL</style>
 		</object>
+		<object class="wxStaticText" name="IDC_WEBOPTS_PERCENT">
+			 <pos>100,111d</pos> <size>19,10d</size>
+			<label>50%</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxStaticBox" name="ID_STATIC">
 			 <pos>170,5d</pos> <size>55,50d</size>
 			<label>Export size</label>
Index: Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc	(revision 1334)
@@ -166,6 +166,11 @@
 			 <pos>10,101d</pos> <size>141,10d</size>
 			<label>Make &amp;groups be transparent as a whole</label>
 		</object>
+		<object class="wxStaticText" name="IDC_OPTS_INFO3">
+			 <pos>10,5d</pos> <size>50,10d</size>
+			<label>General options</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<title> General </title>
 		<label> General </label>
 	</object>
@@ -273,6 +278,11 @@
 			 <pos>5,47d</pos> <size>195,27d</size>
 			<label>Gallery cache</label>
 		</object>
+		<object class="wxStaticText" name="IDC_OPTS_CACHETXT">
+			 <pos>17,59d</pos> <size>124,10d</size>
+			<label>&amp;Number of items cached per group:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxTextCtrl" name="IDC_OPTS_CACHESIZE">
 			 <pos>145,57d</pos> <size>50,12d</size>
 		</object>
@@ -311,9 +321,19 @@
 		<object class="wxTextCtrl" name="IDC_EDIT_CACHE_SIZE">
 			 <pos>145,150d</pos> <size>50,12d</size>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>16,147d</pos> <size>125,20d</size>
+			<label>Percentage of memory to use for caching groups, layers and live effects:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxTextCtrl" name="IDC_EDIT_CURRENTCACHE">
 			 <pos>145,167d</pos> <size>50,12d</size>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC_">
+			 <pos>16,169d</pos> <size>125,8d</size>
+			<label>Percentage of cache currently used:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<title> Tune-ups </title>
 		<label> Tune-ups </label>
 	</object>
@@ -607,10 +627,25 @@
 			 <pos>145,15d</pos> <size>50,14d</size>
 			<label>Setup...</label>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>10,18d</pos> <size>131,8d</size>
+			<label>Set folders for plugins and effects:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxCheckBox" name="IDC_CHECK_NEW_EFFECTS_LOCKED">
 			 <pos>15,55d</pos> <size>122,10d</size>
 			<label>New effects are locked by default</label>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC_LIVEEFFECT_RES">
+			 <pos>11,70d</pos> <size>100,12d</size>
+			<label>Default live effect resolution:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_STATIC_LOCKEDEFFECT_RES">
+			 <pos>11,87d</pos> <size>100,12d</size>
+			<label>Default locked effect resolution:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxOwnerDrawnComboBox" name="IDC_COMBO_LIVEEFFECT_RES">
 			 <pos>113,70d</pos> <size>82,-1d</size>
 		</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc	(revision 1334)
@@ -128,6 +128,11 @@
 			 <pos>7,33d</pos> <size>144,24d</size>
 			<label>"Set Design" will take your selection as the basis for the button design of this state. All buttons in this bar will reflect this design.</label>
 		</object>
+		<object class="wxStaticText" name="IDC_STATE_TEXT">
+			 <pos>92,6d</pos> <size>60,10d</size>
+			<label>MouseOver state</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxOwnerDrawnComboBox" name="IDC_BAR_NO_COMBO">
 			 <pos>92,18d</pos> <size>60,-1d</size>
 			<style>wxCB_READONLY</style>
Index: Trunk/XaraLX/wxOil/xrc/EN/webster.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webster.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/webster.xrc	(revision 1334)
@@ -30,6 +30,11 @@
 			 <pos>11,29d</pos> <size>45,10d</size>
 			<label>Cache usage:</label>
 		</object>
+		<object class="wxStaticText" name="IDC_CACHEUSAGE">
+			 <pos>61,28d</pos> <size>25,11d</size>
+			<label>100</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxStaticText" name="IDC_STATIC">
 			 <pos>88,29d</pos> <size>8,8d</size>
 			<label>%</label>
Index: Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc	(revision 1334)
@@ -119,6 +119,11 @@
 			 <pos>135,131d</pos> <size>124,11d</size>
 			<label></label>
 		</object>
+		<object class="wxStaticText" name="IDC_TRACER_STATUSTEXT">
+			 <pos>137,133d</pos> <size>120,8d</size>
+			<label></label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxButton" name="IDC_TRACER_HELP">
 			 <pos>263,58d</pos> <size>50,14d</size>
 			<label>&amp;Help</label>
Index: Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc	(revision 1334)
@@ -2,6 +2,36 @@
 <resource>
 	<object class="wxDialog" name="IDD_BIASGAIN">
 			 <pos>0,0d</pos> <size>124,149d</size>
+		<object class="wxStaticText" name="IDC_STATIC1">
+			 <pos>9,94d</pos> <size>7,9d</size>
+			<label>-1</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
+		<object class="wxStaticText" name="IDC_STATIC2">
+			 <pos>47,94d</pos> <size>5,9d</size>
+			<label>0</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
+		<object class="wxStaticText" name="IDC_STATIC3">
+			 <pos>81,94d</pos> <size>9,9d</size>
+			<label>+1</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
+		<object class="wxStaticText" name="IDC_STATIC4">
+			 <pos>9,121d</pos> <size>7,9d</size>
+			<label>-1</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
+		<object class="wxStaticText" name="IDC_STATIC5">
+			 <pos>47,121d</pos> <size>5,9d</size>
+			<label>0</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
+		<object class="wxStaticText" name="IDC_STATIC6">
+			 <pos>81,121d</pos> <size>9,9d</size>
+			<label>+1</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxSlider" name="IDC_SLIDER_BIAS">
 			 <pos>7,102d</pos> <size>100,15d</size>
 			<style>wxSL_HORIZONTAL</style>
Index: Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc	(revision 1334)
@@ -217,6 +217,11 @@
 			 <pos>54,82d</pos> <size>50,14d</size>
 			<label>&amp;Suspend</label>
 		</object>
+		<object class="wxStaticText" name="IDC_CURRENTPERCENTAGE">
+			 <pos>6,68d</pos> <size>146,10d</size>
+			<label>0%</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxSlider" name="IDC_PRINTPROGSLIDER">
 			 <pos>6,58d</pos> <size>146,10d</size>
 			<style>wxSL_HORIZONTAL</style>
@@ -229,6 +234,11 @@
 			 <pos>44,4d</pos> <size>108,10d</size>
 			<label></label>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>4,14d</pos> <size>35,10d</size>
+			<label>Printer:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxStaticText" name="IDC_PRINTERNAME">
 			 <pos>44,14d</pos> <size>108,10d</size>
 			<label></label>
@@ -249,6 +259,11 @@
 			 <pos>32,44d</pos> <size>120,10d</size>
 			<label>-</label>
 		</object>
+		<object class="wxStaticText" name="IDC_TILETITLE">
+			 <pos>84,34d</pos> <size>15,10d</size>
+			<label>Tile:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxStaticText" name="IDC_TILENUMBER">
 			 <pos>103,34d</pos> <size>47,10d</size>
 			<label>-</label>
@@ -323,9 +338,19 @@
 			 <pos>5,25d</pos> <size>155,35d</size>
 			<label>Print Objects</label>
 		</object>
+		<object class="wxStaticText" name="stc2">
+			 <pos>24,-1075d</pos> <size>24,9d</size>
+			<label>&amp;From:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxTextCtrl" name="edt1">
 			 <pos>52,-1073d</pos> <size>26,12d</size>
 		</object>
+		<object class="wxStaticText" name="stc3">
+			 <pos>82,-1075d</pos> <size>16,9d</size>
+			<label>&amp;To:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxTextCtrl" name="edt2">
 			 <pos>102,-1073d</pos> <size>26,12d</size>
 		</object>
@@ -357,6 +382,11 @@
 			 <pos>5,130d</pos> <size>215,15d</size>
 			<label></label>
 		</object>
+		<object class="wxStaticText" name="IDC_PRINTLAYOUTINFO">
+			 <pos>10,133d</pos> <size>205,10d</size>
+			<label>Custom fit; 100% Upright: 1 page fits on the paper</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxStaticBox" name="IDC_GROUP_PRINTPAGES">
 			 <pos>5,65d</pos> <size>155,35d</size>
 			<label>Print Pages</label>
@@ -451,6 +481,21 @@
 			 <pos>12,35d</pos> <size>79,10d</size>
 			<label>Use &amp;custom settings</label>
 		</object>
+		<object class="wxStaticText" name="IDC_SSTATIC2">
+			 <pos>19,46d</pos> <size>80,8d</size>
+			<label>Target printer resolution</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_SSTATIC4">
+			 <pos>19,60d</pos> <size>80,8d</size>
+			<label>Default screen frequency</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_SSTATIC6">
+			 <pos>21,75d</pos> <size>78,11d</size>
+			<label>Screen/Dot type</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxStaticText" name="IDC_PRINT_DOCNAMETEXT">
 			 <pos>5,5d</pos> <size>91,8d</size>
 			<label>Colour separation options for</label>
@@ -488,6 +533,11 @@
 			 <pos>23,20d</pos> <size>19,8d</size>
 			<label>Angle</label>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>9,36d</pos> <size>33,8d</size>
+			<label>Frequency</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxTextCtrl" name="IDC_EDITANGLE">
 			 <pos>45,17d</pos> <size>47,12d</size>
 		</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/bezbar.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bezbar.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/bezbar.xrc	(revision 1334)
@@ -104,6 +104,36 @@
 			 <pos>49,74d</pos> <size>20,8d</size>
 			<label>100%</label>
 		</object>
+		<object class="wxStaticText" name="IDC_PATH_STATIC_FIRSTX">
+			 <pos>8,4d</pos> <size>6,8d</size>
+			<label>X</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_PATH_STATIC_FIRSTY">
+			 <pos>8,20d</pos> <size>6,8d</size>
+			<label>Y</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_PATH_STATIC_MIDX">
+			 <pos>48,4d</pos> <size>6,8d</size>
+			<label>X</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_PATH_STATIC_SECONDX">
+			 <pos>88,4d</pos> <size>6,8d</size>
+			<label>X</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_PATH_STATIC_MIDY">
+			 <pos>48,20d</pos> <size>6,8d</size>
+			<label>Y</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_PATH_STATIC_SECONDY">
+			 <pos>88,20d</pos> <size>6,8d</size>
+			<label>Y</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<title>Dialog</title>
 		<label>Dialog</label>
 	</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc	(revision 1334)
@@ -29,14 +29,29 @@
 		<object class="wxCamDrawControl" name="IDC_STRIPE1">
 			 <pos>4,44d</pos> <size>196,1d</size>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>4,49d</pos> <size>52,10d</size>
+			<label>Licensee:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxStaticText" name="IDC_LICENSEE">
 			 <pos>60,49d</pos> <size>132,8d</size>
 			<label>Justin Flude</label>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>4,60d</pos> <size>52,8d</size>
+			<label>Organisation:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxStaticText" name="IDC_COMPANY">
 			 <pos>60,60d</pos> <size>132,8d</size>
 			<label>Xara Ltd.</label>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>4,71d</pos> <size>52,8d</size>
+			<label>Program:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxStaticText" name="IDC_SERIAL">
 			 <pos>60,71d</pos> <size>132,8d</size>
 			<label>+ 44 1442 351000</label>
@@ -44,6 +59,11 @@
 		<object class="wxCamDrawControl" name="IDC_STRIPE2">
 			 <pos>4,85d</pos> <size>196,1d</size>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>4,91d</pos> <size>52,8d</size>
+			<label>Host OS:</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxStaticText" name="IDC_CAMHOST">
 			 <pos>60,91d</pos> <size>131,8d</size>
 			<label>Windows NT 3.50</label>
Index: Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc	(revision 1334)
@@ -18,10 +18,20 @@
 			 <pos>22,59d</pos> <size>10,8d</size>
 			<label>0%</label>
 		</object>
+		<object class="wxStaticText" name="IDC_WEBOPTS_100PERCENT">
+			 <pos>86,59d</pos> <size>20,8d</size>
+			<label>100%</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxSlider" name="IDC_WEBOPTS_QUALITY">
 			 <pos>22,70d</pos> <size>73,15d</size>
 			<style>wxSL_HORIZONTAL</style>
 		</object>
+		<object class="wxStaticText" name="IDC_WEBOPTS_PERCENT">
+			 <pos>108,70d</pos> <size>19,10d</size>
+			<label>50%</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxStaticBox" name="ID_STATIC">
 			 <pos>144,2d</pos> <size>55,41d</size>
 			<label>Area to view</label>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc	(revision 1334)
@@ -296,10 +296,20 @@
 			 <pos>10,97d</pos> <size>10,8d</size>
 			<label>0%</label>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>78,97d</pos> <size>20,8d</size>
+			<label>100%</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxSlider" name="IDC_BMPOPTS_QUALITY">
 			 <pos>10,107d</pos> <size>79,15d</size>
 			<style>wxSL_HORIZONTAL</style>
 		</object>
+		<object class="wxStaticText" name="IDC_BMPOPTS_PERCENT">
+			 <pos>93,107d</pos> <size>20,10d</size>
+			<label>50%</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxCheckBox" name="IDC_JPGOPTS_PROGRESSIVE">
 			 <pos>10,131d</pos> <size>60,13d</size>
 			<label>&amp;Progressive</label>
Index: Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc	(revision 1334)
@@ -30,6 +30,26 @@
 		<object class="wxTextCtrl" name="IDC_EDIT_COMPONENT4">
 			 <pos>96,128d</pos> <size>20,12d</size>
 		</object>
+		<object class="wxStaticText" name="IDC_NAME_COMPONENT1">
+			 <pos>4,130d</pos> <size>16,8d</size>
+			<label>M</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_NAME_COMPONENT2">
+			 <pos>32,127d</pos> <size>16,8d</size>
+			<label>M</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_NAME_COMPONENT3">
+			 <pos>60,127d</pos> <size>16,8d</size>
+			<label>M</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
+		<object class="wxStaticText" name="IDC_NAME_COMPONENT4">
+			 <pos>88,127d</pos> <size>16,8d</size>
+			<label>M</label>
+			<style>wxALIGN_RIGHT</style>
+		</object>
 		<object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLMODEL">
 			 <pos>400,147d</pos> <size>104,-1d</size>
 			<style>wxCB_READONLY</style>
Index: Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc	(revision 1334)
@@ -587,6 +587,11 @@
 	</object>
 	<object class="wxDialog" name="IDD_NAMEDLG_NAME_TEMPLATE">
 			 <pos>0,0d</pos> <size>183,70d</size>
+		<object class="wxStaticText" name="IDC_NAMEDLG_DESC">
+			 <pos>14,8d</pos> <size>152,16d</size>
+			<label>Not enough memory!</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxStaticText" name="IDC_STATIC">
 			 <pos>14,32d</pos> <size>40,10d</size>
 			<label>New name:</label>
@@ -611,6 +616,11 @@
 	</object>
 	<object class="wxDialog" name="IDD_NAMEDLG_RENAME_TEMPLATE">
 			 <pos>0,0d</pos> <size>183,70d</size>
+		<object class="wxStaticText" name="IDC_NAMEDLG_DESC">
+			 <pos>14,8d</pos> <size>152,16d</size>
+			<label>Not enough memory!</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxStaticText" name="IDC_STATIC">
 			 <pos>14,32d</pos> <size>40,10d</size>
 			<label>New name:</label>
Index: Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/galres.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/galres.xrc	(revision 1334)
@@ -360,6 +360,11 @@
 			 <pos>107,20d</pos> <size>50,14d</size>
 			<label>&amp;Cancel</label>
 		</object>
+		<object class="wxStaticText" name="IDC_STATIC">
+			 <pos>2,7d</pos> <size>24,8d</size>
+			<label>Name:</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxCamDrawControl" name="IDC_COLNAME_PATCH">
 			 <pos>8,20d</pos> <size>12,12d</size>
 		</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc	(revision 1333)
+++ Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc	(revision 1334)
@@ -21,6 +21,11 @@
 			 <pos>5,102d</pos> <size>20,8d</size>
 			<label>Value</label>
 		</object>
+		<object class="wxStaticText" name="IDC_DEBUGDLG_COMMENT">
+			 <pos>0,120d</pos> <size>175,15d</size>
+			<label>Description</label>
+			<style>wxALIGN_CENTRE</style>
+		</object>
 		<object class="wxListBox" name="IDC_DEBUGDLG_LIST">
 			 <pos>40,20d</pos> <size>130,75d</size>
 		</object>


Xara