mm: Swapped perty and default contents, so now 'default' skin is davec's, and 'perty...

diff --git a/minimenu/skin/default/arrowdown.png b/minimenu/skin/default/arrowdown.png
index abbdbc0..9b025f7 100644 (file)
Binary files a/minimenu/skin/default/arrowdown.png and b/minimenu/skin/default/arrowdown.png differ

diff --git a/minimenu/skin/default/arrowscroller.png b/minimenu/skin/default/arrowscroller.png
index 8ba9cc2..7546934 100644 (file)
Binary files a/minimenu/skin/default/arrowscroller.png and b/minimenu/skin/default/arrowscroller.png differ

diff --git a/minimenu/skin/default/arrowup.png b/minimenu/skin/default/arrowup.png
index c1616aa..4369f88 100644 (file)
Binary files a/minimenu/skin/default/arrowup.png and b/minimenu/skin/default/arrowup.png differ

diff --git a/minimenu/skin/default/detailpane2.png b/minimenu/skin/default/detailpane2.png
index 97276f0..62e1bb8 100644 (file)
Binary files a/minimenu/skin/default/detailpane2.png and b/minimenu/skin/default/detailpane2.png differ

diff --git a/minimenu/skin/default/detailpanebg.png b/minimenu/skin/default/detailpanebg.png
index 9c177bd..b6b5ce2 100644 (file)
Binary files a/minimenu/skin/default/detailpanebg.png and b/minimenu/skin/default/detailpanebg.png differ

diff --git a/minimenu/skin/default/hilite.png b/minimenu/skin/default/hilite.png
index e4675d8..b6dca90 100644 (file)
Binary files a/minimenu/skin/default/hilite.png and b/minimenu/skin/default/hilite.png differ

diff --git a/minimenu/skin/default/hourglass.png b/minimenu/skin/default/hourglass.png
index 142807a..4a22d40 100644 (file)
Binary files a/minimenu/skin/default/hourglass.png and b/minimenu/skin/default/hourglass.png differ

diff --git a/minimenu/skin/default/mmskin.conf b/minimenu/skin/default/mmskin.conf
index 796f465..a516f2e 100644 (file)
--- a/minimenu/skin/default/mmskin.conf
+++ b/minimenu/skin/default/mmskin.conf
@@ -3,7 +3,8 @@
 # mmskin.conf -- defines the art filenames, artwork positioning and other skin-related parameters.
 # Everything user-configurable should be in mmenu.conf, so they can switch skins without breaking their
 # functionality.
-#
+# preview pic can be overrided: filename is _pvw#0.png ("0" is the subapp number within the pnd, same as for .ovr file)
+
 
 [minimenu]
 font                   Vera.ttf
@@ -11,17 +12,17 @@ font_ptsize         24
 
 [display]
 detail_bg_alpha                100     # when rendering the detail panel background, how transparent?
-font_rgba_r            220     # RGBA for the display text
-font_rgba_g            220     # RGBA for the display text
-font_rgba_b            220     # RGBA for the display text
+font_rgba_r            200     # RGBA for the display text
+font_rgba_g            200     # RGBA for the display text
+font_rgba_b            255     # RGBA for the display text
 font_rgba_a            20      # RGBA for the display text
-battery_x              10      # (x,y) for battery level
-battery_y              450     # (x,y) for battery level
+battery_x              11      # (x,y) for battery level
+battery_y              451     # (x,y) for battery level
 hintline               Push SELECT for options # shown at bottom of screen
-hint_x                 300     # (x,y) for hint line
-hint_y                 450     # (x,y) for hint line
+hint_x                 327     # (x,y) for hint line
+hint_y                 451     # (x,y) for hint line
 clock_x                        650     # (x,y) for clock
-clock_y                        450     # (x,y) for clock
+clock_y                        451     # (x,y) for clock
 
 [tabs]
 font                   Vera.ttf
@@ -59,11 +60,11 @@ arrow_up_x          450     # left edge of up-arrow showing more icons scrolled away
 arrow_up_y             80      # top edge of up-arrow showing more icons scrolled away
 arrow_down_x           450     # left edge of down-arrow showing more icons scrolled away
 arrow_down_y           380     # top edge of down-arrow showing more icons scrolled away
