[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 951
Date : Wed May 3 18:02:47 BST 2006
Changed paths:
M /Trunk/XaraLX/Scripts/rc2xml.pl
M /Trunk/XaraLX/wxOil/dlgmgr.cpp
M /Trunk/XaraLX/wxOil/dragbmp.cpp
M /Trunk/XaraLX/wxOil/osrndrgn.cpp
M /Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/andydlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/assoc.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bezbar.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/blendbar.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/blndres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bmapprev-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/brshname.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/camelot.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/clipdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/cntres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/combbuts.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/customcontrols.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/errordlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/freehres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/gifdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/liveeffectres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/mouldbar.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/peterdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/plugres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/prevwres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/register.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/richard.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/rikdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/rotatini.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/simon.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/textres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/tipsdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/tlockres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/tmpltdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/urlres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/viewrc.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/webdialog.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/will.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/xardlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/zoomres.xrc
Fixed dialogs to have label entries
Diff:
Index: Trunk/XaraLX/Scripts/rc2xml.pl
===================================================================
--- Trunk/XaraLX/Scripts/rc2xml.pl (revision 950)
+++ Trunk/XaraLX/Scripts/rc2xml.pl (revision 951)
@@ -269,6 +269,15 @@
print OUTPUT " <label>$t</label>
";
}
+sub WriteLabel2
+{
+ my $t=shift @_;
+ $t=~s/</</g;
+ $t=~s/>/>/g;
+ $t=~s/&/&/g;
+ print OUTPUT " <label>$t</label>
";
+}
+
sub WriteStyle
{
my $t=shift @_;
@@ -1252,7 +1261,8 @@
ParseControls();
WriteTitle ($title);
- WriteTooltip ($title) if IsPanel($dlgname);
+ WriteLabel2 ($title);
+ # WriteTooltip ($title) if IsPanel($dlgname);
print OUTPUT " </object>
";
}
Index: Trunk/XaraLX/wxOil/dragbmp.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dragbmp.cpp (revision 950)
+++ Trunk/XaraLX/wxOil/dragbmp.cpp (revision 951)
@@ -788,6 +788,13 @@
PGram[1].x = DestWidth; PGram[1].y = 0;
PGram[2].x = 0; PGram[2].y = DestHeight;
+ GD->SetContone(0);
+ GD->SetBias(3, 0.0);
+ GD->SetGain(3, 0.0);
+ GD->SetTileSmoothingFlag(TRUE/*FALSE*/);
+ GD->SetTileFilteringFlag(TRUE/*FALSE*/);
+
+
GD->SetBitmapFill( &(wxBM->BMInfo->bmiHeader),
wxBM->BMBytes,
1,
@@ -824,6 +831,10 @@
// Contone between white and white, but use the transparency values
GD->SetColour(0xFFFFFF);
GD->SetContone(1, 0xFFFFFF, 0xFFFFFF);
+ GD->SetBias(3, 0.0);
+ GD->SetGain(3, 0.0);
+ GD->SetTileSmoothingFlag(TRUE/*FALSE*/);
+ GD->SetTileFilteringFlag(TRUE/*FALSE*/);
GD->SetBitmapFill( &(wxBM->BMInfo->bmiHeader),
wxBM->BMBytes,
0x4000,
Index: Trunk/XaraLX/wxOil/xrc/EN/register.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/register.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/register.xrc (revision 951)
@@ -19,5 +19,6 @@
<bitmap>2.png</bitmap>
</object>
<title>Xara Xtreme Online Registration</title>
+ <label>Xara Xtreme Online Registration</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 951)
@@ -41,6 +41,7 @@
<pos>5,81d</pos> <size>77,-1d</size>
</object>
<title>Flip & Rotate</title>
+ <label>Flip & Rotate</label>
</object>
<object class="wxDialog" name="IDD_BFXDLG_PG2">
<pos>0,0d</pos> <size>182,160d</size>
@@ -92,6 +93,7 @@
<pos>117,122d</pos> <size>54,13d</size>
</object>
<title>Resize</title>
+ <label>Resize</label>
</object>
<object class="wxDialog" name="IDD_BFXDLG_PG3">
<pos>0,0d</pos> <size>182,160d</size>
@@ -137,6 +139,7 @@
<label>Co&lour</label>
</object>
<title>Brightness & Contrast</title>
+ <label>Brightness & Contrast</label>
</object>
<object class="wxDialog" name="IDD_BFXDLG_PG4">
<pos>0,0d</pos> <size>182,160d</size>
@@ -189,6 +192,7 @@
<pos>90,136d</pos> <size>91,10d</size>
</object>
<title>Colour depth</title>
+ <label>Colour depth</label>
</object>
<object class="wxDialog" name="IDD_BFXDLG_PG5">
<pos>0,0d</pos> <size>182,160d</size>
@@ -252,6 +256,7 @@
<style>wxSL_HORIZONTAL</style>
</object>
<title>Special Effects</title>
+ <label>Special Effects</label>
</object>
<object class="wxDialog" name="IDD_BFXDLG_PG6">
<pos>0,0d</pos> <size>182,160d</size>
@@ -345,6 +350,7 @@
<label>Shapes</label>
</object>
<title>Bitmap Alchemist</title>
+ <label>Bitmap Alchemist</label>
</object>
<object class="wxDialog" name="IDD_BFXPLUGINDLG_PG1">
<pos>0,0d</pos> <size>182,171d</size>
@@ -402,6 +408,7 @@
<label>&Help</label>
</object>
<title>Flip & Rotate</title>
+ <label>Flip & Rotate</label>
</object>
<object class="wxDialog" name="IDD_BFXPLUGINDLG_PG2">
<pos>0,0d</pos> <size>182,181d</size>
@@ -469,6 +476,7 @@
<label>&Help</label>
</object>
<title>Resize</title>
+ <label>Resize</label>
</object>
<object class="wxDialog" name="IDD_BFXPLUGINDLG_PG3">
<pos>0,0d</pos> <size>182,176d</size>
@@ -533,6 +541,7 @@
<label>&Help</label>
</object>
<title>Brightness & Contrast</title>
+ <label>Brightness & Contrast</label>
</object>
<object class="wxDialog" name="IDD_BFXPLUGINDLG_PG4">
<pos>0,0d</pos> <size>182,167d</size>
@@ -602,6 +611,7 @@
<label>&Help</label>
</object>
<title>Colour depth</title>
+ <label>Colour depth</label>
</object>
<object class="wxDialog" name="IDD_BFXPLUGINDLG_PG5">
<pos>0,0d</pos> <size>182,167d</size>
@@ -681,5 +691,6 @@
<label>&Help</label>
</object>
<title>Special Effects</title>
+ <label>Special Effects</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc (revision 951)
@@ -81,6 +81,7 @@
<label>Put HTML tag on clipboard</label>
</object>
<title>Export Native Format Options</title>
+ <label>Export Native Format Options</label>
</object>
<object class="wxDialog" name="IDD_PREVIEWBITMAP">
<pos>0,0d</pos> <size>116,192d</size>
@@ -112,5 +113,6 @@
<label>Show preview in options</label>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/prefsdlg.xrc (revision 951)
@@ -81,7 +81,7 @@
<label>DPI when auto generated</label>
</object>
<title> View </title>
- <tooltip> View </tooltip>
+ <label> View </label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_MISC">
<pos>0,0d</pos> <size>206,188d</size>
@@ -164,7 +164,7 @@
<label>Make &groups be transparent as a whole</label>
</object>
<title> General </title>
- <tooltip> General </tooltip>
+ <label> General </label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_PAGE">
<pos>0,0d</pos> <size>206,188d</size>
@@ -237,7 +237,7 @@
<label>Sh&ow page shadow</label>
</object>
<title> Page </title>
- <tooltip> Page </tooltip>
+ <label> Page </label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_TUNE">
<pos>0,0d</pos> <size>206,188d</size>
@@ -311,7 +311,7 @@
<pos>145,167d</pos> <size>50,12d</size>
</object>
<title> Tune-ups </title>
- <tooltip> Tune-ups </tooltip>
+ <label> Tune-ups </label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_SCALE">
<pos>0,0d</pos> <size>206,188d</size>
@@ -354,7 +354,7 @@
<label>E.g. 1 to 25000</label>
</object>
<title> Scaling </title>
- <tooltip> Scaling </tooltip>
+ <label> Scaling </label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_POINTERS">
<pos>0,0d</pos> <size>206,188d</size>
@@ -403,7 +403,7 @@
<pos>140,116d</pos> <size>55,12d</size>
</object>
<title> Mouse </title>
- <tooltip> Mouse </tooltip>
+ <label> Mouse </label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_GRID">
<pos>0,0d</pos> <size>206,188d</size>
@@ -461,7 +461,7 @@
<pos>81,132d</pos> <size>45,12d</size>
</object>
<title> Grid and Ruler </title>
- <tooltip> Grid and Ruler </tooltip>
+ <label> Grid and Ruler </label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_UNITS">
<pos>0,0d</pos> <size>206,188d</size>
@@ -521,7 +521,7 @@
<label>&0 - 255</label>
</object>
<title> Units </title>
- <tooltip> Units </tooltip>
+ <label> Units </label>
</object>
<object class="wxDialog" name="IDD_OPTS_UNITPROPERTIES">
<pos>0,0d</pos> <size>237,113d</size>
@@ -582,6 +582,7 @@
<label>Help</label>
</object>
<title>Unit properties</title>
+ <label>Unit properties</label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_PLUGINS">
<pos>0,0d</pos> <size>206,188d</size>
@@ -608,6 +609,6 @@
<pos>113,87d</pos> <size>82,-1d</size>
</object>
<title>Effects && Plugins</title>
- <tooltip>Effects && Plugins</tooltip>
+ <label>Effects && Plugins</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/lyrprop.xrc (revision 951)
@@ -43,7 +43,7 @@
<label>Guidelines</label>
</object>
<title>Guides</title>
- <tooltip>Guides</tooltip>
+ <label>Guides</label>
</object>
<object class="wxPanel" name="IDD_TAB_LAYER_PROPERTIES">
<pos>0,0d</pos> <size>201,148d</size>
@@ -67,7 +67,7 @@
<pos>45,25d</pos> <size>140,13d</size>
</object>
<title>Layer</title>
- <tooltip>Layer</tooltip>
+ <label>Layer</label>
</object>
<object class="wxDialog" name="IDD_GUIDELINE_PROPERTIES">
<pos>0,0d</pos> <size>171,63d</size>
@@ -107,5 +107,6 @@
<label>Properties</label>
</object>
<title>Guideline properties</title>
+ <label>Guideline properties</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/will.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/will.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/will.xrc (revision 951)
@@ -33,6 +33,7 @@
<label>-</label>
</object>
<title>Fill tool infobar</title>
+ <label>Fill tool infobar</label>
</object>
<object class="wxDialog" name="IDD_TRANFILLDLG">
<pos>0,0d</pos> <size>367,39d</size>
@@ -74,5 +75,6 @@
<label>-</label>
</object>
<title>Transparency tool infobar</title>
+ <label>Transparency tool infobar</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/sliceres.xrc (revision 951)
@@ -34,6 +34,7 @@
<label>Export...</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
<object class="wxDialog" name="IDD_BARSTATESDLG">
<pos>0,0d</pos> <size>218,77d</size>
@@ -102,6 +103,7 @@
<label>from MouseOff</label>
</object>
<title>Manage States for Nav Bar</title>
+ <label>Manage States for Nav Bar</label>
</object>
<object class="wxDialog" name="IDD_REDEFINE_STATE">
<pos>0,0d</pos> <size>158,81d</size>
@@ -129,5 +131,6 @@
<pos>92,18d</pos> <size>60,-1d</size>
</object>
<title>Set button design in this State</title>
+ <label>Set button design in this State</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/webster.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webster.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/webster.xrc (revision 951)
@@ -14,6 +14,7 @@
<label>Stop Download</label>
</object>
<title>File download</title>
+ <label>File download</label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_INTERNET">
<pos>0,0d</pos> <size>206,188d</size>
@@ -74,6 +75,6 @@
<label></label>
</object>
<title>Internet</title>
- <tooltip>Internet</tooltip>
+ <label>Internet</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc (revision 951)
@@ -76,6 +76,8 @@
<pos>228,39d</pos> <size>99,8d</size>
<label>Minimise visible anti-aliasing</label>
</object>
+ <title>Bitmap Size</title>
+ <label>Bitmap Size</label>
</object>
<object class="wxPanel" name="IDD_TIMAPOPTIONS">
<pos>0,0d</pos> <size>370,90d</size>
@@ -146,6 +148,8 @@
<pos>81,72d</pos> <size>98,8d</size>
<label>Current drawing must be saved</label>
</object>
+ <title>Image Map</title>
+ <label>Image Map</label>
</object>
<object class="wxPanel" name="IDD_TBROWSER">
<pos>0,0d</pos> <size>370,90d</size>
@@ -190,6 +194,8 @@
<pos>240,30d</pos> <size>112,10d</size>
<label>Show all previews in browser</label>
</object>
+ <title>Browser Preview</title>
+ <label>Browser Preview</label>
</object>
<object class="wxPanel" name="IDD_TBITMAPOPTIONS">
<pos>0,0d</pos> <size>370,90d</size>
@@ -221,6 +227,8 @@
<pos>6,34d</pos> <size>178,10d</size>
<label>Y</label>
</object>
+ <title>Options</title>
+ <label>Options</label>
</object>
<object class="wxPanel" name="IDD_PALETTE_TAB">
<pos>0,0d</pos> <size>370,90d</size>
@@ -319,6 +327,6 @@
<pos>296,71d</pos> <size>68,-1d</size>
</object>
<title>Palette Options</title>
- <tooltip>Palette Options</tooltip>
+ <label>Palette Options</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/clipdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/clipdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/clipdlg.xrc (revision 951)
@@ -23,5 +23,6 @@
<label>Data type:</label>
</object>
<title>Paste Special</title>
+ <label>Paste Special</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/simon.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/simon.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/simon.xrc (revision 951)
@@ -66,5 +66,6 @@
<label>Cancel</label>
</object>
<title>Create a new NavBar</title>
+ <label>Create a new NavBar</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/bevres.xrc (revision 951)
@@ -42,6 +42,7 @@
<label>Remove bevel</label>
</object>
<title>Bevels</title>
+ <label>Bevels</label>
</object>
<object class="wxDialog" name="IDD_BEVELINFOBAR">
<pos>0,0d</pos> <size>362,17d</size>
@@ -82,5 +83,6 @@
<label>-</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/mouldbar.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/mouldbar.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/mouldbar.xrc (revision 951)
@@ -71,5 +71,6 @@
<label>-</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/blobtab.xrc (revision 951)
@@ -27,7 +27,7 @@
<label></label>
</object>
<title>Coords</title>
- <tooltip>Coords</tooltip>
+ <label>Coords</label>
</object>
<object class="wxPanel" name="IDD_BLOBTAB_PG2">
<pos>0,0d</pos> <size>160,100d</size>
@@ -57,7 +57,7 @@
<label>Radio6</label>
</object>
<title>RadioDaze</title>
- <tooltip>RadioDaze</tooltip>
+ <label>RadioDaze</label>
</object>
<object class="wxPanel" name="IDD_BLOBTAB_PG3">
<pos>0,0d</pos> <size>160,100d</size>
@@ -97,7 +97,7 @@
<label>Convert</label>
</object>
<title>Convert</title>
- <tooltip>Convert</tooltip>
+ <label>Convert</label>
</object>
<object class="wxDialog" name="IDD_BLOBBYDLG">
<pos>0,0d</pos> <size>323,248d</size>
@@ -267,5 +267,6 @@
<pos>272,213d</pos> <size>40,13d</size>
</object>
<title>Blobby Dialog</title>
+ <label>Blobby Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/blendbar.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/blendbar.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/blendbar.xrc (revision 951)
@@ -22,5 +22,6 @@
<label>Anti-alias</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/xardlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xardlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/xardlg.xrc (revision 951)
@@ -28,5 +28,6 @@
<label>&Help</label>
</object>
<title>Native Format Options</title>
+ <label>Native Format Options</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 951)
@@ -134,5 +134,6 @@
<label>&Defaults</label>
</object>
<title>Bitmap tracer</title>
+ <label>Bitmap tracer</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc (revision 951)
@@ -38,5 +38,6 @@
<label></label>
</object>
<title>Profile</title>
+ <label>Profile</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/textres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/textres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/textres.xrc (revision 951)
@@ -108,5 +108,6 @@
<label>-</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/brdlgres.xrc (revision 951)
@@ -49,6 +49,7 @@
<pos>85,78d</pos> <size>48,-1d</size>
</object>
<title>Spacing</title>
+ <label>Spacing</label>
</object>
<object class="wxDialog" name="IDD_BRUSHEDITOFFSET">
<pos>0,0d</pos> <size>190,119d</size>
@@ -99,6 +100,7 @@
<label>%</label>
</object>
<title>Offset</title>
+ <label>Offset</label>
</object>
<object class="wxDialog" name="IDD_BRUSHEDITSCALING">
<pos>0,0d</pos> <size>190,92d</size>
@@ -147,6 +149,7 @@
<label></label>
</object>
<title>Scaling</title>
+ <label>Scaling</label>
</object>
<object class="wxDialog" name="IDD_BRUSHEDITEFFECTS">
<pos>0,0d</pos> <size>204,119d</size>
@@ -209,6 +212,7 @@
<label>degrees</label>
</object>
<title>Rotation</title>
+ <label>Rotation</label>
</object>
<object class="wxDialog" name="IDD_BRUSHEDITSEQUENCE">
<pos>0,0d</pos> <size>190,70d</size>
@@ -248,6 +252,7 @@
<label>%</label>
</object>
<title>Transparency</title>
+ <label>Transparency</label>
</object>
<object class="wxDialog" name="IDD_BRUSHEDITFILL">
<pos>0,0d</pos> <size>197,117d</size>
@@ -313,5 +318,6 @@
<label>degrees</label>
</object>
<title>Fill Properties</title>
+ <label>Fill Properties</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/rikdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/rikdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/rikdlg.xrc (revision 951)
@@ -22,5 +22,6 @@
<label>Redraw Me</label>
</object>
<title>Render Demo</title>
+ <label>Render Demo</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/combbuts.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/combbuts.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/combbuts.xrc (revision 951)
@@ -19,5 +19,6 @@
<label>-</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/liveeffectres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/liveeffectres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/liveeffectres.xrc (revision 951)
@@ -7,5 +7,6 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/nwcolres.xrc (revision 951)
@@ -25,5 +25,6 @@
<label>Make the colour a shade of:</label>
</object>
<title>New named colour</title>
+ <label>New named colour</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 951)
@@ -114,5 +114,6 @@
<label>Help</label>
</object>
<title>Colour editor</title>
+ <label>Colour editor</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/richard.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/richard.xrc (revision 951)
@@ -65,6 +65,7 @@
<label>&Read Only</label>
</object>
<title>Add folder to gallery</title>
+ <label>Add folder to gallery</label>
</object>
<object class="wxDialog" name="IDD_LIBPATHGENDLG">
<pos>36,24d</pos> <size>210,154d</size>
@@ -135,6 +136,7 @@
<label>&Read Only</label>
</object>
<title>Add folder to gallery</title>
+ <label>Add folder to gallery</label>
</object>
<object class="wxDialog" name="IDD_LIBPATHDLG95">
<pos>0,0d</pos> <size>270,134d</size>
@@ -171,6 +173,7 @@
<label>Locate the folder containing the fonts that you want to add to the gallery</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="IDD_LIBPATHGENDLG95">
<pos>0,0d</pos> <size>270,134d</size>
@@ -211,5 +214,6 @@
<label>Locate the folder containing the files that you want to add to the gallery</label>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 951)
@@ -53,5 +53,6 @@
<pos>6,6d</pos> <size>102,74d</size>
</object>
<title>Object Alignment</title>
+ <label>Object Alignment</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 951)
@@ -130,7 +130,7 @@
<style>wxRB_GROUP</style>
</object>
<title>Print layout</title>
- <tooltip>Print layout</tooltip>
+ <label>Print layout</label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_PRINTGENERAL">
<pos>0,0d</pos> <size>206,188d</size>
@@ -208,7 +208,7 @@
<label>Text options</label>
</object>
<title> Output </title>
- <tooltip> Output </tooltip>
+ <label> Output </label>
</object>
<object class="wxDialog" name="IDD_PRINTPROGRESS">
<pos>0,0d</pos> <size>157,100d</size>
@@ -253,6 +253,7 @@
<label>-</label>
</object>
<title>Printing...</title>
+ <label>Printing...</label>
</object>
<object class="wxDialog" name="IDD_PRINTTPLATE">
<pos>36,52d</pos> <size>225,153d</size>
@@ -359,6 +360,7 @@
<label>Print Pages</label>
</object>
<title>Print</title>
+ <label>Print</label>
</object>
<object class="wxDialog" name="IDD_XSEPSOPS">
<pos>0,0d</pos> <size>194,74d</size>
@@ -391,6 +393,7 @@
<label>Resolution</label>
</object>
<title>Xara Xtreme EPS Export Options</title>
+ <label>Xara Xtreme EPS Export Options</label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_PRINTPRINT">
<pos>0,0d</pos> <size>206,188d</size>
@@ -462,7 +465,7 @@
<label>lpi</label>
</object>
<title>Separations</title>
- <tooltip>Separations</tooltip>
+ <label>Separations</label>
</object>
<object class="wxDialog" name="IDD_PLATEPROPS">
<pos>0,0d</pos> <size>176,78d</size>
@@ -501,6 +504,7 @@
<label>Magenta plate properties</label>
</object>
<title>Separation properties</title>
+ <label>Separation properties</label>
</object>
<object class="wxPanel" name="IDD_OPTSTAB_IMAGESETTING">
<pos>0,0d</pos> <size>206,188d</size>
@@ -548,6 +552,6 @@
<label>Always overprint black</label>
</object>
<title>Imagesetting</title>
- <tooltip>Imagesetting</tooltip>
+ <label>Imagesetting</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/camelot.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/camelot.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/camelot.xrc (revision 951)
@@ -189,5 +189,6 @@
<object class="wxDialog" name="IDD_SPLASHDIALOG">
<pos>0,0d</pos> <size>192,133d</size>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/tlockres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tlockres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/tlockres.xrc (revision 951)
@@ -22,5 +22,6 @@
<label>Cancel</label>
</object>
<title>Serial number entry</title>
+ <label>Serial number entry</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/blndres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/blndres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/blndres.xrc (revision 951)
@@ -7,6 +7,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="IDD_BLENDTOOLBAR">
<pos>0,0d</pos> <size>251,57d</size>
@@ -58,5 +59,6 @@
<label>-</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/gifdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/gifdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/gifdlg.xrc (revision 951)
@@ -52,7 +52,7 @@
<label>Make background &transparent</label>
</object>
<title>Animation Colours</title>
- <tooltip>Animation Colours</tooltip>
+ <label>Animation Colours</label>
</object>
<object class="wxPanel" name="IDD_TAB_FRAME_PROPERTIES">
<pos>0,0d</pos> <size>201,121d</size>
@@ -95,7 +95,7 @@
<label>Show frame</label>
</object>
<title>Frame</title>
- <tooltip>Frame</tooltip>
+ <label>Frame</label>
</object>
<object class="wxPanel" name="IDD_TAB_ANIMATION_PROPERTIES">
<pos>0,0d</pos> <size>201,121d</size>
@@ -130,7 +130,7 @@
<label>1/100 s</label>
</object>
<title>Animation Loop and Speed</title>
- <tooltip>Animation Loop and Speed</tooltip>
+ <label>Animation Loop and Speed</label>
</object>
<object class="wxPanel" name="IDD_TAB_PREVIEW_IN_BROWSER">
<pos>0,0d</pos> <size>201,121d</size>
@@ -164,6 +164,6 @@
<label>Include Image Information</label>
</object>
<title>Preview in Browser</title>
- <tooltip>Preview in Browser</tooltip>
+ <label>Preview in Browser</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/cntres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/cntres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/cntres.xrc (revision 951)
@@ -57,5 +57,6 @@
<label>-</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/customcontrols.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/customcontrols.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/customcontrols.xrc (revision 951)
@@ -7,5 +7,6 @@
<style>wxSL_HORIZONTAL</style>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/brshname.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/brshname.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/brshname.xrc (revision 951)
@@ -26,5 +26,6 @@
<label></label>
</object>
<title>Create new brush:</title>
+ <label>Create new brush:</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/bezbar.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bezbar.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/bezbar.xrc (revision 951)
@@ -105,5 +105,6 @@
<label>100%</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc (revision 951)
@@ -53,5 +53,6 @@
<label>32-bit Retail</label>
</object>
<title>MS Sans Serif</title>
+ <label>MS Sans Serif</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 951)
@@ -71,5 +71,6 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/tmpltdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tmpltdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/tmpltdlg.xrc (revision 951)
@@ -59,6 +59,7 @@
<label>Make &Style...</label>
</object>
<title>Wizard Properties</title>
+ <label>Wizard Properties</label>
</object>
<object class="wxDialog" name="IDD_NAME">
<pos>0,0d</pos> <size>183,54d</size>
@@ -82,5 +83,6 @@
<label>Style Name:</label>
</object>
<title>New Style Name</title>
+ <label>New Style Name</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc (revision 951)
@@ -60,6 +60,7 @@
<label>Use &JPEG on compatible bitmaps</label>
</object>
<title>Save options</title>
+ <label>Save options</label>
</object>
<object class="wxDialog" name="IDD_PREVIEWBITMAP">
<pos>0,0d</pos> <size>115,130d</size>
@@ -87,5 +88,6 @@
<label>Show preview in options</label>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/xtendres.xrc (revision 951)
@@ -45,5 +45,6 @@
<label></label>
</object>
<title>Extend #1%S</title>
+ <label>Extend #1%S</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/viewrc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/viewrc.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/viewrc.xrc (revision 951)
@@ -7,6 +7,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="SELRTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -15,6 +16,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="GRIDTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -23,6 +25,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="ELIPTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -31,6 +34,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="ROTATOOLDLG">
<pos>0,0d</pos> <size>31,33d</size>
@@ -39,6 +43,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="RECTTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -47,6 +52,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="BEZTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -55,6 +61,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="GRADTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -63,6 +70,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="PENTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -71,6 +79,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="BLANKTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -79,6 +88,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="TRANSTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -87,6 +97,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="REGSHAPETOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -95,6 +106,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="MOULDTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -103,6 +115,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="TEXTTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -111,6 +124,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="SOFTSHADOWTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -119,6 +133,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="BEVELTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -127,6 +142,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="CONTOURTOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -135,6 +151,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="SLICETOOLDLG">
<pos>0,0d</pos> <size>31,32d</size>
@@ -143,6 +160,7 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="IDD_DIALOG1">
<pos>0,0d</pos> <size>185,92d</size>
@@ -155,5 +173,6 @@
<label>Cancel</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmapprev-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmapprev-strings.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmapprev-strings.xrc (revision 951)
@@ -6,30 +6,6 @@
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
- <object class="wxStaticText" name="IDD_TBITMAPSIZE_NAME">
- <label>Bitmap Size</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
- <object class="wxStaticText" name="IDD_TIMAPOPTIONS_NAME">
- <label>Image Map</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
- <object class="wxStaticText" name="IDD_TBROWSER_NAME">
- <label>Browser Preview</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
- <object class="wxStaticText" name="IDD_TBITMAPOPTIONS_NAME">
- <label>Options</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_ADVANCED_OPTIONS">
<label>#1%s Options</label>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlg.xrc (revision 951)
@@ -220,6 +220,7 @@
<label>Number of colours in palette</label>
</object>
<title>Export bitmap options</title>
+ <label>Export bitmap options</label>
</object>
<object class="wxDialog" name="IDD_EXPORTJPEGOPTS">
<pos>0,0d</pos> <size>221,146d</size>
@@ -318,6 +319,7 @@
<label>Use Original JPEG</label>
</object>
<title>Export JPEG options</title>
+ <label>Export JPEG options</label>
</object>
<object class="wxDialog" name="IDD_PHOTOCDOPTS">
<pos>0,0d</pos> <size>185,108d</size>
@@ -359,5 +361,6 @@
<label>&Help</label>
</object>
<title>Photo CD import options</title>
+ <label>Photo CD import options</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/tipsdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tipsdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/tipsdlg.xrc (revision 951)
@@ -28,5 +28,6 @@
<label>&Show Tips on StartUp</label>
</object>
<title>Tip of the Day</title>
+ <label>Tip of the Day</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/errordlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/errordlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/errordlg.xrc (revision 951)
@@ -31,5 +31,6 @@
<bitmap>.png</bitmap>
</object>
<title>Xara Xtreme</title>
+ <label>Xara Xtreme</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/plugres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/plugres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/plugres.xrc (revision 951)
@@ -35,5 +35,6 @@
<label>Locate the folder containing the plug-ins that you want to use</label>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/andydlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/andydlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/andydlg.xrc (revision 951)
@@ -23,5 +23,6 @@
<label>&Help</label>
</object>
<title>Xara Xtreme</title>
+ <label>Xara Xtreme</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc (revision 951)
@@ -57,6 +57,7 @@
<pos>4,81d</pos> <size>216,1d</size>
</object>
<title>About Xara Xtreme</title>
+ <label>About Xara Xtreme</label>
</object>
<object class="wxDialog" name="IDD_ABOUTDLG_PLUS">
<pos>34,22d</pos> <size>223,106d</size>
@@ -123,6 +124,7 @@
<label>are the property of Pantone Inc.</label>
</object>
<title>About Xara Xtreme Plus</title>
+ <label>About Xara Xtreme Plus</label>
</object>
<object class="wxDialog" name="IDD_ABOUTDLG_XS">
<pos>34,22d</pos> <size>223,86d</size>
@@ -181,5 +183,6 @@
<pos>4,81d</pos> <size>216,1d</size>
</object>
<title>About Xara XS</title>
+ <label>About Xara XS</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/webdialog.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webdialog.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/webdialog.xrc (revision 951)
@@ -7,5 +7,6 @@
<label>Don't show this A&gain</label>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/freehres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/freehres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/freehres.xrc (revision 951)
@@ -7,5 +7,6 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/imagdlg.xrc (revision 951)
@@ -69,5 +69,6 @@
<label>Size of corresponding bitmap</label>
</object>
<title>Image Map Export Options</title>
+ <label>Image Map Export Options</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/peterdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/peterdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/peterdlg.xrc (revision 951)
@@ -133,5 +133,6 @@
<pos>5,124d</pos> <size>185,55d</size>
</object>
<title>Document information</title>
+ <label>Document information</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/assoc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/assoc.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/assoc.xrc (revision 951)
@@ -23,5 +23,6 @@
<label>Do you want to register it ?</label>
</object>
<title>Check Associations</title>
+ <label>Check Associations</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/urlres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/urlres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/urlres.xrc (revision 951)
@@ -22,5 +22,6 @@
<label>URL</label>
</object>
<title>Import from Web...</title>
+ <label>Import from Web...</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/prevwres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/prevwres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/prevwres.xrc (revision 951)
@@ -50,6 +50,7 @@
<pos>10,50d</pos> <size>200,150d</size>
</object>
<title>Preview</title>
+ <label>Preview</label>
</object>
<object class="wxDialog" name="IDD_ANIMATIONBAR">
<pos>0,0d</pos> <size>466,92d</size>
@@ -122,5 +123,6 @@
<label>-</label>
</object>
<title>Animation bar</title>
+ <label>Animation bar</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmpdlgr.xrc (revision 951)
@@ -93,5 +93,6 @@
<label>Smooth when scaled up</label>
</object>
<title>Bitmap Properties</title>
+ <label>Bitmap Properties</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/rotatini.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/rotatini.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/rotatini.xrc (revision 951)
@@ -6,5 +6,6 @@
<pos>61,6d</pos> <size>13,13d</size>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 951)
@@ -104,5 +104,6 @@
<label>Make local to frame</label>
</object>
<title>Colour editor</title>
+ <label>Colour editor</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/zoomres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/zoomres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/zoomres.xrc (revision 951)
@@ -7,5 +7,6 @@
<label>-</label>
</object>
<title></title>
+ <label></label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/barsdlgs.xrc (revision 951)
@@ -394,10 +394,12 @@
<pos>300,12d</pos> <size>43,-1d</size>
</object>
<title>Dummy standard bar</title>
+ <label>Dummy standard bar</label>
</object>
<object class="wxDialog" name="IDD_BLANKBAR">
<pos>0,0d</pos> <size>185,92d</size>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="IDD_GRIDDLG">
<pos>0,0d</pos> <size>329,21d</size>
@@ -418,6 +420,7 @@
<label>G</label>
</object>
<title>Grid tool info</title>
+ <label>Grid tool info</label>
</object>
<object class="wxDialog" name="IDD_GRIDTOOL">
<pos>0,0d</pos> <size>394,22d</size>
@@ -434,6 +437,7 @@
<pos>146,5d</pos> <size>54,-1d</size>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="IDD_LAYER_NAME">
<pos>0,0d</pos> <size>183,54d</size>
@@ -457,6 +461,7 @@
<label>Layer name:</label>
</object>
<title>Name layer</title>
+ <label>Name layer</label>
</object>
<object class="wxDialog" name="IDD_TOOLBARS">
<pos>0,0d</pos> <size>191,126d</size>
@@ -516,6 +521,7 @@
<label>Use large buttons for:</label>
</object>
<title>Control bars</title>
+ <label>Control bars</label>
</object>
<object class="wxDialog" name="IDD_CUSTOMIZEBAR">
<pos>0,0d</pos> <size>177,123d</size>
@@ -536,6 +542,7 @@
<label>Operations:</label>
</object>
<title>Customize</title>
+ <label>Customize</label>
</object>
<object class="wxDialog" name="IDD_INFOBAR">
<pos>0,0d</pos> <size>122,19d</size>
@@ -547,6 +554,7 @@
<label>..</label>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="IDD_NEWTOOLBAR">
<pos>0,0d</pos> <size>186,57d</size>
@@ -570,6 +578,7 @@
<label>Control bar name:</label>
</object>
<title>New control bar</title>
+ <label>New control bar</label>
</object>
<object class="wxDialog" name="IDD_NAMEDLG_NAME_TEMPLATE">
<pos>0,0d</pos> <size>183,70d</size>
@@ -593,6 +602,7 @@
<label>&Help</label>
</object>
<title>Create a name</title>
+ <label>Create a name</label>
</object>
<object class="wxDialog" name="IDD_NAMEDLG_RENAME_TEMPLATE">
<pos>0,0d</pos> <size>183,70d</size>
@@ -616,6 +626,7 @@
<label>&Help</label>
</object>
<title>Change a name</title>
+ <label>Change a name</label>
</object>
<object class="wxDialog" name="IDD_FREEHANDTOOL">
<pos>0,0d</pos> <size>187,22d</size>
@@ -657,6 +668,7 @@
<pos>175,15d</pos> <size>28,-1d</size>
</object>
<title></title>
+ <label></label>
</object>
<object class="wxDialog" name="IDD_LIVEEFFECTTOOLCTRLS">
<pos>0,0d</pos> <size>282,142d</size>
@@ -758,5 +770,6 @@
<label>-</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/rshapbar.xrc (revision 951)
@@ -67,5 +67,6 @@
<label>-</label>
</object>
<title>Dialog</title>
+ <label>Dialog</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 951)
@@ -285,6 +285,7 @@
<label>Add yours in here...</label>
</object>
<title>Gallery button store</title>
+ <label>Gallery button store</label>
</object>
<object class="wxDialog" name="IDD_SGDISPLAY">
<pos>0,0d</pos> <size>146,39d</size>
@@ -304,6 +305,7 @@
<label>&Help</label>
</object>
<title>Gallery icon size</title>
+ <label>Gallery icon size</label>
</object>
<object class="wxDialog" name="IDD_SGSEARCH">
<pos>0,0d</pos> <size>155,72d</size>
@@ -340,6 +342,7 @@
<label>Find items including the text:</label>
</object>
<title>Find gallery item...</title>
+ <label>Find gallery item...</label>
</object>
<object class="wxDialog" name="IDD_COLOURNAMEDLG">
<pos>0,0d</pos> <size>159,38d</size>
@@ -358,6 +361,7 @@
<pos>8,20d</pos> <size>12,12d</size>
</object>
<title>Rename colour style</title>
+ <label>Rename colour style</label>
</object>
<object class="wxDialog" name="IDD_SGSORT">
<pos>0,0d</pos> <size>227,73d</size>
@@ -404,6 +408,7 @@
<label>Secondary key</label>
</object>
<title>Gallery sort options</title>
+ <label>Gallery sort options</label>
</object>
<object class="wxDialog" name="IDD_SGLINEPROPERTIES">
<pos>0,0d</pos> <size>144,201d</size>
@@ -469,5 +474,6 @@
<label>&Help</label>
</object>
<title>Custom brush properties</title>
+ <label>Custom brush properties</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/hotdlg.xrc (revision 951)
@@ -51,5 +51,6 @@
<label>Target frame for URL</label>
</object>
<title>Web Address...</title>
+ <label>Web Address...</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 950)
+++ Trunk/XaraLX/wxOil/xrc/EN/dbgdlg.xrc (revision 951)
@@ -32,5 +32,6 @@
<pos>40,5d</pos> <size>130,-1d</size>
</object>
<title>Camelot debug commands</title>
+ <label>Camelot debug commands</label>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 950)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 951)
@@ -6285,7 +6285,6 @@
Title = pNewPage->GetLabel(); // because wxPanel doesn't seem to support a title
if( Title.IsEmpty() )
{
- ObjectName += _T("_NAME");
ResourceID NameResID = CamResource::GetResourceID( PCTSTR(ObjectName) );
PCTSTR pszStringLookup = CamResource::GetTextFail( NameResID );
if( NULL != pszStringLookup )
Index: Trunk/XaraLX/wxOil/osrndrgn.cpp
===================================================================
--- Trunk/XaraLX/wxOil/osrndrgn.cpp (revision 950)
+++ Trunk/XaraLX/wxOil/osrndrgn.cpp (revision 951)
@@ -4646,6 +4646,15 @@
}
}
#endif
+
+ // Set the context to the default values
+
+ GD->SetContone(0);
+ GD->SetBias(3, 0.0);
+ GD->SetGain(3, 0.0);
+ GD->SetTileSmoothingFlag(TRUE/*FALSE*/);
+ GD->SetTileFilteringFlag(TRUE/*FALSE*/);
+
if (bDoBitmapFill)
{
GD->SetBitmapFill( &(WxBM->BMInfo->bmiHeader),
Xara