[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1213
Date : Tue May 30 15:05:22 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/coldlog.cpp
M /Trunk/XaraLX/Kernel/coldlog.h
M /Trunk/XaraLX/wxOil/colpick.cpp
M /Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
M /Trunk/XaraLX/wxOil/xrc/IDC_COLOURPICKER.png
Make colour editor resizable. Make advanced features work (mostly)
Diff:
Index: Trunk/XaraLX/Kernel/coldlog.h
===================================================================
--- Trunk/XaraLX/Kernel/coldlog.h (revision 1212)
+++ Trunk/XaraLX/Kernel/coldlog.h (revision 1213)
@@ -551,6 +551,11 @@
Cursor *CurrentCursor; // Current cursor object (or NULL)
BOOL m_bDoTimerProcessing; // flag indicates whether or not to do timer processing
+
+ void HideGadgetList(CGadgetID * Gadgets, BOOL Hide=TRUE);
+ void HideOrShowColourPicker();
+ void CheckDialogSize();
+
private:
void LoseKeyboardFocus(void);
// Lobs the keyboard focus back into the document
Index: Trunk/XaraLX/Kernel/coldlog.cpp
===================================================================
--- Trunk/XaraLX/Kernel/coldlog.cpp (revision 1212)
+++ Trunk/XaraLX/Kernel/coldlog.cpp (revision 1213)
@@ -431,11 +431,14 @@
_R(IDC_EDIT_COMPONENT2),
_R(IDC_EDIT_COMPONENT3),
_R(IDC_EDIT_COMPONENT4),
+ _R(IDC_EDIT_WEBHEX),
_R(IDC_NAME_COMPONENT1),
_R(IDC_NAME_COMPONENT2),
_R(IDC_NAME_COMPONENT3),
_R(IDC_NAME_COMPONENT4),
+ _R(IDC_NAME_WEBHEX),
_R(IDC_EDIT_COLMODEL),
+ _R(IDC_EDIT_3D),
_R(IDC_EDIT_COLTYPE),
_R(IDC_EDIT_MAKESTYLE),
#ifndef WEBSTER
@@ -454,7 +457,6 @@
0
};
-
typedef struct
{
CGadgetID Gadget; // Gadget ID
@@ -978,7 +980,8 @@
#ifdef WEBSTER
ColourPicker::SetWindowExtent(WindowID, _R(IDC_EDIT_PICKER), _R(IDC_EDIT_PICKER));
#endif // WEBSTER
-
+ HideGadget(_R(IDC_EDIT_ADVANCEDPANEL), TRUE);
+ CheckDialogSize();
return;
}
@@ -1003,16 +1006,18 @@
// WEBSTER - markn 11/12/96
// Always unfolded.
// Changed folded to show ed fields
- #ifndef WEBSTER
- ColourPicker::SetWindowExtent(WindowID, _R(IDC_EDIT_PICKER), _R(IDC_EDIT_PICKER));
+#ifndef WEBSTER
+ ColourPicker::SetWindowExtent(WindowID, _R(IDC_EDIT_PICKER), _R(IDC_EDIT_PICKER));
// SetStringGadgetValue(_R(IDC_EDIT_ADVANCED), _R(IDS_EDIT_MORE));
- SetBoolGadgetSelected(_R(IDC_EDIT_ADVANCED), FALSE);
- #else
- ColourPicker::SetWindowExtent(WindowID, _R(IDC_EDIT_PICKER), _R(IDC_EDIT_COLTYPE));
- #endif // WEBSTER
- }
+ SetBoolGadgetSelected(_R(IDC_EDIT_ADVANCED), FALSE);
+#else
+ ColourPicker::SetWindowExtent(WindowID, _R(IDC_EDIT_PICKER), _R(IDC_EDIT_COLTYPE));
+#endif // WEBSTER
+ HideGadget(_R(IDC_EDIT_ADVANCEDPANEL), TRUE);
+ }
else
{
+ HideGadget(_R(IDC_EDIT_ADVANCEDPANEL), FALSE);
CGadgetID Gadget = _R(IDC_EDIT_COLTYPE);
if (EditingColour != NULL) // If we have an editing colour, set tint/link controls
@@ -1022,8 +1027,12 @@
case COLOURTYPE_TINT:
{
Gadget = _R(IDC_EDIT_TINT);
- ColourPicker::SetGadgetPositions(WindowID, LinkGadgetIDs, 0);
- ColourPicker::SetGadgetPositions(WindowID, TintGadgetIDs, _R(IDC_EDIT_PARENTCOL));
+ HideGadgetList(LinkGadgetIDs, TRUE);
+ HideGadgetList(TintGadgetIDs, FALSE);
+ HideGadget (_R(IDC_EDIT_PARENTNAME), FALSE);
+ HideGadget (_R(IDC_EDIT_PARENTCOL), FALSE);
+ // ColourPicker::SetGadgetPositions(WindowID, LinkGadgetIDs, 0);
+ // ColourPicker::SetGadgetPositions(WindowID, TintGadgetIDs, _R(IDC_EDIT_PARENTCOL));
// And if it's not a shade, hide the extra writable field
HideGadget(_R(IDC_EDIT_SHADE), !EditingColour->TintIsShade());
@@ -1033,11 +1042,19 @@
case COLOURTYPE_LINKED:
Gadget = _R(IDC_EDIT_INHERIT4);
- ColourPicker::SetGadgetPositions(WindowID, TintGadgetIDs, 0);
- ColourPicker::SetGadgetPositions(WindowID, LinkGadgetIDs, _R(IDC_EDIT_PARENTCOL));
+ HideGadgetList(LinkGadgetIDs, FALSE);
+ HideGadgetList(TintGadgetIDs, TRUE);
+ HideGadget (_R(IDC_EDIT_PARENTNAME), FALSE);
+ HideGadget (_R(IDC_EDIT_PARENTCOL), FALSE);
+ // ColourPicker::SetGadgetPositions(WindowID, TintGadgetIDs, 0);
+ // ColourPicker::SetGadgetPositions(WindowID, LinkGadgetIDs, _R(IDC_EDIT_PARENTCOL));
break;
default:
+ HideGadget (_R(IDC_EDIT_PARENTNAME), TRUE);
+ HideGadget (_R(IDC_EDIT_PARENTCOL), TRUE);
+ HideGadgetList(LinkGadgetIDs, TRUE);
+ HideGadgetList(TintGadgetIDs, TRUE);
break;
}
}
@@ -1048,12 +1065,101 @@
// SetStringGadgetValue(_R(IDC_EDIT_ADVANCED), _R(IDS_EDIT_LESS));
#endif
}
+
+ CheckDialogSize();
+
}
+/********************************************************************************************
+> void ColourEditDlg::HideGadgetList(CGadgetID * Gadgets, BOOL Hide=TRUE)
+
+ Author: Alex Bligh
+ Created: 30/5/2005
+
+ Inputs: Gadgets - NULL terminated list of gadgets
+ Hide - TRUE to hide else FALSE to show
+
+ Purpose: Hides / shows the gadgets on the list
+
+ Scope: Protected
+
+********************************************************************************************/
+
+void ColourEditDlg::HideGadgetList(CGadgetID * Gadgets, BOOL Hide /*=TRUE*/)
+{
+ CGadgetID Gadget;
+ while ((Gadget=*(Gadgets++))) // assignment
+ {
+ HideGadget(Gadget, Hide);
+ }
+}
+
/********************************************************************************************
+> void ColourEditDlg::HideOrShowColourPicker()
+
+ Author: Alex Bligh
+ Created: 30/5/2005
+
+ Inputs: -
+
+ Purpose: Synchronize state of colour picker gadget
+
+ Scope: Protected
+
+********************************************************************************************/
+
+void ColourEditDlg::HideOrShowColourPicker()
+{
+ if (needColPickHidden != colPickHidden)
+ {
+ // this used to use Hide() but that was boring
+ EnableGadget(_R(IDC_COLOURPICKER), !needColPickHidden);
+ colPickHidden=needColPickHidden;
+
+ //CheckDialogSize();
+ }
+}
+
+/********************************************************************************************
+
+> void ColourEditDlg::CheckDialogSize()
+
+ Author: Alex Bligh
+ Created: 30/5/2005
+ Inputs: -
+ Purpose: Ensure the dialog is a sensible size
+ Scope: Protected
+
+********************************************************************************************/
+
+void ColourEditDlg::CheckDialogSize()
+{
+ CWindowID pPanel=DialogManager::GetGadget(WindowID, _R(IDC_EDIT_ADVANCEDPANEL));
+ if (pPanel)
+ {
+ pPanel->Layout();
+ pPanel->Fit();
+ pPanel->GetSizer()->SetSizeHints(pPanel);
+
+ static INT32 flag=0;
+ if (!flag)
+ {
+ flag++;
+ ::wxYield();
+ flag--;
+ }
+ }
+ WindowID->Layout();
+ WindowID->Fit();
+ WindowID->GetSizer()->SetSizeHints(WindowID);
+}
+
+
+/********************************************************************************************
+
> void ColourEditDlg::SetControls(void)
Author: Jason_Williams (Xara Group Ltd) <camelotdev@xxxxxxxx>
@@ -1382,6 +1488,8 @@
State.DisplayModel = DisplayModel;
State.ResultColour = ResultColour;
State.Initialised = TRUE;
+
+ CheckDialogSize();
}
@@ -1475,6 +1583,7 @@
ColourContextList::GetList()->RemoveContext(&cc); // Have finished with it
}
+ CheckDialogSize();
}
@@ -1548,6 +1657,7 @@
}
}
}
+ CheckDialogSize();
}
@@ -1610,10 +1720,20 @@
if (CurrentTypingGadget!=_R(IDC_EDIT_WEBHEX))
{
- // The following assumes _R(IDC_EDIT_COMPONENT1)..._R(IDC_EDIT_COMPONENT4) is sequential
- const INT32 nIndex = CurrentTypingGadget - _R(IDC_EDIT_COMPONENT1) + 1;
-
+ // Work out the index number
+ INT32 nIndex=0;
+ if (CurrentTypingGadget == _R(IDC_EDIT_COMPONENT1))
+ nIndex=1;
+ else if (CurrentTypingGadget == _R(IDC_EDIT_COMPONENT2))
+ nIndex=2;
+ else if (CurrentTypingGadget == _R(IDC_EDIT_COMPONENT3))
+ nIndex=3;
+ else if (CurrentTypingGadget == _R(IDC_EDIT_COMPONENT4))
+ nIndex=4;
+
ERROR3IF(nIndex < 1 || nIndex > 4, "ColourEditDlg::SetColour - nIndex invalid");
+ if (!nIndex)
+ nIndex=1;
if (cc->GetComponentName(nIndex, &NewValue))
{
@@ -3045,107 +3165,6 @@
case DIM_REDRAW: // Kernel-redraw of colour patch or picker controls
{
RenderControl(Msg->GadgetID, (ReDrawInfoType*) Msg->DlgMsgParam);
-
- if (Use3DDisplay == FALSE)
- {
-PORTNOTE("other", "Removed bizarre colour picker reposition during redraw");
-#ifndef EXCLUDE_FROM_XARALX
- if (resetColPickPos == TRUE)
- {
- CWindowID hwndColPick = DialogManager::GetGadget(GetReadWriteWindowID (), _R(IDC_COLOURPICKER));
- ASSERT (hwndColPick);
-
- MoveWindow (hwndColPick, colPickOrigRect.left, colPickOrigRect.top,
- colPickOrigRect.right - colPickOrigRect.left,
- colPickOrigRect.bottom - colPickOrigRect.top, FALSE);
-
- resetColPickPos = FALSE;
- }
-#endif
- }
- else
- {
- // this is naughty winoil code, BUT we need to dynamically relocate camelots
- // custom colour picker control - and we can only do this with MoveWindow ()
-
- /* COLOURMODEL_CIET, // 1 CIE coordinate (X,Y,Z), Transparent
- COLOURMODEL_RGBT, // 2 Red, Green, Blue, Transparent
- COLOURMODEL_CMYK, // 3 Cyan, Magenta, Yellow, Key
- COLOURMODEL_HSVT, // 4 Hue, Saturation, Value, Transparent
- COLOURMODEL_GREYT, // 5 Greyscale intensity, Transparent
- COLOURMODEL_WEBRGBT */ // 6 Red, Green, Blue, Transparent (rrggbb)
-
- if ((DisplayModel == COLOURMODEL_RGBT) || (DisplayModel == COLOURMODEL_WEBRGBT) || (DisplayModel == COLOURMODEL_CMYK))
- {
-PORTNOTE("other", "Removed bizarre colour picker reposition during redraw");
-#ifndef EXCLUDE_FROM_XARALX
- if (resetColPickPos == FALSE)
- {
- CWindowID hwndColPick = DialogManager::GetGadget (GetReadWriteWindowID (), _R(IDC_COLOURPICKER));
- ASSERT (hwndColPick);
- CWindowID hwndEditPicker = DialogManager::GetGadget (GetReadWriteWindowID (), _R(IDC_EDIT_PICKER));
- ASSERT (hwndEditPicker);
-
- RECT colPickRect;
- GetClientRect (hwndColPick, &colPickRect);
- MapWindowPoints (hwndColPick, GetReadWriteWindowID (), (LPPOINT) &colPickRect, 2);
-
- colPickOrigRect = colPickRect;
-
- RECT editPickerRect;
- GetClientRect (hwndEditPicker, &editPickerRect);
- MapWindowPoints (hwndEditPicker, GetReadWriteWindowID (), (LPPOINT) &editPickerRect, 2);
-
- MoveWindow (hwndColPick, colPickRect.left, editPickerRect.bottom - (colPickRect.bottom - colPickRect.top) - 2, colPickRect.right - colPickRect.left,
- colPickRect.bottom - colPickRect.top, FALSE);
-
- resetColPickPos = TRUE;
- }
-#endif
- }
- else if ((DisplayModel == COLOURMODEL_HSVT) || (DisplayModel == COLOURMODEL_GREYT))
- {
-PORTNOTE("other", "Removed bizarre colour picker reposition during redraw");
-#ifndef EXCLUDE_FROM_XARALX
- if (resetColPickPos == TRUE)
- {
- CWindowID hwndColPick = DialogManager::GetGadget (GetReadWriteWindowID (), _R(IDC_COLOURPICKER));
- ASSERT (hwndColPick);
-
- MoveWindow (hwndColPick, colPickOrigRect.left, colPickOrigRect.top,
- colPickOrigRect.right - colPickOrigRect.left,
- colPickOrigRect.bottom - colPickOrigRect.top, FALSE);
-
- resetColPickPos = FALSE;
- }
-#endif
- }
- }
-
- if (needColPickHidden == TRUE)
- {
- HideGadget(_R(IDC_COLOURPICKER), TRUE);
-
- if (colPickHidden == FALSE)
- {
- colPickHidden = TRUE;
- }
- }
- else
- {
- //if (DragStartArea == CEDRAG_NONE /*&& EditingColour != NULL && !DragUpdatedOnIdle*/)
- //{
- HideGadget(_R(IDC_COLOURPICKER), FALSE);
-
- if (colPickHidden == TRUE)
- {
- colPickHidden = FALSE;
- }
- //}
- }
-
- InvalidateGadget(_R(IDC_COLOURPICKER));
- PaintGadgetNow(_R(IDC_COLOURPICKER));
}
break;
@@ -3353,7 +3372,8 @@
if (( Msg->GadgetID == _R(IDC_EDIT_COMPONENT1)) ||
( Msg->GadgetID == _R(IDC_EDIT_COMPONENT2)) ||
( Msg->GadgetID == _R(IDC_EDIT_COMPONENT3)) ||
- ( Msg->GadgetID == _R(IDC_EDIT_COMPONENT4)))
+ ( Msg->GadgetID == _R(IDC_EDIT_COMPONENT4)) ||
+ ( Msg->GadgetID == _R(IDC_EDIT_WEBHEX)))
{
// While setting the colour, make sure we don't try to update the
// field that the user is currently typing into!
@@ -3616,6 +3636,8 @@
needColPickHidden = FALSE;
}
+ HideOrShowColourPicker();
+
BOOL Changed = FALSE;
switch (Index)
@@ -4287,6 +4309,7 @@
*ValSatSquare = *VirtualSize;
ValSatSquare->lo.y = HueRect->hi.y + 4000; // Above the hue slider, with a gap
+ ValSatSquare->hi.x -= PATCHSIZE; // center within the area left by the patches
INT32 SquareSize = ValSatSquare->Height();
if (SquareSize > ValSatSquare->Width())
@@ -6595,7 +6618,7 @@
********************************************************************************************/
- void ColourEditDlg::RenderControl(UINT32 GadgetToRender, ReDrawInfoType* RedrawInfo)
+void ColourEditDlg::RenderControl(UINT32 GadgetToRender, ReDrawInfoType* RedrawInfo)
{
// Use a virtual coord space of (0,0) to (dx, dy)
DocRect VirtualSize(0, 0, RedrawInfo->dx, RedrawInfo->dy);
@@ -11735,3 +11758,4 @@
*ppContext = ColourContext::GetGlobalDefault(ColModel);
return(FALSE);
}
+
Index: Trunk/XaraLX/wxOil/colpick.cpp
===================================================================
--- Trunk/XaraLX/wxOil/colpick.cpp (revision 1212)
+++ Trunk/XaraLX/wxOil/colpick.cpp (revision 1213)
@@ -2046,7 +2046,7 @@
// Turn all percent signs in the number to spaces so the StringToDouble doesn't yell and scream
String_8 TempString;
NewValue->Left(&TempString, 7);
- TempString.SwapChar((TCHAR) '%', (TCHAR) ' ');
+ TempString.SwapChar(_T('%'), _T(' '));
// Convert the string to a double using the global conversion routine
// Note that we ignore failure, because the number is validated below, and it
@@ -2205,7 +2205,7 @@
// Turn all percent signs in the number to spaces so the StringToDouble doesn't yell and scream
String_8 TempString;
NewValueX->Left(&TempString, 7);
- TempString.SwapChar((TCHAR) '%', (TCHAR) ' ');
+ TempString.SwapChar(_T('%'),_T(' '));
// Convert the string to a double using the global conversion routine
// Note that we ignore failure, because the number is validated below, and it
@@ -2237,7 +2237,7 @@
// Turn all percent signs in the number to spaces so the StringToDouble doesn't yell and scream
NewValueY->Left(&TempString, 7);
- TempString.SwapChar((TCHAR) '%', (TCHAR) ' ');
+ TempString.SwapChar(_T('%'),_T(' '));
// Convert the string to a double using the global conversion routine
// Note that we ignore failure, because the number is validated below, and it
Index: Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 1212)
+++ Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 1213)
@@ -1,126 +1,482 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<resource>
- <object class="wxDialog" name="IDD_COLOUREDITDLG">
- <pos>0,0d</pos> <size>142,126d</size>
- <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_NAMEMENU">
- <pos>4,4d</pos> <size>85,-1d</size>
- <style>wxCB_READONLY</style>
- </object>
- <object class="wxCamArtControl" name="IDC_EDIT_MAKESTYLE">
- <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
- <pos>92,4d</pos> <size>18,14d</size>
- <label>-</label>
- </object>
- <object class="wxCamArtControl" name="IDC_EDIT_216ONLY">
- <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
- <pos>107,4d</pos> <size>18,14d</size>
- <label>-</label>
- </object>
- <object class="wxCamArtControl" name="IDC_EDIT_ADVANCED">
- <enabled>0</enabled>
- <pos>122,4d</pos> <size>18,14d</size>
- <label>-</label>
- </object>
- <object class="wxCamArtControl" name="IDC_COLOURPICKER">
- <pos>6,22d</pos> <size>14,14d</size>
- </object>
- <object class="wxTextCtrl" name="IDC_EDIT_COMPONENT1">
- <pos>12,128d</pos> <size>20,12d</size>
- </object>
- <object class="wxTextCtrl" name="IDC_EDIT_COMPONENT2">
- <pos>40,128d</pos> <size>20,12d</size>
- </object>
- <object class="wxTextCtrl" name="IDC_EDIT_COMPONENT3">
- <pos>68,128d</pos> <size>20,12d</size>
- </object>
- <object class="wxTextCtrl" name="IDC_EDIT_COMPONENT4">
- <pos>96,128d</pos> <size>20,12d</size>
- </object>
- <object class="wxTextCtrl" name="IDC_EDIT_WEBHEX">
- <pos>54,128d</pos> <size>40,12d</size>
- </object>
- <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLMODEL">
- <pos>4,144d</pos> <size>104,-1d</size>
- <style>wxCB_READONLY</style>
- </object>
- <object class="wxCheckBox" name="IDC_EDIT_3D">
- <pos>112,144d</pos> <size>24,12d</size>
- <label>&3D</label>
- </object>
- <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLTYPE">
- <pos>4,184d</pos> <size>133,-1d</size>
- <style>wxCB_READONLY</style>
- </object>
- <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_PARENTCOL">
- <pos>33,200d</pos> <size>103,-1d</size>
- <style>wxCB_READONLY</style>
- </object>
- <object class="wxTextCtrl" name="IDC_EDIT_TINT">
- <pos>28,219d</pos> <size>20,13d</size>
- </object>
- <object class="wxTextCtrl" name="IDC_EDIT_SHADE">
- <pos>64,219d</pos> <size>20,13d</size>
- </object>
- <object class="wxCheckBox" name="IDC_EDIT_INHERIT1">
- <pos>32,236d</pos> <size>48,10d</size>
- <label>Comp 1</label>
- </object>
- <object class="wxCheckBox" name="IDC_EDIT_INHERIT2">
- <pos>80,236d</pos> <size>48,10d</size>
- <label>Comp 2</label>
- </object>
- <object class="wxCheckBox" name="IDC_EDIT_INHERIT3">
- <pos>32,249d</pos> <size>48,10d</size>
- <label>Comp 3</label>
- </object>
- <object class="wxCheckBox" name="IDC_EDIT_INHERIT4">
- <pos>80,248d</pos> <size>48,10d</size>
- <label>Comp 4</label>
- </object>
- <object class="wxCamDrawControl" name="IDC_EDIT_PICKER">
- <pos>4,20d</pos> <size>134,104d</size>
- </object>
- <object class="wxStaticBox" name="IDC_STATIC">
- <pos>176,148d</pos> <size>92,0d</size>
- <label></label>
- </object>
- <object class="wxStaticText" name="IDC_EDIT_PARENTNAME">
- <pos>4,202d</pos> <size>28,7d</size>
- <label>Parent:</label>
- </object>
- <object class="wxStaticText" name="IDC_EDIT_TINTNAME">
- <pos>4,221d</pos> <size>24,8d</size>
- <label>Shade:</label>
- </object>
- <object class="wxStaticText" name="IDC_EDIT_TINTPERCENT">
- <pos>50,221d</pos> <size>8,8d</size>
- <label>%</label>
- </object>
- <object class="wxStaticText" name="IDC_EDIT_SHADEPERCENT">
- <pos>86,221d</pos> <size>8,8d</size>
- <label>%</label>
- </object>
- <object class="wxStaticText" name="IDC_EDIT_INHERITNAME">
- <pos>4,236d</pos> <size>24,8d</size>
- <label>Inherit:</label>
- </object>
- <object class="wxCamArtControl" name="IDC_EDIT_NOCOLOUR">
- <pos>4,164d</pos> <size>18,14d</size>
- <label>-</label>
- </object>
- <object class="wxCamArtControl" name="IDC_MAKE_LOCAL">
- <pos>19,164d</pos> <size>18,14d</size>
- <label>-</label>
- </object>
- <object class="wxCamArtControl" name="IDC_EDIT_RENAME">
- <pos>34,164d</pos> <size>18,14d</size>
- <label>-</label>
- </object>
- <object class="wxButton" name="ID_CC_HELP_BUTTON">
- <pos>98,164d</pos> <size>40,12d</size>
- <label>Help</label>
- </object>
- <title>Colour editor</title>
- <label>Colour editor</label>
- </object>
+ <object class="wxDialog" name="IDD_COLOUREDITDLG">
+ <style>wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX</style>
+ <title>Colour editor</title>
+ <centered>1</centered>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_NAMEMENU">
+ <font>
+ <size>8</size>
+ </font>
+ <size>80,-1</size>
+ <buttonsize>17,-1</buttonsize>
+ <style>wxCB_READONLY</style>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_EDIT_MAKESTYLE">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <label>-</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_EDIT_216ONLY">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <label>-</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_COLOURPICKER">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <label>-</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_EDIT_ADVANCED">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER|wxCACS_TOGGLEBUTTON</camartstyle>
+ <label>-</label>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <minsize>120,120</minsize>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <minsize>120,150</minsize>
+ <object class="wxCamDrawControl" name="IDC_EDIT_PICKER">
+ <style>wxFULL_REPAINT_ON_RESIZE</style>
+ <size>120,150</size>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW</flag>
+ <border>0</border>
+ <object class="wxPanel" name="IDC_EDIT_ADVANCEDPANEL">
+ <style>wxNO_BORDER|wxTAB_TRAVERSAL</style>
+ <hidden>1</hidden>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_NAME_COMPONENT1">
+ <font>
+ <size>8</size>
+ </font>
+ <label>1</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxTextCtrl" name="IDC_EDIT_COMPONENT1">
+ <font>
+ <size>8</size>
+ </font>
+ <size>45,-1</size>
+ <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_NAME_COMPONENT2">
+ <font>
+ <size>8</size>
+ </font>
+ <label>2</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxTextCtrl" name="IDC_EDIT_COMPONENT2">
+ <font>
+ <size>8</size>
+ </font>
+ <size>45,-1</size>
+ <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_NAME_COMPONENT3">
+ <font>
+ <size>8</size>
+ </font>
+ <label>3</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxTextCtrl" name="IDC_EDIT_COMPONENT3">
+ <font>
+ <size>8</size>
+ </font>
+ <size>45,-1</size>
+ <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_NAME_COMPONENT4">
+ <font>
+ <size>8</size>
+ </font>
+ <label>4</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxTextCtrl" name="IDC_EDIT_COMPONENT4">
+ <font>
+ <size>8</size>
+ </font>
+ <size>45,-1</size>
+ <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <size>5,1</size>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_NAME_WEBHEX">
+ <font>
+ <size>8</size>
+ </font>
+ <label>#</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxTextCtrl" name="IDC_EDIT_WEBHEX">
+ <font>
+ <size>8</size>
+ </font>
+ <size>55,-1</size>
+ <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLMODEL">
+ <font>
+ <size>8</size>
+ </font>
+ <size>80,-1</size>
+ <buttonsize>17,-1</buttonsize>
+ <style>wxCB_READONLY</style>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCheckBox" name="IDC_EDIT_3D">
+ <font>
+ <size>8</size>
+ </font>
+ <label>&3D</label>
+ <checked>0</checked>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_EDIT_NOCOLOUR">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <label>-</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_MAKE_LOCAL">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <label>-</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCamArtControl" name="IDC_EDIT_RENAME">
+ <camartstyle>wxCACS_PUSHBUTTON|wxCACS_ALLOWHOVER</camartstyle>
+ <label>-</label>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <size>5,1</size>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxButton" name="ID_CC_HELP_BUTTON">
+ <label>Help</label>
+ <font>
+ <size>8</size>
+ </font>
+ <label>Create Brush</label>
+ <style>wxBU_EXACTFIT</style>
+ <size>-1,25</size>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <object class="wxStaticLine" name="IDC_EDIT_STATICLINE">
+ <style>wxLI_HORIZONTAL</style>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_COLTYPE">
+ <font>
+ <size>8</size>
+ </font>
+ <size>80,-1</size>
+ <buttonsize>17,-1</buttonsize>
+ <style>wxCB_READONLY</style>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_EDIT_PARENTNAME">
+ <font>
+ <size>8</size>
+ </font>
+ <label>Parent:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <object class="wxOwnerDrawnComboBox" name="IDC_EDIT_PARENTCOL">
+ <font>
+ <size>8</size>
+ </font>
+ <size>80,-1</size>
+ <buttonsize>17,-1</buttonsize>
+ <style>wxCB_READONLY</style>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxGROW|wxALL</flag>
+ <border>1</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_EDIT_TINTNAME">
+ <font>
+ <size>8</size>
+ </font>
+ <label>Shade:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxTextCtrl" name="IDC_EDIT_TINT">
+ <font>
+ <size>8</size>
+ </font>
+ <size>45,-1</size>
+ <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_EDIT_TINTPERCENT">
+ <font>
+ <size>8</size>
+ </font>
+ <label>%</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxTextCtrl" name="IDC_EDIT_SHADE">
+ <font>
+ <size>8</size>
+ </font>
+ <size>45,-1</size>
+ <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_EDIT_SHADEPERCENT">
+ <font>
+ <size>8</size>
+ </font>
+ <label>%</label>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <size>5,1</size>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_LEFT|wxALL</flag>
+ <border>1</border>
+ <object class="wxBoxSizer">
+ <orient>wxHORIZONTAL</orient>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE</flag>
+ <border>1</border>
+ <object class="wxStaticText" name="IDC_EDIT_INHERITNAME">
+ <font>
+ <size>8</size>
+ </font>
+ <label>Inherit:</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCheckBox" name="IDC_EDIT_INHERIT1">
+ <font>
+ <size>8</size>
+ </font>
+ <label>Comp 1</label>
+ <checked>0</checked>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCheckBox" name="IDC_EDIT_INHERIT2">
+ <font>
+ <size>8</size>
+ </font>
+ <label>Comp 2</label>
+ <checked>0</checked>
+ </object>
+ </object>
+ <object class="spacer">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <option>100</option>
+ <size>5,1</size>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCheckBox" name="IDC_EDIT_INHERIT3">
+ <font>
+ <size>8</size>
+ </font>
+ <label>Comp 3</label>
+ <checked>0</checked>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+ <border>1</border>
+ <object class="wxCheckBox" name="IDC_EDIT_INHERIT4">
+ <font>
+ <size>8</size>
+ </font>
+ <label>Comp 4</label>
+ <checked>0</checked>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
</resource>
+
Index: Trunk/XaraLX/wxOil/xrc/IDC_COLOURPICKER.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Xara