[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete

From: subversion@xxxxxxxxxxxxxx
Date: Tue, 2 May 2006 19:55:45 +0100
Subject: [XaraXtreme-commits] Commit Complete
Commit by  : alex
Repository : xara
Revision   : 939
Date       : Tue May  2 19:55:45 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/main3.cpp
   M /Trunk/XaraLX/Scripts/rc2xml.pl
   M /Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/sliceres.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
   M /Trunk/XaraLX/wxOil/xrc/EN/xardlg.xrc

Fix radio box grouping in dialogs
Fix commit on options dialog so it doesn't crash


Diff:
Index: Trunk/XaraLX/Kernel/main3.cpp
===================================================================
--- Trunk/XaraLX/Kernel/main3.cpp	(revision 938)
+++ Trunk/XaraLX/Kernel/main3.cpp	(revision 939)
@@ -292,9 +292,9 @@
 #ifndef DISABLE_TEXT_RENDERING
 			FontCache::Init() &&
 #endif
-#ifndef EXCLUDE_FROM_XARALX
 			TunedMemory::Init()	&&				// declare prefs for the memory manager
 
+#ifndef EXCLUDE_FROM_XARALX
 			OILRuler::Init() &&					// set the ruler widths depending on .ini font settings
 			InitRegistry() &&					// register us with the shell etc
 			InitAppState()	&&					// get workspace prefs
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl	(revision 938)
+++ Trunk/XaraLX/Scripts/rc2xml.pl	(revision 939)
@@ -93,6 +93,9 @@
 my %stringtable;
 my %bitmap;
 
+my $CurrentGroup=1;
+my $ThisRadioGroup=0;
+
 GetOptions( "stdout!" => \$stdout,
 	    "verbose|v+" => \$verbose,
 	    "help!" => \$help ) || usage ("Bad option");
@@ -151,7 +154,18 @@
     return 0;
 }
 
+sub NewGroup
+{
+    $CurrentGroup++;
+}
 
+sub IsNewRadioGroup
+{
+    my $isnew = ($CurrentGroup != $ThisRadioGroup);
+    $ThisRadioGroup = $CurrentGroup;
+    return $isnew;
+}
+
 sub LookUpString
 {
     my $strid = shift @_;
@@ -548,7 +562,7 @@
 	ReadOrs (\$token) unless $GotOrs;
     }
 
-    $style .= "wxRB_GROUP" if ($token =~ /WS_GROUP/);
+    $style .= "wxRB_GROUP" if (IsNewRadioGroup() || ($token =~ /WS_GROUP/));
 
     print OUTPUT "		<object class=\"wxRadioButton\"";
     WriteBasicInfo (@rect, $varname);
@@ -907,8 +921,17 @@
 
     # read position
     my @rect;
-    ReadRect(\@rect);
+    $token="";
+    if (ReadRect(\@rect))
+    {
+	ReadOrs (\$token);
+    }
 
+    if ($token=~/WS_GROUP/)
+    {
+	NewGroup();
+    }
+
     print OUTPUT "		<object class=\"wxStaticBox\"";
     WriteBasicInfo (@rect, $varname);
     WriteLabel ($phrase);
Index: Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc	(revision 939)
@@ -19,6 +19,7 @@
 		<object class="wxRadioButton" name="IDC_BFXDLG_FLIPX">
 			 <pos>6,100d</pos> <size>66,10d</size>
 			<label>Flip &amp;horizontally</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_BFXDLG_FLIPY">
 			 <pos>6,110d</pos> <size>66,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc	(revision 939)
@@ -45,6 +45,7 @@
 		<object class="wxRadioButton" name="IDC_NATIVEOPTS_DRAWING">
 			 <pos>175,20d</pos> <size>40,10d</size>
 			<label>&amp;Drawing</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_NATIVEOPTS_SELECT">
 			 <pos>175,40d</pos> <size>45,10d</size>
@@ -57,6 +58,7 @@
 		<object class="wxRadioButton" name="IDC_WEBOPTS_DRAWING">
 			 <pos>175,75d</pos> <size>42,10d</size>
 			<label>D&amp;rawing</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_WEBOPTS_SELECT">
 			 <pos>175,95d</pos> <size>45,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc	(revision 939)
