2006-11-10: 3.5.0v3.5.0

- Changed: Don't use "Bitstream Vera Sans" font as default as this looks ugly on Windows (at least for some users).

4 files changed, 35 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 8503359..7a7fd88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2006-11-10  amair
+
+	* HISTORY, vdradmind.pl, po/cs.po, po/fr.po,
+	  template/default/style.css:
+
+	Updated for 3.5.0 release.
+
+2006-11-03  scop
+
+	* vdradmind.pl:
+
+	Trim trailing whitespace.
+
+2006-11-03  scop
+
+	* vdradmind.pl:
+
+	Save config values always in the "C" locale collation order.
+
 2006-11-02  tag v3_5_0rc
 
 2006-11-02  amair
diff --git a/HISTORY b/HISTORY
index ffbc81f..28f5f9e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,9 @@ E-Mail:     mail AT andreas DOT vdr-developer DOT org
 VDR-Portal: amair
 -----------------------------------------------------------
 
+2006-11-10: 3.5.0
+- Changed: Don't use "Bitstream Vera Sans" font as default as this looks ugly on Windows (at least for some users).
+
 2006-11-02: 3.5.0rc
 - Minor bugfixes.
 
diff --git a/template/default/style.css b/template/default/style.css
index da942c5..dc1f2d1 100644
--- a/template/default/style.css
+++ b/template/default/style.css
@@ -13,7 +13,7 @@
 /* END OF ugly MSIE hacks */
 
 * {
-	font-family: Bitstream Vera Sans, Verdana, Arial, Geneva, Helvetica, sans-serif;
+	font-family: Verdana, "Bitstream Vera Sans", Arial, Geneva, Helvetica, sans-serif;
 }
 
 #rc,
diff --git a/vdradmind.pl b/vdradmind.pl
index 0d6c028..c3f6bbe 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -28,7 +28,7 @@
 
 require 5.004;
 
-my $VERSION = "3.5.0rc";
+my $VERSION = "3.5.0";
 my $BASENAME;
 my $EXENAME;
 
@@ -1913,7 +1913,7 @@ sub epgsearch_list {
 
     my @matches;
     my $do_test = $q->param("execute");
-        
+
     if ($do_test) {
         my $id = $q->param("id");
         unless (defined $id) {
@@ -1963,7 +1963,7 @@ sub epgsearch_list {
     }
 
     my $toggle_desc = ($CONFIG{ES_DESC} ? 0 : 1);
-    
+
     my $vars = { usercss          => $UserCSS,
                  url              => $MyURL,
                  sortbypatternurl => "$MyURL?aktion=epgsearch_list&sortby=pattern&desc=" . (($CONFIG{ES_SORTBY} eq "pattern") ? $toggle_desc : $CONFIG{ES_DESC}),
@@ -2164,7 +2164,7 @@ sub EpgSearchQuery {
         chomp;
         next if (length($_) == 0);
         last if(/^no results$/);
-#        Suchtimer-ID : Event-ID : Title : Subtitle : Event-Begin : Event-Ende : 
+#        Suchtimer-ID : Event-ID : Title : Subtitle : Event-Begin : Event-Ende :
 #        Kanalnummer : Timer-Start : Timer-Ende : Timer-File : hat/bekommt Timer
         my ($es_id, $event_id, $title, $subtitle, $estart, $estop, $chan, $tstart, $tstop, $tdir, $has_timer) = split(/:/);
         if ($title) {
@@ -2259,7 +2259,7 @@ sub ExtractEpgSearchConf {
          $timer->{fuzzy_tolerance},  #42 - fuzzy tolerance value for fuzzy searching
          $timer->{use_for_fav},      #43 - use this search in favorites menu (0 no, 1 yes)
          $timer->{unused}) = split(/:/, $_);
-        
+
         #format selected fields
         $timer->{time_start} =~ s/(\d\d)(\d\d)/\1:\2/ if($timer->{time_start});
         $timer->{time_stop} =~ s/(\d\d)(\d\d)/\1:\2/ if($timer->{time_stop});
@@ -3252,7 +3252,7 @@ sub prog_list {
                  }
             );
             $day = strftime("%d", localtime($event->{start}));
-        } 
+        }
         my $imdb_title = $event->{title};
         $imdb_title    =~ s/^.*\~\%*([^\~]*)$/$1/;
         push(@show,
@@ -4723,7 +4723,7 @@ sub prog_summary {
     my $label = $next ? gettext("What's on after") : gettext("What's on at");
     my $vars = { rows    => \@show,
                  now     => $displayed_time,
-                 title   => ($search ? gettext("Suitable matches for:") . " <i>" . $search . "</i>" 
+                 title   => ($search ? gettext("Suitable matches for:") . " <i>" . $search . "</i>"
                                      : $label . " " . strftime("%H:%M", localtime($event_time)) . " " . gettext("o'clock")),
                  switchview_url  => $MyURL . "?aktion=prog_summary&amp;view=" . ($view eq "ext" ? "sml" : "ext") . ($next ? "&amp;next=1" : "") . ($search ? "&amp;search=" . uri_escape($search) : "") . ($time ? "&amp;time=$time" : ""),
                  switchview_text => ($view eq "ext" ? gettext("short view") : gettext("long view")),
@@ -5277,7 +5277,7 @@ sub config {
                 $CONFIG{$_} = $q->param($_);
             }
         }
- 
+
         ValidConfig();
 
         LoadTranslation() if ($old_lang ne $CONFIG{LANG});
@@ -5290,9 +5290,12 @@ sub config {
 
     sub WriteConfig {
         open(CONF, ">$CONFFILE") || print "Can't open $CONFFILE! ($!)\n";
+        my $old_collate = setlocale(LC_COLLATE);
+        setlocale(LC_COLLATE, "C");
         for my $key (sort(keys(%CONFIG))) {
             print CONF "$key = $CONFIG{$key}\n";
         }
+        setlocale(LC_COLLATE, $old_collate);
         close(CONF);
     }
 
@@ -5508,7 +5511,7 @@ sub grab_picture {
     $CONFIG{TV_INTERVAL} = "5" unless($CONFIG{TV_INTERVAL});
     $CONFIG{TV_SIZE}     = $q->param("size")     if($q->param("size"));
     $CONFIG{TV_SIZE}     = "half" unless($CONFIG{TV_SIZE});
- 
+
     my $maxwidth  = 768;
     my $maxheight = 576;
     my ($width, $height);