[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 933
Date : Tue May 2 13:42:36 BST 2006
Changed paths:
M /Trunk/XaraLX/Scripts/rc2xml.pl
M /Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/gifdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/webster.xrc
Converted some further dialog resources over to used tabs
Diff:
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl (revision 932)
+++ Trunk/XaraLX/Scripts/rc2xml.pl (revision 933)
@@ -299,6 +299,15 @@
print OUTPUT " <title>$t</title>
";
}
+sub WriteTooltip
+{
+ my $t=shift @_;
+ $t=~s/</</g;
+ $t=~s/>/>/g;
+ $t=~s/&/&/g;
+ print OUTPUT " <tooltip>$t</tooltip>
";
+}
+
# Write basic info
sub WriteBasicInfo
{
@@ -1220,6 +1229,7 @@
ParseControls();
WriteTitle ($title);
+ WriteTooltip ($title) if IsPanel($dlgname);
print OUTPUT " </object>
";
}
Index: Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc (revision 932)
+++ Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc (revision 933)
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource>
- <object class="wxDialog" name="IDD_OPTSTAB_VIEW">
+ <object class="wxPanel" name="IDD_OPTSTAB_VIEW">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticText" name="IDC_OPTS_VIEWINFO">
<pos>5,5d</pos> <size>195,10d</size>
@@ -81,8 +81,9 @@
<label>DPI when auto generated</label>
</object>
<title> View </title>
+ <tooltip> View </tooltip>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_MISC">
+ <object class="wxPanel" name="IDD_OPTSTAB_MISC">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticBox" name="IDC_OPTS_MISCGRP1">
<pos>5,5d</pos> <size>195,127d</size>
@@ -163,8 +164,9 @@
<label>Make &groups be transparent as a whole</label>
</object>
<title> General </title>
+ <tooltip> General </tooltip>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_PAGE">
+ <object class="wxPanel" name="IDD_OPTSTAB_PAGE">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticText" name="IDC_OPTS_INFO">
<pos>5,5d</pos> <size>195,10d</size>
@@ -234,8 +236,9 @@
<label>Sh&ow page shadow</label>
</object>
<title> Page </title>
+ <tooltip> Page </tooltip>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_TUNE">
+ <object class="wxPanel" name="IDD_OPTSTAB_TUNE">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticBox" name="IDC_OPTS_TUNEGROUP">
<pos>5,2d</pos> <size>195,43d</size>
@@ -305,8 +308,9 @@
<pos>145,167d</pos> <size>50,12d</size>
</object>
<title> Tune-ups </title>
+ <tooltip> Tune-ups </tooltip>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_SCALE">
+ <object class="wxPanel" name="IDD_OPTSTAB_SCALE">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticText" name="IDC_OPTS_INFO">
<pos>5,5d</pos> <size>195,10d</size>
@@ -347,8 +351,9 @@
<label>E.g. 1 to 25000</label>
</object>
<title> Scaling </title>
+ <tooltip> Scaling </tooltip>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_POINTERS">
+ <object class="wxPanel" name="IDD_OPTSTAB_POINTERS">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticText" name="IDC_OPTS_INFO">
<pos>5,5d</pos> <size>195,10d</size>
@@ -395,8 +400,9 @@
<pos>140,116d</pos> <size>55,12d</size>
</object>
<title> Mouse </title>
+ <tooltip> Mouse </tooltip>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_GRID">
+ <object class="wxPanel" name="IDD_OPTSTAB_GRID">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticText" name="IDC_OPTS_INFO">
<pos>5,5d</pos> <size>195,10d</size>
@@ -451,8 +457,9 @@
<pos>81,132d</pos> <size>45,12d</size>
</object>
<title> Grid and Ruler </title>
+ <tooltip> Grid and Ruler </tooltip>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_UNITS">
+ <object class="wxPanel" name="IDD_OPTSTAB_UNITS">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticText" name="IDC_OPTS_INFO">
<pos>5,5d</pos> <size>195,10d</size>
@@ -509,6 +516,7 @@
<label>&0 - 255</label>
</object>
<title> Units </title>
+ <tooltip> Units </tooltip>
</object>
<object class="wxDialog" name="IDD_OPTS_UNITPROPERTIES">
<pos>0,0d</pos> <size>237,113d</size>
@@ -569,7 +577,7 @@
</object>
<title>Unit properties</title>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_PLUGINS">
+ <object class="wxPanel" name="IDD_OPTSTAB_PLUGINS">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticBox" name="IDC_OPTS_LIVEEFFECTS">
<pos>5,40d</pos> <size>195,70d</size>
@@ -594,5 +602,6 @@
<pos>113,87d</pos> <size>82,-1d</size>
</object>
<title>Effects && Plugins</title>
+ <tooltip>Effects && Plugins</tooltip>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 932)
+++ Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 933)
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource>
- <object class="wxDialog" name="IDD_TAB_GUIDELINE_PROPERTIES">
+ <object class="wxPanel" name="IDD_TAB_GUIDELINE_PROPERTIES">
<pos>0,0d</pos> <size>201,148d</size>
<object class="wxButton" name="IDC_GUIDETAB_NEW">
<pos>125,20d</pos> <size>55,14d</size>
@@ -42,8 +42,9 @@
<label>Guidelines</label>
</object>
<title>Guides</title>
+ <tooltip>Guides</tooltip>
</object>
- <object class="wxDialog" name="IDD_TAB_LAYER_PROPERTIES">
+ <object class="wxPanel" name="IDD_TAB_LAYER_PROPERTIES">
<pos>0,0d</pos> <size>201,148d</size>
<object class="wxStaticBox" name="IDC_STATIC">
<pos>5,5d</pos> <size>190,60d</size>
@@ -65,6 +66,7 @@
<pos>45,25d</pos> <size>140,13d</size>
</object>
<title>Layer</title>
+ <tooltip>Layer</tooltip>
</object>
<object class="wxDialog" name="IDD_GUIDELINE_PROPERTIES">
<pos>0,0d</pos> <size>171,63d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/webster.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webster.xrc (revision 932)
+++ Trunk/XaraLX/wxOil/xrc/EN/webster.xrc (revision 933)
@@ -15,7 +15,7 @@
</object>
<title>File download</title>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_INTERNET">
+ <object class="wxPanel" name="IDD_OPTSTAB_INTERNET">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticText" name="IDC_OPTS_INETINFO">
<pos>5,5d</pos> <size>195,10d</size>
@@ -73,5 +73,6 @@
<label></label>
</object>
<title>Internet</title>
+ <tooltip>Internet</tooltip>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc (revision 932)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc (revision 933)
@@ -76,6 +76,7 @@
<pos>228,39d</pos> <size>99,8d</size>
<label>Minimise visible anti-aliasing</label>
</object>
+ <title>Bitmap Size</title>
<tooltip>Bitmap Size</tooltip>
</object>
<object class="wxPanel" name="IDD_TIMAPOPTIONS">
@@ -147,6 +148,7 @@
<pos>81,72d</pos> <size>98,8d</size>
<label>Current drawing must be saved</label>
</object>
+ <title>Image Map</title>
<tooltip>Image Map</tooltip>
</object>
<object class="wxPanel" name="IDD_TBROWSER">
@@ -192,6 +194,7 @@
<pos>240,30d</pos> <size>112,10d</size>
<label>Show all previews in browser</label>
</object>
+ <title>Browser Preview</title>
<tooltip>Browser Preview</tooltip>
</object>
<object class="wxPanel" name="IDD_TBITMAPOPTIONS">
@@ -224,6 +227,7 @@
<pos>6,34d</pos> <size>178,10d</size>
<label>Y</label>
</object>
+ <title>Options</title>
<tooltip>Options</tooltip>
</object>
<object class="wxPanel" name="IDD_PALETTE_TAB">
@@ -322,6 +326,7 @@
<object class="wxComboBox" name="IDC_T2_SORT_LIST">
<pos>296,71d</pos> <size>68,-1d</size>
</object>
+ <title>Palette Options</title>
<tooltip>Palette Options</tooltip>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 932)
+++ Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 933)
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource>
- <object class="wxDialog" name="IDD_BLOBTAB_PG1">
+ <object class="wxPanel" name="IDD_BLOBTAB_PG1">
<pos>0,0d</pos> <size>160,100d</size>
<object class="wxScrollBar" name="IDC_TSCROLLBAR2">
<pos>52,12d</pos> <size>11,56d</size>
@@ -27,8 +27,9 @@
<label></label>
</object>
<title>Coords</title>
+ <tooltip>Coords</tooltip>
</object>
- <object class="wxDialog" name="IDD_BLOBTAB_PG2">
+ <object class="wxPanel" name="IDD_BLOBTAB_PG2">
<pos>0,0d</pos> <size>160,100d</size>
<object class="wxRadioButton" name="IDC_TRADIO21">
<pos>89,34d</pos> <size>35,10d</size>
@@ -56,8 +57,9 @@
<label>Radio6</label>
</object>
<title>RadioDaze</title>
+ <tooltip>RadioDaze</tooltip>
</object>
- <object class="wxDialog" name="IDD_BLOBTAB_PG3">
+ <object class="wxPanel" name="IDD_BLOBTAB_PG3">
<pos>0,0d</pos> <size>160,100d</size>
<object class="wxComboBox" name="IDC_TCOMBO3">
<pos>16,22d</pos> <size>56,-1d</size>
@@ -95,6 +97,7 @@
<label>Convert</label>
</object>
<title>Convert</title>
+ <tooltip>Convert</tooltip>
</object>
<object class="wxDialog" name="IDD_BLOBBYDLG">
<pos>0,0d</pos> <size>323,248d</size>
Index: Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 932)
+++ Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 933)
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource>
- <object class="wxDialog" name="IDD_OPTSTAB_PRINTLAYOUT">
+ <object class="wxPanel" name="IDD_OPTSTAB_PRINTLAYOUT">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxCamArtControl" name="IDC_BTN_UPRIGHT">
<pos>45,55d</pos> <size>24,24d</size>
@@ -130,8 +130,9 @@
<style>wxRB_GROUP</style>
</object>
<title>Print layout</title>
+ <tooltip>Print layout</tooltip>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_PRINTGENERAL">
+ <object class="wxPanel" name="IDD_OPTSTAB_PRINTGENERAL">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxRadioButton" name="IDC_ALLFOREGROUND">
<pos>10,31d</pos> <size>80,11d</size>
@@ -207,6 +208,7 @@
<label>Text options</label>
</object>
<title> Output </title>
+ <tooltip> Output </tooltip>
</object>
<object class="wxDialog" name="IDD_PRINTPROGRESS">
<pos>0,0d</pos> <size>157,100d</size>
@@ -390,7 +392,7 @@
</object>
<title>Xara Xtreme EPS Export Options</title>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_PRINTPRINT">
+ <object class="wxPanel" name="IDD_OPTSTAB_PRINTPRINT">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticBox" name="IDC_STATIC">
<pos>6,15d</pos> <size>193,76d</size>
@@ -460,6 +462,7 @@
<label>lpi</label>
</object>
<title>Separations</title>
+ <tooltip>Separations</tooltip>
</object>
<object class="wxDialog" name="IDD_PLATEPROPS">
<pos>0,0d</pos> <size>176,78d</size>
@@ -499,7 +502,7 @@
</object>
<title>Separation properties</title>
</object>
- <object class="wxDialog" name="IDD_OPTSTAB_IMAGESETTING">
+ <object class="wxPanel" name="IDD_OPTSTAB_IMAGESETTING">
<pos>0,0d</pos> <size>206,188d</size>
<object class="wxStaticText" name="IDC_ISTATIC2">
<pos>8,4d</pos> <size>79,10d</size>
@@ -545,5 +548,6 @@
<label>Always overprint black</label>
</object>
<title>Imagesetting</title>
+ <tooltip>Imagesetting</tooltip>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/gifdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/gifdlg.xrc (revision 932)
+++ Trunk/XaraLX/wxOil/xrc/EN/gifdlg.xrc (revision 933)
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<resource>
- <object class="wxDialog" name="IDD_TAB_ANIMATION_COLOURS">
+ <object class="wxPanel" name="IDD_TAB_ANIMATION_COLOURS">
<pos>0,0d</pos> <size>201,121d</size>
<object class="wxStaticBox" name="IDC_STATIC">
<pos>5,5d</pos> <size>190,60d</size>
@@ -52,8 +52,9 @@
<label>Make background &transparent</label>
</object>
<title>Animation Colours</title>
+ <tooltip>Animation Colours</tooltip>
</object>
- <object class="wxDialog" name="IDD_TAB_FRAME_PROPERTIES">
+ <object class="wxPanel" name="IDD_TAB_FRAME_PROPERTIES">
<pos>0,0d</pos> <size>201,121d</size>
<object class="wxStaticBox" name="IDC_STATIC">
<pos>5,5d</pos> <size>190,51d</size>
@@ -94,8 +95,9 @@
<label>Show frame</label>
</object>
<title>Frame</title>
+ <tooltip>Frame</tooltip>
</object>
- <object class="wxDialog" name="IDD_TAB_ANIMATION_PROPERTIES">
+ <object class="wxPanel" name="IDD_TAB_ANIMATION_PROPERTIES">
<pos>0,0d</pos> <size>201,121d</size>
<object class="wxStaticBox" name="IDC_STATIC">
<pos>5,5d</pos> <size>180,50d</size>
@@ -128,8 +130,9 @@
<label>1/100 s</label>
</object>
<title>Animation Loop and Speed</title>
+ <tooltip>Animation Loop and Speed</tooltip>
</object>
- <object class="wxDialog" name="IDD_TAB_PREVIEW_IN_BROWSER">
+ <object class="wxPanel" name="IDD_TAB_PREVIEW_IN_BROWSER">
<pos>0,0d</pos> <size>201,121d</size>
<object class="wxStaticBox" name="IDC_GIF_T5STATIC1">
<pos>15,5d</pos> <size>110,60d</size>
@@ -161,5 +164,6 @@
<label>Include Image Information</label>
</object>
<title>Preview in Browser</title>
+ <tooltip>Preview in Browser</tooltip>
</object>
</resource>
Xara