-arrow_bar_x            455     # left edge of scrollbar
-arrow_bar_y            100     # top edge of scrollbar
-arrow_bar_clip_w       10      # clip scrollbar artwork to width-X
-arrow_bar_clip_h       274     # clip scrollbar artwork to height-X
-scale_up_bool          1       # if 0, will not try to scale up icons
+arrow_bar_x            450     # left edge of scrollbar
+arrow_bar_y            98      # top edge of scrollbar
+arrow_bar_clip_w       15      # clip scrollbar artwork to width-X
+arrow_bar_clip_h       281     # clip scrollbar artwork to height-X
+scale_up_bool          0       # if 0, will not try to scale up icons
 
 [detailpane]
 show                   1       # if 0, don't show detail pane artwork at all
@@ -74,15 +75,15 @@ pane_offset_y               60      # top edge of detail pane graphic
 font                   Vera.ttf
 font_ptsize            16
 cell_offset_x          488     # left edge of text cell
-cell_offset_y          300     # top edge of text cell
+cell_offset_y          292     # top edge of text cell
 cell_width             250     # width of cell (for text clipping)
 
 [previewpic]
-cell_offset_x          480     # left edge of text cell
-cell_offset_y          90      # top edge of text cell
+cell_offset_x          482     # left edge of text cell
+cell_offset_y          67      # top edge of text cell
 cell_width             285
 cell_height            180
-scale_up_bool          1       # if 0, will not try to scale up preview
+scale_up_bool          0       # if 0, will not try to scale up preview
 
 [graphics]
 IMG_BACKGROUND_800480    800480_6.png
@@ -91,20 +92,20 @@ IMG_DETAIL_PANEL         detailpane2.png
 IMG_DETAIL_BG            detailpanebg.png
 IMG_SELECTED_ALPHAMASK   select.png
 IMG_SELECTED_HILITE     hilite.png
-IMG_TAB_SEL              tab_sel_tall.png      # tab to be used, when not far left/right
-IMG_TAB_SEL_L            tab_sel_tall.png      # tab to be used for far left tab, selected
-IMG_TAB_SEL_R            tab_sel_tall.png      # tab to be used for far right tab, selected
-IMG_TAB_UNSEL            tab_unsel.png         # tab to be used when not far left/right
-IMG_TAB_UNSEL_L          tab_unsel.png # tab to be used for far left tab, unselected
+IMG_TAB_SEL_L            tab_sel_tallL.png     # tab to be used for far left tab, selected
+IMG_TAB_SEL_R            tab_sel_tallR.png     # tab to be used for far right tab, selected
+IMG_TAB_SEL              tab_sel_tall.png
+IMG_TAB_UNSEL            tab_unsel.png
+IMG_TAB_UNSEL_L          tab_unselL.png        # tab to be used for far left tab, unselected
 IMG_TAB_UNSEL_R          tab_unsel.png # tab to be used for far right tab, unselected
 IMG_TAB_LINE            tabline.png    # line under the unselected tab, but not left/right corners
 IMG_TAB_LINEL           tablinel.png   # line under unselected tab on far left
 IMG_TAB_LINER           tabliner.png   # line under unselected tab on far right
 IMG_ICON_MISSING        pandora60.png
-IMG_PREVIEW_MISSING     pandora60.png
+IMG_PREVIEW_MISSING     pandora150.png
 IMG_ARROW_UP            arrowup.png
 IMG_ARROW_DOWN          arrowdown.png
 IMG_ARROW_SCROLLBAR     arrowscroller.png
 IMG_HOURGLASS           hourglass.png
 IMG_FOLDER              /usr/share/icons/gnome/32x32/places/folder.png # in dirbrowser mode
-IMG_EXECBIN             /usr/share/icons/gnome/32x32/categories/applications-other.png # in dirbrowser mode
+IMG_EXECBIN             /usr/share/icons/gnome/32x32/categories/applications-other.png # in dirbrowser mode
\ No newline at end of file

diff --git a/minimenu/skin/perty/pandora150.png b/minimenu/skin/default/pandora150.png
similarity index 100%
rename from minimenu/skin/perty/pandora150.png
rename to minimenu/skin/default/pandora150.png

diff --git a/minimenu/skin/default/pandora60.png b/minimenu/skin/default/pandora60.png
index f3aa263..04087df 100644 (file)
Binary files a/minimenu/skin/default/pandora60.png and b/minimenu/skin/default/pandora60.png differ

diff --git a/minimenu/skin/default/select.png b/minimenu/skin/default/select.png
index 60eec24..bf7c1f2 100644 (file)
Binary files a/minimenu/skin/default/select.png and b/minimenu/skin/default/select.png differ

diff --git a/minimenu/skin/default/tab1mask.png b/minimenu/skin/default/tab1mask.png
index 2aace85..afd35f7 100644 (file)
Binary files a/minimenu/skin/default/tab1mask.png and b/minimenu/skin/default/tab1mask.png differ

diff --git a/minimenu/skin/default/tab_sel_tall.png b/minimenu/skin/default/tab_sel_tall.png
index 189791e..70643f8 100644 (file)
Binary files a/minimenu/skin/default/tab_sel_tall.png and b/minimenu/skin/default/tab_sel_tall.png differ

diff --git a/minimenu/skin/perty/tab_sel_tallL.png b/minimenu/skin/default/tab_sel_tallL.png
similarity index 100%
rename from minimenu/skin/perty/tab_sel_tallL.png
rename to minimenu/skin/default/tab_sel_tallL.png

diff --git a/minimenu/skin/perty/tab_sel_tallR.png b/minimenu/skin/default/tab_sel_tallR.png
similarity index 100%
rename from minimenu/skin/perty/tab_sel_tallR.png
rename to minimenu/skin/default/tab_sel_tallR.png

diff --git a/minimenu/skin/default/tab_unsel.png b/minimenu/skin/default/tab_unsel.png
index e79b201..5f64c42 100644 (file)
Binary files a/minimenu/skin/default/tab_unsel.png and b/minimenu/skin/default/tab_unsel.png differ

diff --git a/minimenu/skin/perty/tab_unselL.png b/minimenu/skin/default/tab_unselL.png
similarity index 100%
rename from minimenu/skin/perty/tab_unselL.png
rename to minimenu/skin/default/tab_unselL.png

diff --git a/minimenu/skin/default/tabline.png b/minimenu/skin/default/tabline.png
index 7504dad..637979c 100644 (file)
Binary files a/minimenu/skin/default/tabline.png and b/minimenu/skin/default/tabline.png differ

diff --git a/minimenu/skin/default/tablinel.png b/minimenu/skin/default/tablinel.png
index 6309273..5139d4d 100644 (file)
Binary files a/minimenu/skin/default/tablinel.png and b/minimenu/skin/default/tablinel.png differ

diff --git a/minimenu/skin/default/tabliner.png b/minimenu/skin/default/tabliner.png
index 4bb5329..8b50b42 100644 (file)
Binary files a/minimenu/skin/default/tabliner.png and b/minimenu/skin/default/tabliner.png differ

diff --git a/minimenu/skin/default/800480_5.png b/minimenu/skin/perty/800480_5.png
similarity index 100%
rename from minimenu/skin/default/800480_5.png
rename to minimenu/skin/perty/800480_5.png

diff --git a/minimenu/skin/perty/arrowdown.png b/minimenu/skin/perty/arrowdown.png
index 9b025f7..abbdbc0 100644 (file)
Binary files a/minimenu/skin/perty/arrowdown.png and b/minimenu/skin/perty/arrowdown.png differ

diff --git a/minimenu/skin/perty/arrowscroller.png b/minimenu/skin/perty/arrowscroller.png
index 7546934..8ba9cc2 100644 (file)
Binary files a/minimenu/skin/perty/arrowscroller.png and b/minimenu/skin/perty/arrowscroller.png differ

diff --git a/minimenu/skin/perty/arrowup.png b/minimenu/skin/perty/arrowup.png
index 4369f88..c1616aa 100644 (file)
Binary files a/minimenu/skin/perty/arrowup.png and b/minimenu/skin/perty/arrowup.png differ

diff --git a/minimenu/skin/default/detailpane.png b/minimenu/skin/perty/detailpane.png
similarity index 100%
rename from minimenu/skin/default/detailpane.png
rename to minimenu/skin/perty/detailpane.png

diff --git a/minimenu/skin/perty/detailpane2.png b/minimenu/skin/perty/detailpane2.png
index 62e1bb8..97276f0 100644 (file)
Binary files a/minimenu/skin/perty/detailpane2.png and b/minimenu/skin/perty/detailpane2.png differ

diff --git a/minimenu/skin/perty/detailpanebg.png b/minimenu/skin/perty/detailpanebg.png
index b6b5ce2..9c177bd 100644 (file)
Binary files a/minimenu/skin/perty/detailpanebg.png and b/minimenu/skin/perty/detailpanebg.png differ

diff --git a/minimenu/skin/perty/hilite.png b/minimenu/skin/perty/hilite.png
index b6dca90..e4675d8 100644 (file)
Binary files a/minimenu/skin/perty/hilite.png and b/minimenu/skin/perty/hilite.png differ

diff --git a/minimenu/skin/perty/hourglass.png b/minimenu/skin/perty/hourglass.png
index 4a22d40..142807a 100644 (file)
Binary files a/minimenu/skin/perty/hourglass.png and b/minimenu/skin/perty/hourglass.png differ

