summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-05-08 23:06:33 +0000
committerNorbert Preining <preining@logic.at>2008-05-08 23:06:33 +0000
commitcd4722a6ee509e1d29e7baf88b7dd24fffcb173a (patch)
tree6edee663c2f3fc607a594bc04817779ed8dc388d /Master
parente3035f3f1d88d6a9f7ae51db12dbfd85337dee97 (diff)
more spacing/gridding/packing tuning
git-svn-id: svn://tug.org/texlive/trunk@7956 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl41
-rw-r--r--Master/texmf/scripts/texlive/tlmgrgui/gui-update.pl17
2 files changed, 26 insertions, 32 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl
index 195b81d4384..c7184da69d7 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-remove.pl
@@ -11,51 +11,30 @@ $screens{"remove"} = $back_f2;
####################### row 1
-# frame .back.f2.f1 -relief ridge -borderwidth 2
our $back_f2_f1 = $back_f2->Frame(-relief => "ridge", -borderwidth => 2);
-# label .back.f2.f1.l -text "Removing packages" \
-# -foreground blue -font {helvetica 10 bold}
$back_f2_f1_l = $back_f2_f1->Label(-text => "Removing packages",
-foreground => "blue", -font => "helvetica 10 bold");
-# label .back.f2.f1.l1 -text "Use Ctrl or Shift or drag to select more"
our $back_f2_f1_l1 = $back_f2_f1->Label(-text => "Use Ctrl or Shift or drag to select more");
-# grid .back.f2.f1 -row 1 -column 1 -columnspan 3 -padx 2m -pady 2m -sticky nwe
-$back_f2_f1->grid(-row => 1, -column => 1, -columnspan => 3,
- -padx => "2m", -pady => "2m", -sticky => "nwe");
-# pack .back.f2.f1.l .back.f2.f1.l1 -side top
+$back_f2_f1->grid(-row => 1, -column => 1, -columnspan => 2,
+ -padx => "2m", -pady => "2m", -sticky => "we");
$back_f2_f1_l->pack(-side => "top");
$back_f2_f1_l1->pack(-side => "top");
####################### row 2 col 1
# list of packages
-# labelframe .back.f2.f21 -text "Select packages for removal"
our $back_f2_f21 = $back_f2->Labelframe(-text => "Select packages for removal");
$back_f2_f21->grid(-row => 2, -column => 1, -sticky => "nswe",
-rowspan => 2, -padx => "2m", -pady => "1m");
# search field
-# frame .back.f2.f21.f
our $back_f2_f21_f = $back_f2_f21->Frame();
-# pack .back.f2.f21.f -pady 1m
$back_f2_f21_f->pack(-pady => "1m");
-# label .back.f2.f21.f.l -text "Search"
our $back_f2_f21_f_l = $back_f2_f21_f->Label(-text => "Search");
-# entry .back.f2.f21.f.e -validate key -validatecommand {
-# set searchListRm [.back.f2.f21.lb get 0 end]
-# set listPositionRm [lsearch $searchListRm " %P*"]
-# if {$listPositionRm ne -1} then {
-# .back.f2.f21.lb yview $listPositionRm
-# .back.f2.f21.lb selection set $listPositionRm
-# }
-# return 1
-# }
our $back_f2_f21_f_e = $back_f2_f21_f->Entry(
-validate => "key",
-validatecommand => sub { validate_search_input($back_f2_f21_lb, $back_f2_f23_t, $_[0], @alllocalpackages); } );
-# button .back.f2.f21.f.b -text "Next" -command {}
our $back_f2_f21_f_b = $back_f2_f21_f->Button(-text => "Next",
-command => sub { find_next_search_match($back_f2_f21_lb, $back_f2_f21_f_e, $back_f2_f23_t, @alllocalpackages); });
-# pack .back.f2.f21.f.l .back.f2.f21.f.e .back.f2.f21.f.b -anchor w -side left -padx 1m -pady 1m
$back_f2_f21_f_l->pack(-anchor => "w", -side => "left",
-padx => "1m", -pady => "1m");
$back_f2_f21_f_e->pack(-anchor => "w", -side => "left",
@@ -69,7 +48,7 @@ $back_f2_f21_f_b->pack(-anchor => "w", -side => "left",
# -xscrollcommand ".back.f2.f21.scrx set"
our $back_f2_f21_scry;
our $back_f2_f21_scrx;
-our $back_f2_f21_lb = $back_f2_f21->Listbox(-width => 30, -height => 15,
+our $back_f2_f21_lb = $back_f2_f21->Listbox(
-listvariable => \@alllocalpackages,
-selectmode => "extended",
-yscrollcommand => sub { $back_f2_f21_scry->set(@_); },
@@ -82,12 +61,9 @@ $back_f2_f21_scrx = $back_f2_f21->Scrollbar(
# scrollbar .back.f2.f21.scry -command ".back.f2.f21.lb yview" -orient vertical
$back_f2_f21_scry = $back_f2_f21->Scrollbar(
-command => sub { $back_f2_f21_lb->yview(@_); }, -orient => "vertical");
-# pack .back.f2.f21.scrx -side bottom -fill x
-# pack .back.f2.f21.scry -side right -fill y
-# pack .back.f2.f21.lb -fill y -expand 1
$back_f2_f21_scrx->pack(-side => "bottom", -fill => "x");
$back_f2_f21_scry->pack(-side => "right", -fill => "y");
-$back_f2_f21_lb->pack(-fill => "y", -expand => 1);
+$back_f2_f21_lb->pack(-fill => "both", -expand => 1);
####################### row 2 col 3
@@ -132,6 +108,15 @@ our $back_f2_buttons_b1 = $back_f2_buttons->Button(-text => "Remove",
$back_f2_buttons_b1->pack(-side => "top", -anchor => "center", -padx => "2m", -pady => "2m", -expand => 1, -fill => "both");
+
+$back_f2->gridRowconfigure(1,-weight => 0);
+$back_f2->gridRowconfigure(2,-weight => 1);
+$back_f2->gridRowconfigure(3,-weight => 0);
+$back_f2->gridColumnconfigure(1,-weight => 1);
+$back_f2->gridColumnconfigure(2,-weight => 1);
+
+1;
+
# EOF
### Local Variables:
### perl-indent-level: 2
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-update.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-update.pl
index c206bcc8b1a..a9542bac53e 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-update.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-update.pl
@@ -44,7 +44,7 @@ $back_up_f21_f_b->pack(-anchor => "w", -side => "left", -padx => "1m", -pady =>
our $back_up_f21_scry;
our $back_up_f21_scrx;
# there was -height => 24, below
-$back_up_f21_lb = $back_up_f21->Listbox(-width => 30, -height => 15,
+$back_up_f21_lb = $back_up_f21->Listbox(
-listvariable => \@updatepackages,
-selectmode => "extended",
-yscrollcommand => sub { $back_up_f21_scry->set(@_); },
@@ -57,12 +57,12 @@ $back_up_f21_scry = $back_up_f21->Scrollbar(
-command => sub { $back_up_f21_lb->yview(@_); }, -orient => "vertical");
$back_up_f21_scrx->pack(-side => "bottom", -fill => "x");
$back_up_f21_scry->pack(-side => "right", -fill => "y");
-$back_up_f21_lb->pack(-fill => "y", -expand => 1);
+$back_up_f21_lb->pack(-fill => "both", -expand => 1);
######################## row 2 col 3
## CD-ROM
our $back_up_f23 = $back_up->Labelframe(-text => "Installation Source");
-$back_up_f23->grid(-row => 2, -column => 2, -sticky => "nswe",
+$back_up_f23->grid(-row => 2, -column => 2, -sticky => "we",
-padx => "2m", -pady => "1m");
## CD-ROM
@@ -90,7 +90,7 @@ $back_up_f33_t->insert("end", "\nAttention. Please check if a DVD drive with the
$back_up_f33_scry = $back_up_f33->Scrollbar(
-command => sub { $back_up_f33_t->yview(@_); }, -orient => "vertical");
-$back_up_f33_scry->pack(-side => "right", -fill => "y");
+$back_up_f33_scry->pack(-side => "right", -fill => "y", -expand => 0);
$back_up_f33_t->pack(-expand => 1, -fill => "both");
@@ -117,6 +117,15 @@ $back_up_buttons_updateall->pack(-expand => 1, -fill => "both",
-padx => "2m", -pady => "2m");
+
+$back_up->gridRowconfigure(1,-weight => 0);
+$back_up->gridRowconfigure(2,-weight => 0);
+$back_up->gridRowconfigure(3,-weight => 1);
+$back_up->gridRowconfigure(4,-weight => 0);
+$back_up->gridColumnconfigure(1,-weight => 1);
+$back_up->gridColumnconfigure(2,-weight => 1);
+
+
1;
### Local Variables: