From d7c50585bded4f1b1039347b24b136ee9d4a4fb2 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sat, 31 Mar 2007 11:35:37 +0000 Subject: - [MB] fixed table design searchtimers - [MB] replaced normal buttons in remote with graphical buttons - [MB] added power button in remote --- css/styles.css | 101 +++++++++++++++++++++++++++++++++------- images/Makefile | 16 ++++--- images/remote_button_blue.png | Bin 0 -> 620 bytes images/remote_button_green.png | Bin 0 -> 620 bytes images/remote_button_grey.png | Bin 0 -> 650 bytes images/remote_button_red.png | Bin 0 -> 624 bytes images/remote_button_yellow.png | Bin 0 -> 631 bytes pages/remote.ecpp | 63 ++++++++++++++----------- pages/searchtimers.ecpp | 25 ++++++---- 9 files changed, 145 insertions(+), 60 deletions(-) create mode 100644 images/remote_button_blue.png create mode 100644 images/remote_button_green.png create mode 100644 images/remote_button_grey.png create mode 100644 images/remote_button_red.png create mode 100644 images/remote_button_yellow.png diff --git a/css/styles.css b/css/styles.css index 3cbee62..5875838 100644 --- a/css/styles.css +++ b/css/styles.css @@ -554,33 +554,100 @@ div.recording_item { ############################## */ -table.keypad { - margin-top: 10px; - border: 1px solid #6D96A9; +div.screenshot { + float: left; + margin-right: 20px; } -table.keypad tr td.button button { - width: 4em; +button.redbutton { + width: 36px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_red.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + +button.greenbutton { + width: 36px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_green.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + +button.yellowbutton { + width: 36px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_yellow.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + +button.bluebutton { + width: 36px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_blue.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; +} + + +button.greybutton { + width: 51px; + height: 17px; + background-color: inherit; + background-image: url(remote_button_grey.png); + background-repeat: no-repeat; + color: #FFFFFF; + font-size: 11px; + border: 0px; + vertical-align: middle; + text-align: center; + cursor: pointer; } -table.keypad tr td.redbutton button { - width: 3em; - background-color: #FF0000; +table.keypad { + border: 1px solid #6D96A9; +} + +table.keypad td.button { + text-align: center; } -table.keypad tr td.greenbutton button { - width: 3em; - background-color: #00FF00; +table.keypad tr td.button button { + padding: 0; } -table.keypad tr td.yellowbutton button { - width: 3em; - background-color: #FFFF00; +table.colorbutton { + width: 100%; } -table.keypad tr td.bluebutton button { - width: 3em; - background-color: #0000FF; +table.colorbutton td.colorbutton { + text-align: center; } /* diff --git a/images/Makefile b/images/Makefile index 8dbe8ce..25ad105 100644 --- a/images/Makefile +++ b/images/Makefile @@ -15,13 +15,15 @@ VDRDIR ?= ../../../.. ### The object files (add further files here): OBJS = logo.o record.o active.o inactive.o button_blue.o \ - file.o folder_closed.o folder_open.o plus.o minus.o \ - transparent.o edit.o del.o play.o close.o \ - bg_header_h.o bg_header_l.o bg_header_r.o \ - bg_box_h.o bg_box_l.o bg_box_r.o \ - movie.o menu_line_bg.o bg_line.o bg_tools.o \ - zap.o favicon.o bg_line_top.o reload.o stop.o \ - one_uparrow.o one_downarrow.o + remote_button_yellow.o remote_button_green.o \ + remote_button_red.o remote_button_grey.o \ + remote_button_blue.o file.o folder_closed.o \ + folder_open.o plus.o minus.o transparent.o \ + edit.o del.o play.o close.o bg_header_h.o \ + bg_header_l.o bg_header_r.o bg_box_h.o bg_box_l.o \ + bg_box_r.o movie.o menu_line_bg.o bg_line.o \ + bg_tools.o zap.o favicon.o bg_line_top.o reload.o \ + stop.o one_uparrow.o one_downarrow.o \ ### Default rules: diff --git a/images/remote_button_blue.png b/images/remote_button_blue.png new file mode 100644 index 0000000..72fd603 Binary files /dev/null and b/images/remote_button_blue.png differ diff --git a/images/remote_button_green.png b/images/remote_button_green.png new file mode 100644 index 0000000..232ea94 Binary files /dev/null and b/images/remote_button_green.png differ diff --git a/images/remote_button_grey.png b/images/remote_button_grey.png new file mode 100644 index 0000000..5175c2a Binary files /dev/null and b/images/remote_button_grey.png differ diff --git a/images/remote_button_red.png b/images/remote_button_red.png new file mode 100644 index 0000000..511a230 Binary files /dev/null and b/images/remote_button_red.png differ diff --git a/images/remote_button_yellow.png b/images/remote_button_yellow.png new file mode 100644 index 0000000..d4031c3 Binary files /dev/null and b/images/remote_button_yellow.png differ diff --git a/pages/remote.ecpp b/pages/remote.ecpp index 16033ff..5c7a37d 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -74,41 +74,52 @@ using namespace vdrlive; - - - + + + + + + + + + + - - - + + + - - - + + + - + - + - + -
  
 
   
 
 
- + + + + + @@ -118,32 +129,32 @@ using namespace vdrlive; - + - - - + + + - + - - - + + +
 
+ - - - - + + + +
   
 
 
   
 
diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp index 1915cd2..fa40f14 100644 --- a/pages/searchtimers.ecpp +++ b/pages/searchtimers.ecpp @@ -28,21 +28,24 @@ using namespace vdrlive; Keiner Suchtimer definiert % } else { - - - - - - - - - + + + + + + + + + + + <{ bool active = false; for (SearchTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { }> "> + @@ -51,14 +54,16 @@ using namespace vdrlive; + <{ active = !active; } } }> +
 <$ tr("Active") $><$ tr("Expression") $><$ tr("Channel") $><$ tr("Start") $><$ tr("Stop") $>  
 <$ tr("Active") $><$ tr("Expression") $><$ tr("Channel") $><$ tr("Start") $><$ tr("Stop") $>  
.png" alt="Aktiv?" /> <$ timer->Search() $>UseTime() ? timer->StopTime() ?>    
 
-<%include>page_exit.eh +<%include>page_exit.eh \ No newline at end of file -- cgit v1.2.3