aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/driver/ssh:/git@git.mageia.org
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/phpbb/db/driver/ssh:/git@git.mageia.org')
0 files changed, 0 insertions, 0 deletions
='16.11'/>
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2012-08-01 17:16:30 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-11-24 21:28:33 +0100
commitb9e700aea8f8dfae031d9ff923f00393b052fd3d (patch)
tree77874a7a36987e70b128aa303842ba623ec249e0
parent2cfaaed875e7caeae898acf23630558077bb668a (diff)
downloaddrakx-b9e700aea8f8dfae031d9ff923f00393b052fd3d.tar
drakx-b9e700aea8f8dfae031d9ff923f00393b052fd3d.tar.gz
drakx-b9e700aea8f8dfae031d9ff923f00393b052fd3d.tar.bz2
drakx-b9e700aea8f8dfae031d9ff923f00393b052fd3d.tar.xz
drakx-b9e700aea8f8dfae031d9ff923f00393b052fd3d.zip
use Gtk3 namespace instead of Gtk2
Diffstat
-rw-r--r--perl-install/any.pm8
-rw-r--r--perl-install/common.pm2
-rw-r--r--perl-install/dbus_object.pm4
-rw-r--r--perl-install/diskdrake/hd_gtk.pm34
-rw-r--r--perl-install/diskdrake/smbnfs_gtk.pm12
-rw-r--r--perl-install/fs/partitioning_wizard.pm48
-rw-r--r--perl-install/install/gtk.pm16
-rw-r--r--perl-install/install/steps_gtk.pm14
-rw-r--r--perl-install/interactive/gtk.pm94
-rw-r--r--perl-install/mygtk3.pm150
-rw-r--r--perl-install/services.pm26
-rwxr-xr-xperl-install/share/po/translation_size.pl12
-rwxr-xr-xperl-install/standalone/display_help10
-rwxr-xr-xperl-install/standalone/drakautoinst58
-rwxr-xr-xperl-install/standalone/drakboot2
-rwxr-xr-xperl-install/standalone/drakbug24
-rwxr-xr-xperl-install/standalone/drakclock18
-rwxr-xr-xperl-install/standalone/drakdvb8
-rwxr-xr-xperl-install/standalone/drakfloppy14
-rwxr-xr-xperl-install/standalone/drakfont92
-rwxr-xr-xperl-install/standalone/drakperm12
-rwxr-xr-xperl-install/standalone/draksec8
-rwxr-xr-xperl-install/standalone/drakups28
-rwxr-xr-xperl-install/standalone/harddrake226
-rwxr-xr-xperl-install/standalone/logdrake48
-rw-r--r--perl-install/ugtk3.pm116
-rwxr-xr-xperl-install/unused/migrate-ugtk2-to-mygtk2.pl2
27 files changed, 443 insertions, 443 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index a04c47f5e..a19b1c057 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1027,7 +1027,7 @@ sub display_release_notes {
return;
}
- require Gtk2::WebKit;
+ require Gtk3::WebKit;
require ugtk3;
ugtk3->import(':all');
require mygtk3;
@@ -1037,13 +1037,13 @@ sub display_release_notes {
my $w = ugtk3->new(N("Release Notes"), transient => $::main_window, modal => 1, pop_it => 1);
gtkadd($w->{rwindow},
- gtkpack_(Gtk2::VBox->new,
+ gtkpack_(Gtk3::VBox->new,
1, create_scrolled_window(ugtk3::gtkset_border_width($view, 5),
[ 'never', 'automatic' ],
),
0, gtkpack(create_hbox('end'),
gtknew('Button', text => N("Close"),
- clicked => sub { Gtk2->main_quit })
+ clicked => sub { Gtk3->main_quit })
),
),
);
@@ -1201,7 +1201,7 @@ sub selectLanguage_standalone {
]);
$locale->{utf8} = !$non_utf8;
lang::set($locale);
- Gtk2->set_locale if $in->isa('interactive::gtk');
+ Gtk3->set_locale if $in->isa('interactive::gtk');
lang::lang_changed($locale) if $old_lang ne $locale->{lang};
}
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 9d5763202..f0dcacff3 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -84,7 +84,7 @@ sub to_utf8 {
$str;
}
-#- This is needed because text printed by Gtk2 will always be encoded
+#- This is needed because text printed by Gtk3 will always be encoded
#- in UTF-8;
#- we first check if LC_ALL is defined, because if it is, changing
#- only LC_COLLATE will have no effect.
diff --git a/perl-install/dbus_object.pm b/perl-install/dbus_object.pm
index a1038fc40..5c59de7e0 100644
--- a/perl-install/dbus_object.pm
+++ b/perl-install/dbus_object.pm
@@ -55,9 +55,9 @@ sub set_gtk3_watch_helper {
my ($con, $watch) = @_;
my $flags = $watch->get_flags;
require Net::DBus::Binding::Watch;
- require Gtk2::Helper;
+ require Gtk3::Helper;
if ($flags & &Net::DBus::Binding::Watch::READABLE) {
- Gtk2::Helper->add_watch($watch->get_fileno, 'in', sub {
+ Gtk3::Helper->add_watch($watch->get_fileno, 'in', sub {
$watch->handle(&Net::DBus::Binding::Watch::READABLE);
$con->dispatch;
1;
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index f552fb1af..5d3a5af4e 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -48,7 +48,7 @@ sub load_theme() {
my $rc = "/usr/share/libDrakX/diskdrake.rc";
-r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc";
-r $rc or $rc = dirname(__FILE__) . "/../share/diskdrake.rc";
- Gtk2::Rc->parse($rc);
+ Gtk3::Rc->parse($rc);
}
sub main {
@@ -68,16 +68,16 @@ sub main {
# updateLoopback();
gtkadd($w->{window},
- gtkpack_(Gtk2::VBox->new(0,7),
+ gtkpack_(Gtk3::VBox->new(0,7),
0, gtknew(($::isInstall ? ('Title1', 'label') : ('Label_Left', 'text'))
=> N("Click on a partition, choose a filesystem type then choose an action"),
# workaround infamous 6 years old gnome bug #101968:
width => mygtk3::get_label_width()
),
- 1, (my $notebook_widget = Gtk2::Notebook->new),
+ 1, (my $notebook_widget = Gtk3::Notebook->new),
0, (my $per_kind_action_box = gtknew('HButtonBox', layout => 'edge')),
0, (my $per_kind_action_box2 = gtknew('HButtonBox', layout => 'end')),
- 0, Gtk2::HSeparator->new,
+ 0, Gtk3::HSeparator->new,
0, (my $general_action_box = gtknew('HBox', spacing => 5)),
),
);
@@ -150,7 +150,7 @@ sub try_ {
}
$update_all->($refresh);
- Gtk2->main_quit if $v && member($name, 'Done');
+ Gtk3->main_quit if $v && member($name, 'Done');
}
sub get_action_box_size() {
@@ -164,11 +164,11 @@ sub add_kind2notebook {
my ($notebook_widget, $kind) = @_;
die if $kind->{main_box};
- $kind->{display_box} = gtkset_size_request(Gtk2::HBox->new(0,0), $width, $height);
- $kind->{action_box} = gtkset_size_request(Gtk2::VBox->new, get_action_box_size());
- $kind->{info_box} = Gtk2::VBox->new(0,0);
+ $kind->{display_box} = gtkset_size_request(Gtk3::HBox->new(0,0), $width, $height);
+ $kind->{action_box} = gtkset_size_request(Gtk3::VBox->new, get_action_box_size());
+ $kind->{info_box} = Gtk3::VBox->new(0,0);
my $box =
- gtkpack_(Gtk2::VBox->new(0,7),
+ gtkpack_(Gtk3::VBox->new(0,7),
0, $kind->{display_box},
0, filesystems_button_box(),
1, $kind->{info_box});
@@ -203,7 +203,7 @@ sub general_action_box {
N_("Done"));
my $box_end = gtknew('HButtonBox', layout => 'end', spacing => 5);
foreach my $s (@actions) {
- my $button = Gtk2::Button->new(translate($s));
+ my $button = Gtk3::Button->new(translate($s));
$done_button = $button if $s eq 'Done';
gtkadd($box_end, gtksignal_connect($button, clicked => sub { try($s) }));
}
@@ -217,12 +217,12 @@ sub per_kind_action_box {
foreach my $s (diskdrake::interactive::hd_possible_actions_base($in)) {
gtkadd($box,
- gtksignal_connect(Gtk2::Button->new(translate($s)),
+ gtksignal_connect(Gtk3::Button->new(translate($s)),
clicked => sub { try($s, kind2hd($kind)) }));
}
foreach my $s (diskdrake::interactive::hd_possible_actions_extra($in)) {
gtkadd($box2,
- gtksignal_connect(Gtk2::Button->new(translate($s)),
+ gtksignal_connect(Gtk3::Button->new(translate($s)),
clicked => sub { try($s, kind2hd($kind)) }));
}
}
@@ -233,18 +233,18 @@ sub per_entry_action_box {
if ($entry) {
my @buttons = map {
my $s = $_;
- my $w = Gtk2::Button->new(translate($s));
+ my $w = Gtk3::Button->new(translate($s));
$w->signal_connect(clicked => sub { try($s, kind2hd($kind), $entry) });
$w;
} diskdrake::interactive::part_possible_actions($in, kind2hd($kind), $entry, $all_hds);
- gtkadd($box, create_scrolled_window(gtkpack__(Gtk2::VBox->new, @buttons), undef, 'none')) if @buttons;
+ gtkadd($box, create_scrolled_window(gtkpack__(Gtk3::VBox->new, @buttons), undef, 'none')) if @buttons;
} else {
my $txt = !$::isStandalone && fsedit::is_one_big_fat_or_NT($all_hds->{hds}) ?
N("You have one big Microsoft Windows partition.
I suggest you first resize that partition
(click on it, then click on \"Resize\")") : N("Please click on a partition");
- gtkpack($box, gtktext_insert(Gtk2::TextView->new, $txt));
+ gtkpack($box, gtktext_insert(Gtk3::TextView->new, $txt));
}
}
@@ -338,7 +338,7 @@ sub create_buttons4partitions {
}
my $info = $entry->{mntpoint} || $entry->{device_LABEL};
$info .= "\n" . ($entry->{size} ? formatXiB($entry->{size}, 512) : N("Unknown")) if $info;
- my $w = Gtk2::ToggleButton->new_with_label($info) or internal_error('new_with_label');
+ my $w = Gtk3::ToggleButton->new_with_label($info) or internal_error('new_with_label');
$w->signal_connect(clicked => sub {
$current_button != $w or return;
current_entry_changed($kind, $entry);
@@ -406,7 +406,7 @@ sub filesystems_button_box() {
N_("Other"), N_("Empty"));
my %name2fs_type = (Ext3 => 'ext3', Ext4 => 'ext4', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs');
- gtkpack(Gtk2::HBox->new,
+ gtkpack(Gtk3::HBox->new,
map {
my $t = $name2fs_type{$_};
my $w = gtknew('Button', text => translate($_), widget_name => 'PART_' . ($t || 'empty'),
diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm
index e29101b44..ff50e0a18 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -42,7 +42,7 @@ sub try_ {
$in->ask_warn(N("Error"), formatError($err));
}
update($kind);
- Gtk2->main_quit if member($name, 'Cancel', 'Done');
+ Gtk3->main_quit if member($name, 'Cancel', 'Done');
}
sub raw_hd_options {
@@ -127,14 +127,14 @@ sub import_tree {
my ($kind, $info_box) = @_;
my (%servers_displayed, %wservers, %wexports);
- $tree_model = Gtk2::TreeStore->new("Gtk2::Gdk::Pixbuf", "Glib::String");
- my $tree = Gtk2::TreeView->new_with_model($tree_model);
+ $tree_model = Gtk3::TreeStore->new("Gtk3::Gdk::Pixbuf", "Glib::String");
+ my $tree = Gtk3::TreeView->new_with_model($tree_model);
$tree->get_selection->set_mode('browse');
- my $col = Gtk2::TreeViewColumn->new;
- $col->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0);
+ my $col = Gtk3::TreeViewColumn->new;
+ $col->pack_start(my $pixrender = Gtk3::CellRendererPixbuf->new, 0);
$col->add_attribute($pixrender, 'pixbuf', 0);
- $col->pack_start(my $texrender = Gtk2::CellRendererText->new, 1);
+ $col->pack_start(my $texrender = Gtk3::CellRendererText->new, 1);
$col->add_attribute($texrender, 'text', 1);
$tree->append_column($col);
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 935ecb5bc..86b06f72e 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -300,14 +300,14 @@ sub create_display_box {
my $width = 540;
my $minwidth = 40;
- my $display_box = ugtk3::gtkset_size_request(Gtk2::HBox->new(0,0), -1, 26);
+ my $display_box = ugtk3::gtkset_size_request(Gtk3::HBox->new(0,0), -1, 26);
my $sep_count = @parts - 1;
#- ratio used to compute initial partition pixel width (each partition should be > min_width)
#- though, the pixel/sectors ratio cannot be the same for all the partitions
my $initial_ratio = $totalsectors ? ($width - @parts * $minwidth - $sep_count) / $totalsectors : 1;
- my $vbox = Gtk2::VBox->new;
+ my $vbox = Gtk3::VBox->new;
my $part_sep;
my $desc;
@@ -315,9 +315,9 @@ sub create_display_box {
my $last = $resize && $resize->[-1];
foreach my $entry (@parts) {
- my $part_info = Gtk2::Label->new($entry->{device_LABEL});
+ my $part_info = Gtk3::Label->new($entry->{device_LABEL});
my @colorized_fs_types = qw(ext2 ext3 ext4 xfs swap vfat ntfs ntfs-3g);
- my $part_widget = Gtk2::EventBox->new;
+ my $part_widget = Gtk3::EventBox->new;
$entry->{width} = int($entry->{size} * $initial_ratio) + $minwidth;
if ($last && $last->{device} eq $entry->{device}) {
#- entry is the last resizable partition
@@ -329,11 +329,11 @@ sub create_display_box {
$part_widget->set_name("PART_vfat");
$part_info->set_size_request(ceil($ratio * $entry->{min_win}), 0);
- my $mdv_widget = gtkadd(gtkset_name(Gtk2::EventBox->new, "PART_new"),
+ my $mdv_widget = gtkadd(gtkset_name(Gtk3::EventBox->new, "PART_new"),
gtkset_size_request(gtknew("Image", file => "small-logo"),
$ratio * MB(600), 0));
- my $hpane = Gtk2::HPaned->new;
+ my $hpane = Gtk3::HPaned->new;
$hpane->add1($part_widget);
$hpane->child1_shrink(0);
$hpane->add2($mdv_widget);
@@ -345,17 +345,17 @@ sub create_display_box {
my $add_part_size_info = sub {
my ($name, $label) = @_;
ugtk3::gtkpack__($desc,
- gtkadd(gtkset_name(Gtk2::EventBox->new, $name),
- Gtk2::Label->new(" " x 4)),
+ gtkadd(gtkset_name(Gtk3::EventBox->new, $name),
+ Gtk3::Label->new(" " x 4)),
gtkset_size_request(gtkset_alignment($label, 0, 0.5),
150, 20));
};
- $desc = Gtk2::HBox->new(0,0);
+ $desc = Gtk3::HBox->new(0,0);
- my $win_size_label = Gtk2::Label->new;
+ my $win_size_label = Gtk3::Label->new;
$add_part_size_info->("PART_vfat", $win_size_label);
- my $mdv_size_label = Gtk2::Label->new;
+ my $mdv_size_label = Gtk3::Label->new;
$add_part_size_info->("PART_new", $mdv_size_label);
my $update_size_labels = sub {
@@ -400,8 +400,8 @@ sub create_display_box {
}
$part_widget->add($part_info);
- $part_sep = gtkadd(Gtk2::EventBox->new,
- gtkset_size_request(Gtk2::Label->new("."), 1, 0));
+ $part_sep = gtkadd(Gtk3::EventBox->new,
+ gtkset_size_request(Gtk3::Label->new("."), 1, 0));
gtkpack__($display_box, $part_sep);
}
$display_box->remove($part_sep) if $part_sep;
@@ -409,11 +409,11 @@ sub create_display_box {
my @types = (N_("Ext2/3/4"), N_("XFS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("Windows"),
N_("Other"), N_("Empty"));
my %name2fs_type = ('Ext2/3/4' => 'ext3', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs');
- $desc = ugtk3::gtkpack(Gtk2::HBox->new,
+ $desc = ugtk3::gtkpack(Gtk3::HBox->new,
map {
my $t = $name2fs_type{$_};
- my $ev = Gtk2::EventBox->new;
- my $w = Gtk2::Label->new(translate($_));
+ my $ev = Gtk3::EventBox->new;
+ my $w = Gtk3::Label->new(translate($_));
$ev->add($w);
$ev->set_name('PART_' . ($t || 'empty'));
$ev;
@@ -461,7 +461,7 @@ sub display_choices {
$item = create_display_box($mainw->{kind}, $solutions{$s}[3], undef, $button);
} elsif ($s eq 'existing_part') {
} elsif ($s eq 'wipe_drive') {
- $item = Gtk2::EventBox->new;
+ $item = Gtk3::EventBox->new;
my $b2 = gtknew("Image", file => "small-logo");
$item->add($b2);
$item->set_size_request(540,26);
@@ -507,17 +507,17 @@ sub main {
require diskdrake::hd_gtk;
diskdrake::hd_gtk::load_theme();
- my $mainbox = Gtk2::VBox->new;
+ my $mainbox = Gtk3::VBox->new;
my @kinds = map { diskdrake::hd_gtk::hd2kind($_) } sort { $a->{is_removable} <=> $b->{is_removable} } @{ $all_hds->{hds} };
push @kinds, diskdrake::hd_gtk::raid2real_kind($_) foreach @{$all_hds->{raids}};
push @kinds, map { diskdrake::hd_gtk::lvm2kind($_) } @{$all_hds->{lvms}};
- my $hdchoice = Gtk2::HBox->new;
+ my $hdchoice = Gtk3::HBox->new;
- my $hdchoicelabel = Gtk2::Label->new(N("Here is the content of your disk drive "));
+ my $hdchoicelabel = Gtk3::Label->new(N("Here is the content of your disk drive "));
- my $combobox = Gtk2::ComboBox->new_text;
+ my $combobox = Gtk3::ComboBox->new_text;
foreach (@kinds) {
my $info = $_->{val}{info} || $_->{val}{device};
$info =~ s|^(?:.*/)?(.{24}).*|$1|;
@@ -531,11 +531,11 @@ sub main {
ugtk3::gtkpack2__($mainbox, $hdchoice);
- my $contentbox = Gtk2::VBox->new(0, 12);
+ my $contentbox = Gtk3::VBox->new(0, 12);
- my $scroll = Gtk2::ScrolledWindow->new;
+ my $scroll = Gtk3::ScrolledWindow->new;
$scroll->set_policy('never', 'automatic'),
- my $vp = Gtk2::Viewport->new;
+ my $vp = Gtk3::Viewport->new;
$vp->set_shadow_type('none');
$vp->add($contentbox);
$scroll->add($vp);
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index a1fa46ebf..dedb66af2 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -59,7 +59,7 @@ sub load_rc {
my $f = $name;
-r $name or $f = find { -r $_ } map { "$_/themes-$name.rc" } ("share", $ENV{SHARE_PATH}, dirname(__FILE__) . '/..');
if ($f) {
- Gtk2::Rc->parse_string($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f));
+ Gtk3::Rc->parse_string($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f));
}
}
@@ -68,7 +68,7 @@ sub load_font {
my ($o) = @_;
if (defined($::WizardWindow) && lang::text_direction_rtl()) {
- Gtk2::Widget->set_default_direction('rtl');
+ Gtk3::Widget->set_default_direction('rtl');
my ($x, $y) = $::WizardWindow->get_position;
my ($width) = $::WizardWindow->get_size;
$::WizardWindow->move($::rootwidth - $width - $x, $y);
@@ -76,7 +76,7 @@ sub load_font {
my $font = lang::l2pango_font($o->{locale}{lang});
my $s = qq(gtk-font-name="$font");
- Gtk2::Rc->parse_string($s);
+ Gtk3::Rc->parse_string($s);
mkdir("/root");
output("/root/.gtkrc-2.0", $s);
}
@@ -169,7 +169,7 @@ sub update_steps_position {
exists $steps{steps}{$_} or next;
if ($o->{steps}{$_}{entered} && !$o->{steps}{$_}{done}) {
# we need to flush the X queue since else we got a temporary Y position of -1 when switching locales:
- mygtk3::flush(); #- for auto_installs which never go through the Gtk2 main loop
+ mygtk3::flush(); #- for auto_installs which never go through the Gtk3 main loop
$o->{steps_widget}->move_selection($steps{steps}{$_}{text});
if ($last_step) {
@@ -179,7 +179,7 @@ sub update_steps_position {
}
$last_step = $_;
}
- mygtk3::flush(); #- for auto_installs which never go through the Gtk2 main loop
+ mygtk3::flush(); #- for auto_installs which never go through the Gtk3 main loop
}
#------------------------------------------------------------------------------
@@ -199,14 +199,14 @@ q(<fontconfig>
$ENV{FONTCONFIG_FILE} = '/tmp/fonts.conf';
}
- Gtk2->init;
- Gtk2->set_locale;
+ Gtk3->init;
+ Gtk3->set_locale;
}
#------------------------------------------------------------------------------
sub init_sizes {
my ($o) = @_;
- ($::rootwidth, $::rootheight) = (Gtk2::Gdk->screen_width, Gtk2::Gdk->screen_height);
+ ($::rootwidth, $::rootheight) = (Gtk3::Gdk->screen_width, Gtk3::Gdk->screen_height);
$::stepswidth = $::rootwidth <= 640 ? 0 : 196;
($::logowidth, $::logoheight) = $::rootwidth <= 640 ? (0, 0) : (800, 75);
($o->{windowwidth}, $o->{windowheight}) = ($::rootwidth - $::stepswidth, $::rootheight);
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index d88fa2106..f57c9cecc 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -180,7 +180,7 @@ sub leavingStep {
sub charsetChanged {
my ($o) = @_;
- Gtk2->set_locale;
+ Gtk3->set_locale;
install::gtk::load_font($o);
install::gtk::create_steps_window($o);
}
@@ -264,11 +264,11 @@ sub reallyChooseDesktop {
$prev->signal_connect(key_press_event => sub {
my (undef, $event) = @_;
if (!$event || ($event->keyval & 0x7f) == 0xd) {
- Gtk2->main_quit;
+ Gtk3->main_quit;
}
});
my $img = gtksignal_connect(
- gtkadd(Gtk2::EventBox->new, gtknew('Image', file => "desktop-$val->[0]")),
+ gtkadd(Gtk3::EventBox->new, gtknew('Image', file => "desktop-$val->[0]")),
'button-press-event' => sub {
my %title = (
KDE => N("KDE Desktop"),
@@ -286,7 +286,7 @@ sub reallyChooseDesktop {
1, gtknew('Image', file => "desktop-$val->[0]-big"),
0, gtknew('HSeparator'),
0, gtknew('HButtonBox', layout => 'end', children_loose => [
- gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit })
+ gtknew('Button', text => N("Close"), clicked => sub { Gtk3->main_quit })
]),
]),
);
@@ -355,7 +355,7 @@ sub reallyChooseGroups {
gtknew('Install_Button', text => N("Help"), clicked => sub {
interactive::gtk::display_help($o, { interactive_help_id => 'choosePackageGroups' }) }),
gtknew('Button', text => N("Unselect All"), clicked => sub { $_->set_active(0) foreach @entries }),
- gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }),
+ gtknew('Button', text => N("Next"), clicked => sub { Gtk3->main_quit }),
]),
]),
)
@@ -572,7 +572,7 @@ sub installPackages {
my $pl = $f; $pl =~ s/\.png$/.pl/;
eval(cat_($pl)) if -e $pl;
$banner->{text} = $title;
- Gtk2::Banner::update_text($banner);
+ Gtk3::Banner::update_text($banner);
}
};
@@ -788,7 +788,7 @@ It will then continue from the hard disk drive and the packages will remain avai
0, gtknew('HButtonBox', layout => 'edge', children_tight => [
gtknew('Install_Button', text => N("Help"), clicked => sub {
interactive::gtk::display_help($o, { interactive_help_id => 'choosePackagesTree' }) }),
- gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }),
+ gtknew('Button', text => N("Next"), clicked => sub { Gtk3->main_quit }),
]),
]),
);
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index d3b36abc3..c1b196f8f 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -44,9 +44,9 @@ sub ask_fileW {
sub create_boxradio {
my ($e, $onchange_f, $double_click) = @_;
- my $boxradio = gtkpack2__(Gtk2::VBox->new,
+ my $boxradio = gtkpack2__(Gtk3::VBox->new,
my @radios = gtkradio('', @{$e->{formatted_list}}));
- my $tips = Gtk2::Tooltips->new;
+ my $tips = Gtk3::Tooltips->new;
mapn {
my ($txt, $w) = @_;
# workaround infamous 6 years old gnome bug #101968:
@@ -78,11 +78,11 @@ sub create_treeview_list {
my ($e, $onchange_f, $double_click) = @_;
my $curr;
- my $list = Gtk2::ListStore->new("Glib::String");
- my $list_tv = Gtk2::TreeView->new_with_model($list);
+ my $list = Gtk3::ListStore->new("Glib::String");
+ my $list_tv = Gtk3::TreeView->new_with_model($list);
$list_tv->set_headers_visible(0);
$list_tv->get_selection->set_mode('browse');
- my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, my $renderer = Gtk2::CellRendererText->new, 'text' => 0);
+ my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, my $renderer = Gtk3::CellRendererText->new, 'text' => 0);
$list_tv->append_column($textcolumn);
$renderer->set_property('ellipsize', 'end');
@@ -124,7 +124,7 @@ sub create_treeview_list {
if ($j == @l) {
$starting_word = '';
} else {
- $select->(Gtk2::TreePath->new_from_string(($j + $curr) % @l));
+ $select->(Gtk3::TreePath->new_from_string(($j + $curr) % @l));
}
$timeout = Glib::Timeout->add($forgetTime, sub { $timeout = $starting_word = ''; 0 });
@@ -151,7 +151,7 @@ sub create_treeview_list {
my $nb = find_index { $_ eq $v } @{$e->{list}};
my ($old_path) = $list_tv->get_cursor;
if (!$old_path || $nb != $old_path->to_string) {
- $select->(Gtk2::TreePath->new_from_string($nb));
+ $select->(Gtk3::TreePath->new_from_string($nb));
}
undef $old_path if $old_path;
};
@@ -162,7 +162,7 @@ sub __create_tree_model {
my ($e) = @_;
my $sep = quotemeta $e->{separator};
- my $tree_model = Gtk2::TreeStore->new("Glib::String", if_($e->{image2f}, "Gtk2::Gdk::Pixbuf"));
+ my $tree_model = Gtk3::TreeStore->new("Glib::String", if_($e->{image2f}, "Gtk3::Gdk::Pixbuf"));
my $build_value = sub {
my ($v) = @_;
@@ -203,14 +203,14 @@ sub create_treeview_tree {
my ($e, $onchange_f, $double_click) = @_;
my $tree_model = __create_tree_model($e);
- my $tree = Gtk2::TreeView->new_with_model($tree_model);
+ my $tree = Gtk3::TreeView->new_with_model($tree_model);
$tree->get_selection->set_mode('browse');
{
- my $col = Gtk2::TreeViewColumn->new;
- $col->pack_start(my $texrender = Gtk2::CellRendererText->new, 0);
+ my $col = Gtk3::TreeViewColumn->new;
+ $col->pack_start(my $texrender = Gtk3::CellRendererText->new, 0);
$col->add_attribute($texrender, text => 0);
if ($e->{image2f}) {
- $col->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0);
+ $col->pack_start(my $pixrender = Gtk3::CellRendererPixbuf->new, 0);
$col->add_attribute($pixrender, pixbuf => 1);
}
$tree->append_column($col);
@@ -219,7 +219,7 @@ sub create_treeview_tree {
my $select = sub {
my ($path_str) = @_;
- my $path = Gtk2::TreePath->new_from_string($path_str);
+ my $path = Gtk3::TreePath->new_from_string($path_str);
$tree->expand_to_path($path);
$tree->set_cursor($path, undef, 0);
gtkflush(); #- workaround gtk3 bug not honouring centering on the given row if node was closed
@@ -331,7 +331,7 @@ sub create_treeview_tree {
}
#- $actions is a ref list of $action
-#- $action is a { kind => $kind, action => sub { ... }, button => Gtk2::Button->new(...) }
+#- $action is a { kind => $kind, action => sub { ... }, button => Gtk3::Button->new(...) }
#- where $kind is one of '', 'modify', 'remove', 'add'
sub add_modify_remove_action {
my ($button, $buttons, $e, $treelist) = @_;
@@ -371,13 +371,13 @@ sub create_widget {
my ($w, $real_w, $focus_w, $set);
if ($e->{type} eq 'iconlist') {
- $w = Gtk2::Button->new;
+ $w = Gtk3::Button->new;
$set = sub {
gtkdestroy($e->{icon});
my $f = $e->{icon2f}->($_[0]);
$e->{icon} = -e $f ?
gtkcreate_img($f) :
- Gtk2::WrappedLabel->new(may_apply($e->{format}, $_[0]));
+ Gtk3::WrappedLabel->new(may_apply($e->{format}, $_[0]));
$w->add(gtkshow($e->{icon}));
};
$w->signal_connect(clicked => sub {
@@ -387,14 +387,14 @@ sub create_widget {
if ($e->{alignment} eq 'right') {
$real_w = gtknew('HButtonBox', layout => 'start', children_tight => [ $w ]);
} else {
- $real_w = gtkpack_(Gtk2::HBox->new(0,10), 1, Gtk2::HBox->new(0,0), 0, $w, 1, Gtk2::HBox->new(0,0));
+ $real_w = gtkpack_(Gtk3::HBox->new(0,10), 1, Gtk3::HBox->new(0,0), 0, $w, 1, Gtk3::HBox->new(0,0));
}
} elsif ($e->{type} eq 'bool') {
if ($e->{image}) {
- $w = ugtk3::gtkadd(Gtk2::CheckButton->new, gtkshow(gtkcreate_img($e->{image})));
+ $w = ugtk3::gtkadd(Gtk3::CheckButton->new, gtkshow(gtkcreate_img($e->{image})));
} else {
#- warn "\"text\" member should have been used instead of \"label\" one at:\n", common::backtrace(), "\n" if $e->{label} && !$e->{text};
- $w = Gtk2::CheckButton->new_with_label($e->{text});
+ $w = Gtk3::CheckButton->new_with_label($e->{text});
}
$w->signal_connect(clicked => $onchange->(sub { $w->get_active }));
$set = sub { $w->set_active($_[0]) };
@@ -419,16 +419,16 @@ sub create_widget {
$set = sub {
my $w = $w->child;
# handle Install_Buttons:
- if (ref($w) =~ /Gtk2::HBox/) {
- ($w) = find { ref($_) =~ /Gtk2::Label/ } $w->get_children;
+ if (ref($w) =~ /Gtk3::HBox/) {
+ ($w) = find { ref($_) =~ /Gtk3::Label/ } $w->get_children;
}
# guard against 'advanced' widgets that are now in their own dialog
# (instead of in another block child of an expander):
return if !$w;
$w->set_label(may_apply($e->{format}, $_[0])) };
} elsif ($e->{type} eq 'range') {
- my $adj = Gtk2::Adjustment->new(${$e->{val}}, $e->{min}, $e->{max} + ($e->{SpinButton} ? 0 : 1), 1, ($e->{max} - $e->{min}) / 10, 1);
- $w = $e->{SpinButton} ? Gtk2::SpinButton->new($adj, 10, 0) : Gtk2::HScale->new($adj);
+ my $adj = Gtk3::Adjustment->new(${$e->{val}}, $e->{min}, $e->{max} + ($e->{SpinButton} ? 0 : 1), 1, ($e->{max} - $e->{min}) / 10, 1);
+ $w = $e->{SpinButton} ? Gtk3::SpinButton->new($adj, 10, 0) : Gtk3::HScale->new($adj);
$w->set_size_request($e->{SpinButton} ? 100 : 200, -1);
$w->set_digits(0);
$adj->signal_connect(value_changed => $onchange->(sub { $adj->get_value }));
@@ -458,7 +458,7 @@ sub create_widget {
push @buttons, map { if_($actions->{$_}, 'gtk-go-' . $_) } qw(Up Down);
@buttons = map {
my $button = /^gtk-/ ? gtknew('Button', image => gtknew('Image', stock => lc($_)))
- : Gtk2::Button->new(translate($_));
+ : Gtk3::Button->new(translate($_));
my $kind = $_;
$kind =~ s/^gtk-go-//;
{ kind => lc $kind, action => $actions->{$kind}, button => $button, real_kind => $_ };
@@ -479,9 +479,9 @@ sub create_widget {
add_modify_remove_sensitive(\@buttons, $e);
my ($images, $real_buttons) = partition { $_->{real_kind} =~ /^gtk-/ } @buttons;
- $real_w = gtkpack_(Gtk2::HBox->new(0,0),
+ $real_w = gtkpack_(Gtk3::HBox->new(0,0),
1, create_scrolled_window($w),
- 0, gtkpack__(Gtk2::VBox->new(0,0),
+ 0, gtkpack__(Gtk3::VBox->new(0,0),
(map { $_->{button} } @$real_buttons),
if_($images,
gtknew('HButtonBox',
@@ -518,23 +518,23 @@ sub create_widget {
if (!$e->{separator}) {
if ($e->{not_edit}) {
- $real_w = $w = Gtk2::ComboBox->new_text;
+ $real_w = $w = Gtk3::ComboBox->new_text;
# FIXME: the following causes Gtk-CRITICAL but not solvable at realize time:
first($w->child->get_cell_renderers)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize};
$w->set_wrap_width($e->{gtk}{wrap_width}) if exists $e->{gtk}{wrap_width};
} else {
- $w = Gtk2::ComboBoxEntry->new_text;
+ $w = Gtk3::ComboBoxEntry->new_text;
($real_w, $w) = ($w, $w->child);
}
$real_w->set_popdown_strings(@formatted_list);
} else {
$model = __create_tree_model($e);
- $real_w = $w = Gtk2::ComboBox->new_with_model($model);
+ $real_w = $w = Gtk3::ComboBox->new_with_model($model);
- $w->pack_start(my $texrender = Gtk2::CellRendererText->new, 0);
+ $w->pack_start(my $texrender = Gtk3::CellRendererText->new, 0);
$w->add_attribute($texrender, text => 0);
if ($e->{image2f}) {
- $w->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0);
+ $w->pack_start(my $pixrender = Gtk3::CellRendererPixbuf->new, 0);
$w->add_attribute($pixrender, pixbuf => 1);
}
}
@@ -568,21 +568,21 @@ sub create_widget {
$w = gtknew('WeaknessCheckEntry');
}
else {
- $w = Gtk2::Entry->new;
+ $w = Gtk3::Entry->new;
}
$w->signal_connect(changed => $onchange->(sub { $w->get_text }));
$w->signal_connect(focus_in_event => sub { $w->select_region(0, -1) });
$w->signal_connect(focus_out_event => sub { $w->select_region(0, 0) });
$set = sub { $w->set_text($_[0]) if $_[0] ne $w->get_text };
if ($e->{type} eq 'file') {
- my $button = gtksignal_connect(Gtk2::Button->new_from_stock('gtk-open'), clicked => sub {
+ my $button = gtksignal_connect(Gtk3::Button->new_from_stock('gtk-open'), clicked => sub {
my $file = $o->ask_fileW({
title => $e->{label},
want_a_dir => to_bool($e->{want_a_dir}),
});
$set->($file) if $file;
});
- $real_w = gtkpack_(Gtk2::HBox->new(0,0), 1, $w, 0, $button);
+ $real_w = gtkpack_(Gtk3::HBox->new(0,0), 1, $w, 0, $button);
}
}
$w->signal_connect(key_press_event => $e->{may_go_to_next});
@@ -628,9 +628,9 @@ sub all_title_entries {
sub create_widgets_block {
my ($o, $common, $l, $update, $ignore_ref) = @_;
- my $label_sizegrp = Gtk2::SizeGroup->new('horizontal');
- my $right_label_sizegrp = Gtk2::SizeGroup->new('horizontal');
- my $realw_sizegrp = Gtk2::SizeGroup->new('horizontal');
+ my $label_sizegrp = Gtk3::SizeGroup->new('horizontal');
+ my $right_label_sizegrp = Gtk3::SizeGroup->new('horizontal');
+ my $realw_sizegrp = Gtk3::SizeGroup->new('horizontal');
@$l = map_index {
if ($::i && ($_->{type} eq 'expander' || $_->{title})) {
@@ -667,7 +667,7 @@ sub create_widgets_block {
my $eater = if_($e->{alignment} eq 'right' && !$label_w, gtknew('Label'));
- $e->{real_w} = gtkpack_(Gtk2::HBox->new,
+ $e->{real_w} = gtkpack_(Gtk3::HBox->new,
if_($e->{icon}, 0, eval { gtkcreate_img($e->{icon}) }),
if_($eater, 1, $eater),
if_($label_w, $e->{alignment} eq 'right', $label_w),
@@ -700,7 +700,7 @@ sub create_widgets {
my $ok_clicked = sub {
!$mainw->{ok} || $mainw->{ok}->get_property('sensitive') or return;
$mainw->{retval} = 1;
- Gtk2->main_quit;
+ Gtk3->main_quit;
};
my @all = all_entries($l);
@@ -718,7 +718,7 @@ sub create_widgets {
$mainw->{rwindow}->hide;
if (my $v = $e->{clicked_may_quit}()) {
$mainw->{retval} = $v;
- Gtk2->main_quit;
+ Gtk3->main_quit;
}
$mainw->{rwindow}->show;
$update->();
@@ -750,7 +750,7 @@ sub create_widgets {
my $box = create_widgets_block($o, $common, $l, $update, \$ignore);
- my $tooltips = Gtk2::Tooltips->new;
+ my $tooltips = Gtk3::Tooltips->new;
foreach my $e (@all) {
$tooltips->set_tip($e->{w}, $e->{help}) if $e->{help} && !ref($e->{help});
}
@@ -804,20 +804,20 @@ sub get_html_file {
sub display_help_window {
my ($o, $common) = @_;
if (my $file = $common->{interactive_help_id}) {
- require Gtk2::WebKit;
+ require Gtk3::WebKit;
my $view = gtknew('WebKit_View');
load_from_uri($view, $file);
my $w = ugtk3->new(N("Help"), modal => 1);
gtkadd($w->{rwindow},
- gtkpack_(Gtk2::VBox->new,
+ gtkpack_(Gtk3::VBox->new,
1, create_scrolled_window(gtkset_border_width($view, 5),
[ 'never', 'automatic' ],
),
- 0, Gtk2::HSeparator->new,
+ 0, Gtk3::HSeparator->new,
0, gtkpack(create_hbox('end'),
- gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit })
+ gtknew('Button', text => N("Close"), clicked => sub { Gtk3->main_quit })
),
),
);
@@ -875,7 +875,7 @@ sub ask_fromW {
my $entry_to_focus = find { $_->{focus} && $_->{focus}() } @$l;
my $widget_to_focus = $entry_to_focus ? $entry_to_focus->{focus_w} :
$common->{focus_cancel} ? $mainw->{cancel} :
- @$l && (!$mainw->{ok} || @$l == 1 && member(ref($l->[0]{focus_w}), "Gtk2::TreeView", "Gtk2::RadioButton")) ?
+ @$l && (!$mainw->{ok} || @$l == 1 && member(ref($l->[0]{focus_w}), "Gtk3::TreeView", "Gtk3::RadioButton")) ?
$l->[0]{focus_w} :
$mainw->{ok};
$widget_to_focus->grab_focus if $widget_to_focus;
@@ -918,7 +918,7 @@ my $reuse_timeout;
sub wait_messageW {
my ($o, $title, $message, $message_modifiable) = @_;
- my $to_modify = Gtk2::Label->new(scalar warp_text(ref $message_modifiable ? '' : $message_modifiable));
+ my $to_modify = Gtk3::Label->new(scalar warp_text(ref $message_modifiable ? '' : $message_modifiable));
Glib::Source->remove($reuse_timeout) if $reuse_timeout; $reuse_timeout = '';
diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm
index 0c4798e4c..b4e3522f5 100644
--- a/perl-install/mygtk3.pm
+++ b/perl-install/mygtk3.pm
@@ -11,13 +11,13 @@ use c;
use log;
use common;
-use Gtk2;
+use Gtk3;
sub init() {
!check_for_xserver() and print("Cannot be run in console mode.\n"), c::_exit(0);
$::one_message_has_been_translated and warn("N() was called from $::one_message_has_been_translated BEFORE gtk3 initialisation, replace it with a N_() AND a translate() later.\n"), c::_exit(1);
- Gtk2->init;
+ Gtk3->init;
Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'),
if_($::isRestore, 'draksnapshot'), if_($::isInstall, 'urpmi'),
'drakx-net', 'drakx-kbd-mouse-x11', # shared translation
@@ -52,7 +52,7 @@ sub gtkset {
}
my %opts = @_;
- $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk3)::// or internal_error("gtkset unknown class $class");
+ $class =~ s/^(Gtk3|Gtk3::Gdk|mygtk3)::// or internal_error("gtkset unknown class $class");
_gtk($w, $class, 'gtkset', \%opts);
}
@@ -67,7 +67,7 @@ sub gtkadd {
internal_error("gtkadd $class: $r should be a string in @_");
}
my %opts = @_;
- $class =~ s/^(Gtk2|Gtk2::Gdk|mygtk3)::// or internal_error("gtkadd unknown class $class");
+ $class =~ s/^(Gtk3|Gtk3::Gdk|mygtk3)::// or internal_error("gtkadd unknown class $class");
_gtk($w, $class, 'gtkadd', \%opts);
}
@@ -122,7 +122,7 @@ sub _gtk {
$w->signal_connect(realize => delete $opts->{realize}) if exists $opts->{realize};
(delete $opts->{size_group})->add_widget($w) if $opts->{size_group};
if (my $tip = delete $opts->{tip}) {
- $global_tooltips ||= Gtk2::Tooltips->new;
+ $global_tooltips ||= Gtk3::Tooltips->new;
$global_tooltips->set_tip($w, $tip);
}
@@ -170,10 +170,10 @@ sub _gtk_any_Button {
if ($class eq 'RadioButton') {
@radio_options = delete $opts->{group};
}
- $w = $opts->{child} ? "Gtk2::$class"->new(@radio_options) :
- delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') :
- $opts->{text} ? "Gtk2::$class"->new_with_label(@radio_options, delete $opts->{text} || '') :
- "Gtk2::$class"->new(@radio_options);
+ $w = $opts->{child} ? "Gtk3::$class"->new(@radio_options) :
+ delete $opts->{mnemonic} ? "Gtk3::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') :
+ $opts->{text} ? "Gtk3::$class"->new_with_label(@radio_options, delete $opts->{text} || '') :
+ "Gtk3::$class"->new(@radio_options);
$w->{format} = delete $opts->{format} if exists $opts->{format};
}
@@ -223,9 +223,9 @@ sub _gtk__CheckMenuItem {
if (!$w) {
add2hash_($opts, { mnemonic => 1 });
- $w = $opts->{image} || !exists $opts->{text} ? "Gtk2::$class"->new :
- delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_label(delete $opts->{text}) :
- "Gtk2::$class"->new_with_mnemonic(delete $opts->{text});
+ $w = $opts->{image} || !exists $opts->{text} ? "Gtk3::$class"->new :
+ delete $opts->{mnemonic} ? "Gtk3::$class"->new_with_label(delete $opts->{text}) :
+ "Gtk3::$class"->new_with_mnemonic(delete $opts->{text});
}
$w->set_active(delete $opts->{active}) if exists $opts->{active};
@@ -239,9 +239,9 @@ sub _gtk__SpinButton {
if (!$w) {
$opts->{adjustment} ||= do {
add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1, value => delete $opts->{lower} });
- Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, delete $opts->{upper}, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size});
+ Gtk3::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, delete $opts->{upper}, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size});
};
- $w = Gtk2::SpinButton->new(delete $opts->{adjustment}, delete $opts->{climb_rate} || 0, delete $opts->{digits} || 0);
+ $w = Gtk3::SpinButton->new(delete $opts->{adjustment}, delete $opts->{climb_rate} || 0, delete $opts->{digits} || 0);
}
$w->signal_connect(value_changed => delete $opts->{value_changed}) if exists $opts->{value_changed};
@@ -255,9 +255,9 @@ sub _gtk__HScale {
$opts->{adjustment} ||= do {
add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1 });
add2hash_($opts, { value => $opts->{lower} }) if !exists $opts->{value};
- Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, (delete $opts->{upper}) + 1, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size});
+ Gtk3::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, (delete $opts->{upper}) + 1, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size});
};
- $w = Gtk2::HScale->new(delete $opts->{adjustment});
+ $w = Gtk3::HScale->new(delete $opts->{adjustment});
}
$w->set_digits(delete $opts->{digits}) if exists $opts->{digits};
@@ -277,7 +277,7 @@ sub _gtk__ProgressBar {
my ($w, $opts) = @_;
if (!$w) {
- $w = Gtk2::ProgressBar->new;
+ $w = Gtk3::ProgressBar->new;
}
if (my $fraction_ref = delete $opts->{fraction_ref}) {
@@ -299,7 +299,7 @@ sub _gtk__DrawingArea {
my ($w, $_opts) = @_;
if (!$w) {
- $w = Gtk2::DrawingArea->new;
+ $w = Gtk3::DrawingArea->new;
}
$w;
}
@@ -311,9 +311,9 @@ sub _gtk__Pixbuf {
my $name = delete $opts->{file} or internal_error("missing file");
my $file = _find_imgfile($name) or internal_error("cannot find image $name");
if (my $size = delete $opts->{size}) {
- $w = Gtk2::Gdk::Pixbuf->new_from_file_at_scale($file, $size, $size, 1);
+ $w = Gtk3::Gdk::Pixbuf->new_from_file_at_scale($file, $size, $size, 1);
} else {
- $w = Gtk2::Gdk::Pixbuf->new_from_file($file);
+ $w = Gtk3::Gdk::Pixbuf->new_from_file($file);
}
$w = $w->flip(1) if delete $opts->{flip};
}
@@ -328,7 +328,7 @@ sub _gtk__Image {
my ($w, $opts, $class) = @_;
if (!$w) {
- $w = Gtk2::Image->new;
+ $w = Gtk3::Image->new;
$w->{format} = delete $opts->{format} if exists $opts->{format};
$w->set_from_stock(delete $opts->{stock}, 'button') if exists $opts->{stock};
@@ -414,7 +414,7 @@ sub _gtk__Label {
if ($w) {
$w->set_text(delete $opts->{text}) if exists $opts->{text};
} else {
- $w = exists $opts->{text} ? Gtk2::Label->new(delete $opts->{text}) : Gtk2::Label->new;
+ $w = exists $opts->{text} ? Gtk3::Label->new(delete $opts->{text}) : Gtk3::Label->new;
$w->set_selectable(delete $opts->{selectable}) if exists $opts->{selectable};
$w->set_ellipsize(delete $opts->{ellipsize}) if exists $opts->{ellipsize};
$w->set_justify(delete $opts->{justify}) if exists $opts->{justify};
@@ -444,7 +444,7 @@ sub _gtk__Alignment {
my ($w, $_opts) = @_;
if (!$w) {
- $w = Gtk2::Alignment->new(0, 0, 0, 0);
+ $w = Gtk3::Alignment->new(0, 0, 0, 0);
}
$w;
}
@@ -472,7 +472,7 @@ sub _gtk__Install_Title {
0, gtknew('Label', padding => [ 6, 0 ]),
1, gtknew('VBox', widget_name => 'Banner', children_tight => [
_gtk__Title2($w, $opts),
- if_($::isInstall, Gtk2::HSeparator->new),
+ if_($::isInstall, Gtk3::HSeparator->new),
]),
0, gtknew('Label', padding => [ 6, 0 ]),
]);
@@ -495,9 +495,9 @@ sub _gtk__Title2 {
sub _gtk__Sexy_IconEntry {
my ($w, $opts) = @_;
- require Gtk2::Sexy;
+ require Gtk3::Sexy;
if (!$w) {
- $w = Gtk2::Sexy::IconEntry->new;
+ $w = Gtk3::Sexy::IconEntry->new;
$w->set_editable(delete $opts->{editable}) if exists $opts->{editable};
}
@@ -521,7 +521,7 @@ sub _gtk__Entry {
my ($w, $opts) = @_;
if (!$w) {
- $w = Gtk2::Entry->new;
+ $w = Gtk3::Entry->new;
$w->set_editable(delete $opts->{editable}) if exists $opts->{editable};
}
@@ -573,7 +573,7 @@ sub _gtk__TextView {
my ($w, $opts, $_class, $action) = @_;
if (!$w) {
- $w = Gtk2::TextView->new;
+ $w = Gtk3::TextView->new;
$w->set_editable(delete $opts->{editable}) if exists $opts->{editable};
$w->set_wrap_mode(delete $opts->{wrap_mode}) if exists $opts->{wrap_mode};
$w->set_cursor_visible(delete $opts->{cursor_visible}) if exists $opts->{cursor_visible};
@@ -586,7 +586,7 @@ sub _gtk__TextView {
sub _gtk__WebKit_View {
my ($w, $opts, $_class, $_action) = @_;
if (!$w) {
- $w = Gtk2::WebKit::WebView->new;
+ $w = Gtk3::WebKit::WebView->new;
}
# disable contextual menu:
@@ -605,14 +605,14 @@ sub _gtk__ComboBox {
my ($w, $opts, $_class, $action) = @_;
if (!$w) {
- $w = Gtk2::ComboBox->new_text;
+ $w = Gtk3::ComboBox->new_text;
$w->{format} = delete $opts->{format} if exists $opts->{format};
}