[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 778
Date : Wed Apr 5 22:28:38 BST 2006
Changed paths:
M /Trunk/XaraLX/Scripts/barconverter
M /Trunk/XaraLX/Scripts/makebars.sh
M /Trunk/XaraLX/tools/shadinfo.cpp
D /Trunk/XaraLX/wxOil/xrc/EN/shadbar.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
A /Trunk/XaraLX/wxOil/xrc/barsource/shadbar.ini
Fixed shadow tool info bar to be consistent with other info bars
Fixed logic in shadinfo.cpp so it actually processes message requests
This seems to have revealed some bugs in (e.g.) making floor shadows which you couldn't do before.
Diff:
Index: Trunk/XaraLX/tools/shadinfo.cpp
===================================================================
--- Trunk/XaraLX/tools/shadinfo.cpp (revision 777)
+++ Trunk/XaraLX/tools/shadinfo.cpp (revision 778)
@@ -1242,46 +1242,53 @@
}
else if (Msg->GadgetID == _R(IDC_SHADOW_SLIDER_EDIT))
+ {
if (Msg->DlgMsg == DIM_SELECTION_CHANGED)
{
// handle the edit control changing
HandleSliderEditChange();
}
-
+ }
else if (Msg->GadgetID == _R(IDC_SHADOWTRANSP_EDIT))
+ {
if (Msg->DlgMsg == DIM_SELECTION_CHANGED)
{
// handle the edit control changing
HandleSliderTranspEditChange();
}
-
+ }
else if (Msg->GadgetID == _R(IDC_BTN_NOSHADOW))
+ {
if (Msg->DlgMsg == DIM_LFT_BN_CLICKED)
{
HandleNoShadowBtnClicked();
return OK;
}
-
+ }
else if (Msg->GadgetID == _R(IDC_BTN_WALLSHADOW))
+ {
if (Msg->DlgMsg == DIM_LFT_BN_CLICKED)
{
HandleWallShadowBtnClicked();
return OK;
}
-
+ }
else if (Msg->GadgetID == _R(IDC_BTN_FLOORSHADOW))
+ {
if (Msg->DlgMsg == DIM_LFT_BN_CLICKED)
{
HandleFloorShadowBtnClicked();
return OK;
}
-
+ }
else if (Msg->GadgetID == _R(IDC_BTN_GLOWSHADOW))
+ {
if (Msg->DlgMsg == DIM_LFT_BN_CLICKED)
{
HandleGlowShadowBtnClicked();
return OK;
}
+ }
}
}
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter (revision 777)
+++ Trunk/XaraLX/Scripts/barconverter (revision 778)
@@ -35,7 +35,9 @@
"IDC_EDITBRUSH" => "Edit Brush",
"IDC_REMOVEBLEND" => "Remove Blend",
"IDC_REMOVEMOULD" => "Remove",
- "IDC_REMOVECONTOUR" => "Remove"
+ "IDC_REMOVECONTOUR" => "Remove",
+ "IDC_SOFTSHADOWCENTRE_X" => "X",
+ "IDC_SOFTSHADOWCENTRE_Y" => "Y"
);
return $namemap{ $resname } || "";
@@ -74,6 +76,7 @@
"IDD_CONTOURINFOBAR" => "Contour tool info bar",
"IDD_TEXT_INFO_BAR" => "Text tool info bar",
"IDD_PENTOOLBAR" => "Pen tool info bar",
+ "IDD_SOFTSHADOWTOOLBAR" => "Shadow tool info bar"
);
return $namemap{ $resname } || "This bar should not be called $resname";
}
@@ -98,7 +101,8 @@
"\"Bevel" => "IDD_BEVELINFOBAR",
"\"Contour" => "IDD_CONTOURINFOBAR",
"\"Text" => "IDD_TEXT_INFO_BAR",
- "\"Pen" => "IDD_PENTOOLBAR"
+ "\"Pen" => "IDD_PENTOOLBAR",
+ "\"Shadow" => "IDD_SOFTSHADOWTOOLBAR"
);
return $qnamemap{ $qname } || $qname;
@@ -123,7 +127,9 @@
"IDC_BEVEL_SLIDER_COMBO" => 96,
"IDC_TRANSPSLIDE" => 128,
"IDC_BEVELSLIDER" => 96,
- "IDC_FREEHANDSLIDER" => 128
+ "IDC_FREEHANDSLIDER" => 128,
+ "IDC_SOFTSHADOWSLIDER" => 128,
+ "IDC_SOFTSHADOWTRANSPSLIDER" => 128
);
return $cnamemap{ $control } || $default;
}
@@ -137,7 +143,7 @@
sub IsToggle
{
my $name = shift @_;
- return ($name=~/^(IDC_BTN_MAKECURVE|IDC_BTN_MAKELINE|IDC_BTN_SMOOTHPOINT|IDC_BTN_CUSPPOINT|IDC_BTN_REGSHAPETOOL_RADIUS|IDC_BTN_REGSHAPETOOL_DIAMETER|IDC_BTN_REGSHAPETOOL_BOUNDBOX|IDC_BTN_REGSHAPETOOL_POLYGON|IDC_BTN_REGSHAPETOOL_ELLIPSE|IDC_BTN_REGSHAPETOOL_STELLATION|IDC_BTN_REGSHAPETOOL_CURVATURE|IDC_SEL_SHOWBOUNDSBLOBS|IDC_SEL_SHOWOBJECTBLOBS|IDC_SEL_SHOWFILLBLOBS|IDC_SEL_ROTATEBUTTON|IDC_SEL_SCALELINES|IDC_SEL_PADLOCK|IDC_BTN_MAGNET|IDC_BTN_BLENDDISTANCE|C_BTN_BLENDSTEPS|IDC_BTN_ONETOONE|IDC_BTN_BLENDANTIALIAS|IDC_BTN_DETACHMOULD|IDC_BTN_BEVELOUTER|IDC_BTN_BEVELINNER|IDC_BEVELJOINTYPEMITRE|IDC_BEVELJOINTYPEROUND|IDC_BEVELJOINTYPEBEVEL|IDC_BTN_CONTOURDISTANCE|IDC_BTN_CONTOURSTEPS|IDC_BTN_CONTOUROUTER|IDC_BTN_CONTOURINNER|IDC_CONTOURJOINTYPEMITRE|IDC_CONTOURJOINTYPEROUND|IDC_CONTOURJOINTYPEBEVEL|IDC_BOLDBUTTON|IDC_ITALICBUTTON|IDC_JUSTIFYLEFT|IDC_JUSTIFYCENTRE|IDC_JUSTIFYRIGHT|IDC_JUSTIFYFULL|IDC_SUPERSCRIPT|IDC_SUBSCRIPT|IDC_AUTOKERN)$/)?1:0;
+ return ($name=~/^(IDC_BTN_MAKECURVE|IDC_BTN_MAKELINE|IDC_BTN_SMOOTHPOINT|IDC_BTN_CUSPPOINT|IDC_BTN_REGSHAPETOOL_RADIUS|IDC_BTN_REGSHAPETOOL_DIAMETER|IDC_BTN_REGSHAPETOOL_BOUNDBOX|IDC_BTN_REGSHAPETOOL_POLYGON|IDC_BTN_REGSHAPETOOL_ELLIPSE|IDC_BTN_REGSHAPETOOL_STELLATION|IDC_BTN_REGSHAPETOOL_CURVATURE|IDC_SEL_SHOWBOUNDSBLOBS|IDC_SEL_SHOWOBJECTBLOBS|IDC_SEL_SHOWFILLBLOBS|IDC_SEL_ROTATEBUTTON|IDC_SEL_SCALELINES|IDC_SEL_PADLOCK|IDC_BTN_MAGNET|IDC_BTN_BLENDDISTANCE|C_BTN_BLENDSTEPS|IDC_BTN_ONETOONE|IDC_BTN_BLENDANTIALIAS|IDC_BTN_DETACHMOULD|IDC_BTN_BEVELOUTER|IDC_BTN_BEVELINNER|IDC_BEVELJOINTYPEMITRE|IDC_BEVELJOINTYPEROUND|IDC_BEVELJOINTYPEBEVEL|IDC_BTN_CONTOURDISTANCE|IDC_BTN_CONTOURSTEPS|IDC_BTN_CONTOUROUTER|IDC_BTN_CONTOURINNER|IDC_CONTOURJOINTYPEMITRE|IDC_CONTOURJOINTYPEROUND|IDC_CONTOURJOINTYPEBEVEL|IDC_BOLDBUTTON|IDC_ITALICBUTTON|IDC_JUSTIFYLEFT|IDC_JUSTIFYCENTRE|IDC_JUSTIFYRIGHT|IDC_JUSTIFYFULL|IDC_SUPERSCRIPT|IDC_SUBSCRIPT|IDC_AUTOKERN|IDC_BTN_NOSHADOW|IDC_BTN_WALLSHADOW|IDC_BTN_FLOORSHADOW|IDC_BTN_GLOWSHADOW)$/)?1:0;
}
sub ConvertOptoken
@@ -463,15 +469,15 @@
{
WriteCombo($name,$optoken);
}
- elsif ($name =~ /^(IDC_QUALITYSLIDER|IDC_TRANSPSLIDE|IDC_SMOOTHSLIDER|IDC_FEATHERSIZE_CUSTOMEDIT|IDC_FREEHANDSLIDER|IDC_BEVELSLIDER|IDC_CONTOURSLIDER)$/)
+ elsif ($name =~ /^(IDC_QUALITYSLIDER|IDC_TRANSPSLIDE|IDC_SMOOTHSLIDER|IDC_FEATHERSIZE_CUSTOMEDIT|IDC_FREEHANDSLIDER|IDC_BEVELSLIDER|IDC_CONTOURSLIDER|IDC_SOFTSHADOWSLIDER|IDC_SOFTSHADOWTRANSPSLIDER)$/)
{
WriteSlider($name,$optoken);
}
- elsif ($name =~ /^(IDC_REGSHAPETOOL_ADDCHANGE|IDC_SELPOINT|IDC_SELCOLOUR|IDC_BEZTOOLADDCHANGE|IDC_PATH_STATIC_FIRSTX|IDC_PATH_STATIC_FIRSTY|IDC_PATH_STATIC_MIDX|IDC_PATH_STATIC_MIDY|IDC_PATH_STATIC_SECONDX|IDC_PATH_STATIC_SECONDY|IDC_SMOOTHPERCENT|IDC_FREEHANDPERCENT|IDC_FREEHANDRETRO)$/)
+ elsif ($name =~ /^(IDC_REGSHAPETOOL_ADDCHANGE|IDC_SELPOINT|IDC_SELCOLOUR|IDC_BEZTOOLADDCHANGE|IDC_PATH_STATIC_FIRSTX|IDC_PATH_STATIC_FIRSTY|IDC_PATH_STATIC_MIDX|IDC_PATH_STATIC_MIDY|IDC_PATH_STATIC_SECONDX|IDC_PATH_STATIC_SECONDY|IDC_SMOOTHPERCENT|IDC_FREEHANDPERCENT|IDC_FREEHANDRETRO|IDC_SOFTSHADOWCENTRE_X|IDC_SOFTSHADOWCENTRE_Y)$/)
{
WriteStaticText($name,$optoken);
}
- elsif ($name =~ /^(IDC_EDIT_REGSHAPETOOL_UPPER|IDC_EDIT_REGSHAPETOOL_LOWER|IDC_PATH_EDIT_FIRSTX|IDC_PATH_EDIT_FIRSTY|IDC_PATH_EDIT_ENDPOINTX|IDC_PATH_EDIT_ENDPOINTY|IDC_PATH_EDIT_SECONDX|IDC_PATH_EDIT_SECONDY|IDC_SEL_EDIT_X|IDC_SEL_EDIT_Y|IDC_SEL_EDIT_W|IDC_SEL_EDIT_H|IDC_SEL_EDIT_XSCALE|IDC_SEL_EDIT_YSCALE|IDC_SEL_EDIT_SHEAR|IDC_SEL_EDIT_ANGLE|IDC_BLENDSTEPS|IDC_BEVEL_SLIDER_EDIT|IDC_CONTOURSTEPS|IDC_CONTOURSLIDEREDIT|IDC_ASPECTEDIT|IDC_SPACING_EDIT|IDC_TRACKING_EDIT|IDC_KERN_EDIT_Y|IDC_KERN_EDIT_X)$/)
+ elsif ($name =~ /^(IDC_EDIT_REGSHAPETOOL_UPPER|IDC_EDIT_REGSHAPETOOL_LOWER|IDC_PATH_EDIT_FIRSTX|IDC_PATH_EDIT_FIRSTY|IDC_PATH_EDIT_ENDPOINTX|IDC_PATH_EDIT_ENDPOINTY|IDC_PATH_EDIT_SECONDX|IDC_PATH_EDIT_SECONDY|IDC_SEL_EDIT_X|IDC_SEL_EDIT_Y|IDC_SEL_EDIT_W|IDC_SEL_EDIT_H|IDC_SEL_EDIT_XSCALE|IDC_SEL_EDIT_YSCALE|IDC_SEL_EDIT_SHEAR|IDC_SEL_EDIT_ANGLE|IDC_BLENDSTEPS|IDC_BEVEL_SLIDER_EDIT|IDC_CONTOURSTEPS|IDC_CONTOURSLIDEREDIT|IDC_ASPECTEDIT|IDC_SPACING_EDIT|IDC_TRACKING_EDIT|IDC_KERN_EDIT_Y|IDC_KERN_EDIT_X|IDC_SHADOW_SLIDER_EDIT|IDC_SHADOWTRANSP_EDIT|IDC_SOFTSHADOWCENTRE_EDIT_X|IDC_SOFTSHADOWCENTRE_EDIT_Y)$/)
{
WriteTextControl($name,$optoken);
}
@@ -479,7 +485,7 @@
{
WriteSelGrid();
}
- elsif ($name =~ /^(IDC_SEL_STATIC_XY|IDC_SEL_STATIC_WH|IDC_SEL_BRACKETSYMBOL|IDC_SEL_ROTATESYMBOL|IDC_SEL_SHEARSYMBOL|IDC_ASPECTBIT|IDC_TRACKINGBIT|IDC_KERNINGBIT)$/)
+ elsif ($name =~ /^(IDC_SEL_STATIC_XY|IDC_SEL_STATIC_WH|IDC_SEL_BRACKETSYMBOL|IDC_SEL_ROTATESYMBOL|IDC_SEL_SHEARSYMBOL|IDC_ASPECTBIT|IDC_TRACKINGBIT|IDC_KERNINGBIT|IDC_SOFTSHADOWCENTRE_X|IDC_SOFTSHADOWCENTRE_Y)$/)
{
WriteStaticBitmap($name,$optoken);
}
Index: Trunk/XaraLX/Scripts/makebars.sh
===================================================================
--- Trunk/XaraLX/Scripts/makebars.sh (revision 777)
+++ Trunk/XaraLX/Scripts/makebars.sh (revision 778)
@@ -1,2 +1,2 @@
#!/bin/sh
-Scripts/barconverter wxOil/xrc/barsource/bars.ini wxOil/xrc/barsource/pushbar.ini wxOil/xrc/barsource/zoombar.ini wxOil/xrc/barsource/rshapbar.ini wxOil/xrc/barsource/rectangl.ini wxOil/xrc/barsource/ellipse.ini wxOil/xrc/barsource/gradbar.ini wxOil/xrc/barsource/transbar.ini wxOil/xrc/barsource/bezbar.ini wxOil/xrc/barsource/selector.ini wxOil/xrc/barsource/freehand.ini wxOil/xrc/barsource/blendbar.ini wxOil/xrc/barsource/mouldbar.ini wxOil/xrc/barsource/cntrbar.ini wxOil/xrc/barsource/bevbar.ini wxOil/xrc/barsource/textbar.ini wxOil/xrc/barsource/penbar.ini > wxOil/xrc/EN/xaralx-bars.xrc
+Scripts/barconverter wxOil/xrc/barsource/bars.ini wxOil/xrc/barsource/pushbar.ini wxOil/xrc/barsource/zoombar.ini wxOil/xrc/barsource/rshapbar.ini wxOil/xrc/barsource/rectangl.ini wxOil/xrc/barsource/ellipse.ini wxOil/xrc/barsource/gradbar.ini wxOil/xrc/barsource/transbar.ini wxOil/xrc/barsource/bezbar.ini wxOil/xrc/barsource/selector.ini wxOil/xrc/barsource/freehand.ini wxOil/xrc/barsource/blendbar.ini wxOil/xrc/barsource/mouldbar.ini wxOil/xrc/barsource/cntrbar.ini wxOil/xrc/barsource/bevbar.ini wxOil/xrc/barsource/textbar.ini wxOil/xrc/barsource/penbar.ini wxOil/xrc/barsource/shadbar.ini > wxOil/xrc/EN/xaralx-bars.xrc
Index: Trunk/XaraLX/wxOil/xrc/barsource/shadbar.ini
===================================================================
--- Trunk/XaraLX/wxOil/xrc/barsource/shadbar.ini (revision 0)
+++ Trunk/XaraLX/wxOil/xrc/barsource/shadbar.ini (revision 778)
@@ -0,0 +1,54 @@
+// $Header: c:\RCSdir\winoil/shadbar.ini 1.2 29/10/96 16:17:30 Olivier Exp $
+
+INC_BEGIN
+#include "shadbar.h"
+#include "shadres.h"
+#include "bars.h"
+#include "biasres.h"
+INC_END
+
+#ifndef WEBSTER
+
+Bar "Shadow tool infobar" Top DEFAULT_TOOL_INFOBAR_SLOT 1
+ ; type buttons
+ Control B IDBBL_BTN_NOSHADOW IDS_BTN_NOSHADOW 0 IDD_SOFTSHADOWTOOLBAR IDC_BTN_NOSHADOW
+ Control B IDBBL_BTN_WALLSHADOW IDS_BTN_WALLSHADOW 0 IDD_SOFTSHADOWTOOLBAR IDC_BTN_WALLSHADOW
+ Control B IDBBL_BTN_FLOORSHADOW IDS_BTN_FLOORSHADOW 0 IDD_SOFTSHADOWTOOLBAR IDC_BTN_FLOORSHADOW
+ Control B IDBBL_BTN_GLOWSHADOW IDS_BTN_GLOWSHADOW 0 IDD_SOFTSHADOWTOOLBAR IDC_BTN_GLOWSHADOW
+ Separator
+ ; The Blur Slider Control
+ Control B IDBBL_SOFTSHADOWSLIDER IDS_SOFTSHADOWACCURACY 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWSLIDER
+ Separator
+ ; the edit box for the shadow
+ Control B IDBBL_SOFTSHADOWSLIDER IDS_SOFTSHADOWACCURACY 0 IDD_SOFTSHADOWTOOLBAR IDC_SHADOW_SLIDER_EDIT
+ Separator
+ ; The Transparency Slider Control
+ Control B IDBBL_SHADOWSLIDERDARKNESS IDS_SHADOWSLIDERDARKNESSID 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWTRANSPSLIDER
+ Separator
+ ; the edit box for the transparency
+ Control B IDBBL_SHADOWSLIDERDARKNESS IDS_SHADOWSLIDERDARKNESSID 0 IDD_SOFTSHADOWTOOLBAR IDC_SHADOWTRANSP_EDIT
+ ; the bias/gain dialog
+ Separator
+ Control B IDBBL_BIASGAIN IDS_BIASGAINDLG 0 IDD_SOFTSHADOWTOOLBAR IDC_BIASGAIN
+ ; The position & nudge controls
+ Separator
+ DDeckerTop
+ Control B IDBBL_SOFTSHADOWCENTREX IDS_SOFTSHADOWCENTREX 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWCENTRE_X
+ DDeckerBottom
+ Control B IDBBL_SOFTSHADOWCENTREY IDS_SOFTSHADOWCENTREY 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWCENTRE_Y
+ DDeckerEnd
+ DDeckerTop
+ Control B IDBBL_SOFTSHADOWCENTREX IDS_SOFTSHADOWCENTREX 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWCENTRE_EDIT_X
+ DDeckerBottom
+ Control B IDBBL_SOFTSHADOWCENTREY IDS_SOFTSHADOWCENTREY 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWCENTRE_EDIT_Y
+ DDeckerEnd
+ DDeckerTop
+ Control B IDBBL_SOFTSHADOWCENTRENUDGE IDS_SOFTSHADOWCENTRENUDGE 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWCENTRE_X_LESS
+ Control B IDBBL_SOFTSHADOWCENTRENUDGE IDS_SOFTSHADOWCENTRENUDGE 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWCENTRE_X_MORE
+ DDeckerBottom
+ Control B IDBBL_SOFTSHADOWCENTRENUDGE IDS_SOFTSHADOWCENTRENUDGE 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWCENTRE_Y_LESS
+ Control B IDBBL_SOFTSHADOWCENTRENUDGE IDS_SOFTSHADOWCENTRENUDGE 0 IDD_SOFTSHADOWTOOLBAR IDC_SOFTSHADOWCENTRE_Y_MORE
+ DDeckerEnd
+EndBar
+
+#endif // WEBSTER
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc (revision 777)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc (revision 778)
@@ -4782,4 +4782,291 @@
<orient>wxHORIZONTAL</orient>
</object>
</object>
+ <object class="wxPanel" name="IDD_SOFTSHADOWTOOLBAR">
+ <label>Shadow tool info bar</label>
+ <title>Shadow tool info bar</title>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_NOSHADOW">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
+ <tooltip>No shadow</tooltip>
+ <help>Click to remove shadows from the selection</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_WALLSHADOW">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
+ <tooltip>Wall shadow</tooltip>
+ <help>Click to apply wall shadows to the selection</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_FLOORSHADOW">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
+ <tooltip>Floor shadow</tooltip>
+ <help>Click to apply floor shadows to the selection</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_GLOWSHADOW">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
+ <tooltip>Glow</tooltip>
+ <help>Click to apply glows to the selection</help>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxSlider" name="IDC_SOFTSHADOWSLIDER">
+ <size>128,-1</size>
+ <style>wxSL_HORIZONTAL|wxSL_AUTOTICKS</style>
+ <value>0</value>
+ <min>0</min>
+ <max>100</max>
+ <tooltip>Shadow Parameters</tooltip>
+ <help>Drag to alter the transparency of the selected shadow(s)</help>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxTextCtrl" name="IDC_SHADOW_SLIDER_EDIT">
+ <font>
+ <size>7</size>
+ </font>
+ <size>50,14</size>
+ <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
+ <tooltip>Shadow Parameters</tooltip>
+ <help>Drag to alter the transparency of the selected shadow(s)</help>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxSlider" name="IDC_SOFTSHADOWTRANSPSLIDER">
+ <size>128,-1</size>
+ <style>wxSL_HORIZONTAL|wxSL_AUTOTICKS</style>
+ <value>0</value>
+ <min>0</min>
+ <max>100</max>
+ <tooltip>Shadow transparency</tooltip>
+ <help>Changes the transparency of the selected shadows</help>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxTextCtrl" name="IDC_SHADOWTRANSP_EDIT">
+ <font>
+ <size>7</size>
+ </font>
+ <size>50,14</size>
+ <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
+ <tooltip>Shadow transparency</tooltip>
+ <help>Changes the transparency of the selected shadows</help>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BIASGAIN">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <tooltip>Profile</tooltip>
+ <help>Choose the rate of fading across colours</help>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_SOFTSHADOWCENTRE_X">
+ <font>
+ <size>8</size>
+ </font>
+ <label>X</label>
+ <size>-1,-1</size>
+ <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
+ <tooltip>Horizontal position</tooltip>
+ <help>Allows editing of the horizontal position of the selected shadow(s)</help>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_SOFTSHADOWCENTRE_Y">
+ <font>
+ <size>8</size>
+ </font>
+ <label>Y</label>
+ <size>-1,-1</size>
+ <style>wxALIGN_CENTRE|wxSUNKEN_BORDER</style>
+ <tooltip>Vertical position</tooltip>
+ <help>Allows editing of the vertical position of the selected shadow(s)</help>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxTextCtrl" name="IDC_SOFTSHADOWCENTRE_EDIT_X">
+ <font>
+ <size>7</size>
+ </font>
+ <size>50,14</size>
+ <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
+ <tooltip>Horizontal position</tooltip>
+ <help>Allows editing of the horizontal position of the selected shadow(s)</help>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxTextCtrl" name="IDC_SOFTSHADOWCENTRE_EDIT_Y">
+ <font>
+ <size>7</size>
+ </font>
+ <size>50,14</size>
+ <style>wxTE_RIGHT|wxTE_PROCESS_ENTER|wxNO_BORDER</style>
+ <tooltip>Vertical position</tooltip>
+ <help>Allows editing of the vertical position of the selected shadow(s)</help>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxCamArtControl" name="IDC_SOFTSHADOWCENTRE_X_LESS">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <tooltip>Position nudge</tooltip>
+ <help>Use to nudge the position of the selected shadow(s)</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxCamArtControl" name="IDC_SOFTSHADOWCENTRE_X_MORE">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <tooltip>Position nudge</tooltip>
+ <help>Use to nudge the position of the selected shadow(s)</help>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxCamArtControl" name="IDC_SOFTSHADOWCENTRE_Y_LESS">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <tooltip>Position nudge</tooltip>
+ <help>Use to nudge the position of the selected shadow(s)</help>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>0</border>
+ <object class="wxCamArtControl" name="IDC_SOFTSHADOWCENTRE_Y_MORE">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <tooltip>Position nudge</tooltip>
+ <help>Use to nudge the position of the selected shadow(s)</help>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/shadbar.xrc (deleted)
===================================================================
Xara