===================================================================
--- pgadmin/ui/dlgAggregate.xrc (revision 7390)
+++ pgadmin/ui/dlgAggregate.xrc (working copy)
@@ -2,153 +2,297 @@
<resource>
<object class="wxDialog" name="dlgAggregate">
<title></title>
- <object class="wxNotebook" name="nbNotebook">
- <object class="notebookpage">
- <label>Properties</label>
- <object class="wxPanel" name="pnlProperties">
- <object class="wxStaticText" name="stName">
- <label>Name</label>
- <pos>5,7d</pos>
+ <size>218,238d</size>
+ <style>wxDEFAULT_DIALOG_STYLE|wxCAPTION|wxSYSTEM_MENU|wxRESIZE_BORDER|wxRESIZE_BOX|wxTHICK_FRAME</style>
+ <object class="wxFlexGridSizer">
+ <cols>1</cols>
+ <object class="sizeritem">
+ <object class="wxNotebook" name="nbNotebook">
+ <object class="notebookpage">
+ <label>Properties</label>
+ <object class="wxPanel" name="pnlProperties">
+ <object class="wxFlexGridSizer">
+ <cols>2</cols>
+ <rows>5</rows>
+ <vgap>5</vgap>
+ <hgap>5</hgap>
+ <growablerows>3</growablerows>
+ <growablecols>1</growablecols>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stName">
+ <label>Name</label>
+ <pos>5,7d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxTextCtrl" name="txtName">
+ <pos>70,5d</pos>
+ <size>135,-1d</size>
+ </object>
+ <flag>wxEXPAND|wxALIGN_TOP</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stOID">
+ <label>OID</label>
+ <pos>5,22d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxTextCtrl" name="txtOID">
+ <pos>70,20d</pos>
+ <size>135,-1d</size>
+ </object>
+ <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stOwner">
+ <label>Owner</label>
+ <pos>5,37d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="ctlComboBox" name="cbOwner">
+ <pos>70,35d</pos>
+ <size>135,12d</size>
+ <content/>
+ <style>wxCB_DROPDOWN</style>
+ </object>
+ <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stComment">
+ <label>Comment</label>
+ <pos>5,52d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxTextCtrl" name="txtComment">
+ <pos>70,50d</pos>
+ <size>135,132d</size>
+ <style>wxTE_MULTILINE</style>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stClusterSet">
+ <label>Use replication</label>
+ <pos>5,187d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxComboBox" name="cbClusterSet">
+ <content/>
+ <pos>70,185d</pos>
+ <size>135,12d</size>
+ <style>wxCB_READONLY|wxCB_DROPDOWN</style>
+ </object>
+ <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ </object>
+ </object>
</object>
- <object class="wxTextCtrl" name="txtName">
- <pos>70,5d</pos>
- <size>135,-1d</size>
+ <object class="notebookpage">
+ <label>Definition</label>
+ <object class="wxPanel" name="pnlDefinition">
+ <object class="wxFlexGridSizer">
+ <cols>2</cols>
+ <rows>7</rows>
+ <vgap>5</vgap>
+ <hgap>5</hgap>
+ <growablecols>1</growablecols>
+ <growablerows>0</growablerows>
+ <object class="sizeritem">
+ <object class="wxFlexGridSizer">
+ <cols>1</cols>
+ <rows>2</rows>
+ <vgap>5</vgap>
+ <hgap>5</hgap>
+ <growablerows>1</growablerows>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stInputTypes">
+ <label>Input types</label>
+ <pos>5,7d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="btnRemoveType">
+ <label>&Remove</label>
+ <pos>5,87d</pos>
+ <size>60,-1d</size>
+ </object>
+ <flag>wxALIGN_BOTTOM|wxBOTTOM</flag>
+ </object>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <object class="wxListCtrl" name="lstInputTypes">
+ <pos>70,5d</pos>
+ <size>135,97d</size>
+ <style>wxLC_REPORT</style>
+ </object>
+ <flag>wxALL|wxEXPAND</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxButton" name="btnAddType">
+ <label>&Add</label>
+ <pos>5,105d</pos>
+ <size>60,-1d</size>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="ctlComboBox" name="cbInputType">
+ <content/>
+ <pos>70,105d</pos>
+ <size>135,12d</size>
+ <style>wxCB_DROPDOWN</style>
+ </object>
+ <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stStateType">
+ <label>State type</label>
+ <pos>5,127d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="ctlComboBox" name="cbStateType">
+ <content/>
+ <pos>70,125d</pos>
+ <size>135,12d</size>
+ <style>wxCB_DROPDOWN</style>
+ </object>
+ <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stStateFunc">
+ <label>State function</label>
+ <pos>5,142d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxComboBox" name="cbStateFunc">
+ <content/>
+ <pos>70,140d</pos>
+ <size>135,12d</size>
+ <style>wxCB_READONLY|wxCB_DROPDOWN</style>
+ </object>
+ <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stFinalFunc">
+ <label>Final function</label>
+ <pos>5,157d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxComboBox" name="cbFinalFunc">
+ <content/>
+ <pos>70,155d</pos>
+ <size>135,12d</size>
+ <style>wxCB_READONLY|wxCB_DROPDOWN</style>
+ </object>
+ <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stSortOp">
+ <label>Sort Operator</label>
+ <pos>5,172d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxComboBox" name="cbSortOp">
+ <content/>
+ <pos>70,170d</pos>
+ <size>135,12d</size>
+ <style>wxCB_READONLY|wxCB_DROPDOWN</style>
+ </object>
+ <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxStaticText" name="stInitial">
+ <label>Initial condition</label>
+ <pos>5,187d</pos>
+ </object>
+ <flag>wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ <object class="sizeritem">
+ <object class="wxTextCtrl" name="txtInitial">
+ <pos>70,185d</pos>
+ <size>135,-1d</size>
+ </object>
+ <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+ </object>
+ </object>
+ </object>
</object>
- <object class="wxStaticText" name="stOID">
- <label>OID</label>
- <pos>5,22d</pos>
- </object>
- <object class="wxTextCtrl" name="txtOID">
- <pos>70,20d</pos>
- <size>135,-1d</size>
- </object>
- <object class="wxStaticText" name="stOwner">
- <label>Owner</label>
- <pos>5,37d</pos>
- </object>
- <object class="ctlComboBox" name="cbOwner">
- <pos>70,35d</pos>
- <size>135,12d</size>
- <content/>
- <style>wxCB_DROPDOWN</style>
- </object>
- <object class="wxStaticText" name="stComment">
- <label>Comment</label>
- <pos>5,52d</pos>
- </object>
- <object class="wxTextCtrl" name="txtComment">
- <pos>70,50d</pos>
- <size>135,132d</size>
- <style>wxTE_MULTILINE</style>
- </object>
- <object class="wxStaticText" name="stClusterSet">
- <label>Use replication</label>
- <pos>5,187d</pos>
- </object>
- <object class="wxComboBox" name="cbClusterSet">
- <content/>
- <pos>70,185d</pos>
- <size>135,12d</size>
- <style>wxCB_READONLY|wxCB_DROPDOWN</style>
- </object>
</object>
- <selected>1</selected>
+ <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+ <border>3</border>
</object>
- <pos>2,2d</pos>
- <size>214,215d</size>
- <object class="notebookpage">
- <label>Definition</label>
- <object class="wxPanel" name="pnlDefinition">
- <object class="wxStaticText" name="stInputTypes">
- <label>Input types</label>
- <pos>5,7d</pos>
+ <growablecols>0</growablecols>
+ <growablerows>0</growablerows>
+ <object class="spacer">
+ <size>2,2d</size>
+ </object>
+ <object class="sizeritem">
+ <object class="wxFlexGridSizer">
+ <cols>7</cols>
+ <object class="spacer">
+ <size>3,3d</size>
</object>
- <object class="wxListCtrl" name="lstInputTypes">
- <pos>70,5d</pos>
- <size>135,97d</size>
- <style>wxLC_REPORT</style>
+ <object class="sizeritem">
+ <object class="wxButton" name="wxID_HELP">
+ <label>Help</label>
+ <pos>135,220d</pos>
+ </object>
</object>
- <object class="wxButton" name="btnRemoveType">
- <label>&Remove</label>
- <pos>5,87d</pos>
- <size>60,-1d</size>
+ <object class="spacer">
+ <size>3,3d</size>
</object>
- <object class="wxButton" name="btnAddType">
- <label>&Add</label>
- <pos>5,105d</pos>
- <size>60,-1d</size>
+ <object class="sizeritem">
+ <object class="wxButton" name="wxID_OK">
+ <label>&OK</label>
+ <default>1</default>
+ <pos>135,220d</pos>
+ </object>
</object>
- <object class="ctlComboBox" name="cbInputType">
- <content/>
- <pos>70,105d</pos>
- <size>135,12d</size>
- <style>wxCB_DROPDOWN</style>
+ <object class="spacer">
+ <size>3,3d</size>
</object>
- <object class="wxStaticText" name="stStateType">
- <label>State type</label>
- <pos>5,127d</pos>
+ <object class="sizeritem">
+ <object class="wxButton" name="wxID_CANCEL">
+ <label>&Cancel</label>
+ <pos>176,220d</pos>
+ </object>
</object>
- <object class="ctlComboBox" name="cbStateType">
- <content/>
- <pos>70,125d</pos>
- <size>135,12d</size>
- <style>wxCB_DROPDOWN</style>
+ <object class="spacer">
+ <size>3,3d</size>
</object>
- <object class="wxStaticText" name="stStateFunc">
- <label>State function</label>
- <pos>5,142d</pos>
- </object>
- <object class="wxComboBox" name="cbStateFunc">
- <content/>
- <pos>70,140d</pos>
- <size>135,12d</size>
- <style>wxCB_READONLY|wxCB_DROPDOWN</style>
- </object>
- <object class="wxStaticText" name="stFinalFunc">
- <label>Final function</label>
- <pos>5,157d</pos>
- </object>
- <object class="wxComboBox" name="cbFinalFunc">
- <content/>
- <pos>70,155d</pos>
- <size>135,12d</size>
- <style>wxCB_READONLY|wxCB_DROPDOWN</style>
- </object>
- <object class="wxStaticText" name="stSortOp">
- <label>Sort Operator</label>
- <pos>5,172d</pos>
- </object>
- <object class="wxComboBox" name="cbSortOp">
- <content/>
- <pos>70,170d</pos>
- <size>135,12d</size>
- <style>wxCB_READONLY|wxCB_DROPDOWN</style>
- </object>
- <object class="wxStaticText" name="stInitial">
- <label>Initial condition</label>
- <pos>5,187d</pos>
- </object>
- <object class="wxTextCtrl" name="txtInitial">
- <pos>70,185d</pos>
- <size>135,-1d</size>
- </object>
+ <growablecols>2</growablecols>
</object>
+ <flag>wxTOP|wxLEFT|wxRIGHT|wxGROW</flag>
</object>
+ <object class="spacer">
+ <size>3,3d</size>
+ </object>
+ <object class="sizeritem">
+ <object class="unknown" name="unkStatusBar">
+ <size>-1,15d</size>
+ </object>
+ <flag>wxGROW|wxALIGN_CENTRE</flag>
+ <border>3</border>
+ </object>
</object>
- <object class="wxButton" name="wxID_HELP">
- <label>Help</label>
- <pos>3,221d</pos>
- </object>
- <object class="wxButton" name="wxID_OK">
- <label>&OK</label>
- <default>1</default>
- <pos>113,221d</pos>
- </object>
- <object class="wxButton" name="wxID_CANCEL">
- <label>&Cancel</label>
- <pos>166,221d</pos>
- </object>
- <size>218,240d</size>
- <style></style>
</object>
</resource>
Guillaume Lelarge a écrit :
> [...]
> I tend to prefer the "one patch for each dialog" approach, but I would
> like to know your thoughts on this.
>
Here is the first one, dlgAggregate.xrc.
--
Guillaume.
No comments:
Post a Comment