Commit 4d8281cf authored by springob's avatar springob

* update

git-svn-id: https://svn.code.sf.net/p/robodude/code/bobdude@35 bbe26285-3967-4f0a-9db1-5cc42c1bf15a
parent 1c645c76
......@@ -130,7 +130,6 @@ MainFrame::MainFrame(wxWindow* parent,wxWindowID id) {
MenuBar1->Append(MenuHelp, _("Help"));
SetMenuBar(MenuBar1);
FileDialog1 = new wxFileDialog(this, _("Select file"), wxEmptyString, wxEmptyString, _("All supported files|*.bob3;*.xhex;*.hex;*.srec|BOB3 files (*.bob3)|*.bob3|XHex files (*.xhex)|*.xhex|Intel HEX files (*.hex)|*.hex|Motorla S-record file (*.srec)|*.srec"), wxFD_DEFAULT_STYLE, wxDefaultPosition, wxDefaultSize, _T("wxFileDialog"));
FileDialog1 = new wxFileDialog(this, _("Select file"), wxEmptyString, wxEmptyString, _("All supported files|*.bob3;*.xhex;*.hex;*.srec|BOB3 files (*.bob3)|*.bob3|XHex files (*.xhex)|*.xhex|Intel HEX files (*.hex)|*.hex|Motorla S-record file (*.srec)|*.srec"), wxFD_DEFAULT_STYLE, wxDefaultPosition, wxDefaultSize, _T("wxFileDialog"));
SetSizer(BoxSizer1);
Layout();
Center();
......@@ -155,8 +154,9 @@ MainFrame::MainFrame(wxWindow* parent,wxWindowID id) {
FileDialog1->SetPath(strValue);
SetTitle("BobDude " VERSION_STR);
#if defined(__WINDOWS__)
SetIcon(wxIcon(_("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE ));
#endif
progressBar = GaugeProgress;
/*
......
......@@ -42,12 +42,12 @@ PlatformDialog::PlatformDialog(wxWindow* parent,wxWindowID id) {
StaticTextPlatform = new wxStaticText(this, wxID_ANY, _("Platform:"), wxDefaultPosition, wxDefaultSize, 0, _T("wxID_ANY"));
FlexGridSizer1->Add(StaticTextPlatform, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
ComboBoxPlatform = new wxComboBox(this, ID_COMBOBOX_PLATFORM, wxEmptyString, wxDefaultPosition, wxSize(220,-1), 0, 0, 0, wxDefaultValidator, _T("ID_COMBOBOX_PLATFORM"));
FlexGridSizer1->Add(ComboBoxPlatform, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
FlexGridSizer1->Add(ComboBoxPlatform, 1, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP, 5);
StaticTextMCU = new wxStaticText(this, wxID_ANY, _("MCU:"), wxDefaultPosition, wxDefaultSize, 0, _T("wxID_ANY"));
FlexGridSizer1->Add(StaticTextMCU, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
ComboBoxMCU = new wxComboBox(this, ID_COMBOBOX_MCU, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, 0, 0, wxDefaultValidator, _T("ID_COMBOBOX_MCU"));
ComboBoxMCU->Disable();
FlexGridSizer1->Add(ComboBoxMCU, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
FlexGridSizer1->Add(ComboBoxMCU, 1, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP, 5);
StaticTextBitclock = new wxStaticText(this, wxID_ANY, _("Bitclock:"), wxDefaultPosition, wxDefaultSize, 0, _T("wxID_ANY"));
FlexGridSizer1->Add(StaticTextBitclock, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
ComboBoxBitclock = new wxComboBox(this, ID_COMBOBOX_BITCLOCK, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, 0, 0, wxDefaultValidator, _T("ID_COMBOBOX_BITCLOCK"));
......@@ -66,17 +66,17 @@ PlatformDialog::PlatformDialog(wxWindow* parent,wxWindowID id) {
ComboBoxBitclock->Append(_("50"));
ComboBoxBitclock->Append(_("100"));
ComboBoxBitclock->Disable();
FlexGridSizer1->Add(ComboBoxBitclock, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
FlexGridSizer1->Add(ComboBoxBitclock, 1, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP, 5);
StaticTextProgrammer = new wxStaticText(this, wxID_ANY, _("Programmer:"), wxDefaultPosition, wxDefaultSize, 0, _T("wxID_ANY"));
FlexGridSizer1->Add(StaticTextProgrammer, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
ComboBoxProgrammer = new wxComboBox(this, ID_COMBOBOX_PROGRAMMER, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, 0, 0, wxDefaultValidator, _T("ID_COMBOBOX_PROGRAMMER"));
ComboBoxProgrammer->Disable();
FlexGridSizer1->Add(ComboBoxProgrammer, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
FlexGridSizer1->Add(ComboBoxProgrammer, 1, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP, 5);
StaticTextInterface = new wxStaticText(this, wxID_ANY, _("Interface:"), wxDefaultPosition, wxDefaultSize, 0, _T("wxID_ANY"));
FlexGridSizer1->Add(StaticTextInterface, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
ComboBoxInterface = new wxComboBox(this, ID_COMBOBOX_INTERFACE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, 0, 0, wxDefaultValidator, _T("ID_COMBOBOX_INTERFACE"));
ComboBoxInterface->Disable();
FlexGridSizer1->Add(ComboBoxInterface, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
FlexGridSizer1->Add(ComboBoxInterface, 1, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP, 5);
StaticTextBaudrate = new wxStaticText(this, wxID_ANY, _("Baudrate:"), wxDefaultPosition, wxDefaultSize, 0, _T("wxID_ANY"));
FlexGridSizer1->Add(StaticTextBaudrate, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
ComboBoxBaudrate = new wxComboBox(this, ID_COMBOBOX_BAUDRATE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, 0, 0, wxDefaultValidator, _T("ID_COMBOBOX_BAUDRATE"));
......@@ -95,14 +95,14 @@ PlatformDialog::PlatformDialog(wxWindow* parent,wxWindowID id) {
ComboBoxBaudrate->Append(_("56000"));
ComboBoxBaudrate->Append(_("57600"));
ComboBoxBaudrate->Append(_("115200"));
FlexGridSizer1->Add(ComboBoxBaudrate, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
FlexGridSizer1->Add(ComboBoxBaudrate, 1, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP, 5);
BoxSizer1->Add(FlexGridSizer1, 1, wxEXPAND|wxFIXED_MINSIZE|wxALIGN_LEFT|wxALIGN_TOP, 0);
StdDialogButtonSizer1 = new wxStdDialogButtonSizer();
StdDialogButtonSizer1->AddButton(new wxButton(this, wxID_OK, wxEmptyString));
StdDialogButtonSizer1->AddButton(new wxButton(this, wxID_NO, _("Reset")));
StdDialogButtonSizer1->AddButton(new wxButton(this, wxID_CANCEL, wxEmptyString));
StdDialogButtonSizer1->Realize();
BoxSizer1->Add(StdDialogButtonSizer1, 0, wxALL|wxEXPAND|wxFIXED_MINSIZE|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
BoxSizer1->Add(StdDialogButtonSizer1, 0, wxALL|wxEXPAND|wxFIXED_MINSIZE|wxALIGN_LEFT|wxALIGN_TOP, 5);
SetSizer(BoxSizer1);
BoxSizer1->Fit(this);
BoxSizer1->SetSizeHints(this);
......
......@@ -20,7 +20,7 @@
<maxsize>-1,122</maxsize>
<style>wxHW_SCROLLBAR_NEVER|wxHW_NO_SELECTION</style>
</object>
<flag>wxALL|wxEXPAND|wxFIXED_MINSIZE</flag>
<flag>wxALL|wxEXPAND|wxFIXED_MINSIZE|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
<option>1</option>
</object>
......@@ -32,12 +32,12 @@
<maxsize>-1,122</maxsize>
<style>wxHW_SCROLLBAR_NEVER|wxHW_NO_SELECTION</style>
</object>
<flag>wxALL|wxEXPAND|wxFIXED_MINSIZE</flag>
<flag>wxALL|wxEXPAND|wxFIXED_MINSIZE|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
<option>1</option>
</object>
</object>
<flag>wxEXPAND|wxFIXED_MINSIZE</flag>
<flag>wxEXPAND|wxFIXED_MINSIZE|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
</object>
<object class="sizeritem">
......@@ -49,7 +49,7 @@
<size>433,41</size>
<style>wxHW_SCROLLBAR_NEVER</style>
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
</object>
<object class="sizeritem">
......@@ -57,12 +57,12 @@
<htmlcode>&lt;html&gt;&lt;body&gt;&#x0A;&lt;font size=&quot;2&quot;&gt;&#x0A;</htmlcode>
<size>433,146</size>
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
<option>1</option>
</object>
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<option>1</option>
</object>
<object class="sizeritem">
......@@ -70,7 +70,7 @@
<size>374,16</size>
<style>wxGA_SMOOTH|wxNO_BORDER</style>
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
</object>
</object>
......
......@@ -23,7 +23,7 @@
<size>220,-1</size>
<handler function="OnComboBoxPlatformSelected" entry="EVT_COMBOBOX" />
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
<option>1</option>
</object>
......@@ -38,7 +38,7 @@
<object class="wxComboBox" name="ID_COMBOBOX_MCU" variable="ComboBoxMCU" member="yes">
<enabled>0</enabled>
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
<option>1</option>
</object>
......@@ -69,7 +69,7 @@
</content>
<enabled>0</enabled>
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
<option>1</option>
</object>
......@@ -85,7 +85,7 @@
<enabled>0</enabled>
<handler function="OnComboBoxProgrammerSelected" entry="EVT_COMBOBOX" />
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
<option>1</option>
</object>
......@@ -100,7 +100,7 @@
<object class="wxComboBox" name="ID_COMBOBOX_INTERFACE" variable="ComboBoxInterface" member="yes">
<enabled>0</enabled>
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
<option>1</option>
</object>
......@@ -131,12 +131,12 @@
<item>115200</item>
</content>
</object>
<flag>wxALL|wxEXPAND</flag>
<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
<option>1</option>
</object>
</object>
<flag>wxEXPAND|wxFIXED_MINSIZE</flag>
<flag>wxEXPAND|wxFIXED_MINSIZE|wxALIGN_LEFT|wxALIGN_TOP</flag>
<option>1</option>
</object>
<object class="sizeritem">
......@@ -157,7 +157,7 @@
</object>
</object>
</object>
<flag>wxALL|wxEXPAND|wxFIXED_MINSIZE</flag>
<flag>wxALL|wxEXPAND|wxFIXED_MINSIZE|wxALIGN_LEFT|wxALIGN_TOP</flag>
<border>5</border>
</object>
</object>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment