[Freevo-cvslog] freevo/skins/main1 main1_image.py,1.8,1.9 main1_video.py,1.5,1.6 skin_main1.py,1.85,1.86

[<di...@us...>]

Update of /cvsroot/freevo/freevo/skins/main1
In directory sc8-pr-cvs1:/tmp/cvs-serv10496

Modified Files:
	main1_image.py main1_video.py skin_main1.py 
Log Message:
Add [] for directories in the normal menu and don't change the name
for the extended once.


Index: main1_image.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/main1/main1_image.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main1_image.py	21 Feb 2003 04:59:55 -0000	1.8
--- main1_image.py	2 Mar 2003 19:02:14 -0000	1.9
***************
*** 10,13 ****
--- 10,17 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.9  2003/03/02 19:02:14  dischi
+ # Add [] for directories in the normal menu and don't change the name
+ # for the extended once.
+ #
  # Revision 1.8  2003/02/21 04:59:55  krister
  # Bugfix for downarrow on last page.
***************
*** 210,214 ****
  
              elif item.type == 'dir':
!                 DrawTextFramed('Folder: %s' %  item.name[1:-1], val, x, y, w, h)
                  y += str_h
                  DrawTextFramed('Path: %s' %  item.dir, val, x, y, w, h)
--- 214,218 ----
  
              elif item.type == 'dir':
!                 DrawTextFramed('Folder: %s' %  item.name, val, x, y, w, h)
                  y += str_h
                  DrawTextFramed('Path: %s' %  item.dir, val, x, y, w, h)

Index: main1_video.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/main1/main1_video.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main1_video.py	19 Feb 2003 14:54:02 -0000	1.5
--- main1_video.py	2 Mar 2003 19:02:15 -0000	1.6
***************
*** 10,13 ****
--- 10,17 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.6  2003/03/02 19:02:15  dischi
+ # Add [] for directories in the normal menu and don't change the name
+ # for the extended once.
+ #
  # Revision 1.5  2003/02/19 14:54:02  dischi
  # Some cleanups:
***************
*** 199,203 ****
                      
              elif item.type == 'dir':
!                 DrawTextFramed('Folder: %s' %  item.name[1:-1], val, x, y, w, h)
                  y += str_h
                  DrawTextFramed('Path: %s' %  item.dir, val, x, y, w, h)
--- 203,207 ----
                      
              elif item.type == 'dir':
!                 DrawTextFramed('Folder: %s' %  item.name, val, x, y, w, h)
                  y += str_h
                  DrawTextFramed('Path: %s' %  item.dir, val, x, y, w, h)

Index: skin_main1.py
===================================================================
RCS file: /cvsroot/freevo/freevo/skins/main1/skin_main1.py,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** skin_main1.py	2 Mar 2003 14:35:11 -0000	1.85
--- skin_main1.py	2 Mar 2003 19:02:15 -0000	1.86
***************
*** 10,13 ****
--- 10,17 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.86  2003/03/02 19:02:15  dischi
+ # Add [] for directories in the normal menu and don't change the name
+ # for the extended once.
+ #
  # Revision 1.85  2003/03/02 14:35:11  dischi
  # Added clear function
***************
*** 525,528 ****
--- 529,535 ----
              if choice.type == 'playlist':
                  text = 'PL: %s' % text
+             if choice.type == 'dir' and choice.parent and \
+                choice.parent.type != 'mediamenu':
+                 text = '[%s]' % text
              font_w, font_h = osd.stringsize(text, font=obj.font, ptsize=obj.size)