@@ -200,6 +200,7 @@
 		<object class="wxRadioButton" name="IDC_OPTS_PORTRAIT">
 			 <pos>59,65d</pos> <size>40,10d</size>
 			<label>&amp;Portrait</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_OPTS_LANDSCAPE">
 			 <pos>104,65d</pos> <size>50,10d</size>
@@ -255,6 +256,7 @@
 		<object class="wxRadioButton" name="IDC_OPTS_USEMAXMEMORY">
 			 <pos>50,28d</pos> <size>45,10d</size>
 			<label>&amp;Automatic</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_OPTS_USELIMITMEM">
 			 <pos>105,28d</pos> <size>40,10d</size>
@@ -285,6 +287,7 @@
 		<object class="wxRadioButton" name="IDC_OPTS_UNLIMITEDUNDO">
 			 <pos>50,104d</pos> <size>45,10d</size>
 			<label>&amp;Unlimited</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_OPTS_LIMITEDUNDO">
 			 <pos>105,104d</pos> <size>37,10d</size>
@@ -433,6 +436,7 @@
 		<object class="wxRadioButton" name="IDC_OPTS_RECTANGULAR">
 			 <pos>81,83d</pos> <size>55,10d</size>
 			<label>&amp;Rectangular</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_OPTS_ISOMETRIC">
 			 <pos>145,83d</pos> <size>45,10d</size>
@@ -510,6 +514,7 @@
 		<object class="wxRadioButton" name="IDC_OPTS_CLR_UNIT_USE_PERCENT">
 			 <pos>145,35d</pos> <size>46,9d</size>
 			<label>Percen&amp;t</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_OPTS_CLR_UNIT_USE_BYTE">
 			 <pos>145,48d</pos> <size>46,9d</size>
@@ -541,6 +546,7 @@
 		<object class="wxRadioButton" name="IDC_OPTS_UNITPREFIX">
 			 <pos>100,40d</pos> <size>30,10d</size>
 			<label>P&amp;refix</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_OPTS_UNITSUFFIX">
 			 <pos>135,40d</pos> <size>30,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc	(revision 939)
@@ -13,6 +13,7 @@
 		<object class="wxRadioButton" name="IDC_GUIDETAB_HORZ">
 			 <pos>25,79d</pos> <size>45,10d</size>
 			<label>Horizontal</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_GUIDETAB_VERT">
 			 <pos>75,79d</pos> <size>45,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc	(revision 939)
@@ -44,6 +44,7 @@
 		<object class="wxRadioButton" name="IDC_MOUSE_OFF">
 			 <pos>8,8d</pos> <size>55,10d</size>
 			<label>Mouse Off</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_MOUSE_OVER">
 			 <pos>8,19d</pos> <size>55,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/webster.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webster.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/webster.xrc	(revision 939)
@@ -51,6 +51,7 @@
 		<object class="wxRadioButton" name="IDC_14K">
 			 <pos>15,73d</pos> <size>96,12d</size>
 			<label>14.4 Kbs modem</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_28K">
 			 <pos>15,85d</pos> <size>96,12d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/xardlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xardlg.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/xardlg.xrc	(revision 939)
@@ -9,6 +9,7 @@
 		<object class="wxRadioButton" name="IDC_NATIVEOPTS_DRAWING">
 			 <pos>10,20d</pos> <size>40,10d</size>
 			<label>&amp;Drawing</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_NATIVEOPTS_SELECT">
 			 <pos>10,35d</pos> <size>45,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc	(revision 939)
@@ -262,6 +262,7 @@
 		<object class="wxRadioButton" name="IDC_RADIOLOCALFILLALL">
 			 <pos>107,71d</pos> <size>67,13d</size>
 			<label>All brush colours</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_RADIOLOCALFILLNAMED">
 			 <pos>107,95d</pos> <size>83,12d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc	(revision 939)
