Merge pull request #7 from matyalatte/dev

v0.2.1

Author: matyalatte

changelog.txt

@@ -1,3 +1,11 @@
+ver0.2.1
+- Introduced wxBoxSizer to align components automatically.
+- Added "default" option to all components.
+- Fixed a bug that non-ascii characters won't be shown up as "empty_message." (Windows)
+- Fixed a bug that LogFrame can't catch non-ascii characters from std::cout. (Linux)
+- Fixed an error when executing non-ascii commands. (Unix)
+- Fixed an error when saving non-ascii characters for text box.
+
 ver0.2.0
 - Made "button" key optional
 - Fixed a bug that text boxes can't handle their input values properly.

docs/Build-With-Unix.md

@@ -25,13 +25,13 @@ The steps are as follows.
 
 1.  Open the Terminal.
 2.  Move to `./Simple-Command-Runner/shell_scripts`
-3.  Type `bush build_exe.sh`.
+3.  Type `bash build_exe.sh`.
 4.  An executable file `SimpleCommandRunner` will be generated in `./Simple-Command-Runner/Release`.
 
 ## Debug build
 
 If you want a debug build, you need to use `Debug` as an argument for shell scripts.  
-So, you should type `bash build_wxWidgets.sh Debug` and `bush build_exe.sh Debug` on the terminal.  
+So, you should type `bash build_wxWidgets.sh Debug` and `bash build_exe.sh Debug` on the terminal.  
 
 ## Test
 

docs/README.md