diff --git a/minimenu/skin/perty/mmskin.conf b/minimenu/skin/perty/mmskin.conf
index a516f2e..796f465 100644 (file)
--- a/minimenu/skin/perty/mmskin.conf
+++ b/minimenu/skin/perty/mmskin.conf
@@ -3,8 +3,7 @@
 # mmskin.conf -- defines the art filenames, artwork positioning and other skin-related parameters.
 # Everything user-configurable should be in mmenu.conf, so they can switch skins without breaking their
 # functionality.
-# preview pic can be overrided: filename is _pvw#0.png ("0" is the subapp number within the pnd, same as for .ovr file)
-
+#
 
 [minimenu]
 font                   Vera.ttf
@@ -12,17 +11,17 @@ font_ptsize         24
 
 [display]
 detail_bg_alpha                100     # when rendering the detail panel background, how transparent?
-font_rgba_r            200     # RGBA for the display text
-font_rgba_g            200     # RGBA for the display text
-font_rgba_b            255     # RGBA for the display text
+font_rgba_r            220     # RGBA for the display text
+font_rgba_g            220     # RGBA for the display text
+font_rgba_b            220     # RGBA for the display text
 font_rgba_a            20      # RGBA for the display text
-battery_x              11      # (x,y) for battery level
-battery_y              451     # (x,y) for battery level
+battery_x              10      # (x,y) for battery level
+battery_y              450     # (x,y) for battery level
 hintline               Push SELECT for options # shown at bottom of screen
-hint_x                 327     # (x,y) for hint line
-hint_y                 451     # (x,y) for hint line
+hint_x                 300     # (x,y) for hint line
+hint_y                 450     # (x,y) for hint line
 clock_x                        650     # (x,y) for clock
-clock_y                        451     # (x,y) for clock
+clock_y                        450     # (x,y) for clock
 
 [tabs]
 font                   Vera.ttf
@@ -60,11 +59,11 @@ arrow_up_x          450     # left edge of up-arrow showing more icons scrolled away
 arrow_up_y             80      # top edge of up-arrow showing more icons scrolled away
 arrow_down_x           450     # left edge of down-arrow showing more icons scrolled away
 arrow_down_y           380     # top edge of down-arrow showing more icons scrolled away
-arrow_bar_x            450     # left edge of scrollbar
-arrow_bar_y            98      # top edge of scrollbar
-arrow_bar_clip_w       15      # clip scrollbar artwork to width-X
-arrow_bar_clip_h       281     # clip scrollbar artwork to height-X
-scale_up_bool          0       # if 0, will not try to scale up icons
+arrow_bar_x            455     # left edge of scrollbar
+arrow_bar_y            100     # top edge of scrollbar
+arrow_bar_clip_w       10      # clip scrollbar artwork to width-X
+arrow_bar_clip_h       274     # clip scrollbar artwork to height-X
+scale_up_bool          1       # if 0, will not try to scale up icons
 
 [detailpane]
 show                   1       # if 0, don't show detail pane artwork at all
@@ -75,15 +74,15 @@ pane_offset_y               60      # top edge of detail pane graphic
 font                   Vera.ttf
 font_ptsize            16
 cell_offset_x          488     # left edge of text cell
-cell_offset_y          292     # top edge of text cell
+cell_offset_y          300     # top edge of text cell
 cell_width             250     # width of cell (for text clipping)
 
 [previewpic]
-cell_offset_x          482     # left edge of text cell
-cell_offset_y          67      # top edge of text cell
+cell_offset_x          480     # left edge of text cell
+cell_offset_y          90      # top edge of text cell
 cell_width             285
 cell_height            180
-scale_up_bool          0       # if 0, will not try to scale up preview
+scale_up_bool          1       # if 0, will not try to scale up preview
 
 [graphics]
 IMG_BACKGROUND_800480    800480_6.png
@@ -92,20 +91,20 @@ IMG_DETAIL_PANEL         detailpane2.png
 IMG_DETAIL_BG            detailpanebg.png
 IMG_SELECTED_ALPHAMASK   select.png
 IMG_SELECTED_HILITE     hilite.png
