Menu
▾
▴
[Wxdevide-svn] SF.net SVN: wxdevide:[12] trunk/wxdevide/source
|
From: <ni...@us...> - 2008-10-07 18:03:02
|
Revision: 12
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=12&view=rev
Author: ninjanl
Date: 2008-10-07 18:02:56 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
Changed AddToDoFrm to be sizer based.
Added EnviroFrm data transfer for the environment variables.
Wondering if this svn gets through unchallenged.
Modified Paths:
--------------
trunk/wxdevide/source/AddToDoFrm.cpp
trunk/wxdevide/source/AddToDoFrm.h
trunk/wxdevide/source/AddToDoFrm.wxform
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/EnviroFrm.h
trunk/wxdevide/source/EnviroFrm.wxform
Modified: trunk/wxdevide/source/AddToDoFrm.cpp
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/AddToDoFrm.cpp 2008-10-07 18:02:56 UTC (rev 12)
@@ -52,30 +52,57 @@
//Add the custom code before or after the blocks
////GUI Items Creation Start
- WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxPoint(0,0), wxSize(292,206));
+ DialogSizer = new wxBoxSizer(wxVERTICAL);
+ this->SetSizer(DialogSizer);
+ this->SetAutoLayout(true);
- LblDescription = new wxStaticText(WxPanel1, ID_LBLDESCRIPTION, _("Description:"), wxPoint(8,8), wxDefaultSize, 0, _("LblDescription"));
+ WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxDefaultPosition, wxDefaultSize);
+ WxPanel1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ DialogSizer->Add(WxPanel1,0,wxALIGN_CENTER | wxALL,5);
- MemDescription = new wxTextCtrl(WxPanel1, ID_MEMDESCRIPTION, _(""), wxPoint(8,24), wxSize(277,95), wxTE_MULTILINE, wxDefaultValidator, _("MemDescription"));
+ PanelSizer = new wxBoxSizer(wxVERTICAL);
+ WxPanel1->SetSizer(PanelSizer);
+ WxPanel1->SetAutoLayout(true);
+
+ LblDescription = new wxStaticText(WxPanel1, ID_LBLDESCRIPTION, _("Description:"), wxDefaultPosition, wxDefaultSize, 0, _("LblDescription"));
+ LblDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ PanelSizer->Add(LblDescription,0,wxALIGN_LEFT | wxALL,5);
+
+ MemDescription = new wxTextCtrl(WxPanel1, ID_MEMDESCRIPTION, _(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE, wxDefaultValidator, _("MemDescription"));
MemDescription->SetMaxLength(0);
MemDescription->SetFocus();
MemDescription->SetInsertionPointEnd();
+ MemDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ PanelSizer->Add(MemDescription,1,wxEXPAND | wxALL,5);
- LblPriority = new wxStaticText(WxPanel1, ID_LBLPRIORITY, _("Priority:"), wxPoint(8,124), wxDefaultSize, 0, _("LblPriority"));
+ WxFlexGridSizer1 = new wxFlexGridSizer(0, 2, 0, 0);
+ PanelSizer->Add(WxFlexGridSizer1, 0, wxALIGN_CENTER | wxALL, 5);
- LblUser = new wxStaticText(WxPanel1, ID_LBLUSER, _("User:"), wxPoint(132,124), wxDefaultSize, 0, _("LblUser"));
+ LblPriority = new wxStaticText(WxPanel1, ID_LBLPRIORITY, _("Priority:"), wxDefaultPosition, wxDefaultSize, 0, _("LblPriority"));
+ LblPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblPriority,0,wxALIGN_LEFT | wxALL,5);
- SpnPriority = new wxSpinCtrl(WxPanel1, ID_SPNPRIORITY, _("1"), wxPoint(8,140), wxSize(113,22), wxSP_ARROW_KEYS, 1, 9, 1);
+ LblUser = new wxStaticText(WxPanel1, ID_LBLUSER, _("User:"), wxDefaultPosition, wxDefaultSize, 0, _("LblUser"));
+ LblUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblUser,1,wxALIGN_LEFT | wxALL,5);
- EdtUser = new wxTextCtrl(WxPanel1, ID_EDTUSER, _(""), wxPoint(132,140), wxSize(153,22), 0, wxTextValidator(wxFILTER_ALPHANUMERIC, NULL), _("EdtUser"));
+ SpnPriority = new wxSpinCtrl(WxPanel1, ID_SPNPRIORITY, _("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 9, 1);
+ SpnPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(SpnPriority,0,wxALIGN_LEFT | wxALL,5);
- BtnOK = new wxButton(WxPanel1, wxID_OK, _("OK"), wxPoint(131,172), wxSize(75,25), 0, wxDefaultValidator, _("BtnOK"));
+ EdtUser = new wxTextCtrl(WxPanel1, ID_EDTUSER, _(""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_ALPHANUMERIC, NULL), _("EdtUser"));
+ EdtUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(EdtUser,1,0 | wxALL,5);
- BtnCancel = new wxButton(WxPanel1, wxID_CANCEL, _("Cancel"), wxPoint(211,172), wxSize(75,25), 0, wxDefaultValidator, _("BtnCancel"));
+ WxStdDialogButtonSizer1 = CreateButtonSizer(wxOK | wxCANCEL);
+ DialogSizer->Add(WxStdDialogButtonSizer1, 0, wxALIGN_CENTER | wxALL, 5);
SetTitle(_("Add To-Do Item"));
SetIcon(wxNullIcon);
- SetSize(8,8,300,234);
+
+ GetSizer()->Layout();
+ GetSizer()->Fit(this);
+ GetSizer()->SetSizeHints(this);
Center();
////GUI Items Creation End
@@ -83,8 +110,14 @@
LblDescription->SetLabel(Lang()->GetString(ID_ADDTODO_DESCRIPTION) + wxT(":"));
LblPriority->SetLabel(Lang()->GetString(ID_ADDTODO_PRIORITY) + wxT(":"));
LblUser->SetLabel(Lang()->GetString(ID_ADDTODO_USER) + wxT(":"));
- BtnOK->SetLabel(Lang()->GetString(ID_BTN_OK));
- BtnCancel->SetLabel(Lang()->GetString(ID_BTN_CANCEL));
+//mn BtnOK->SetLabel(Lang()->GetString(ID_BTN_OK));
+//mn BtnCancel->SetLabel(Lang()->GetString(ID_BTN_CANCEL));
+
+ MemDescription->SetMinSize(wxSize(277,95));
+ GetSizer()->Layout();
+ GetSizer()->Fit(this);
+ GetSizer()->SetSizeHints(this);
+ Center();
}
void AddToDoFrm::OnClose(wxCloseEvent& event)
Modified: trunk/wxdevide/source/AddToDoFrm.h
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.h 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/AddToDoFrm.h 2008-10-07 18:02:56 UTC (rev 12)
@@ -25,11 +25,11 @@
//Header Include Start and Header Include End.
//wxDev-C++ designer will remove them. Add custom headers after the block.
////Header Include Start
-#include <wx/button.h>
#include <wx/spinctrl.h>
#include <wx/textctrl.h>
#include <wx/stattext.h>
#include <wx/panel.h>
+#include <wx/sizer.h>
////Header Include End
////Dialog Style Start
@@ -53,15 +53,17 @@
//GUI Control Declaration Start and GUI Control Declaration End.
//wxDev-C++ will remove them. Add custom code after the block.
////GUI Control Declaration Start
- wxButton *BtnCancel;
- wxButton *BtnOK;
+ wxSizer *WxStdDialogButtonSizer1;
wxTextCtrl *EdtUser;
wxSpinCtrl *SpnPriority;
wxStaticText *LblUser;
wxStaticText *LblPriority;
+ wxFlexGridSizer *WxFlexGridSizer1;
wxTextCtrl *MemDescription;
wxStaticText *LblDescription;
+ wxBoxSizer *PanelSizer;
wxPanel *WxPanel1;
+ wxBoxSizer *DialogSizer;
////GUI Control Declaration End
private:
@@ -72,10 +74,10 @@
enum
{
////GUI Enum Control ID Start
- ID_EDTUSER = 1008,
- ID_SPNPRIORITY = 1007,
- ID_LBLUSER = 1006,
- ID_LBLPRIORITY = 1005,
+ ID_EDTUSER = 1017,
+ ID_SPNPRIORITY = 1016,
+ ID_LBLUSER = 1015,
+ ID_LBLPRIORITY = 1014,
ID_MEMDESCRIPTION = 1004,
ID_LBLDESCRIPTION = 1003,
ID_WXPANEL1 = 1002,
Modified: trunk/wxdevide/source/AddToDoFrm.wxform
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.wxform 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/AddToDoFrm.wxform 2008-10-07 18:02:56 UTC (rev 12)
@@ -1,11 +1,11 @@
-object frmNewForm_2: TfrmNewForm
+object frmNewForm: TfrmNewForm
Left = 8
Top = 8
AutoScroll = False
BorderIcons = [biSystemMenu, biMinimize]
Caption = 'Add To-Do Item'
- ClientHeight = 206
- ClientWidth = 292
+ ClientHeight = 287
+ ClientWidth = 303
Color = clAppWorkSpace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -13,7 +13,7 @@
Font.Name = 'MS Sans Serif'
Font.Style = []
OldCreateOrder = True
- PopupMenu = MainForm.DesignerPopup
+ PopupMenu = DesignerPopup.Owner
Visible = True
OnCreate = FormCreate
OnDestroy = FormDestroy
@@ -29,20 +29,33 @@
Wx_SizeToContents = True
Wx_GeneralStyle = []
Wx_DialogStyle = [wxCAPTION, wxSYSTEM_MENU, wxDIALOG_NO_PARENT, wxMINIMIZE_BOX, wxCLOSE_BOX, wxFRAME_TOOL_WINDOW]
- Wx_DesignerType = dtWxFrame
Wx_Border = 0
Wx_BorderAlignment = []
PixelsPerInch = 96
TextHeight = 13
- object WxPanel1: TWxPanel
+ object DialogSizer: TWxBoxSizer
Left = 0
Top = 0
- Width = 292
- Height = 206
+ Width = 303
+ Height = 287
Align = alClient
TabOrder = 0
+ Orientation = wxVertical
+ Wx_Class = 'wxBoxSizer'
+ Wx_ControlOrientation = wxControlVertical
+ Wx_IDName = 'ID_WXBOXSIZER1'
+ Wx_IDValue = 1001
+ Wx_Alignment = [wxEXPAND]
+ object WxPanel1: TWxPanel
+ Left = 1
+ Top = 1
+ Width = 301
+ Height = 285
+ Align = alClient
+ TabOrder = 0
Wx_BKColor = clBlack
Wx_Class = 'wxPanel'
+ Wx_ControlOrientation = wxControlVertical
Wx_Default = False
Wx_EventList.Strings = (
'EVT_UPDATE_UI:OnUpdateUI')
@@ -51,25 +64,41 @@
Wx_Hidden = False
Wx_IDName = 'ID_WXPANEL1'
Wx_IDValue = 1002
+ object PanelSizer: TWxBoxSizer
+ Left = 1
+ Top = 1
+ Width = 299
+ Height = 283
+ Align = alClient
+ TabOrder = 0
+ Orientation = wxVertical
+ Wx_Class = 'wxBoxSizer'
+ Wx_ControlOrientation = wxControlVertical
+ Wx_IDName = 'ID_WXBOXSIZER2'
+ Wx_IDValue = 1006
+ Wx_Alignment = [wxEXPAND]
+ Wx_StretchFactor = 1
object LblDescription: TWxStaticText
- Left = 8
- Top = 8
+ Left = 118
+ Top = 5
Width = 60
Height = 17
Caption = 'Description:'
TabOrder = 0
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_LBLDESCRIPTION'
Wx_IDValue = 1003
Wx_LabelStyle = []
+ Wx_Alignment = [wxALIGN_LEFT]
end
object MemDescription: TWxMemo
- Left = 8
- Top = 24
+ Left = 9
+ Top = 32
Width = 277
Height = 95
BevelInner = bvNone
@@ -77,126 +106,134 @@
TabOrder = 1
Wx_BGColor = clBlack
Wx_Class = 'wxTextCtrl'
+ Wx_ControlOrientation = wxControlVertical
Wx_EditStyle = [wxTE_MULTILINE]
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_IDName = 'ID_MEMDESCRIPTION'
Wx_IDValue = 1004
Wx_MaxLength = 0
+ Wx_Alignment = [wxEXPAND]
+ Wx_StretchFactor = 1
end
+ object WxFlexGridSizer1: TWxFlexGridSizer
+ Left = 5
+ Top = 137
+ Width = 286
+ Height = 59
+ TabOrder = 2
+ Wx_Class = 'wxFlexGridSizer'
+ Wx_ControlOrientation = wxControlVertical
+ Wx_IDName = 'ID_WXFLEXGRIDSIZER1'
+ Wx_IDValue = 1013
object LblPriority: TWxStaticText
- Left = 8
- Top = 124
+ Left = 42
+ Top = 5
Width = 38
Height = 17
Caption = 'Priority:'
- TabOrder = 2
+ TabOrder = 0
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_LBLPRIORITY'
- Wx_IDValue = 1005
+ Wx_IDValue = 1014
Wx_LabelStyle = []
+ Wx_Alignment = [wxALIGN_LEFT]
end
object LblUser: TWxStaticText
- Left = 132
- Top = 124
+ Left = 190
+ Top = 5
Width = 29
Height = 17
Caption = 'User:'
- TabOrder = 3
+ TabOrder = 1
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_LBLUSER'
- Wx_IDValue = 1006
+ Wx_IDValue = 1015
Wx_LabelStyle = []
+ Wx_Alignment = [wxALIGN_LEFT]
+ Wx_StretchFactor = 1
end
object SpnPriority: TWxSpinCtrl
- Left = 8
- Top = 140
+ Left = 5
+ Top = 32
Width = 113
Height = 22
MaxValue = 9
MinValue = 1
- TabOrder = 4
+ TabOrder = 2
Value = 1
Wx_BGColor = clBlack
Wx_Class = 'wxSpinCtrl'
Wx_SpinButtonStyle = []
Wx_EditStyle = []
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_SPNPRIORITY'
- Wx_IDValue = 1007
+ Wx_IDValue = 1016
+ Wx_Alignment = [wxALIGN_LEFT]
end
object EdtUser: TWxEdit
- Left = 132
- Top = 140
+ Left = 128
+ Top = 32
Width = 153
Height = 22
BevelInner = bvNone
BevelOuter = bvNone
Modified = False
AutoSize = False
- TabOrder = 5
+ TabOrder = 3
Wx_BGColor = clBlack
Wx_Class = 'wxTextCtrl'
+ Wx_ControlOrientation = wxControlVertical
Wx_EditStyle = []
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_EDTUSER'
- Wx_IDValue = 1008
+ Wx_IDValue = 1017
Wx_Validator = 'wxTextValidator(wxFILTER_ALPHANUMERIC, NULL)'
+ Wx_Alignment = []
+ Wx_StretchFactor = 1
Wx_MaxLength = 0
end
- object BtnOK: TWxButton
- Left = 131
- Top = 172
- Width = 75
- Height = 25
- Caption = 'OK'
- TabOrder = 6
- EVT_BUTTON = 'BtnOKClick'
- Wx_BKColor = clBlack
- Wx_ButtonStyle = []
- Wx_Class = 'wxButton'
- Wx_Default = False
- Wx_EventList.Strings = (
- 'EVT_BUTTON:OnClick'
- 'EVT_UPDATE_UI:OnUpdateUI')
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'wxID_OK'
- Wx_IDValue = 1009
end
- object BtnCancel: TWxButton
- Left = 211
- Top = 172
- Width = 75
- Height = 25
- Caption = 'Cancel'
- TabOrder = 7
- EVT_BUTTON = 'BtnCancelClick'
- Wx_BKColor = clBlack
- Wx_ButtonStyle = []
- Wx_Class = 'wxButton'
- Wx_Default = False
+ end
+ end
+ object WxStdDialogButtonSizer1: TWxStdDialogButtonSizer
+ Left = 78
+ Top = 300
+ Width = 155
+ Height = 23
+ TabOrder = 1
+ Wx_Class = 'wxStdDialogButtonSizer'
Wx_EventList.Strings = (
- 'EVT_BUTTON:OnClick'
- 'EVT_UPDATE_UI:OnUpdateUI')
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'wxID_CANCEL'
- Wx_IDValue = 1011
+ 'EVT_OK_BUTTON:OnOkClick'
+ 'EVT_OK_UPDATE_UI:OnOkUpdateUI'
+ 'EVT_APPLY_BUTTON:OnApplyClick'
+ 'EVT_APPLY_UPDATE_UI:OnApplyUpdateUI'
+ 'EVT_NO_BUTTON:OnNoClick'
+ 'EVT_NO_UPDATE_UI:OnNoUpdateUI'
+ 'EVT_CANCEL_BUTTON:OnCancelClick'
+ 'EVT_CANCEL_UPDATE_UI:OnCancelUpdateUI'
+ 'EVT_HELP_BUTTON:OnHelpClick'
+ 'EVT_HELP_UPDATE_UI:OnHelpUpdateUI')
+ Wx_IDName = 'ID_WXSTDDIALOGBUTTONSIZER1'
+ Wx_IDValue = 1012
+ Wx_Buttons = [wxID_OK, wxID_CANCEL]
+ EVT_OK_BUTTON = 'BtnOKClick'
+ EVT_CANCEL_BUTTON = 'BtnCancelClick'
end
end
end
Modified: trunk/wxdevide/source/EnviroFrm.cpp
===================================================================
--- trunk/wxdevide/source/EnviroFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/EnviroFrm.cpp 2008-10-07 18:02:56 UTC (rev 12)
@@ -21,6 +21,9 @@
#include "Images/TEnviroForm_btnAltConfig_XPM.xpm"
////Header Include End
+
+#include "devcfg.h" // Needed to access DevData
+
//----------------------------------------------------------------------------
// TEnviroForm
//----------------------------------------------------------------------------
@@ -82,19 +85,19 @@
cbShowMenu = new wxCheckBox(tabGeneral, ID_CBSHOWMENU, _("Show Menu in Full Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbShowMenu"));
GeneralBoxSizer->Add(cbShowMenu,0,wxALIGN_LEFT | wxALL,5);
- cbdblFiles = new wxCheckBox(tabGeneral, ID_CBDBLFILES, _("Double-click to open Project Inspector files"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbdblFiles"));
- GeneralBoxSizer->Add(cbdblFiles,0,wxALIGN_LEFT | wxALL,5);
+ cbDblFiles = new wxCheckBox(tabGeneral, ID_CBDBLFILES, _("Double-click to open Project Inspector files"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbDblFiles"));
+ GeneralBoxSizer->Add(cbDblFiles,0,wxALIGN_LEFT | wxALL,5);
RadioStaticSizer = new wxBoxSizer(wxHORIZONTAL);
GeneralBoxSizer->Add(RadioStaticSizer, 0, wxALIGN_CENTER | wxALL, 5);
- wxArrayString arrayStringFor_WxRadioBox1;
- arrayStringFor_WxRadioBox1.Add(_("All Project Files"));
- arrayStringFor_WxRadioBox1.Add(_("Only First Project File"));
- arrayStringFor_WxRadioBox1.Add(_("None"));
- WxRadioBox1 = new wxRadioBox(tabGeneral, ID_WXRADIOBOX1, _("Auto Open"), wxDefaultPosition, wxDefaultSize, arrayStringFor_WxRadioBox1, 1, wxRA_SPECIFY_COLS, wxDefaultValidator, _("WxRadioBox1"));
- WxRadioBox1->SetSelection(0);
- RadioStaticSizer->Add(WxRadioBox1,0,wxALIGN_CENTER | wxALL,5);
+ wxArrayString arrayStringFor_rgbAutoOpen;
+ arrayStringFor_rgbAutoOpen.Add(_("All Project Files"));
+ arrayStringFor_rgbAutoOpen.Add(_("Only First Project File"));
+ arrayStringFor_rgbAutoOpen.Add(_("None"));
+ rgbAutoOpen = new wxRadioBox(tabGeneral, ID_WXRADIOBOX1, _("Auto Open"), wxDefaultPosition, wxDefaultSize, arrayStringFor_rgbAutoOpen, 1, wxRA_SPECIFY_COLS, wxDefaultValidator, _("rgbAutoOpen"));
+ rgbAutoOpen->SetSelection(0);
+ RadioStaticSizer->Add(rgbAutoOpen,0,wxALIGN_CENTER | wxALL,5);
wxStaticBox* gbDebugger_StaticBoxObj = new wxStaticBox(tabGeneral, wxID_ANY, _("Debug Variable Browser"));
gbDebugger = new wxStaticBoxSizer(gbDebugger_StaticBoxObj, wxVERTICAL);
@@ -119,28 +122,30 @@
lblMRU = new wxStaticText(tabInterface, ID_LBLMRU, _("Files to retain in Recently Used List:"), wxDefaultPosition, wxDefaultSize, 0, _("lblMRU"));
WxFlexGridSizer1->Add(lblMRU,0,wxALIGN_CENTER | wxALL,5);
- seMRUMax = new wxSpinCtrl(tabInterface, ID_SEMRUMAX, _("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 0);
+ seMRUMax = new wxSpinCtrl(tabInterface, ID_SEMRUMAX, _("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 12, 0);
WxFlexGridSizer1->Add(seMRUMax,0,wxALIGN_CENTER | wxALL,5);
lblmsgTabs = new wxStaticText(tabInterface, ID_LBLMSGTABS, _("Message Window Tabs:"), wxDefaultPosition, wxDefaultSize, 0, _("lblmsgTabs"));
WxFlexGridSizer1->Add(lblmsgTabs,0,wxALIGN_CENTER | wxALL,5);
wxArrayString arrayStringFor_cboTabsTop;
- cboTabsTop = new wxComboBox(tabInterface, ID_CBOTABSTOP, _("cboTabsTop"), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboTabsTop, 0, wxDefaultValidator, _("cboTabsTop"));
+ arrayStringFor_cboTabsTop.Add(_("Bottom"));
+ arrayStringFor_cboTabsTop.Add(_("Top"));
+ cboTabsTop = new wxComboBox(tabInterface, ID_CBOTABSTOP, _(""), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboTabsTop, 0, wxDefaultValidator, _("cboTabsTop"));
WxFlexGridSizer1->Add(cboTabsTop,0,wxALIGN_CENTER | wxALL,5);
lblLang = new wxStaticText(tabInterface, ID_LBLLANG, _("Language:"), wxDefaultPosition, wxDefaultSize, 0, _("lblLang"));
WxFlexGridSizer1->Add(lblLang,0,wxALIGN_CENTER | wxALL,5);
wxArrayString arrayStringFor_cboLang;
- cboLang = new wxComboBox(tabInterface, ID_CBOLANG, _("cboLang"), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboLang, 0, wxDefaultValidator, _("cboLang"));
+ cboLang = new wxComboBox(tabInterface, ID_CBOLANG, _(""), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboLang, 0, wxDefaultValidator, _("cboLang"));
WxFlexGridSizer1->Add(cboLang,0,wxALIGN_CENTER | wxALL,5);
lblTheme = new wxStaticText(tabInterface, ID_LBLTHEME, _("Theme:"), wxDefaultPosition, wxDefaultSize, 0, _("lblTheme"));
WxFlexGridSizer1->Add(lblTheme,0,wxALIGN_CENTER | wxALL,5);
wxArrayString arrayStringFor_cboTheme;
- cboTheme = new wxComboBox(tabInterface, ID_CBOTHEME, _("cboTheme"), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboTheme, 0, wxDefaultValidator, _("cboTheme"));
+ cboTheme = new wxComboBox(tabInterface, ID_CBOTHEME, _(""), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboTheme, 0, wxDefaultValidator, _("cboTheme"));
WxFlexGridSizer1->Add(cboTheme,0,wxALIGN_CENTER | wxALL,5);
cbNoSplashScreen = new wxCheckBox(tabInterface, ID_CBNOSPLASHSCREEN, _("No Splash Screen on startup"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbNoSplashScreen"));
@@ -255,8 +260,8 @@
SplashScreenSizer = new wxBoxSizer(wxHORIZONTAL);
FilesBoxSizer->Add(SplashScreenSizer, 1, wxEXPAND | 0, 5);
- WxEdit6 = new wxTextCtrl(tabPaths, ID_WXEDIT6, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("WxEdit6"));
- SplashScreenSizer->Add(WxEdit6,1,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,5);
+ edSplash = new wxTextCtrl(tabPaths, ID_EDSPLASH, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edSplash"));
+ SplashScreenSizer->Add(edSplash,1,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,5);
wxBitmap btnBrwSplash_BITMAP (TEnviroForm_btnBrwSplash_XPM);
btnBrwSplash = new wxBitmapButton(tabPaths, ID_BTNBRWSPLASH, btnBrwSplash_BITMAP, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator, _("btnBrwSplash"));
@@ -367,3 +372,115 @@
{
// insert your code here
}
+
+/*!
+* Transfer data to the window
+*/
+bool TEnviroForm::TransferDataToWindow()
+{
+ extern TdevData * DevData;
+ extern TdevDirs * DevDirs;
+
+ //General Info First
+ cbSingleInstance->SetValue(DevData->GetSingleInstance());
+ cbBackups->SetValue(DevData->GetBackUps());
+ cbMinOnRun->SetValue(DevData->GetMinOnRun());
+ cbShowBars->SetValue(DevData->GetShowBars());
+ cbShowMenu->SetValue(DevData->GetShowMenu());
+ cbDblFiles->SetValue(DevData->GetDblFiles());
+ rgbAutoOpen->SetSelection(DevData->GetAutoOpen());
+ cbWatchHint->SetValue(DevData->GetWatchHint());
+ cbWatchError->SetValue(DevData->GetWatchError());
+
+ //Interface Window Next
+ seMRUMax->SetValue(DevData->GetMRUMax());
+// cboTabsTop->SetValue(DevData->GetMsgTabs());
+ cboLang->Clear();
+ // Fill the Language combo with the language list here
+ // Fill the Theme Combobox here
+ cboTheme->Clear();
+
+ cbNoSplashScreen->SetValue(DevData->GetNoSplashScreen());
+ cbXPTheme->SetValue(DevData->GetXPTheme());
+ cbNativeDocks->SetValue(DevData->GetNativeDocks());
+ rgbOpenStyle->SetSelection(DevData->GetOpenStyle());
+ cbShowProgress->SetValue(DevData->GetShowProgress());
+ cbAutoCloseProgress->SetValue(DevData->GetAutoCloseProgress());
+
+ //Files and Directories
+ chkAltConfig->SetValue(DevData->GetUseAltConfigFile());
+ edAltConfig->SetValue(DevData->GetAltConfigFile());
+ edUserDir->SetValue(DevDirs->GetDefault());
+ edTemplatesDir->SetValue(DevDirs->GetTemplates());
+ edIcoLib->SetValue(DevDirs->GetIcons());
+ edLang->SetValue(DevDirs->GetLang());
+ edSplash->SetValue(DevData->GetSplash());
+
+ //External programs
+ //fill the view with our data
+ //vleExternal->
+
+ //File Associations
+ //lstAssocFileTypes->
+
+ //Source Code Control
+ //edCVSExec->
+
+ return true;
+}
+/*!
+* Transfer data from the window
+*/
+bool TEnviroForm::TransferDataFromWindow()
+{
+ extern TdevData * DevData;
+ extern TdevDirs * DevDirs;
+
+ //General Info First
+ DevData->SetSingleInstance(cbSingleInstance->GetValue());
+ DevData->SetBackUps(cbBackups->GetValue());
+ DevData->SetMinOnRun(cbMinOnRun->GetValue());
+ DevData->SetShowBars(cbShowBars->GetValue());
+ DevData->SetShowMenu(cbShowMenu->GetValue());
+ DevData->SetDblFiles(cbDblFiles->GetValue());
+ DevData->SetAutoOpen(rgbAutoOpen->GetSelection());
+ DevData->SetWatchHint(cbWatchHint->GetValue());
+ DevData->SetWatchError(cbWatchError->GetValue());
+
+ //Interface Window Next
+ seMRUMax->SetValue(DevData->GetMRUMax());
+// cboTabsTop->SetValue(DevData->GetMsgTabs());
+ cboLang->Clear();
+ // Fill the Language combo with the language list here
+ // Fill the Theme Combobox here
+ cboTheme->Clear();
+
+ DevData->SetNoSplashScreen(cbNoSplashScreen->GetValue());
+ DevData->SetXPTheme(cbXPTheme->GetValue());
+ DevData->SetNativeDocks(cbNativeDocks->GetValue());
+ DevData->SetOpenStyle(rgbOpenStyle->GetSelection());
+ DevData->SetShowProgress(cbShowProgress->GetValue());
+ DevData->SetAutoCloseProgress(cbAutoCloseProgress->GetValue());
+
+ //Files and Directories
+ DevData->SetUseAltConfigFile(chkAltConfig->GetValue());
+ DevData->SetAltConfigFile(edAltConfig->GetValue());
+ DevDirs->SetDefault(edUserDir->GetValue());
+ DevDirs->SetTemplates(edTemplatesDir->GetValue());
+ DevDirs->SetIcons(edIcoLib->GetValue());
+ DevDirs->SetLang(edLang->GetValue());
+ DevData->SetSplash(edSplash->GetValue());
+
+ //External programs
+ //fill the view with our data
+ //vleExternal->
+
+ //File Associations
+ //lstAssocFileTypes->
+
+ //Source Code Control
+ //edCVSExec->
+
+
+ return true;
+}
Modified: trunk/wxdevide/source/EnviroFrm.h
===================================================================
--- trunk/wxdevide/source/EnviroFrm.h 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/EnviroFrm.h 2008-10-07 18:02:56 UTC (rev 12)
@@ -85,7 +85,7 @@
wxBoxSizer *ExtProgSizer;
wxPanel *tabExternal;
wxBitmapButton *btnBrwSplash;
- wxTextCtrl *WxEdit6;
+ wxTextCtrl *edSplash;
wxBoxSizer *SplashScreenSizer;
wxStaticText *lblSplash;
wxBitmapButton *btnBrwLang;
@@ -133,9 +133,9 @@
wxCheckBox *cbWatchError;
wxCheckBox *cbWatchHint;
wxStaticBoxSizer *gbDebugger;
- wxRadioBox *WxRadioBox1;
+ wxRadioBox *rgbAutoOpen;
wxBoxSizer *RadioStaticSizer;
- wxCheckBox *cbdblFiles;
+ wxCheckBox *cbDblFiles;
wxCheckBox *cbShowMenu;
wxCheckBox *cbShowBars;
wxCheckBox *cbMinOnRun;
@@ -172,7 +172,7 @@
ID_LBLEXTERNAL = 1077,
ID_TABEXTERNAL = 1008,
ID_BTNBRWSPLASH = 1072,
- ID_WXEDIT6 = 1071,
+ ID_EDSPLASH = 1071,
ID_LBLSPLASH = 1061,
ID_BTNBRWLANG = 1070,
ID_EDLANG = 1069,
@@ -223,6 +223,8 @@
private:
void OnClose(wxCloseEvent& event);
void CreateGUIControls();
+ bool TransferDataToWindow();
+ bool TransferDataFromWindow();
};
#endif
Modified: trunk/wxdevide/source/EnviroFrm.wxform
===================================================================
--- trunk/wxdevide/source/EnviroFrm.wxform 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/EnviroFrm.wxform 2008-10-07 18:02:56 UTC (rev 12)
@@ -177,7 +177,7 @@
Wx_IDValue = 1016
Wx_Alignment = [wxALIGN_LEFT]
end
- object cbdblFiles: TWxCheckBox
+ object cbDblFiles: TWxCheckBox
Left = 5
Top = 140
Width = 248
@@ -205,7 +205,7 @@
Wx_ControlOrientation = wxControlVertical
Wx_IDName = 'ID_WXBOXSIZER5'
Wx_IDValue = 1019
- object WxRadioBox1: TWxRadioBox
+ object rgbAutoOpen: TWxRadioBox
Left = 5
Top = 5
Width = 185
@@ -342,6 +342,7 @@
Top = 5
Width = 121
Height = 24
+ MaxValue = 12
MinValue = 0
TabOrder = 1
Value = 0
@@ -380,7 +381,9 @@
Height = 23
ItemHeight = 15
TabOrder = 3
- Text = 'cboTabsTop'
+ Items.Strings = (
+ 'Bottom'
+ 'Top')
Wx_BGColor = clBlack
Wx_Class = 'wxComboBox'
Wx_ComboboxStyle = []
@@ -414,9 +417,8 @@
Top = 72
Width = 145
Height = 23
- ItemHeight = 15
+ ItemHeight = 0
TabOrder = 5
- Text = 'cboLang'
Wx_BGColor = clBlack
Wx_Class = 'wxComboBox'
Wx_ComboboxStyle = []
@@ -450,9 +452,8 @@
Top = 105
Width = 145
Height = 23
- ItemHeight = 15
+ ItemHeight = 0
TabOrder = 7
- Text = 'cboTheme'
Wx_BGColor = clBlack
Wx_Class = 'wxComboBox'
Wx_ComboboxStyle = []
@@ -645,8 +646,8 @@
Wx_IDValue = 1047
Wx_Alignment = [wxEXPAND]
object chkAltConfig: TWxCheckBox
- Left = 19
- Top = 20
+ Left = 8
+ Top = 23
Width = 137
Height = 17
Caption = 'Use this alternate configuration file'
@@ -1343,7 +1344,7 @@
Wx_BorderAlignment = []
Wx_Alignment = [wxEXPAND]
Wx_StretchFactor = 1
- object WxEdit6: TWxEdit
+ object edSplash: TWxEdit
Left = 268
Top = 471
Width = 121
@@ -1360,7 +1361,7 @@
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
- Wx_IDName = 'ID_WXEDIT6'
+ Wx_IDName = 'ID_EDSPLASH'
Wx_IDValue = 1071
Wx_Alignment = [wxALIGN_LEFT]
Wx_StretchFactor = 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
