Merge branch 'master' into develop

Tanukium · Feb 25, 2019 · de9beae · de9beae
2 parents 37f3e8f + a761685
commit de9beae
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/main.py b/src/main.py
@@ -28,10 +28,10 @@ def OnDropFiles(self, x, y, file_names):
         return True
 
 
-class MyFrame(wx.Frame):
+class E2cFrame(wx.Frame):
 
     def __init__(self, *args, **kwds):
-        # begin wxGlade: MyFrame.__init__
+        # begin wxGlade: E2cFrame.__init__
         kwds["style"] = kwds.get("style", 0) | wx.DEFAULT_FRAME_STYLE
         wx.Frame.__init__(self, *args, **kwds)
         self.SetSize((400, 300))
@@ -41,12 +41,12 @@ def __init__(self, *args, **kwds):
         # end wxGlade
 
     def __set_properties(self):
-        # begin wxGlade: MyFrame.__set_properties
+        # begin wxGlade: E2cFrame.__set_properties
         self.SetTitle("Excel->CSV直行便 v1.00")
         # end wxGlade
 
     def __do_layout(self):
-        # begin wxGlade: MyFrame.__do_layout
+        # begin wxGlade: E2cFrame.__do_layout
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1.Add((400, 120), 0, wx.EXPAND, 0)
 
@@ -67,19 +67,19 @@ def __do_layout(self):
         # end wxGlade
 
 
-# end of class MyFrame
+# end of class E2cFrame
 
-class MyApp(wx.App):
+class E2cApp(wx.App):
 
     def OnInit(self):
-        self.frame = MyFrame(None, wx.ID_ANY, "")
+        self.frame = E2cFrame(None, wx.ID_ANY, "")
         self.SetTopWindow(self.frame)
         self.frame.Show()
         return True
 
 
-# end of class MyApp
+# end of class E2cApp
 
 if __name__ == "__main__":
-    msemiApp = MyApp(0)
+    msemiApp = E2cApp(0)
     msemiApp.MainLoop()
diff --git a/src/txt.py → src/txt2csv.py b/src/txt.py → src/txt2csv.py
diff --git a/src/wxg/msemi.wxg b/src/wxg/msemi.wxg
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!-- generated by wxGlade 0.8.3 on Mon Jul  2 15:38:34 2018 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="msemiApp" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
-    <object class="MyFrame" name="frame" base="EditFrame">
+<application class="E2cApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="msemiApp" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="E2cFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>TestTool</title>
         <style>wxDEFAULT_FRAME_STYLE</style>

diff --git a/src/wxg/msemi.wxg.bak b/src/wxg/msemi.wxg.bak
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!-- generated by wxGlade 0.8.3 on Mon Jul  2 15:15:12 2018 -->
 
-<application class="MyApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="msemiApp" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
-    <object class="MyFrame" name="frame" base="EditFrame">
+<application class="E2cApp" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="msemiApp" option="0" overwrite="1" path="./wxglade_out.py" source_extension=".cpp" top_window="frame" use_gettext="0" use_new_namespace="1">
+    <object class="E2cFrame" name="frame" base="EditFrame">
         <size>400, 300</size>
         <title>TestTool</title>
         <style>wxDEFAULT_FRAME_STYLE</style>