[xiph-commits] r11836 - in trunk/mgm: . lib modules/share

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2006-09-11 19:49:13 -0700 (Mon, 11 Sep 2006)
New Revision: 11836

Modified:
   trunk/mgm/lib/widget
   trunk/mgm/mgm
   trunk/mgm/modules/share/hostlogo
   trunk/mgm/modules/share/spacer
Log:
Apparently the Tk people have been 'cleaning up' their options code, and a 
number of option names have been 'tightened up'.  Keep MGM up to date with 
current Debian perl-tk



Modified: trunk/mgm/lib/widget
===================================================================
--- trunk/mgm/lib/widget	2006-09-08 09:58:21 UTC (rev 11835)
+++ trunk/mgm/lib/widget	2006-09-12 02:49:13 UTC (rev 11836)
@@ -146,27 +146,27 @@
 
 	$below->configure(-borderwidth=>$aborder,
 			  -background=>$aback,
-			  highlightthickness=>0,
-			  width=>($width-$aborder*2),
-			  height=>($height-$aborder*2),
-			  relief=>$arelief);
+			  -highlightthickness=>0,
+			  -width=>($width-$aborder*2),
+			  -height=>($height-$aborder*2),
+			  -relief=>$arelief);
 	
 	$above->configure(-borderwidth=>0,
 			  -background=>$back,
-			  highlightthickness=>0,
-			  width=>$width,
-			  height=>$height,
-			  relief=>'flat');
+			  -highlightthickness=>0,
+			  -width=>$width,
+			  -height=>$height,
+			  -relief=>'flat');
 	
 	$this->{"reliefhack"}->destroy if(defined($this->{"reliefhack"}));
 	if($aborder){
 	    $this->{"reliefhack"}=$above->
 		Label(-borderwidth=>$aborder,
 		      -background=>$aback,
-		      highlightthickness=>0,
-		      width=>($width-$aborder*2),
-		      height=>4,
-		      relief=>$arelief)->
+		      -highlightthickness=>0,
+		      -width=>($width-$aborder*2),
+		      -height=>4,
+		      -relief=>$arelief)->
 			  place('-x'=>0,-rely=>1.0,'-y'=>-$aborder,
 				-anchor=>'nw',-bordermode=>'outside');
 	}
@@ -191,17 +191,17 @@
 	$this->{"cfborder"}=$aborder;
 	$below->configure(-borderwidth=>0,
 			  -background=>$back,
-			  highlightthickness=>0,
-			  width=>$width,
-			  height=>$height-$border*2,
-			  relief=>'flat');
+			  -highlightthickness=>0,
+			  -width=>$width,
+			  -height=>$height-$border*2,
+			  -relief=>'flat');
 	
 	$above->configure(-borderwidth=>$aborder,
 			  -background=>$aback,
-			  highlightthickness=>0,
-			  width=>($width-2*$aborder),
-			  height=>($height-2*$aborder),
-			  relief=>$arelief);
+			  -highlightthickness=>0,
+			  -width=>($width-2*$aborder),
+			  -height=>($height-2*$aborder),
+			  -relief=>$arelief);
 	
 	$above->createImage($pad,$height-$pad,-image=>$littext,-anchor=>'sw',
 			    -tags=>['xpmlabel']);
@@ -332,10 +332,10 @@
 	if($orient eq 'vertical'){
 	    $label=$p->{"widget"}->Canvas(Name=>'scalerange',
 					  -borderwidth=>0,
-					  highlightthickness=>0,
-					  width=>$textw,
-					  height=>$textl,
-					  relief=>'flat')->
+					  -highlightthickness=>0,
+					  -width=>$textw,
+					  -height=>$textl,
+					  -relief=>'flat')->
 					      place('-x'=>0,'-y'=>2,-anchor=>'nw');
 	    $label->createImage(0,0,
 				-image=>$prompts{"$mult$prompt"},-anchor=>'nw');
@@ -344,10 +344,10 @@
 	}else{
 	    $label=$p->{"widget"}->Canvas(Name=>'scalerange',
 					  -borderwidth=>0,
-					  highlightthickness=>0,
-					  width=>$textl,
-					  height=>$textw,
-					  relief=>'flat')->
+					  -highlightthickness=>0,
+					  -width=>$textl,
+					  -height=>$textw,
+					  -relief=>'flat')->
 					      place(-relx=>1.0,
 						    '-x'=>-2,'-y'=>0,
 						    -anchor=>'ne');
