diff --git a/modules/slideshow/slideshow.py b/modules/slideshow/slideshow.py
index 010c782..fee4bbd 100644
--- a/modules/slideshow/slideshow.py
+++ b/modules/slideshow/slideshow.py
@@ -458,13 +458,19 @@ class Module:
tempItem = tempMenu.addItem(directoryEntry)
- #Start experimental schtuff
+ #Start experimental schtuff (MESSY!!!)
img_list = os.listdir(subdir)
- img_list = self.os_listdir_recursive(subdir, showHidden = False)
+ img_list_temp = []
+ for img in img_list:
+ img = subdir + "/" + img
+ img_list_temp.append(img)
+ img_list = img_list_temp
+ img_list.extend(self.os_listdir_recursive(subdir, showHidden = False))
#Attempt to get the thumbnail images
#print img_list
+
img_list_preview = filter(self.filterPreviewImageFile, img_list)
- if len(img_list_preview) == 0:
+ if len(img_list_preview) > 0:
img_list = img_list_preview
#If not, just use the full images
else:
@@ -474,13 +480,18 @@ class Module:
#Set the max preview img sizes (These come from the slideshow.xml theme file
if (not self.preview_width is None) and (not self.preview_height is None):
img_previewer.set_max_img_dimensions(self.preview_width, self.preview_height)
-
+
+ preview_count = 0
for img in img_list:
- imgPath = subdir + "/" + img #os.listdir(subdir)[0]
+ #imgPath = subdir + "/" + img #os.listdir(subdir)[0]
imgPath = img
- print imgPath
- img_previewer.add_texture(imgPath)
#print imgPath
+
+ #Only add a max of 15 images to the previewer
+ if preview_count < 15:
+ img_previewer.add_texture(imgPath)
+ preview_count += 1
+
#new_file_list = os.listdir(dirPath)
if tempMenu.usePreviewEffects:
tempItem.itemTexturesGroup = img_previewer
diff --git a/themes/Mich/down.png b/themes/Mich/down.png
new file mode 100755
index 0000000..1c3c00c
Binary files /dev/null and b/themes/Mich/down.png differ
diff --git a/themes/Mich/music.xml b/themes/Mich/music.xml
index 23c13ab..fe60d27 100644
--- a/themes/Mich/music.xml
+++ b/themes/Mich/music.xml
@@ -11,7 +11,102 @@
+
+
+ Tahoma
+ 30
+ 38
+ 30
+ 25
+
+
+
+ 40%
+ 40%
+
+
+ 40%
+ 50%
+
+
+
+ 1.00
+
+
+ 255
+ 135
+ 135
+ 0.9
+ 0.8
+ 0.8
+
+ 30
+ 10
+
+
+
+
+
+
+ Tahoma
+ 30
+ 38
+ 30
+ 25
+
+
+
+ 40%
+ 40%
+
+
+ 70%
+ 50%
+
+
+
+ 1.00
+
+
+ 255
+ 135
+ 135
+ 0.9
+ 0.8
+ 0.8
+
+ 30
+ 10
+
+
+
music/default_cover.png
+
+ music/default_cover.png
+
+
+
+ None
+ True
+
+
+
+ 25%
+ 25%
+
+
+ 10%
+ 40%
+
+
diff --git a/themes/Mich/music/songlist_off.png b/themes/Mich/music/songlist_off.png
new file mode 100644
index 0000000..856f8b0
Binary files /dev/null and b/themes/Mich/music/songlist_off.png differ
diff --git a/themes/Mich/music_play_screen.xml b/themes/Mich/music_play_screen.xml
new file mode 100644
index 0000000..7d56cf1
--- /dev/null
+++ b/themes/Mich/music_play_screen.xml
@@ -0,0 +1,95 @@
+
+
+
+
+ Tahoma
+ 30
+ 38
+ 30
+ 25
+
+
+
+ 40%
+ 40%
+
+
+ 50%
+ 25%
+
+
+
+ 1.00
+
+
+ 255
+ 135
+ 135
+ 1
+ 1
+ 1
+
+ 30
+ 10
+
+
+ music/songlist_off.png
+
+ 100%
+ 100%
+
+
+ 0
+ 0
+
+
+
+
+ up.png
+
+ 3%
+ 3%
+
+
+ 0
+ 0
+
+
+
+
+ down.png
+
+ 3%
+ 3%
+
+
+ 0
+ 0
+
+
+ music/songlist_off.png
+
+
+
+
+
+
+ None
+ True
+
+
+
+ 30%
+ 30%
+
+
+ 10%
+ 35%
+
+
+
+
diff --git a/themes/Mich/up.png b/themes/Mich/up.png
new file mode 100755
index 0000000..c6a0454
Binary files /dev/null and b/themes/Mich/up.png differ
diff --git a/themes/default/down.png b/themes/default/down.png
new file mode 100755
index 0000000..1c3c00c
Binary files /dev/null and b/themes/default/down.png differ
diff --git a/themes/default/music.xml b/themes/default/music.xml
index 7fb0ed9..fe60d27 100644
--- a/themes/default/music.xml
+++ b/themes/default/music.xml
@@ -1,9 +1,9 @@
+
+
+ Tahoma
+ 30
+ 38
+ 30
+ 25
+
+
+
+ 40%
+ 40%
+
+
+ 40%
+ 50%
+
+
+
+ 1.00
+
+
+ 255
+ 135
+ 135
+ 0.9
+ 0.8
+ 0.8
+
+ 30
+ 10
+
+
+
+
+
+
+ Tahoma
+ 30
+ 38
+ 30
+ 25
+
+
+
+ 40%
+ 40%
+
+
+ 70%
+ 50%
+
+
+
+ 1.00
+
+
+ 255
+ 135
+ 135
+ 0.9
+ 0.8
+ 0.8
+
+ 30
+ 10
+
+
+
music/default_cover.png
+
+ music/default_cover.png
+
+
+
+ None
+ True
+
+
+
+ 25%
+ 25%
+
+
+ 10%
+ 40%
+
+
diff --git a/themes/default/music/songlist_off.png b/themes/default/music/songlist_off.png
new file mode 100644
index 0000000..856f8b0
Binary files /dev/null and b/themes/default/music/songlist_off.png differ
diff --git a/themes/default/music_play_screen.xml b/themes/default/music_play_screen.xml
new file mode 100644
index 0000000..7d56cf1
--- /dev/null
+++ b/themes/default/music_play_screen.xml
@@ -0,0 +1,95 @@
+
+
+
+
+ Tahoma
+ 30
+ 38
+ 30
+ 25
+
+
+
+ 40%
+ 40%
+
+
+ 50%
+ 25%
+
+
+
+ 1.00
+
+
+ 255
+ 135
+ 135
+ 1
+ 1
+ 1
+
+ 30
+ 10
+
+
+ music/songlist_off.png
+
+ 100%
+ 100%
+
+
+ 0
+ 0
+
+
+
+
+ up.png
+
+ 3%
+ 3%
+
+
+ 0
+ 0
+
+
+
+
+ down.png
+
+ 3%
+ 3%
+
+
+ 0
+ 0
+
+
+ music/songlist_off.png
+
+
+
+
+
+
+ None
+ True
+
+
+
+ 30%
+ 30%
+
+
+ 10%
+ 35%
+
+
+
+
diff --git a/themes/default/up.png b/themes/default/up.png
new file mode 100755
index 0000000..c6a0454
Binary files /dev/null and b/themes/default/up.png differ