mirror of
https://github.com/duncs/clusterssh.git
synced 2025-07-03 09:53:23 +00:00
Don't hardcode the number of static menu entries
This commit is contained in:
parent
61449301d0
commit
f23821af6f
1 changed files with 14 additions and 8 deletions
|
@ -109,6 +109,8 @@ my $xdisplay;
|
||||||
my %keyboardmap;
|
my %keyboardmap;
|
||||||
my $sysconfigdir = "/etc";
|
my $sysconfigdir = "/etc";
|
||||||
my %ssh_hostnames;
|
my %ssh_hostnames;
|
||||||
|
my $host_menu_static_items; # number of items in the host menu that should
|
||||||
|
# not be touched by build_host_menu
|
||||||
|
|
||||||
$keysymtocode{unknown_sym} = 0xFFFFFF; # put in a default "unknown" entry
|
$keysymtocode{unknown_sym} = 0xFFFFFF; # put in a default "unknown" entry
|
||||||
$keysymtocode{EuroSign}
|
$keysymtocode{EuroSign}
|
||||||
|
@ -1235,9 +1237,8 @@ sub build_hosts_menu() {
|
||||||
my ($self) = @_;
|
my ($self) = @_;
|
||||||
$self->debug( 2, "Building hosts menu" );
|
$self->debug( 2, "Building hosts menu" );
|
||||||
|
|
||||||
# first, empty the hosts menu from the 4th entry on
|
# first, empty the hosts menu from the last static entry + 1 on
|
||||||
my $menu = $menus{bar}->entrycget( 'Hosts', -menu );
|
my $menu = $menus{bar}->entrycget( 'Hosts', -menu );
|
||||||
my $host_menu_static_items = 7;
|
|
||||||
$menu->delete( $host_menu_static_items, 'end' );
|
$menu->delete( $host_menu_static_items, 'end' );
|
||||||
|
|
||||||
$self->debug( 3, "Menu deleted" );
|
$self->debug( 3, "Menu deleted" );
|
||||||
|
@ -1725,10 +1726,7 @@ sub create_menubar() {
|
||||||
-tearoff => 0,
|
-tearoff => 0,
|
||||||
);
|
);
|
||||||
|
|
||||||
$menus{hosts} = $menus{bar}->cascade(
|
my $host_menu_items = [
|
||||||
-label => 'Hosts',
|
|
||||||
-tearoff => 1,
|
|
||||||
-menuitems => [
|
|
||||||
[ "command",
|
[ "command",
|
||||||
"Retile Windows",
|
"Retile Windows",
|
||||||
-command => sub { $self->retile_hosts },
|
-command => sub { $self->retile_hosts },
|
||||||
|
@ -1757,10 +1755,18 @@ sub create_menubar() {
|
||||||
-command => sub { $self->add_host_by_name, },
|
-command => sub { $self->add_host_by_name, },
|
||||||
-accelerator => $self->config->{key_addhost},
|
-accelerator => $self->config->{key_addhost},
|
||||||
],
|
],
|
||||||
'',
|
'' # this is needed as build_host_menu always drops the
|
||||||
],
|
# last item
|
||||||
|
];
|
||||||
|
|
||||||
|
$menus{hosts} = $menus{bar}->cascade(
|
||||||
|
-label => 'Hosts',
|
||||||
|
-tearoff => 1,
|
||||||
|
-menuitems => $host_menu_items
|
||||||
);
|
);
|
||||||
|
|
||||||
|
$host_menu_static_items = scalar(@{$host_menu_items});
|
||||||
|
|
||||||
$menus{send} = $menus{bar}->cascade(
|
$menus{send} = $menus{bar}->cascade(
|
||||||
-label => 'Send',
|
-label => 'Send',
|
||||||
-tearoff => 1,
|
-tearoff => 1,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue