Version 0.4.1

talesm · Mar 2, 2016 · bd2ad22 · bd2ad22
1 parent 7544389
commit bd2ad22
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 24 deletions.
diff --git a/ui/wxcrafter.cpp b/ui/wxcrafter.cpp
@@ -470,38 +470,38 @@ WalletOverviewDialogBase::WalletOverviewDialogBase(wxWindow* parent, wxWindowID
     wxArrayString lsWalletsArr;
     lsWallets = new wxSimpleHtmlListBox(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), lsWalletsArr, wxHLB_DEFAULT_STYLE);
 
-    BoxSizer135->Add(lsWallets, 4, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+    BoxSizer135->Add(lsWallets, 3, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
     lsWallets->SetMinSize(wxSize(200,-1));
 
-    wxFlexGridSizer* flexGridSizer2137 = new wxFlexGridSizer(3, 2, 0, 0);
+    wxFlexGridSizer* flexGridSizer2137 = new wxFlexGridSizer(2, 2, 0, 0);
     flexGridSizer2137->SetFlexibleDirection( wxBOTH );
     flexGridSizer2137->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-    flexGridSizer2137->AddGrowableCol(1);
+    flexGridSizer2137->AddGrowableCol(0);
 
     BoxSizer135->Add(flexGridSizer2137, 2, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0);
 
     lbName = new wxStaticText(this, wxID_ANY, _("Name:"), wxDefaultPosition, wxSize(-1,-1), 0);
 
-    flexGridSizer2137->Add(lbName, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+    flexGridSizer2137->Add(lbName, 0, wxALL|wxEXPAND|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
 
     txName = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
     #if wxVERSION_NUMBER >= 3000
     txName->SetHint(wxT(""));
     #endif
 
-    flexGridSizer2137->Add(txName, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+    flexGridSizer2137->Add(txName, 0, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
 
     lbObs = new wxStaticText(this, wxID_ANY, _("Obs"), wxDefaultPosition, wxSize(-1,-1), 0);
 
-    flexGridSizer2137->Add(lbObs, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+    flexGridSizer2137->Add(lbObs, 0, wxALL|wxEXPAND|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
 
     txObs = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), wxTE_MULTILINE);
 
-    flexGridSizer2137->Add(txObs, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+    flexGridSizer2137->Add(txObs, 4, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
 
     wxBoxSizer* BoxSizer242 = new wxBoxSizer(wxHORIZONTAL);
 
-    BoxSizer135->Add(BoxSizer242, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0);
+    BoxSizer135->Add(BoxSizer242, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0);
 
     btEdit = new wxButton(this, wxID_ANY, _("Edit"), wxDefaultPosition, wxSize(-1,-1), 0);
     btEdit->Enable(false);

diff --git a/ui/wxcrafter.h b/ui/wxcrafter.h
@@ -13,9 +13,9 @@
 #include <wx/frame.h>
 #include <wx/iconbndl.h>
 #include <wx/artprov.h>
+#include <wx/sizer.h>
 #include <wx/menu.h>
 #include <wx/statusbr.h>
-#include <wx/sizer.h>
 #include <wx/gbsizer.h>
 #include <wx/htmllbox.h>
 #include <wx/grid.h>

diff --git a/ui/wxcrafter.wxcp b/ui/wxcrafter.wxcp
@@ -10,6 +10,7 @@
   "m_firstWindowId": 10000,
   "m_useEnum": true,
   "m_useUnderscoreMacro": true,
+  "m_addHandlers": true,
   "m_templateClasses": []
  },
  "windows": [{
@@ -4487,7 +4488,7 @@
      "m_events": [],
      "m_children": [{
        "m_type": 4522,
-       "proportion": 4,
+       "proportion": 3,
        "border": 5,
        "gbSpan": "",
        "gbPosition": "",
@@ -4594,11 +4595,11 @@
         }, {
          "type": "string",
          "m_label": "# Rows:",
-         "m_value": "3"
+         "m_value": "2"
         }, {
          "type": "string",
          "m_label": "Growable columns:",
-         "m_value": "1"
+         "m_value": "0"
         }, {
          "type": "string",
          "m_label": "Growable rows:",
@@ -4615,12 +4616,12 @@
        "m_events": [],
        "m_children": [{
          "m_type": 4405,
-         "proportion": 1,
+         "proportion": 0,
          "border": 5,
          "gbSpan": "",
          "gbPosition": "",
          "m_styles": [],
-         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_CENTER_VERTICAL"],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_RIGHT", "wxALIGN_CENTER_VERTICAL"],
          "m_properties": [{
            "type": "winid",
            "m_label": "ID:",
@@ -4690,12 +4691,12 @@
          "m_children": []
         }, {
          "m_type": 4406,
-         "proportion": 1,
+         "proportion": 0,
          "border": 5,
          "gbSpan": "",
          "gbPosition": "",
          "m_styles": [],
-         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_CENTER_VERTICAL"],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_LEFT", "wxALIGN_CENTER_VERTICAL"],
          "m_properties": [{
            "type": "winid",
            "m_label": "ID:",
@@ -4784,12 +4785,12 @@
          "m_children": []
         }, {
          "m_type": 4405,
-         "proportion": 1,
+         "proportion": 0,
          "border": 5,
          "gbSpan": "",
          "gbPosition": "",
          "m_styles": [],
-         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_CENTER_VERTICAL"],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_RIGHT", "wxALIGN_CENTER_VERTICAL"],
          "m_properties": [{
            "type": "winid",
            "m_label": "ID:",
@@ -4859,12 +4860,12 @@
          "m_children": []
         }, {
          "m_type": 4406,
-         "proportion": 1,
+         "proportion": 4,
          "border": 5,
          "gbSpan": "",
          "gbPosition": "",
          "m_styles": ["wxTE_MULTILINE"],
-         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_CENTER_VERTICAL"],
+         "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_LEFT", "wxALIGN_CENTER_VERTICAL"],
          "m_properties": [{
            "type": "winid",
            "m_label": "ID:",
@@ -4959,7 +4960,7 @@
        "gbSpan": "",
        "gbPosition": "",
        "m_styles": [],
-       "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_CENTER_VERTICAL"],
+       "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_CENTER_VERTICAL"],
        "m_properties": [{
          "type": "string",
          "m_label": "Minimum Size:",

diff --git a/ui/wxcrafter_ui_bitmaps.cpp b/ui/wxcrafter_ui_bitmaps.cpp
@@ -21,13 +21,15 @@
         wxMemoryFSHandler::AddFile(name, data, size)
 #endif
 
-static size_t xml_res_size_0 = 90;
+static size_t xml_res_size_0 = 137;
 static unsigned char xml_res_file_0[] = {
 60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
 110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
 115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
 47,47,119,119,119,46,119,120,119,105,100,103,101,116,115,46,111,114,103,
-47,119,120,120,114,99,34,47,62,10};
+47,119,120,120,114,99,34,62,10,32,32,60,33,45,45,32,72,97,110,100,108,101,
+114,32,71,101,110,101,114,97,116,105,111,110,32,105,115,32,79,78,32,45,
+45,62,10,60,47,114,101,115,111,117,114,99,101,62,10};
 
 void wxC898CInitBitmapResources()
 {

diff --git a/ui/wxcrafter_ui_bitmaps.xrc b/ui/wxcrafter_ui_bitmaps.xrc
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc"/>
+<resource xmlns="http://www.wxwidgets.org/wxxrc">
+  <!-- Handler Generation is ON -->
+</resource>