diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-12-09 21:37:32 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-12-09 21:37:32 +0000 |
| commit | 959943551599fc1fe7e1bba59b508d8d441b448e (patch) | |
| tree | 9c52ad4e0ca016f87679edfdf1410b42a071e835 | |
| parent | b87d2d404d5553b9bce42084b4c8cf69061a7966 (diff) | |
| download | drakx-959943551599fc1fe7e1bba59b508d8d441b448e.tar drakx-959943551599fc1fe7e1bba59b508d8d441b448e.tar.gz drakx-959943551599fc1fe7e1bba59b508d8d441b448e.tar.bz2 drakx-959943551599fc1fe7e1bba59b508d8d441b448e.tar.xz drakx-959943551599fc1fe7e1bba59b508d8d441b448e.zip | |
remove dynamic theme choosing, and next/previous (F11/F12) handling
| -rw-r--r-- | perl-install/my_gtk.pm | 7 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 079f5d5f9..9f14368c5 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -224,18 +224,13 @@ sub _create_window($$) { } $w->signal_connect(key_press_event => sub { my $d = ${{ 0xffbe => 'help', - 0xffbf => 'screenshot', - 0xffc2 => 'set_theme', - 0xffc9 => 'next', - 0xffc8 => 'previous' }}{$_[1]{keyval}}; + 0xffbf => 'screenshot' }}{$_[1]{keyval}}; if ($d eq "help") { require install_gtk; install_gtk::create_big_help($::o); } elsif ($::isInstall && $d eq 'screenshot') { common::take_screenshot($o); - } elsif ($::isInstall && $d eq 'set_theme') { - $::setstep and die "set_theme\n"; #- set_theme is similar to setstep, don't raise one when not allowed to } elsif (chr($_[1]{keyval}) eq 'e' && $_[1]{state} & 8) { log::l("Switching to " . ($::expert ? "beginner" : "expert")); $::expert = !$::expert; diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 75e579a2a..2c97dad0e 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -850,10 +850,7 @@ sub _create_window($$) { $w->signal_connect(key_press_event => sub { my (undef, $event) = @_; my $d = ${{ Gtk2::Gdk::Event::Key->Sym_F1 => 'help', - Gtk2::Gdk::Event::Key->Sym_F2 => 'screenshot', - Gtk2::Gdk::Event::Key->Sym_F5 => 'set_theme', - Gtk2::Gdk::Event::Key->Sym_F12 => 'next', - Gtk2::Gdk::Event::Key->Sym_F11 => 'previous' }}{$event->keyval}; + Gtk2::Gdk::Event::Key->Sym_F2 => 'screenshot' }}{$event->keyval}; if ($event->keyval == Gtk2::Gdk::Event::Key->Sym_Print) { #- TEMP print STDERR "Sym Print\n"; #- TEMP @@ -867,8 +864,6 @@ sub _create_window($$) { install_gtk::create_big_help($::o); } elsif ($::isInstall && $d eq 'screenshot') { common::take_screenshot($o); - } elsif ($::isInstall && $d eq 'set_theme') { - $::setstep and die "set_theme\n"; #- set_theme is similar to setstep, don't raise one when not allowed to } elsif (chr($event->keyval) eq 'e' && member('mod1-mask', @{$event->state})) { #- alt-e log::l("Switching to " . ($::expert ? "beginner" : "expert")); $::expert = !$::expert; |