@@ -445,10 +445,10 @@
 	my $widget=$this->{"widget"};
 
 	$widget->configure(-borderwidth=>0,
-			   highlightthickness=>0,
-			   width=>$width,
-			   height=>$height,
-			   relief=>'flat');
+			   -highlightthickness=>0,
+			   -width=>$width,
+			   -height=>$height,
+			   -relief=>'flat');
 	
 	my $rangesetting=$this->{"rangesetting"};
 	my($dummy,$dummy2,$scalew)=&calcsize($this,$rangesetting,$prompt,$num);

Modified: trunk/mgm/mgm
===================================================================
--- trunk/mgm/mgm	2006-09-08 09:58:21 UTC (rev 11835)
+++ trunk/mgm/mgm	2006-09-12 02:49:13 UTC (rev 11836)
@@ -60,7 +60,7 @@
 $toplevel->optionAdd("$Xname*widgetpad",        '2',20);
 
 $toplevel->optionAdd("$Xname*font",    
-		     '-*-helvetica-medium-r-*-*-8-*-*-*-*-*-*-*',20);
+		     '-*-helvetica-medium-r-semicondensed-*-8-*-*-*-*-*-*-*',20);
 
 $toplevel->optionAdd("$Xname*labelsize",       '9',20);
 

Modified: trunk/mgm/modules/share/hostlogo
===================================================================
--- trunk/mgm/modules/share/hostlogo	2006-09-08 09:58:21 UTC (rev 11835)
+++ trunk/mgm/modules/share/hostlogo	2006-09-12 02:49:13 UTC (rev 11836)
@@ -109,14 +109,14 @@
 
     my$widget=$toplevel->Frame(-class=>$this->{"name"},
 			       Name=>$this->{"sequence"},
-			       highlightthickness=>0,
-			       borderwidth=>$this->{"borderwidth"},
-			       relief=>$this->{"relief"},
-			       width=>$width,height=>$height);
-    $this->{"logowidget"}=$widget->Canvas(borderwidth=>0,
-					  highlightthickness=>0,
-					  width=>$this->{"logowidth"},
-					  height=>$this->{"logoheight"})->
+			       -highlightthickness=>0,
+			       -borderwidth=>$this->{"borderwidth"},
+			       -relief=>$this->{"relief"},
+			       -width=>$width,-height=>$height);
+    $this->{"logowidget"}=$widget->Canvas(-borderwidth=>0,
+					  -highlightthickness=>0,
+					  -width=>$this->{"logowidth"},
+					  -height=>$this->{"logoheight"})->
 					      place('-x'=>$logopad,
 						    '-y'=>$vpad,-anchor=>'nw',
 						    -bordermode=>'outside');

Modified: trunk/mgm/modules/share/spacer
===================================================================
--- trunk/mgm/modules/share/spacer	2006-09-08 09:58:21 UTC (rev 11835)
+++ trunk/mgm/modules/share/spacer	2006-09-12 02:49:13 UTC (rev 11836)
@@ -61,30 +61,30 @@
 
     my$widget=$toplevel->Frame(-class=>$this->{"name"},
 			       Name=>$this->{"sequence"},
-			       width=>$width,
-			       height=>$height,
-			       borderwidth=>0,
-			       highlightthickness=>0,
+			       -width=>$width,
+			       -height=>$height,
+			       -borderwidth=>0,
+			       -highlightthickness=>0,
 			       -background=>$mainback);
 
     my$back=$widget->optionGet("background","");
 
     if($stack eq 'vertical'){
 	my$pad=($height-$thick-$border*2)/2;
-	$widget->Frame(highlightthickness=>0,
-		       borderwidth=>$border,
-		       relief=>$this->{"relief"},
-		       width=>$width,
-		       height=>$border*2+$thick,
+	$widget->Frame(-highlightthickness=>0,
+		       -borderwidth=>$border,
+		       -relief=>$this->{"relief"},
+		       -width=>$width,
+		       -height=>$border*2+$thick,
 		       -background=>$back)->place('-x'=>0,'-y'=>$pad,
 						 -anchor=>'nw');
     }else{
 	my$pad=($width-$thick-$border*2)/2;
-	$widget->Frame(highlightthickness=>0,
-		       borderwidth=>$border,
-		       relief=>$this->{"relief"},
-		       width=>$border*2+$thick,
-		       height=>$height,
+	$widget->Frame(-highlightthickness=>0,
+		       -borderwidth=>$border,
+		       -relief=>$this->{"relief"},
+		       -width=>$border*2+$thick,
+		       -height=>$height,
 		       -background=>$back)->place('-x'=>$pad,'-y'=>0,
 						 -anchor=>'nw');
     }