[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1070
Date : Tue May 16 11:56:58 BST 2006
Changed paths:
M /Trunk/XaraLX/Scripts/barconverter
M /Trunk/XaraLX/wxOil/camframe.cpp
M /Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
M /Trunk/XaraLX/wxOil/xrc/barsource/bars.ini
M /Trunk/XaraLX/wxXtra/combo.cpp
M /Trunk/XaraLX/wxXtra/odcombo.cpp
Put galleries onto standard bar
Tweak dropbutton size on combos
Tweak some combo and slider widths
Diff:
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter (revision 1069)
+++ Trunk/XaraLX/Scripts/barconverter (revision 1070)
@@ -129,22 +129,22 @@
my $default = shift @_;
my %cnamemap = (
- "IDC_GEOMETRY" => 128,
- "IDC_MAPPING" => 128,
- "IDC_EFFECT" => 96,
- "IDC_BITMAPEFFECT" => 128,
- "IDC_TRANSPTYPE" => 128,
+ "IDC_GEOMETRY" => $dd?112:128,
+ "IDC_MAPPING" => $dd?112:128,
+ "IDC_EFFECT" => $dd?112:96,
+ "IDC_BITMAPEFFECT" => $dd?112:128,
+ "IDC_TRANSPTYPE" => $dd?112:128,
"IDC_SEL_EDIT_XSCALE" => 30,
"IDC_SEL_EDIT_YSCALE" => 30,
"IDC_SEL_EDIT_SHEAR" => 30,
"IDC_SEL_EDIT_ANGLE" => 30,
"IDC_BEVEL_TYPE_COMBO" => 96,
"IDC_BEVEL_SLIDER_COMBO" => 96,
- "IDC_TRANSPSLIDE" => 128,
+ "IDC_TRANSPSLIDE" => 96,
"IDC_BEVELSLIDER" => 96,
- "IDC_FREEHANDSLIDER" => 128,
- "IDC_SOFTSHADOWSLIDER" => 128,
- "IDC_SOFTSHADOWTRANSPSLIDER" => 128,
+ "IDC_FREEHANDSLIDER" => 96,
+ "IDC_SOFTSHADOWSLIDER" => 96,
+ "IDC_SOFTSHADOWTRANSPSLIDER" => 96,
"IDC_EDIT_REGSHAPETOOL_POS" => 128,
"IDC_FONT_COMBO" => 128
);
@@ -326,9 +326,10 @@
printf STDOUT $ddindent." <flag>wxALIGN_CENTER_%s|wxALL</flag>
", IsVertical()?"HORIZONTAL":"VERTICAL";;
print STDOUT $ddindent." <border>0</border>
";
print STDOUT $ddindent." <object class=\"wxOwnerDrawnComboBox\" name=\"$name\">
";
- printf STDOUT $ddindent." <size>%d,-1</size>
",GetSize($name, 80);
+ printf STDOUT $ddindent." <size>%d,%d</size>
",GetSize($name, 80), $dd?14:-1;
WriteFont();
printf STDOUT $ddindent." <style>%s</style>
", GetComboStyle($name);
+ printf STDOUT $ddindent." <buttonsize>%d,-1</buttonsize>
", $dd?15:17;
ConvertOptoken($optoken) if ($optoken ne "");
BubbleHelp();
print STDOUT $ddindent." </object>
";
@@ -571,7 +572,7 @@
{
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|IDC_SOFTSHADOWCENTRE_X|IDC_SOFTSHADOWCENTRE_Y)$/)
+ elsif ($name =~ /^(IDC_REGSHAPETOOL_ADDCHANGE|IDC_SELPOINT|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|IDC_SELCOLOUR)$/)
{
WriteStaticText($name,$optoken);
}
@@ -629,6 +630,7 @@
}
elsif (/^End(Bar|Gallery)/)
{
+ WriteSeparator(); # end with a separator to ensure minimum height
$dialogname="";
$ingal?WriteGalleryTail():WriteBarTail();
$inbar = 0;
Index: Trunk/XaraLX/wxXtra/combo.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/combo.cpp (revision 1069)
+++ Trunk/XaraLX/wxXtra/combo.cpp (revision 1070)
@@ -795,7 +795,7 @@
int btnBorder; // border for button only
if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) || m_blankButtonBg ) &&
- m_btnSpacingX == 0 && m_btnWid == 0 && m_btnHei == 0 &&
+// m_btnSpacingX == 0 && m_btnWid == 0 && m_btnHei == 0 &&
(!m_bmpNormal.Ok() || m_blankButtonBg) )
{
buttonOutside = true;
Index: Trunk/XaraLX/wxXtra/odcombo.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/odcombo.cpp (revision 1069)
+++ Trunk/XaraLX/wxXtra/odcombo.cpp (revision 1070)
@@ -840,6 +840,11 @@
control->SetPopupControl(NULL);
+ wxSize ButtonSize=GetSize(wxT("buttonsize"));
+
+ if (ButtonSize != wxDefaultSize)
+ control->SetButtonPosition(ButtonSize.GetWidth(), ButtonSize.GetHeight());
+
if (selection != -1)
control->SetSelection(selection);
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc (revision 1069)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc (revision 1070)
@@ -152,6 +152,11 @@
<optoken>TOOL25</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_IMAGESETTING">
@@ -211,6 +216,11 @@
<optoken>PrintOnAllPlates</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_WINDOW">
@@ -363,6 +373,11 @@
<optoken>QualityOutline</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_ARRANGE">
@@ -543,6 +558,11 @@
<optoken>FitTextToPath</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_EDIT">
@@ -658,6 +678,11 @@
<optoken>BarCreationDlg</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_FILE">
@@ -783,6 +808,11 @@
<optoken>PrintSetup</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_GALLERIES">
@@ -864,6 +894,11 @@
<optoken>DisplayNameGallery</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_STANDARD">
@@ -953,6 +988,7 @@
<size>8</size>
</font>
<style>wxCB_DROPDOWN</style>
+ <buttonsize>17,-1</buttonsize>
<optoken>ZoomCombo</optoken>
</object>
</object>
@@ -991,6 +1027,7 @@
<size>8</size>
</font>
<style>wxCB_DROPDOWN</style>
+ <buttonsize>17,-1</buttonsize>
<optoken>ChangeLineWidth</optoken>
</object>
</object>
@@ -1049,6 +1086,83 @@
<optoken>FeatherProfile</optoken>
</object>
</object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_SGCOLOUR">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <optoken>DisplayColourGallery</optoken>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_SGLAYER">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <optoken>DisplayLayerGallery</optoken>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_SGFRAME">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <optoken>DisplayFrameGallery</optoken>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_SGBITMAP">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <optoken>DisplayBitmapGallery</optoken>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_SGLINE">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <optoken>DisplayLineGallery</optoken>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_SGFONTS">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <optoken>DisplayFontsGallery</optoken>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_SGCLIPART">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <optoken>DisplayClipartGallery</optoken>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_SGFILLS">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <optoken>DisplayFillsGallery</optoken>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_BTN_SGNAME">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <optoken>DisplayNameGallery</optoken>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_TOOLBAR">
@@ -1202,6 +1316,11 @@
<optoken>TOOL4</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_ANIMATION">
@@ -1309,6 +1428,11 @@
<optoken>BrowserPreview</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BUTTBAR_FEATHER">
@@ -1343,6 +1467,11 @@
<optoken>FeatherProfile</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_COLOURSGALLERY">
@@ -1544,7 +1673,12 @@
</object>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
</object>
+ </object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
@@ -1715,7 +1849,12 @@
<help>Make all layers editable regardless of their editable state</help>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
</object>
+ </object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
@@ -1883,7 +2022,12 @@
<help>IDS_FRAME_STATUS_MULTILAYER</help>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
</object>
+ </object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
@@ -2154,7 +2298,12 @@
</object>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
</object>
+ </object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
@@ -2234,6 +2383,7 @@
<size>8</size>
</font>
<style>wxCB_DROPDOWN</style>
+ <buttonsize>17,-1</buttonsize>
<optoken>ChangeLineWidth</optoken>
</object>
</object>
@@ -2263,7 +2413,12 @@
<optoken>ChangeLineCap</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
</object>
+ </object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
@@ -2498,10 +2653,16 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<optoken>NameGalleryPropertyIndex</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
</object>
+ </object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
@@ -2714,7 +2875,12 @@
</object>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
</object>
+ </object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
@@ -2952,7 +3118,12 @@
<optoken>LibGalClipTheme</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
</object>
+ </object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
@@ -3182,7 +3353,12 @@
</object>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
</object>
+ </object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxEXPAND</flag>
@@ -3212,6 +3388,7 @@
<size>8</size>
</font>
<style>wxCB_DROPDOWN</style>
+ <buttonsize>17,-1</buttonsize>
<optoken>ZoomCombo</optoken>
</object>
</object>
@@ -3257,6 +3434,11 @@
<optoken>ZoomSelect</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_ZOOMINFO">
@@ -3275,6 +3457,7 @@
<size>8</size>
</font>
<style>wxCB_DROPDOWN</style>
+ <buttonsize>17,-1</buttonsize>
<optoken>ZoomCombo</optoken>
</object>
</object>
@@ -3320,6 +3503,11 @@
<optoken>ZoomSelect</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_REGSHAPETOOLBAR">
@@ -3453,6 +3641,7 @@
<size>8</size>
</font>
<style>wxCB_DROPDOWN</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Number of sides</tooltip>
<help>Enter the number of sides the QuickShape has</help>
</object>
@@ -3471,6 +3660,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Editable items</tooltip>
<help>Select items from this menu to edit</help>
</object>
@@ -3589,6 +3779,11 @@
<border>1</border>
<size>3,28</size>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_RECTTOOLBAR">
@@ -3671,6 +3866,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Editable items</tooltip>
<help>Select items from this menu to edit</help>
</object>
@@ -3789,6 +3985,11 @@
<border>1</border>
<size>3,28</size>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_ELLIPSETOOLBAR">
@@ -3857,6 +4058,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Editable items</tooltip>
<help>Select items from this menu to edit</help>
</object>
@@ -3975,6 +4177,11 @@
<border>1</border>
<size>3,28</size>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_GRADFILLDLG">
@@ -3993,6 +4200,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Fill type</tooltip>
<help>Choose the type of fill</help>
</object>
@@ -4011,6 +4219,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Fill tiling</tooltip>
<help>Choose the rate of fade from one point to another</help>
</object>
@@ -4029,6 +4238,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Fill effect</tooltip>
<help>Choose how the fill fades from one colour to another</help>
</object>
@@ -4047,6 +4257,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Fill effect</tooltip>
<help>Choose how the fill fades from one colour to another</help>
</object>
@@ -4106,6 +4317,11 @@
<border>1</border>
<size>3,28</size>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_TRANFILLDLG">
@@ -4124,6 +4340,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Transparency shape</tooltip>
<help>Choose the type of fill</help>
</object>
@@ -4142,6 +4359,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Transparency type</tooltip>
<help>Choose the type of transparency</help>
</object>
@@ -4160,6 +4378,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Fill tiling</tooltip>
<help>Choose the rate of fade from one point to another</help>
</object>
@@ -4178,6 +4397,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Fill effect</tooltip>
<help>Choose how the fill fades from one colour to another</help>
</object>
@@ -4223,7 +4443,7 @@
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>0</border>
<object class="wxSlider" name="IDC_TRANSPSLIDE">
- <size>128,-1</size>
+ <size>96,-1</size>
<style>wxSL_HORIZONTAL|wxSL_AUTOTICKS</style>
<value>0</value>
<min>0</min>
@@ -4250,6 +4470,11 @@
<help>Drag slider to change the transparency of a fill handle</help>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BEZTOOLBAR">
@@ -4862,6 +5087,11 @@
<help>Sets accuracy of the smoothing operation</help>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_SELECTORINFO">
@@ -5497,6 +5727,11 @@
<optoken>NameObjectsDlg</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_FREEHANDTOOL">
@@ -5510,7 +5745,7 @@
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>0</border>
<object class="wxSlider" name="IDC_FREEHANDSLIDER">
- <size>128,-1</size>
+ <size>96,-1</size>
<style>wxSL_HORIZONTAL|wxSL_AUTOTICKS</style>
<value>0</value>
<min>0</min>
@@ -5608,6 +5843,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Select an existing brush</tooltip>
<help>Select an existing brush</help>
</object>
@@ -5626,10 +5862,16 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Select an existing stroke shape / pressure profile</tooltip>
<help>Select an existing stroke shape / pressure profile</help>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BLENDTOOLBAR">
@@ -5707,6 +5949,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Colour blend effect</tooltip>
<help>Choose the way in which colours are blended together</help>
</object>
@@ -5794,6 +6037,11 @@
<help>Rotate the objects to match the angle of the curve</help>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_MOULDTOOLBAR">
@@ -5975,6 +6223,11 @@
<optoken>PastePerspective</optoken>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_CONTOURINFOBAR">
@@ -6052,6 +6305,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Change the colour effect</tooltip>
<help>Change the colour effect of the contour rings</help>
</object>
@@ -6184,6 +6438,11 @@
<help>Set line join type to bevelled</help>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_BEVELINFOBAR">
@@ -6202,6 +6461,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Bevel type</tooltip>
<help>Select the appearance of the bevel from the list</help>
</object>
@@ -6220,6 +6480,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Slider type</tooltip>
<help>Use the slider to change the bevel settings</help>
</object>
@@ -6315,6 +6576,11 @@
<help>Set line join type to bevelled</help>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_TEXT_INFO_BAR">
@@ -6333,6 +6599,7 @@
<size>8</size>
</font>
<style>wxCB_READONLY</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Font</tooltip>
<help>Set font typeface; choose from TrueType fonts</help>
</object>
@@ -6351,6 +6618,7 @@
<size>8</size>
</font>
<style>wxCB_DROPDOWN</style>
+ <buttonsize>17,-1</buttonsize>
<tooltip>Size</tooltip>
<help>Set font size</help>
</object>
@@ -6733,6 +7001,11 @@
<help>Use automatic kerning</help>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_PENTOOLBAR">
@@ -6747,6 +7020,11 @@
<border>1</border>
<size>3,28</size>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
<object class="wxPanel" name="IDD_SOFTSHADOWTOOLBAR">
@@ -6801,7 +7079,7 @@
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>0</border>
<object class="wxSlider" name="IDC_SOFTSHADOWSLIDER">
- <size>128,-1</size>
+ <size>96,-1</size>
<style>wxSL_HORIZONTAL|wxSL_AUTOTICKS</style>
<value>0</value>
<min>0</min>
@@ -6837,7 +7115,7 @@
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>0</border>
<object class="wxSlider" name="IDC_SOFTSHADOWTRANSPSLIDER">
- <size>128,-1</size>
+ <size>96,-1</size>
<style>wxSL_HORIZONTAL|wxSL_AUTOTICKS</style>
<value>0</value>
<min>0</min>
@@ -7036,6 +7314,11 @@
</object>
</object>
</object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <size>3,28</size>
+ </object>
</object>
</object>
</resource>
Index: Trunk/XaraLX/wxOil/xrc/barsource/bars.ini
===================================================================
--- Trunk/XaraLX/wxOil/xrc/barsource/bars.ini (revision 1069)
+++ Trunk/XaraLX/wxOil/xrc/barsource/bars.ini (revision 1070)
@@ -389,6 +389,28 @@
Control B OPTOKEN_FEATHERSIZE 0 IDD_BARCONTROLSTORE IDC_FEATHERSIZE_CUSTOMEDIT
Control B OPTOKEN_FEATHERPROFILE 0 IDD_BARCONTROLSTORE IDC_FEATHERPROFILE_GDGT
+; And now he wants these too
+#ifndef EXCLUDE_GALS
+; WEBSTER- MartinD
+ Control B OPTOKEN_DISPLAYCOLOURGALLERY 0 IDD_GALBUTTONSTORE IDC_BTN_SGCOLOUR
+; WEBSTER-ranbirr-30/10/96
+#ifndef WEBSTER
+ Control B OPTOKEN_DISPLAYLAYERGALLERY 0 IDD_GALBUTTONSTORE IDC_BTN_SGLAYER
+#endif // Webster
+ Control B OPTOKEN_DISPLAYFRAMEGALLERY 0 IDD_GALBUTTONSTORE IDC_BTN_SGFRAME
+ Control B OPTOKEN_DISPLAYBITMAPGALLERY 0 IDD_GALBUTTONSTORE IDC_BTN_SGBITMAP
+; WEBSTER-ranbirr-30/10/96
+#ifndef WEBSTER
+ Control B OPTOKEN_DISPLAY_LINE_GALLERY 0 IDD_GALBUTTONSTORE IDC_BTN_SGLINE
+#endif // Webster
+ Control B OPTOKEN_DISPLAYFONTSGALLERY 0 IDD_GALBUTTONSTORE IDC_BTN_SGFONTS
+ Control B OPTOKEN_DISPLAYCLIPARTGALLERY 0 IDD_GALBUTTONSTORE IDC_BTN_SGCLIPART
+ Control B OPTOKEN_DISPLAYFILLSGALLERY 0 IDD_GALBUTTONSTORE IDC_BTN_SGFILLS
+#ifndef WEBSTER
+ Control B OPTOKEN_DISPLAY_NAME_GALLERY 0 IDD_GALBUTTONSTORE IDC_BTN_SGNAME
+#endif // Webster
+#endif
+
EndBar
Index: Trunk/XaraLX/wxOil/camframe.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camframe.cpp (revision 1069)
+++ Trunk/XaraLX/wxOil/camframe.cpp (revision 1070)
@@ -392,8 +392,8 @@
wxCommandEvent sbbe(wxEVT_COMMAND_MENU_SELECTED, _R(IDD_BUTTBAR_STATUS));
OnStandardBar(sbbe);
- wxCommandEvent gbe(wxEVT_COMMAND_MENU_SELECTED, _R(IDD_BUTTBAR_GALLERIES));
- OnStandardBar(gbe);
+// wxCommandEvent gbe(wxEVT_COMMAND_MENU_SELECTED, _R(IDD_BUTTBAR_GALLERIES));
+// OnStandardBar(gbe);
return TRUE;
}
Xara