diff --git a/configure.ac b/configure.ac index e88e9a594..e9d16fccb 100644 --- a/configure.ac +++ b/configure.ac @@ -310,7 +310,9 @@ data/icons/slider/Makefile data/icons/status/Makefile data/icons/status/ca/Makefile data/icons/status/channel/Makefile +data/icons/status/info/Makefile data/icons/status/markers/Makefile +data/icons/status/progress/Makefile data/icons/status/various/Makefile data/icons/various/Makefile data/inetradio/Makefile diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 73dc7d717..bff4d209b 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -9,38 +9,3 @@ SUBDIRS = \ slider \ status \ various - -#NI -SUBDIRS += screensaver - -installdir = $(ICONSDIR) - -install_DATA = \ - clock_face.png \ - hint_blank_screen.png \ - hint_hdd_info.png \ - hint_iconsPKG0.png \ - hint_iconsPKG1.png \ - hint_iconsPKG2.png \ - hint_iconsPKG3.png \ - hint_imagelogo.png \ - hint_vtxt.png \ - imdb.png \ - progressbar.png \ - progressbar_inactive_passive.png \ - progressbar_passive.png \ - stars.png \ - stars_bg.png \ - volumebar.png \ - volumebar_passive.png - -# NI Infoicons -install_DATA += \ - info0_off.png \ - info0_on.png \ - info1_off.png \ - info1_on.png \ - info2_off.png \ - info2_on.png \ - info3_off.png \ - info3_on.png diff --git a/data/icons/hints/Makefile.am b/data/icons/hints/Makefile.am index 6447b47aa..b64106667 100644 --- a/data/icons/hints/Makefile.am +++ b/data/icons/hints/Makefile.am @@ -7,6 +7,7 @@ install_DATA = \ hint_audio.png \ hint_back.png \ hint_bedit.png \ + hint_blank_screen.png \ hint_ci.png \ hint_dboxinfo.png \ hint_delete.png \ @@ -14,7 +15,13 @@ install_DATA = \ hint_fileplay.png \ hint_games.png \ hint_hdd.png \ + hint_hdd_info.png \ + hint_iconsPKG0.png \ + hint_iconsPKG1.png \ + hint_iconsPKG2.png \ + hint_iconsPKG3.png \ hint_imageinfo.png \ + hint_imagelogo.png \ hint_inetradio.png \ hint_info.png \ hint_keys.png \ @@ -49,4 +56,5 @@ install_DATA = \ hint_tvradio_switch.png \ hint_vfd.png \ hint_video.png \ + hint_vtxt.png \ hint_ytplay.png diff --git a/data/icons/hint_blank_screen.png b/data/icons/hints/hint_blank_screen.png similarity index 100% rename from data/icons/hint_blank_screen.png rename to data/icons/hints/hint_blank_screen.png diff --git a/data/icons/hint_hdd_info.png b/data/icons/hints/hint_hdd_info.png similarity index 100% rename from data/icons/hint_hdd_info.png rename to data/icons/hints/hint_hdd_info.png diff --git a/data/icons/hint_iconsPKG0.png b/data/icons/hints/hint_iconsPKG0.png similarity index 100% rename from data/icons/hint_iconsPKG0.png rename to data/icons/hints/hint_iconsPKG0.png diff --git a/data/icons/hint_iconsPKG1.png b/data/icons/hints/hint_iconsPKG1.png similarity index 100% rename from data/icons/hint_iconsPKG1.png rename to data/icons/hints/hint_iconsPKG1.png diff --git a/data/icons/hint_iconsPKG2.png b/data/icons/hints/hint_iconsPKG2.png similarity index 100% rename from data/icons/hint_iconsPKG2.png rename to data/icons/hints/hint_iconsPKG2.png diff --git a/data/icons/hint_iconsPKG3.png b/data/icons/hints/hint_iconsPKG3.png similarity index 100% rename from data/icons/hint_iconsPKG3.png rename to data/icons/hints/hint_iconsPKG3.png diff --git a/data/icons/hint_imagelogo.png b/data/icons/hints/hint_imagelogo.png similarity index 100% rename from data/icons/hint_imagelogo.png rename to data/icons/hints/hint_imagelogo.png diff --git a/data/icons/hint_lcd4linux.png b/data/icons/hints/hint_lcd4linux.png similarity index 100% rename from data/icons/hint_lcd4linux.png rename to data/icons/hints/hint_lcd4linux.png diff --git a/data/icons/hint_vtxt.png b/data/icons/hints/hint_vtxt.png similarity index 100% rename from data/icons/hint_vtxt.png rename to data/icons/hints/hint_vtxt.png diff --git a/data/icons/screensaver/Makefile.am b/data/icons/screensaver/Makefile.am deleted file mode 100644 index ac90de4f6..000000000 --- a/data/icons/screensaver/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -installdir = $(ICONSDIR)/screensaver - -install_DATA = \ - black.jpg diff --git a/data/icons/status/Makefile.am b/data/icons/status/Makefile.am index c38d951ac..82ae80b82 100644 --- a/data/icons/status/Makefile.am +++ b/data/icons/status/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = \ ca \ channel \ + info \ markers \ + progress \ various diff --git a/data/icons/status/info/Makefile.am b/data/icons/status/info/Makefile.am new file mode 100644 index 000000000..e4a2cb0d4 --- /dev/null +++ b/data/icons/status/info/Makefile.am @@ -0,0 +1,12 @@ +installdir = $(ICONSDIR) + +# NI Infoicons +install_DATA += \ + info0_off.png \ + info0_on.png \ + info1_off.png \ + info1_on.png \ + info2_off.png \ + info2_on.png \ + info3_off.png \ + info3_on.png diff --git a/data/icons/info0_off.png b/data/icons/status/info/info0_off.png similarity index 100% rename from data/icons/info0_off.png rename to data/icons/status/info/info0_off.png diff --git a/data/icons/info0_on.png b/data/icons/status/info/info0_on.png similarity index 100% rename from data/icons/info0_on.png rename to data/icons/status/info/info0_on.png diff --git a/data/icons/info1_off.png b/data/icons/status/info/info1_off.png similarity index 100% rename from data/icons/info1_off.png rename to data/icons/status/info/info1_off.png diff --git a/data/icons/info1_on.png b/data/icons/status/info/info1_on.png similarity index 100% rename from data/icons/info1_on.png rename to data/icons/status/info/info1_on.png diff --git a/data/icons/info2_off.png b/data/icons/status/info/info2_off.png similarity index 100% rename from data/icons/info2_off.png rename to data/icons/status/info/info2_off.png diff --git a/data/icons/info2_on.png b/data/icons/status/info/info2_on.png similarity index 100% rename from data/icons/info2_on.png rename to data/icons/status/info/info2_on.png diff --git a/data/icons/info3_off.png b/data/icons/status/info/info3_off.png similarity index 100% rename from data/icons/info3_off.png rename to data/icons/status/info/info3_off.png diff --git a/data/icons/info3_on.png b/data/icons/status/info/info3_on.png similarity index 100% rename from data/icons/info3_on.png rename to data/icons/status/info/info3_on.png diff --git a/data/icons/status/progress/Makefile.am b/data/icons/status/progress/Makefile.am new file mode 100644 index 000000000..7cbe2b5f1 --- /dev/null +++ b/data/icons/status/progress/Makefile.am @@ -0,0 +1,8 @@ +installdir = $(ICONSDIR) + +install_DATA = \ + progressbar.png \ + progressbar_inactive_passive.png \ + progressbar_passive.png \ + volumebar.png \ + volumebar_passive.png diff --git a/data/icons/progressbar.png b/data/icons/status/progress/progressbar.png similarity index 100% rename from data/icons/progressbar.png rename to data/icons/status/progress/progressbar.png diff --git a/data/icons/progressbar_inactive_passive.png b/data/icons/status/progress/progressbar_inactive_passive.png similarity index 100% rename from data/icons/progressbar_inactive_passive.png rename to data/icons/status/progress/progressbar_inactive_passive.png diff --git a/data/icons/progressbar_passive.png b/data/icons/status/progress/progressbar_passive.png similarity index 100% rename from data/icons/progressbar_passive.png rename to data/icons/status/progress/progressbar_passive.png diff --git a/data/icons/volumebar.png b/data/icons/status/progress/volumebar.png similarity index 100% rename from data/icons/volumebar.png rename to data/icons/status/progress/volumebar.png diff --git a/data/icons/volumebar_passive.png b/data/icons/status/progress/volumebar_passive.png similarity index 100% rename from data/icons/volumebar_passive.png rename to data/icons/status/progress/volumebar_passive.png diff --git a/data/icons/various/Makefile.am b/data/icons/various/Makefile.am index a8accfeff..797e8996f 100644 --- a/data/icons/various/Makefile.am +++ b/data/icons/various/Makefile.am @@ -3,8 +3,12 @@ installdir = $(ICONSDIR) install_DATA = \ border_lr.png \ border_ul.png \ + clock_face.png \ + imdb.png \ numericpad.png \ star-off.png \ star-on.png \ + stars.png \ + stars_bg.png \ tmdb.png \ volume.png diff --git a/data/icons/clock_face.png b/data/icons/various/clock_face.png similarity index 100% rename from data/icons/clock_face.png rename to data/icons/various/clock_face.png diff --git a/data/icons/imdb.png b/data/icons/various/imdb.png similarity index 100% rename from data/icons/imdb.png rename to data/icons/various/imdb.png diff --git a/data/icons/stars.png b/data/icons/various/stars.png similarity index 100% rename from data/icons/stars.png rename to data/icons/various/stars.png diff --git a/data/icons/stars_bg.png b/data/icons/various/stars_bg.png similarity index 100% rename from data/icons/stars_bg.png rename to data/icons/various/stars_bg.png diff --git a/data/icons/screensaver/black.jpg b/data/pictures/screensaver/1280x720/black.jpg similarity index 100% rename from data/icons/screensaver/black.jpg rename to data/pictures/screensaver/1280x720/black.jpg diff --git a/data/pictures/screensaver/1280x720/mp3-0.jpg b/data/pictures/screensaver/1280x720/mp3-0.jpg deleted file mode 100644 index 0bb50cb38..000000000 Binary files a/data/pictures/screensaver/1280x720/mp3-0.jpg and /dev/null differ diff --git a/data/pictures/screensaver/1280x720/mp3-1.jpg b/data/pictures/screensaver/1280x720/mp3-1.jpg deleted file mode 100644 index 6c0294f90..000000000 Binary files a/data/pictures/screensaver/1280x720/mp3-1.jpg and /dev/null differ diff --git a/data/pictures/screensaver/1280x720/mp3-2.jpg b/data/pictures/screensaver/1280x720/mp3-2.jpg deleted file mode 100644 index ab1594883..000000000 Binary files a/data/pictures/screensaver/1280x720/mp3-2.jpg and /dev/null differ diff --git a/data/pictures/screensaver/1280x720/mp3-3.jpg b/data/pictures/screensaver/1280x720/mp3-3.jpg deleted file mode 100644 index eed32fede..000000000 Binary files a/data/pictures/screensaver/1280x720/mp3-3.jpg and /dev/null differ diff --git a/data/pictures/screensaver/1280x720/mp3-4.jpg b/data/pictures/screensaver/1280x720/mp3-4.jpg deleted file mode 100644 index 86ad3a372..000000000 Binary files a/data/pictures/screensaver/1280x720/mp3-4.jpg and /dev/null differ diff --git a/data/pictures/screensaver/1280x720/mp3-5.jpg b/data/pictures/screensaver/1280x720/mp3-5.jpg deleted file mode 100644 index 3fa627a06..000000000 Binary files a/data/pictures/screensaver/1280x720/mp3-5.jpg and /dev/null differ diff --git a/data/pictures/screensaver/1280x720/mp3-6.jpg b/data/pictures/screensaver/1280x720/mp3-6.jpg deleted file mode 100644 index 150aa866d..000000000 Binary files a/data/pictures/screensaver/1280x720/mp3-6.jpg and /dev/null differ diff --git a/data/pictures/screensaver/1280x720/mp3-7.jpg b/data/pictures/screensaver/1280x720/mp3-7.jpg deleted file mode 100644 index c2bd4b5ed..000000000 Binary files a/data/pictures/screensaver/1280x720/mp3-7.jpg and /dev/null differ diff --git a/data/pictures/screensaver/Makefile.am b/data/pictures/screensaver/Makefile.am index 153b2cba5..07b3b90b2 100644 --- a/data/pictures/screensaver/Makefile.am +++ b/data/pictures/screensaver/Makefile.am @@ -1,13 +1,6 @@ -installdir = $(ICONSDIR) +installdir = $(ICONSDIR)/screensaver resolution = 1280x720 install_DATA = \ - $(resolution)/mp3-0.jpg \ - $(resolution)/mp3-1.jpg \ - $(resolution)/mp3-2.jpg \ - $(resolution)/mp3-3.jpg \ - $(resolution)/mp3-4.jpg \ - $(resolution)/mp3-5.jpg \ - $(resolution)/mp3-6.jpg \ - $(resolution)/mp3-7.jpg + $(resolution)/black.jpg