@@ -1,4 +1,4 @@
-# Simple-Command-Runner ver 0.2.0
+# Simple-Command-Runner ver 0.2.1
 
 ![build](https://github.com/matyalatte/Simple-Command-Runner/actions/workflows/build_all.yml/badge.svg)
 ![test](https://github.com/matyalatte/Simple-Command-Runner/actions/workflows/test.yml/badge.svg)

examples/6_all_keys/gui_definition.json

@@ -49,37 +49,39 @@
                     "label": "PNG or JPG",
                     "extension": "png or jpg (*.png;*.jpg)|*.png;*.jpg",
                     "empty_message": "Drop a file here!",
+                    "default": "test.txt",
                     "add_quotes": true
                 },
                 {
                     "type": "folder",
-                    "label": "Some folder path",
+                    "label": "Folder path",
                     "empty_message": "Drop a folder here!",
+                    "default": "testdir",
                     "add_quotes": true
                 },
                 {
                     "type": "check",
-                    "label": "checkbox",
+                    "label": "Checkbox",
                     "value": "flag!",
                     "default": true
                 },
                 {
                     "type": "choice",
-                    "label": "combo box",
+                    "label": "Combo box",
                     "items": ["item1", "item2", "item3"],
                     "values": ["value1", "value2", "value3"],
                     "default": 2
                 },
                 {
                     "type": "check_array",
-                    "label": "options",
+                    "label": "Options",
                     "items": ["item1", "item2", "item3", "item4"],
                     "values": ["falg1", "falg2", "falg3", "flag4"],
                     "default": [false, false, true, false]
                 },
                 {
                     "type": "text_box",
-                    "label": "text box",
+                    "label": "Text box",
                     "empty_message": "type here!",
                     "default": "remove this text!"
                 }

include/component.h

@@ -8,23 +8,18 @@
 #include "json_utils.h"
 #include "custom_wx_obj.h"
 
-#ifdef _WIN32
-#include <codecvt>  // char code converter for Windows system
-#endif
-
 // Base class for GUI components (file picker, combo box, etc.)
 class Component {
  protected:
     void* m_widget;
 
  private:
-    int m_height;
     bool m_has_string;
     bool m_add_quotes;
     std::string m_label;
 
  public:
-    Component(nlohmann::json j, int height, bool has_string);
+    Component(nlohmann::json j, bool has_string);
     ~Component() {}
     virtual wxString GetRawString() { return "";}
     wxString GetString();
@@ -33,12 +28,9 @@ class Component {
     virtual void SetConfig(nlohmann::json config) {}
     virtual nlohmann::json GetConfig();
 
-    void SetHeight(int h);
-    int GetHeight();
-
     bool HasString();
 
-    static Component* PutComponent(wxPanel* panel, nlohmann::json j, int y);
+    static Component* PutComponent(wxWindow* panel, wxBoxSizer* sizer, nlohmann::json j);
 };
 
 // containers for Choice and CheckArray
@@ -60,29 +52,33 @@ std::wstring UTF8ToWString(const std::string& str);
 
 class StaticText : public Component {
  public:
-    StaticText(wxPanel* panel, nlohmann::json j, int y);
+    StaticText(wxWindow* panel, wxBoxSizer* sizer, nlohmann::json j);
 };
 
-class FilePicker : public Component {
+class StringComponentBase : public Component {
  public:
-    wxString GetRawString() override;
-    FilePicker(wxPanel* panel, nlohmann::json j, int y);
+    StringComponentBase(wxWindow* panel, wxBoxSizer* sizer, nlohmann::json j);
     nlohmann::json GetConfig() override;
+};
+
+class FilePicker : public StringComponentBase {
+ public:
+    wxString GetRawString() override;
+    FilePicker(wxWindow* panel, wxBoxSizer* sizer, nlohmann::json j);
     void SetConfig(nlohmann::json config) override;
 };
 
-class DirPicker : public Component {
+class DirPicker : public StringComponentBase {
  public:
     wxString GetRawString() override;
-    DirPicker(wxPanel* panel, nlohmann::json j, int y);
-    nlohmann::json GetConfig() override;
+    DirPicker(wxWindow* panel, wxBoxSizer* sizer, nlohmann::json j);
     void SetConfig(nlohmann::json config) override;
 };
 
 class Choice : public Component, MultipleValuesContainer {
  public:
     wxString GetRawString() override;
-    Choice(wxPanel* panel, nlohmann::json j, int y);
+    Choice(wxWindow* panel, wxBoxSizer* sizer, nlohmann::json j);
     nlohmann::json GetConfig() override;
     void SetConfig(nlohmann::json config) override;
 };
@@ -92,23 +88,22 @@ class CheckBox : public Component {
     std::string m_value;
  public:
     wxString GetRawString() override;
-    CheckBox(wxPanel* panel, nlohmann::json j, int y);
+    CheckBox(wxWindow* panel, wxBoxSizer* sizer, nlohmann::json j);
     nlohmann::json GetConfig() override;
     void SetConfig(nlohmann::json config) override;
 };
 
 class CheckArray : public Component, MultipleValuesContainer {
  public:
     wxString GetRawString() override;
-    CheckArray(wxPanel* panel, nlohmann::json j, int y);
+    CheckArray(wxWindow* panel, wxBoxSizer* sizer, nlohmann::json j);
     nlohmann::json GetConfig() override;
     void SetConfig(nlohmann::json config) override;
 };
 
-class TextBox : public Component {
+class TextBox : public StringComponentBase {
  public:
     wxString GetRawString() override;
-    TextBox(wxPanel* panel, nlohmann::json j, int y);
-    nlohmann::json GetConfig() override;
+    TextBox(wxWindow* panel, wxBoxSizer* sizer, nlohmann::json j);
     void SetConfig(nlohmann::json config) override;
 };

include/custom_wx_obj.h

@@ -22,7 +22,6 @@ class CustomTextCtrl : public wxTextCtrl {
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxTextCtrlNameStr);
-    virtual ~CustomTextCtrl() {}
 
     void OnSetFocusEmptyMessage(wxFocusEvent& event);
     void OnKillFocusEmptyMessage(wxFocusEvent& event);
@@ -41,9 +40,14 @@ class DropFilePath : public wxFileDropTarget{
     CustomTextCtrl* m_text_ctrl;
 
  public:
-    DropFilePath(T* frame, CustomTextCtrl* text_ctrl);
-    ~DropFilePath();
-    virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) wxOVERRIDE;
+    DropFilePath(T* frame, CustomTextCtrl* text_ctrl): wxFileDropTarget() {
+        m_frame = frame;
+        m_text_ctrl = text_ctrl;
+    }
+    bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames){
+        m_text_ctrl->UpdateText(filenames[0]);
+        return 1;
+    }
 };
 
 // Customized wxFileDirPickerCtrlBase
@@ -53,8 +57,9 @@ class CustomPickerBase : public wxFileDirPickerCtrlBase {
     CustomTextCtrl* m_custom_text_ctrl;
 
  public:
-    CustomPickerBase();
-    virtual ~CustomPickerBase() {}
+    CustomPickerBase() : wxFileDirPickerCtrlBase() {
+        m_custom_text_ctrl = nullptr;
+    }
 
     // Customized wxPickerBase::CreateBase
     bool CustomCreatePickerBase(wxWindow* parent,
@@ -98,7 +103,6 @@ class CustomFilePicker : public CustomPickerBase {
         long style = wxFLP_DEFAULT_STYLE,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxFilePickerCtrlNameStr);
-    virtual ~CustomFilePicker() {}
 
     wxString GetTextCtrlValue() const wxOVERRIDE;
     wxString GetFullPath() wxOVERRIDE;
@@ -153,7 +157,6 @@ class CustomDirPicker : public CustomPickerBase {
         long style = wxFLP_DEFAULT_STYLE,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxFilePickerCtrlNameStr);
-    virtual ~CustomDirPicker() {}
 
     wxString GetTextCtrlValue() const wxOVERRIDE;
     wxString GetFullPath() wxOVERRIDE;

include/exec.h

@@ -5,5 +5,42 @@
 #include "wx/wx.h"
 #include "wx/process.h"
 
+#ifdef __linux__
+// A text window to show outputs.
+// wxStreamToTextRedirector won't work because it can't handle utf-8 characters.
+class LogFrame : public wxFrame {
+ private:
+    wxTextCtrl* m_log_box;
+    wxStreamToTextRedirector* m_log_redirector;
+
+ public:
+    explicit LogFrame(wxString exepath);
+    void OnClose(wxCloseEvent& event);
+    LogFrame& operator <<(std::string& str) {
+        m_log_box->AppendText(wxString::FromUTF8(str));
+        return *this;
+    }
+    LogFrame& operator <<(wxString& str) {
+        m_log_box->AppendText(str);
+        return *this;
+    }
+    LogFrame& operator <<(const char* str) {
+        m_log_box->AppendText(wxString::FromUTF8(str));
+        return *this;
+    }
+    typedef std::basic_ostream<char, std::char_traits<char> > CoutType;
+    typedef CoutType& (*StandardEndLine)(CoutType&);
+    LogFrame& operator <<(StandardEndLine endl) {
+        *this << "\n";
+        return *this;
+    }
+};
+#endif
+
+
 // run command and return error messages
-std::array<std::string, 2> Exec(const char* cmd);
+#ifdef __linux__
+std::array<std::string, 2> Exec(LogFrame& ostream, wxString& cmd);
+#else
+std::array<std::string, 2> Exec(std::ostream& ostream, wxString& cmd);
+#endif

include/main_frame.h

@@ -12,48 +12,42 @@
 #include <wx/stdpaths.h>
 #endif
 
-#ifdef __linux__
-class LogFrame : public wxFrame {
- private:
-    wxTextCtrl* m_log_box;
-    wxStreamToTextRedirector* m_log_redirector;
- public:
-    explicit LogFrame(wxString exepath);
-    virtual ~LogFrame() {}
-    void OnClose(wxCloseEvent& event);
-};
-#endif
-
 // Main window
 class MainFrame : public wxFrame {
  private:
     nlohmann::json m_definition;
     nlohmann::json m_sub_definition;
     nlohmann::json m_config;
+
 #ifdef __linux__
+    // Linux needs a window to show outputs
     LogFrame* m_log_frame;
+    LogFrame* m_ostream;
+#else
+    std::ostream* m_ostream;
 #endif
+
 #ifndef _WIN32
+    // Unix systems need to get current dir to read json files.
     wxString m_exe_path;
     void CalcExePath();
 #endif
+
     std::vector<Component*> m_components;
-    wxPanel* m_main_panel;
+    wxPanel* m_panel;
     wxButton* m_run_button;
 
     void CreateFrame();
     void CheckDefinition();
-    int UpdatePanel(wxPanel* panel);
+    void UpdatePanel();
     void UpdateConfig();
-    void Align(int y);
     void ShowErrorDialog(wxString msg);
     void ShowSuccessDialog(wxString msg);
     void JsonLoadFailed(std::string msg);
 
  public:
     MainFrame();
     explicit MainFrame(nlohmann::json definition, nlohmann::json config = nlohmann::json({}));
-    virtual ~MainFrame() {}
 
     void OnClose(wxCloseEvent& event);
     void OpenURL(wxCommandEvent& event);