@@ -29,6 +29,7 @@
 		<object class="wxRadioButton" name="IDC_WEBOPTS_DRAWING">
 			 <pos>149,13d</pos> <size>40,10d</size>
 			<label>&amp;Drawing</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_WEBOPTS_SELECT">
 			 <pos>149,28d</pos> <size>45,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc	(revision 939)
@@ -54,6 +54,7 @@
 		<object class="wxRadioButton" name="IDC_BMPOPTS_SPREAD">
 			 <pos>165,20d</pos> <size>45,10d</size>
 			<label>S&amp;pread</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_BMPOPTS_DRAWING">
 			 <pos>165,40d</pos> <size>40,10d</size>
@@ -70,6 +71,7 @@
 		<object class="wxRadioButton" name="IDC_BMPOPTS_CMYK">
 			 <pos>12,100d</pos> <size>32,10d</size>
 			<label>CMYK</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_BMPOPTS_32BPP">
 			 <pos>17,100d</pos> <size>24,10d</size>
@@ -98,6 +100,7 @@
 		<object class="wxRadioButton" name="IDC_BMPOPTS_RLE">
 			 <pos>164,100d</pos> <size>31,10d</size>
 			<label>RLE</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_BMPOPTS_RGB">
 			 <pos>204,100d</pos> <size>31,10d</size>
@@ -141,6 +144,7 @@
 		<object class="wxRadioButton" name="IDC_BMPOPTS_PAL_STD">
 			 <pos>12,134d</pos> <size>41,10d</size>
 			<label>Browser</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_BMPOPTS_PAL_OPT">
 			 <pos>58,134d</pos> <size>43,10d</size>
@@ -153,6 +157,7 @@
 		<object class="wxRadioButton" name="IDC_BMPOPTS_NODITHER">
 			 <pos>120,134d</pos> <size>33,10d</size>
 			<label>None</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_BMPOPTS_ORDDITHER">
 			 <pos>159,134d</pos> <size>42,10d</size>
@@ -270,6 +275,7 @@
 		<object class="wxRadioButton" name="IDC_BMPOPTS_SPREAD">
 			 <pos>165,85d</pos> <size>40,10d</size>
 			<label>S&amp;pread</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_BMPOPTS_DRAWING">
 			 <pos>165,100d</pos> <size>40,10d</size>
@@ -322,6 +328,7 @@
 		<object class="wxRadioButton" name="IDC_PHOTOCD_BASEDIV16">
 			 <pos>10,20d</pos> <size>110,10d</size>
 			<label>Base/16 (192 by 128) </label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_PHOTOCD_BASEDIV4">
 			 <pos>10,35d</pos> <size>110,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc	(revision 939)
@@ -18,6 +18,7 @@
 		<object class="wxRadioButton" name="IDC_IMAGEMAP_AREA_SELECTION">
 			 <pos>36,94d</pos> <size>45,10d</size>
 			<label>&amp;Selection</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_IMAGEMAP_AREA_DRAWING">
 			 <pos>112,94d</pos> <size>40,10d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/galres.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/galres.xrc	(revision 939)
@@ -310,6 +310,7 @@
 		<object class="wxRadioButton" name="IDC_SGSEARCH_NAMEONLY">
 			 <pos>4,36d</pos> <size>100,10d</size>
 			<label>Search &amp;names &amp;&amp; keywords</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxTextCtrl" name="IDC_SGSEARCH_TEXT">
 			 <pos>4,20d</pos> <size>104,13d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc	(revision 938)
+++ Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc	(revision 939)
@@ -16,6 +16,7 @@
 		<object class="wxRadioButton" name="IDC_WEBADDRESS_OBJECTSHAPE">
 			 <pos>18,83d</pos> <size>79,11d</size>
 			<label>Shape of object</label>
+			<style>wxRB_GROUP</style>
 		</object>
 		<object class="wxRadioButton" name="IDC_WEBADDRESS_RECTANGLE">
 			 <pos>103,82d</pos> <size>112,12d</size>


Xara
Prev by Date: [XaraXtreme-commits] Commit Complete
Next by Date: [XaraXtreme-commits] Commit Complete
Previous by thread: [XaraXtreme-commits] Commit Complete
Next by thread: [XaraXtreme-commits] Commit Complete
Index(es):
- Thread