Merge commit 'tadi/master'cvs-commit-348

Conflicts:

	tools.cpp

9 files changed, 57 insertions, 6 deletions

diff --git a/css/styles.css b/css/styles.css
index c6a9854..8e208a1 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -219,18 +219,17 @@ a:active {
 }
 
 
+/* ######################
+   # Style for negative notification popup
+   ######################
+*/
+
 .err-info {
 	margin: 0px auto;
  	max-width: 480px; /* depends on the tip backround image width */
  	color: #fff;
 }
 
-
-/* ######################
-   # Style for negative notification popup
-   ######################
-*/
-
 .err-info .err-info-top .err-info-c,
 .err-info .err-info-bot .err-info-c {
 	font-size: 1px; /* ensure minimum height */
diff --git a/live/img/rounded-box-redwine-bl.png b/live/img/rounded-box-redwine-bl.png
new file mode 100644
index 0000000..14b1256
--- /dev/null
+++ b/live/img/rounded-box-redwine-bl.png
diff --git a/live/img/rounded-box-redwine-br.png b/live/img/rounded-box-redwine-br.png
new file mode 100644
index 0000000..82a4f73
--- /dev/null
+++ b/live/img/rounded-box-redwine-br.png
diff --git a/live/img/rounded-box-redwine-ml.png b/live/img/rounded-box-redwine-ml.png
new file mode 100644
index 0000000..94b237c
--- /dev/null
+++ b/live/img/rounded-box-redwine-ml.png
diff --git a/live/img/rounded-box-redwine-mr.png b/live/img/rounded-box-redwine-mr.png
new file mode 100644
index 0000000..bba05ab
--- /dev/null
+++ b/live/img/rounded-box-redwine-mr.png
diff --git a/live/img/rounded-box-redwine-tl.png b/live/img/rounded-box-redwine-tl.png
new file mode 100644
index 0000000..9b58d9d
--- /dev/null
+++ b/live/img/rounded-box-redwine-tl.png
diff --git a/live/img/rounded-box-redwine-tr.png b/live/img/rounded-box-redwine-tr.png
new file mode 100644
index 0000000..168ad55
--- /dev/null
+++ b/live/img/rounded-box-redwine-tr.png
diff --git a/live/themes/redwine/css/theme.css b/live/themes/redwine/css/theme.css
index ee8e776..4a3f033 100644
--- a/live/themes/redwine/css/theme.css
+++ b/live/themes/redwine/css/theme.css
@@ -11,6 +11,40 @@ select {
 	border: 1px solid #963B5F;
 }
 
+/* ######################
+   # Tooltip style for hints
+   ######################
+*/
+
+.hint-tip {
+	color: white;
+}
+
+.hint-tip .hint-tip-top {
+	background: transparent url(/img/rounded-box-redwine-tl.png) no-repeat 0px 0px;
+}
+
+.hint-tip .hint-tip-top .hint-tip-c {
+	background: transparent url(/img/rounded-box-redwine-tr.png) no-repeat right 0px;
+}
+
+.hint-tip .hint-tip-bdy {
+	background: transparent url(/img/rounded-box-redwine-ml.png) repeat-y 0px 0px;
+}
+
+.hint-tip .hint-tip-bdy .hint-tip-c {
+	background: transparent url(/img/rounded-box-redwine-mr.png) repeat-y right 0px;
+}
+
+.hint-tip .hint-tip-bot {
+	background: transparent url(/img/rounded-box-redwine-bl.png) no-repeat 0px 0px;
+}
+
+.hint-tip .hint-tip-bot .hint-tip-c {
+	background: transparent url(/img/rounded-box-redwine-br.png) no-repeat right 0px;
+}
+
+
 /* ##############################
    # Tooltip style for epg infos
    ##############################
diff --git a/tools.cpp b/tools.cpp
index cca1b9d..8053c3d 100644
--- a/tools.cpp
+++ b/tools.cpp
@@ -17,6 +17,7 @@ using namespace tnt;
 
 istream& operator>>( istream& is, tChannelID& ret )
 {
+  /* alternativ implementation
   string line;
   if ( !getline( is, line ) ) {    
     if ( !is.eof() )
@@ -28,6 +29,23 @@ istream& operator>>( istream& is, tChannelID& ret )
   if ( !line.empty() && !( ret = tChannelID::FromString( line.c_str() ) ).Valid() )
     is.setstate( ios::badbit );
   return is;
+  */
+
+  string line;
+  if (!getline( is, line ) ) {
+    if (0 == is.gcount()) {
+      is.clear(is.rdstate() & ~ios::failbit);
+      return is;
+    }
+    if (!is.eof()) {
+      is.setstate( ios::badbit );
+      return is;
+    }
+  }
+  
+  if ( !line.empty() && !( ret = tChannelID::FromString( line.c_str() ) ).Valid() )
+    is.setstate( ios::badbit );
+  return is;
 }
 
 namespace vdrlive {