summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xsrc/ivymon28
2 files changed, 26 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index e42f641..f7e35e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ivymon (1.23) unstable; urgency=low
+
+ * version compatible squeeze (pour les fontes)
+
+ -- Daniel Etienne <etienne@cena.fr> Thu, 5 Aug 2010 18:13:00 +0200
+
ivymon (1.22) unstable; urgency=low
* ivyreplay :
diff --git a/src/ivymon b/src/ivymon
index 9705860..c1f2592 100755
--- a/src/ivymon
+++ b/src/ivymon
@@ -93,7 +93,7 @@ use Tk::CmdLine;
use vars qw/$VERSION $opt_help $opt_b $opt_bus $opt_history @opt_bind
@opt_send $opt_size $opt_undersize $opt_out $opt_debug/;
# **** VERSION ****
-$VERSION = '1.21';
+$VERSION = '1.23';
# options initialisation
# geometry
@@ -177,7 +177,8 @@ my @effectivebind;
# command line options management
#----------------------------------------------------------------------------------
-Tk::CmdLine::SetArguments(-font => '7x14');
+Tk::CmdLine::SetArguments(-font =>
+ '-Misc-Fixed-Medium-R-Normal--10-100-75-75-C-60-ISO8859-1');
Tk::CmdLine::SetArguments();
if (not GetOptions('-help', '-history=s', '-b=s', '-bus=s', '-bind=s@',
@@ -242,35 +243,46 @@ if($opt_size eq "UXGA" || $opt_size eq "1600") {
$minH = 1200;
$smallsized = 0;
$coef = 1.2;
- Tk::CmdLine::SetArguments(-font => '10x20');
+ # Tk::CmdLine::SetArguments(-font => '10x20');
+ Tk::CmdLine::SetArguments(-font =>
+ '-Misc-Fixed-Medium-R-Normal--13-120-75-75-C-80-ISO8859-1');
Tk::CmdLine::SetArguments();
}elsif($opt_size eq "SXGA" || $opt_size eq "1280") {
$minW = 1280;
$minH = 1024;
$smallsized = 0;
$coef = 1.1;
- Tk::CmdLine::SetArguments(-font => '8x13');
+ # Tk::CmdLine::SetArguments(-font => '8x13');
+ Tk::CmdLine::SetArguments(-font =>
+ '-Misc-Fixed-Medium-R-Normal--13-120-75-75-C-80-ISO8859-1');
Tk::CmdLine::SetArguments();
}elsif($opt_size eq "XGA" || $opt_size eq "1024") {
- $minW = 1024;
+ $minW = 1024;
$minH = 768;
$smallsized = 1;
$coef = 1;
- Tk::CmdLine::SetArguments(-font => '7x14');
+ # Tk::CmdLine::SetArguments(-font => '7x14');
+ Tk::CmdLine::SetArguments(-font =>
+ '-Misc-Fixed-Medium-R-Normal--10-100-75-75-C-60-ISO8859-1');
+ # '-Misc-Fixed-Medium-R-Normal--14-130-75-75-C-70-ISO8859-1');
Tk::CmdLine::SetArguments();
}elsif($opt_size eq "SVGA" || $opt_size eq "800") {
$minW = 800;
$minH = 600;
$smallsized = 1;
$coef = 0.64;
- Tk::CmdLine::SetArguments(-font => '6x10');
+ # Tk::CmdLine::SetArguments(-font => '6x10');
+ Tk::CmdLine::SetArguments(-font =>
+ '-Misc-Fixed-Medium-R-Normal--10-100-75-75-C-60-ISO8859-1');
Tk::CmdLine::SetArguments();
}elsif($opt_size eq "VGA" || $opt_size eq "640"){
$minW = 640;
$minH = 480;
$smallsized = 1;
$coef = 0.48;
- Tk::CmdLine::SetArguments(-font => '5x7');
+ # Tk::CmdLine::SetArguments(-font => '5x7');
+ Tk::CmdLine::SetArguments(-font =>
+ '-Misc-Fixed-Medium-R-Normal--7-70-75-75-C-50-ISO8859-1');
Tk::CmdLine::SetArguments();
}