Encore un agrandissement de l'interface utilisateur.

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@387 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/src/minwii/widgets/data/minwii_theme/config.txt b/src/minwii/widgets/data/minwii_theme/config.txt
index 0004c26..9978f5b 100644 (file)
--- a/src/minwii/widgets/data/minwii_theme/config.txt
+++ b/src/minwii/widgets/data/minwii_theme/config.txt
@@ -1,6 +1,6 @@
 desktop background desktop.png
 
 desktop background desktop.png
 

-input font Vera.ttf 32 
+input font Vera.ttf 38 

 input background input.normal.png
 input color #000000
 input:focus background input.focus.png
 input background input.normal.png
 input color #000000
 input:focus background input.focus.png


@@ -9,42 +9,42 @@ input padding_right 6
 input padding_top 3
 input padding_bottom 3
 
 input padding_top 3
 input padding_bottom 3
 

-link font Vera.ttf 24
+link font Vera.ttf 29

 link color #0000FF
 link:hover color #FF0000
 link:down color #00FF00
 
 link color #0000FF
 link:hover color #FF0000
 link:down color #00FF00
 

-label font Vera.ttf 32
+label font Vera.ttf 38

 label color #000000
 
 label color #000000
 

-document font Vera.ttf 32
+document font Vera.ttf 38

 document color #000000
 document color #000000

-div font Vera.ttf 32
+div font Vera.ttf 38

 div color #000000
 
 div color #000000
 

-td font Vera.ttf 32
+td font Vera.ttf 38

 td color #000000
 td color #000000

-th font Vera.ttf 32
+th font Vera.ttf 38

 th color #000000
 
 th color #000000
 

-h1 font Vera.ttf 48
+h1 font Vera.ttf 58

 h1 color #000000
 h1 color #000000

-h2 font Vera.ttf 40
+h2 font Vera.ttf 48

 h2 color #000000
 h2 color #000000

-h3 font Vera.ttf 32
+h3 font Vera.ttf 38

 h3 color #000000
 h3 color #000000

-h4 font Vera.ttf 28
+h4 font Vera.ttf 34

 h4 color #000000
 h4 color #000000

-h5 font Vera.ttf 24
+h5 font Vera.ttf 29

 h5 color #000000
 h5 color #000000

-h6 font Vera.ttf 20
+h6 font Vera.ttf 24

 h6 color #000000
 
 h6 color #000000
 

-ul font Vera.ttf 32
+ul font Vera.ttf 38

 ul color #000000
 ul color #000000

-ol font Vera.ttf 32
+ol font Vera.ttf 38

 ol color #000000
 ol color #000000

-li font Vera.ttf 32
+li font Vera.ttf 38

 li color #000000
 li padding_left 32
 
 li color #000000
 li padding_left 32
 


@@ -81,7 +81,7 @@ button padding_left 8
 button padding_right 8
 button padding_top 1
 button padding_bottom 1
 button padding_right 8
 button padding_top 1
 button padding_bottom 1

-button.label font Vera.ttf 32
+button.label font Vera.ttf 38

 button.label color #000000
 
 slider background slider.tga
 button.label color #000000
 
 slider background slider.tga


@@ -159,7 +159,7 @@ select.option padding_bottom 1
 #select.option border_bottom 1
 #select.option border_left 1
 
 #select.option border_bottom 1
 #select.option border_left 1
 

-select.option.label font Vera.ttf 32
+select.option.label font Vera.ttf 38

 select.option.label color #000000
 select.options padding_left 1
 select.options padding_right 1
 select.option.label color #000000
 select.options padding_left 1
 select.options padding_right 1


@@ -183,7 +183,7 @@ dialog.main padding_right 8
 dialog.main padding_top 4
 dialog.main padding_bottom 4
 
 dialog.main padding_top 4
 dialog.main padding_bottom 4
 

-keysym font Vera.ttf 32
+keysym font Vera.ttf 38

 keysym background input.normal.png
 keysym color #000000
 keysym:focus background input.focus.png
 keysym background input.normal.png
 keysym color #000000
 keysym:focus background input.focus.png


@@ -199,7 +199,7 @@ tool padding_left 4
 tool padding_right 4
 tool padding_top 1
 tool padding_bottom 1
 tool padding_right 4
 tool padding_top 1
 tool padding_bottom 1

-tool.label font Vera.ttf 32
+tool.label font Vera.ttf 38

 tool.label color #000000
 
 menu background menu.normal.tga
 tool.label color #000000
 
 menu background menu.normal.tga


@@ -209,7 +209,7 @@ menu padding_left 6
 menu padding_right 6
 menu padding_top 3
 menu padding_bottom 3
 menu padding_right 6
 menu padding_top 3
 menu padding_bottom 3

-menu.label font Vera.ttf 32
+menu.label font Vera.ttf 38

 menu.label color #000000
 
 menu-open background menu.down.tga
 menu.label color #000000
 
 menu-open background menu.down.tga


@@ -228,7 +228,7 @@ menu.option padding_left 6
 menu.option padding_right 6
 menu.option padding_top 1
 menu.option padding_bottom 1
 menu.option padding_right 6
 menu.option padding_top 1
 menu.option padding_bottom 1

-menu.option.label font Vera.ttf 32
+menu.option.label font Vera.ttf 38

 menu.option.label color #000000
 menu.options padding_left 1
 menu.options padding_right 1
 menu.option.label color #000000
 menu.options padding_left 1
 menu.options padding_right 1


