Make windows resizeable and fix some proportions.

alexras · Nov 21, 2018 · cebeb61 · cebeb61
1 parent 566fe8e
commit cebeb61
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@ cover/
 Include/
 Lib/
 Scripts
-*~
+*~
diff --git a/lsmc/.gitignore b/lsmc/.gitignore
@@ -1,2 +1,3 @@
 dist
 build
+images/images.py
diff --git a/lsmc/InstrumentPane.py b/lsmc/InstrumentPane.py
@@ -69,7 +69,7 @@ def name_setter(instrument, new_name):
 
         sizer = wx.BoxSizer(wx.HORIZONTAL)
 
-        sizer.Add(self.instr_list, 1, wx.ALL | wx.EXPAND, border=5)
+        sizer.Add(self.instr_list, 0, wx.ALL | wx.EXPAND, border=5)
 
         for panel in self.instr_panels.values():
             sizer.Add(panel, 1, wx.EXPAND)

diff --git a/lsmc/LSMC b/lsmc/LSMC
@@ -46,8 +46,7 @@ class MainMenuBar(wx.MenuBar):
 class MainWindow(wx.Frame):
     def __init__(self):
         wx.Frame.__init__(
-            self, None, wx.ID_ANY, "Little Sound MC", size=(600,400),
-            style=wx.SYSTEM_MENU | wx.CAPTION | wx.CLOSE_BOX | wx.CLIP_CHILDREN)
+            self, None, wx.ID_ANY, "Little Sound MC", size=(600,600))
 
         self.sav_obj = None
 

diff --git a/lsmc/Makefile b/lsmc/Makefile
@@ -29,8 +29,4 @@ install-deps-mac:
 
 .PHONY: install-deps-win
 install-deps-win:
-	pip install --upgrade -r ../requirements_win.txt \
-		--allow-external wxPython \
-		--allow-unverified wxPython \
-		--allow-external ObjectListView \
-		--allow-unverified ObjectListView
+	pip install --upgrade -r ../requirements_win.txt
diff --git a/lsmc/SongWindow.py b/lsmc/SongWindow.py
@@ -11,7 +11,7 @@
 class SongWindow(wx.Frame):
 
     def __init__(self, parent, project, index):
-        frame_size = (650, 550)
+        frame_size = (750, 550)
 
         window_pos = utils.random_pos(frame_size)
 
@@ -22,7 +22,7 @@ def __init__(self, parent, project, index):
             self, parent, wx.ID_ANY, "Song - %s" % (project.name),
             size=frame_size, pos=window_pos,
             style=wx.SYSTEM_MENU | wx.CAPTION |
-            wx.CLOSE_BOX | wx.CLIP_CHILDREN)
+            wx.CLOSE_BOX | wx.CLIP_CHILDREN | wx.RESIZE_BORDER)
 
         panel = wx.Panel(self)
 

diff --git a/lsmc/TablePane.py b/lsmc/TablePane.py
@@ -104,10 +104,8 @@ def __init__(self, parent, project):
 
         self.sizer = wx.BoxSizer(wx.HORIZONTAL)
 
-        self.sizer.Add(self.table_list, 1, wx.ALL | wx.EXPAND)
-        self.sizer.AddSpacer(20)
-        self.sizer.Add(self.table_view, 2, wx.ALL | wx.EXPAND)
-        self.sizer.AddStretchSpacer()
+        self.sizer.Add(self.table_list, 0, wx.ALL | wx.EXPAND, border=5)
+        self.sizer.Add(self.table_view, 1, wx.EXPAND)
 
         self.SetSizer(self.sizer)