-IMG_TAB_SEL_L            tab_sel_tallL.png     # tab to be used for far left tab, selected
-IMG_TAB_SEL_R            tab_sel_tallR.png     # tab to be used for far right tab, selected
-IMG_TAB_SEL              tab_sel_tall.png
-IMG_TAB_UNSEL            tab_unsel.png
-IMG_TAB_UNSEL_L          tab_unselL.png        # tab to be used for far left tab, unselected
+IMG_TAB_SEL              tab_sel_tall.png      # tab to be used, when not far left/right
+IMG_TAB_SEL_L            tab_sel_tall.png      # tab to be used for far left tab, selected
+IMG_TAB_SEL_R            tab_sel_tall.png      # tab to be used for far right tab, selected
+IMG_TAB_UNSEL            tab_unsel.png         # tab to be used when not far left/right
+IMG_TAB_UNSEL_L          tab_unsel.png # tab to be used for far left tab, unselected
 IMG_TAB_UNSEL_R          tab_unsel.png # tab to be used for far right tab, unselected
 IMG_TAB_LINE            tabline.png    # line under the unselected tab, but not left/right corners
 IMG_TAB_LINEL           tablinel.png   # line under unselected tab on far left
 IMG_TAB_LINER           tabliner.png   # line under unselected tab on far right
 IMG_ICON_MISSING        pandora60.png
-IMG_PREVIEW_MISSING     pandora150.png
+IMG_PREVIEW_MISSING     pandora60.png
 IMG_ARROW_UP            arrowup.png
 IMG_ARROW_DOWN          arrowdown.png
 IMG_ARROW_SCROLLBAR     arrowscroller.png
 IMG_HOURGLASS           hourglass.png
 IMG_FOLDER              /usr/share/icons/gnome/32x32/places/folder.png # in dirbrowser mode
-IMG_EXECBIN             /usr/share/icons/gnome/32x32/categories/applications-other.png # in dirbrowser mode
\ No newline at end of file
+IMG_EXECBIN             /usr/share/icons/gnome/32x32/categories/applications-other.png # in dirbrowser mode

diff --git a/minimenu/skin/perty/pandora60.png b/minimenu/skin/perty/pandora60.png
index 04087df..f3aa263 100644 (file)
Binary files a/minimenu/skin/perty/pandora60.png and b/minimenu/skin/perty/pandora60.png differ

diff --git a/minimenu/skin/perty/select.png b/minimenu/skin/perty/select.png
index bf7c1f2..60eec24 100644 (file)
Binary files a/minimenu/skin/perty/select.png and b/minimenu/skin/perty/select.png differ

diff --git a/minimenu/skin/perty/tab1mask.png b/minimenu/skin/perty/tab1mask.png
index afd35f7..2aace85 100644 (file)
Binary files a/minimenu/skin/perty/tab1mask.png and b/minimenu/skin/perty/tab1mask.png differ

diff --git a/minimenu/skin/default/tab_sel.png b/minimenu/skin/perty/tab_sel.png
similarity index 100%
rename from minimenu/skin/default/tab_sel.png
rename to minimenu/skin/perty/tab_sel.png

diff --git a/minimenu/skin/perty/tab_sel_tall.png b/minimenu/skin/perty/tab_sel_tall.png
index 70643f8..189791e 100644 (file)
Binary files a/minimenu/skin/perty/tab_sel_tall.png and b/minimenu/skin/perty/tab_sel_tall.png differ

diff --git a/minimenu/skin/perty/tab_unsel.png b/minimenu/skin/perty/tab_unsel.png
index 5f64c42..e79b201 100644 (file)
Binary files a/minimenu/skin/perty/tab_unsel.png and b/minimenu/skin/perty/tab_unsel.png differ

diff --git a/minimenu/skin/perty/tabline.png b/minimenu/skin/perty/tabline.png
index 637979c..7504dad 100644 (file)
Binary files a/minimenu/skin/perty/tabline.png and b/minimenu/skin/perty/tabline.png differ

diff --git a/minimenu/skin/perty/tablinel.png b/minimenu/skin/perty/tablinel.png
index 5139d4d..6309273 100644 (file)
Binary files a/minimenu/skin/perty/tablinel.png and b/minimenu/skin/perty/tablinel.png differ

diff --git a/minimenu/skin/perty/tabliner.png b/minimenu/skin/perty/tabliner.png
index 8b50b42..4bb5329 100644 (file)
Binary files a/minimenu/skin/perty/tabliner.png and b/minimenu/skin/perty/tabliner.png differ

diff --git a/minimenu/skin/default/ttf-bitstream-vera-1.10.tar.bz2 b/minimenu/skin/perty/ttf-bitstream-vera-1.10.tar.bz2
similarity index 100%
rename from minimenu/skin/default/ttf-bitstream-vera-1.10.tar.bz2
rename to minimenu/skin/perty/ttf-bitstream-vera-1.10.tar.bz2