@@ -253,7 +253,7 @@ list.item padding_top 2
 list.item padding_bottom 2
 list.item margin_bottom 1
 list.item align -1
 list.item padding_bottom 2
 list.item margin_bottom 1
 list.item align -1

-list.item.label font Vera.ttf 28
+list.item.label font Vera.ttf 34

 list.item.label color #000000
 
 list background list.png
 list.item.label color #000000
 
 list background list.png


@@ -269,11 +269,11 @@ list.content padding_bottom 1
 
 filedialog.folder image filebrowser.folder.png
 filedialog.soundfile image note.png
 
 filedialog.folder image filebrowser.folder.png
 filedialog.soundfile image note.png

-filedialog.label font Vera.ttf 28
+filedialog.label font Vera.ttf 34

 filedialog.label color #000000
 filedialog.label color #000000

-filedialog.title.label font Vera.ttf 32
+filedialog.title.label font Vera.ttf 38

 filedialog.title.label color #000000
 filedialog.title.label color #000000

-filedialog.input font Vera.ttf 28
+filedialog.input font Vera.ttf 34

 filedialog.input background input.normal.png
 filedialog.input color #000000
 filedialog.input:focus background input.focus.png
 filedialog.input background input.normal.png
 filedialog.input color #000000
 filedialog.input:focus background input.focus.png


@@ -282,7 +282,7 @@ filedialog.input padding_right 6
 filedialog.input padding_top 3
 filedialog.input padding_bottom 3
 
 filedialog.input padding_top 3
 filedialog.input padding_bottom 3
 

-dialog.title.label font Vera.ttf 32
+dialog.title.label font Vera.ttf 38

 dialog.title.label color #000000
 
 
 dialog.title.label color #000000
 
 

diff --git a/src/minwii/widgets/home.py b/src/minwii/widgets/home.py
index b395eb6..10aa9d6 100755 (executable)
--- a/src/minwii/widgets/home.py
+++ b/src/minwii/widgets/home.py
@@ -49,7 +49,7 @@ class Home(object, Table) :
         self.nwiimotes = params.get('nwiimotes', 0)
         self.songFile = params.get('songFile', '')
         self.spaceSize = (100,100)
         self.nwiimotes = params.get('nwiimotes', 0)
         self.songFile = params.get('songFile', '')
         self.spaceSize = (100,100)

-        self.font = pygame.font.Font(None,70)
+        self.font = pygame.font.Font(None,90)

         self._fill()
         self.selectedPlayMode = params.get('playMode', 'NORMAL')
         self.displayNotes = params.get('displayNotes', True)
         self._fill()
         self.selectedPlayMode = params.get('playMode', 'NORMAL')
         self.displayNotes = params.get('displayNotes', True)


@@ -69,7 +69,7 @@ class Home(object, Table) :
 
         self.tr()
         caption = '' if not self.songFile else FileOpenDialog.getSongTitle(self.songFile)
 
         self.tr()
         caption = '' if not self.songFile else FileOpenDialog.getSongTitle(self.songFile)

-        self.songTitle = self.createLabel(caption)
+        self.songTitle = self.createLabel(caption, font=pygame.font.Font(None,60))

         st = STYLE_RIGHT_COL.copy()
         del st['padding_top']
         self.td(self.songTitle, style = st)
         st = STYLE_RIGHT_COL.copy()
         del st['padding_top']
         self.td(self.songTitle, style = st)


@@ -175,7 +175,7 @@ class Home(object, Table) :
         if dlg.value and os.path.isfile(dlg.value):
             self.remove(self.songTitle)
             title = FileOpenDialog.getSongTitle(dlg.value)
         if dlg.value and os.path.isfile(dlg.value):
             self.remove(self.songTitle)
             title = FileOpenDialog.getSongTitle(dlg.value)

-            self.songTitle = self.createLabel(title)
+            self.songTitle = self.createLabel(title, font= pygame.font.Font(None,60))

             self.td(self.songTitle, col=1, row=1, style=STYLE_RIGHT_COL)
             self.songFile = dlg.value
             self.playButton.disabled = False
             self.td(self.songTitle, col=1, row=1, style=STYLE_RIGHT_COL)
             self.songFile = dlg.value
             self.playButton.disabled = False

diff --git a/src/minwii/widgets/songfilebrowser.py b/src/minwii/widgets/songfilebrowser.py
index aa34c65..2f0120e 100755 (executable)
--- a/src/minwii/widgets/songfilebrowser.py
+++ b/src/minwii/widgets/songfilebrowser.py
@@ -67,7 +67,7 @@ class FileOpenDialog(FileDialog):
                     'padding_bottom': 2}
         self.title = basic.Label("Ouvrir une chanson", cls="dialog.title.label")
         self.body = table.Table()
                     'padding_bottom': 2}
         self.title = basic.Label("Ouvrir une chanson", cls="dialog.title.label")
         self.body = table.Table()

-        self.list = area.List(width=700, height=250)
+        self.list = area.List(width=880, height=375)

         self.input_dir = input.Input()
         self.input_file = input.Input()
         self._current_sort = 'alpha'
         self.input_dir = input.Input()
         self.input_file = input.Input()
         self._current_sort = 'alpha'