summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-22 20:04:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-22 20:04:52 +0000
commit8eda95cfd17ba78c28e2e818b36a5ac8c26b1c1c (patch)
tree5e169c320d98046b123280a201a95c53f70a0333
parentf2ca9ed86130f1be3363ef58eeb4ec25c0283bf8 (diff)
downloaddrakx-backup-do-not-use-8eda95cfd17ba78c28e2e818b36a5ac8c26b1c1c.tar
drakx-backup-do-not-use-8eda95cfd17ba78c28e2e818b36a5ac8c26b1c1c.tar.gz
drakx-backup-do-not-use-8eda95cfd17ba78c28e2e818b36a5ac8c26b1c1c.tar.bz2
drakx-backup-do-not-use-8eda95cfd17ba78c28e2e818b36a5ac8c26b1c1c.tar.xz
drakx-backup-do-not-use-8eda95cfd17ba78c28e2e818b36a5ac8c26b1c1c.zip
fix the various transient on {rwindow} (or even {window} ?) not working anymore on the MagicWindow
(maybe the code could be simplified since it should now work even when embedded (?))
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
-rwxr-xr-xperl-install/standalone/drakboot2
-rwxr-xr-xperl-install/standalone/drakfloppy2
-rwxr-xr-xperl-install/standalone/drakfont2
-rwxr-xr-xperl-install/standalone/drakperm2
-rwxr-xr-xperl-install/standalone/draksec4
-rwxr-xr-xperl-install/standalone/draksplash2
-rwxr-xr-xperl-install/standalone/drakups4
-rwxr-xr-xperl-install/standalone/harddrake28
-rwxr-xr-xperl-install/standalone/logdrake2
-rwxr-xr-xperl-install/standalone/printerdrake2
11 files changed, 16 insertions, 16 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index a4ce1be77..036bfff85 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -53,7 +53,7 @@ sub main {
local $in->{grab} = 1;
$w = ugtk2->new('DiskDrake');
- $::main_window = $w->{rwindow} if !$::isEmbedded && !$::isInstall;
+ $::main_window = $w->{real_window} if !$::isEmbedded && !$::isInstall;
my $rc = "/usr/share/libDrakX/diskdrake.rc";
-r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc";
-r $rc or $rc = dirname(__FILE__) . "/../share/diskdrake.rc";
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 493a4c15b..02486a772 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -63,7 +63,7 @@ my $remove_theme = '/usr/share/bootsplash/scripts/remove-theme';
my $w = ugtk2->new($splash_working ? N("Graphical boot theme selection") : N("System mode"));
my $window = $w->{window};
-$::main_window = $w->{rwindow} if !$::isEmbedded;
+$::main_window = $w->{real_window} if !$::isEmbedded;
$window->signal_connect(delete_event => sub { ugtk2->exit(0) });
unless ($::isEmbedded) {
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index 242b11c3a..16e86cad7 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -115,7 +115,7 @@ my $remove_but;
sub pref_dialog() {
my $dialog = gtkset_modal(gtkset_size_request(_create_dialog(N("Advanced preferences")), 600, -1), 1);
- $dialog->set_transient_for($window->{rwindow}) unless $::isEmbedded;
+ $dialog->set_transient_for($window->{real_window}) unless $::isEmbedded;
# Create root tree:
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 1576f54a1..11d46aa3c 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -624,7 +624,7 @@ sub exitdialog() { Gtk2->main_quit };
sub dialog {
my ($title, $widgets, $buttons, $o_main_loop) = @_;
- $dialog = _create_dialog($title, { transient => $::isEmbedded ? $::Plug : $window1->{window} });
+ $dialog = _create_dialog($title, { transient => $window1->{real_window} });
$dialog->signal_connect(delete_event => \&exitdialog);
gtkpack_($dialog->vbox, @$widgets);
gtkpack($dialog->action_area, @$buttons) if $buttons;
diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm
index 3b680fe9a..d4c2a8ea6 100755
--- a/perl-install/standalone/drakperm
+++ b/perl-install/standalone/drakperm
@@ -236,7 +236,7 @@ sub row_setting_dialog {
my ($iter) = @_;
my $dlg = Gtk2::Dialog->new;
- $dlg->set_transient_for($w->{rwindow}) unless $::isEmbedded;
+ $dlg->set_transient_for($w->{real_window}) unless $::isEmbedded;
$dlg->set_modal(1);
# $dlg->set_resizable(0);
my $browse = Gtk2::Button->new(N("browse"));
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 371702303..7f9b87a9f 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -65,7 +65,7 @@ my %inv_fields = reverse %fields;
# factorize this with rpmdrake and harddrake2
sub wait_msg {
- my $mainw = ugtk2->new(N("Please wait"), (modal => 1, if_(!$::isEmbedded, transient => $w->{rwindow})));
+ my $mainw = ugtk2->new(N("Please wait"), (modal => 1, if_(!$::isEmbedded, transient => $w->{real_window})));
$mainw->{window}->add(Gtk2::WrappedLabel->new($_[0]));
$mainw->{rwindow}->show_all;
gtkset_mousecursor_wait($mainw->{rwindow}->window);
@@ -343,7 +343,7 @@ gtkpack_($vbox,
]
),
{ use_markup => 1,
- if_(!$::isEmbedded, transient => $w->{window}),
+ if_(!$::isEmbedded, transient => $w->{real_window}),
height => 400,
width => 600,
scroll => 1,
diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash
index 4a59407bd..072b593b6 100755
--- a/perl-install/standalone/draksplash
+++ b/perl-install/standalone/draksplash
@@ -165,7 +165,7 @@ $first{widgets}{combo}{res}->entry->signal_connect(changed => sub {
#- image file selection for new theme
$first{widgets}{button}{file}->signal_connect(clicked => sub {
my $file_dialog = gtkset_modal(Gtk2::FileSelection->new(N("choose image")), 1);
- $file_dialog->set_transient_for($window->{rwindow});
+ $file_dialog->set_transient_for($window->{real_window});
$file_dialog->set_filename($img_file || '~/');
$file_dialog->cancel_button->signal_connect(clicked => sub { $file_dialog->destroy });
diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups
index ee6aeedb1..6995377c5 100755
--- a/perl-install/standalone/drakups
+++ b/perl-install/standalone/drakups
@@ -196,7 +196,7 @@ sub edit_row {
# create new item if needed (that is when adding a new one) at end of list
$iter ||= $model->append;
my $dialog = Gtk2::Dialog->new;
- $dialog->set_transient_for($w->{rwindow}) unless $::isEmbedded;
+ $dialog->set_transient_for($w->{real_window}) unless $::isEmbedded;
$dialog->set_modal(1);
gtkpack_($dialog->vbox,
@@ -324,7 +324,7 @@ if (member('--wizard', @ARGV)) {
$w = ugtk2->new(N("DrakUPS"));
if (!$::isEmbedded) {
- $::main_window = $w->{rwindow};
+ $::main_window = $w->{real_window};
$w->{window}->set_size_request(500, 550);
$w->{rwindow}->set_title(N("DrakUPS"));
}
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index bb9e5df32..8621622d2 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -204,10 +204,10 @@ my @menu_items =
my $info = lookup_field($_);
if_($info->[0], formatAlaTeX(qq(<span foreground="royalblue3">$info->[0]:</span> $info->[1])));
} sort keys %$current_device),
- { use_markup => 1, if_(!$::isEmbedded, transient => $w->{rwindow}), height => 400, scroll => 1 });
+ { use_markup => 1, if_(!$::isEmbedded, transient => $w->{real_window}), height => 400, scroll => 1 });
} else {
- create_dialog(N("Select a device!"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { if_(!$::isEmbedded, transient => $w->{rwindow}) });
+ create_dialog(N("Select a device!"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { if_(!$::isEmbedded, transient => $w->{real_window}) });
}
},
undef, '<Item>'
@@ -220,7 +220,7 @@ my @menu_items =
#-PO: Do not alter the <span ..> and </span> tags
N("This is HardDrake, a %s hardware configuration tool.\n<span foreground=\"royalblue3\">Version:</span> %s
<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud\@mandrakesoft.com&gt;\n\n", $distro_name, $harddrake::data::version) . "\n" .
- formatAlaTeX($::license), { use_markup => 1, if_(!$::isEmbedded, transient => $w->{rwindow}) });
+ formatAlaTeX($::license), { use_markup => 1, if_(!$::isEmbedded, transient => $w->{real_window}) });
}, undef, '<Item>'
]
);
@@ -241,7 +241,7 @@ my ($menubar, $factory);
if ($::isEmbedded) {
($menubar, $factory) = create_factory_menu($::Plug, @menu_items);
} else {
- $::main_window = $w->{rwindow};
+ $::main_window = $w->{real_window};
($menubar, $factory) = create_factory_menu($w->{rwindow}, @menu_items);
$w->{window}->set_size_request(805, 550);
}
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index ed5a6a507..1e288e5f6 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -222,7 +222,7 @@ sub parse_file {
$pbar = Gtk2::ProgressBar->new
)
);
- $win_pb->set_transient_for($my_win->{rwindow}) unless $::isEmbedded;
+ $win_pb->set_transient_for($my_win->{real_window}) unless $::isEmbedded;
$win_pb->set_position('center');
$win_pb->realize;
$win_pb->show_all;
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index a60e11255..ce3e7b3d7 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -538,7 +538,7 @@ sub CreateTree {
sub NewDialog {
my ($title, $o_no_button) = @_;
my $dialog = gtkset_border_width(Gtk2::Dialog->new, 10);
- $dialog->set_transient_for($us->{wnd}{rwindow}) if !$isEmbedded;
+ $dialog->set_transient_for($us->{wnd}{real_window}) if !$isEmbedded;
$dialog->set_position('center-on-parent');
$dialog->set_title($title);
$dialog->action_area->pack_start(gtkadd(Gtk2::HButtonBox->new,