From 42f2df6ed4b50513130670416896e1704ad9a436 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 3 Aug 2007 12:34:46 +0000
Subject: move drakroam code in network::drakroam

---
 bin/drakroam | 347 +----------------------------------------------------------
 1 file changed, 4 insertions(+), 343 deletions(-)

(limited to 'bin/drakroam')

diff --git a/bin/drakroam b/bin/drakroam
index df827af..6f56c82 100755
--- a/bin/drakroam
+++ b/bin/drakroam
@@ -10,350 +10,10 @@ use lib qw(/usr/lib/libDrakX);
 
 # i18n: IMPORTANT: to get correct namespace (drakx-net instead of libDrakX)
 BEGIN { unshift @::textdomains, 'drakx-net' }
+
 use standalone;
 use common;
-use run_program;
-use detect_devices;
-use interactive;
-use mygtk2;
-use ugtk2 qw(:create :helpers :wrappers);
-use Gtk2::SimpleList;
-use network::monitor;
-use network::signal_strength;
-use network::network;
-use network::tools;
-use network::connection;
-use network::connection::wireless;
-use network::connection::cellular_card;
-use modules;
-
-sub update_connections_list {
-    my ($droam) = @_;
-
-    $droam->{gui}{model}->set($droam->{gui}{model}->append, 0, $droam->{gui}{empty_pixbuf} , 1, N("No device found")) unless @{$droam->{all_connections}};
-    $droam->{gui}{model}->set($droam->{gui}{model}->append,
-                0, gtknew('Pixbuf', file => $_->get_type_icon)->scale_simple($droam->{gui}{pixbuf_size}, $droam->{gui}{pixbuf_size}, 'hyper'),
-                1, $_->get_description) foreach @{$droam->{all_connections}};
-    my $index = $droam->{connection} && eval { find_index { $_ == $droam->{connection} } @{$droam->{all_connections}} };
-    $droam->{gui}{connections_combo}->set_active($index) if defined $index;
-}
-
-sub get_connection {
-    my ($droam) = @_;
-
-    @{$droam->{all_connections}} or return;
-    my $index = $droam->{gui}{connections_combo}->get_active;
-    defined $index && $droam->{all_connections}[$index];
-}
-
-sub prepare_connection {
-    my ($droam) = @_;
-
-    my @packages = $droam->{connection}->can('get_packages') ? $droam->{connection}->get_packages : ();
-    if (@packages && !$droam->{in}->do_pkgs->install(@packages)) {
-        $droam->{in}->ask_warn(N("Error"), N("Could not install the packages (%s)!", join(', ', @packages)));
-        return;
-    }
-    $droam->{connection}->prepare_device;
-    $droam->{connection}->setup_thirdparty($droam->{in}) or return;
-    if ($droam->{connection}->can("check_device") && !$droam->{connection}->check_device) {
-        $droam->{in}->ask_warn(N("Error"), $droam->{connection}{device}{error});
-        return;
-    }
-    if ($droam->{connection}->can('get_hardware_settings')) {
-        $droam->{connection}->guess_hardware_settings if $droam->{connection}->can('guess_hardware_settings');
-        $droam->{in}->ask_from_({
-            title => "Network settings",
-            messages => N("Please enter settings for network")
-        }, $droam->{connection}->get_hardware_settings) or return;
-    }
-    if ($droam->{connection}->can('check_hardware')) {
-        my $_w = $droam->{in}->wait_message('', N("Configuring device..."));
-        if (!$droam->{connection}->check_hardware) {
-            $droam->{in}->ask_warn(N("Error"), $droam->{connection}{hardware}{error}) if $droam->{connection}{hardware}{error};
-            return;
-        }
-    }
-}
-
-sub select_connection {
-    my ($droam) = @_;
-
-    $droam->{connection} = get_connection($droam);
-    prepare_connection($droam) if $droam->{connection};
-    update_on_connection_change($droam);
-}
-
-sub update_on_connection_change {
-    my ($droam) = @_;
-    $droam->{gui}{buttons}{refresh}->set_sensitive(to_bool($droam->{connection}));
-    update_networks($droam);
-}
-
-sub get_network_event_message {
-    my ($droam, $member, @args) = @_;
-    #- FIXME: the hostname.d script and s2u use a different D-Bus interface
-    if ($member eq 'hostname') {
-        my ($hostname) = @args;
-        N("Hostname changed to \"%s\"", $hostname);
-    } elsif ($member eq 'status') {
-        my ($status, $interface) = @args;
-        my $event_connection = find { $_->get_interface eq $interface } @{$droam->{all_connections}};
-        $event_connection && $event_connection->get_status_message($status);
-    }
-}
-
-sub update_networks {
-    my ($droam) = @_;
-    @{$droam->{gui}{networks_list}{data}} = ();
-
-    if ($droam->{connection}) {
-        my $wait = $droam->{connection}->network_scan_is_slow && $droam->{in}->wait_message('', N("Scanning for networks..."));
-        $droam->{connection}{networks} = $droam->{connection}->get_networks;
-        undef $wait;
-
-        $droam->{connection}{network} ||= find { $droam->{connection}{networks}{$_}{current} } keys %{$droam->{connection}{networks}};
-
-        my $routes = network::tools::get_routes();
-        my $interface = $droam->{connection}->get_interface;
-        my $connected = exists $routes->{$interface}{network};
-
-        while (my ($ap, $network) = each(%{$droam->{connection}{networks}})) {
-            push @{$droam->{gui}{networks_list}{data}}, [
-                $ap || $network->{name},
-                $network->{current} ? $connected ? $droam->{gui}{pixbufs}{state}{connected} : $droam->{gui}{pixbufs}{state}{refresh} : undef,
-                !$network->{essid} && exists $droam->{net}{wireless}{$ap} && $droam->{net}{wireless}{$ap}{WIRELESS_ESSID} || $network->{name},
-                network::signal_strength::get_strength_icon($network),
-                $droam->{gui}{pixbufs}{encryption}{$network->{flags} =~ /WPA/i ? 'strong' : $network->{flags} =~ /WEP/i ? 'weak' : 'open'},
-                $network->{flags},
-                $network->{mode},
-            ];
-        }
-
-        if ($droam->{connection}{network}) {
-            my $index = eval { find_index { $_->[0] eq $droam->{connection}{network} } @{$droam->{gui}{networks_list}{data}} };
-            $droam->{gui}{networks_list}->select($index) if defined $index;
-        }
-    }
-
-    update_on_network_change($droam);
-}
-
-sub load_settings {
-    my ($droam) = @_;
-
-    $droam->{connection}->load_interface_settings;
-    $droam->{connection}->guess_network_access_settings if $droam->{connection}->can('guess_network_access_settings');
-    $droam->{connection}->guess_protocol($droam->{net}) if $droam->{connection}->can('guess_protocol');
-    $droam->{connection}->guess_access_settings if $droam->{connection}->can('guess_access_settings');
-    $droam->{connection}->guess_address_settings if $droam->{connection}->can('guess_address_settings');
-    $droam->{connection}->guess_hostname_settings if $droam->{connection}->can('guess_hostname_settings');
-    $droam->{connection}->guess_network_control_settings if $droam->{connection}->can('guess_network_control_settings');
-    $droam->{connection}->guess_control_settings;
-}
-
-sub configure_network {
-    my ($droam) = @_;
-
-    load_settings($droam);
-
-    $droam->{in}->ask_from_({
-        title => "Network settings",
-        messages => N("Please enter settings for network")
-    },
-                   [
-                       $droam->{connection}->can('get_network_access_settings') ? (
-                           { label => $droam->{connection}->get_network_access_settings_label, title => 1, advanced => 1 },
-                           @{$droam->{connection}->get_network_access_settings},
-                       ) : (),
-                       $droam->{connection}->can('get_protocols') ? (
-                         @{$droam->{connection}->get_protocol_settings},
-                       ) : (),
-                       $droam->{connection}->can('get_access_settings') ? (
-                         { label => $droam->{connection}->get_access_settings_label, title => 1, advanced => 1 },
-                         @{$droam->{connection}->get_access_settings}
-                       ) : (),
-                       $droam->{connection}->can('get_address_settings') ? (
-                         { label => $droam->{connection}->get_address_settings_label, title => 1, advanced => 1 },
-                         @{$droam->{connection}->get_address_settings('show_all')}
-                       ) : (),
-                       $droam->{connection}->can('get_network_control_settings') ? (
-                         @{$droam->{connection}->get_network_control_settings}
-                       ) : (),
-                   ],
-               ) or return;
-
-    $droam->{connection}->install_packages($droam->{in}) if $droam->{connection}->can('install_packages');
-    $droam->{connection}->unload_connection if $droam->{connection}->can('unload_connection');
-
-    my $modules_conf = modules::any_conf->read;
-    $droam->{connection}->write_settings($droam->{net}, $modules_conf);
-    $modules_conf->write;
-
-    1;
-}
-
-sub connect_to_network {
-    my ($droam) = @_;
-
-    if ($droam->{connection}->selected_network_is_configured || configure_network($droam)) {
-        gtkset_mousecursor_wait($droam->{gui}{w}{window}->window);
-        my $_wait = $droam->{in}->wait_message(N("Please wait"), N("Connecting..."));
-        #- settings have to be rewritten only if they are impacted by choices from the main window
-        if ($droam->{connection}->can('get_networks')) {
-            load_settings($droam);
-            $droam->{connection}->write_settings($droam->{net});
-        }
-        $droam->{connection}->prepare_connection if $droam->{connection}->can('prepare_connection');
-        $droam->{connection}->disconnect;
-        $droam->{connection}->connect($droam->{in}, $droam->{net});
-        gtkset_mousecursor_normal($droam->{gui}{w}{window}->window);
-    }
-}
-
-sub select_network {
-    my ($droam) = @_;
-
-    if ($droam->{connection}) {
-        my ($selected) = $droam->{gui}{networks_list}->get_selected_indices;
-        $droam->{connection}{network} = defined $selected && $droam->{gui}{networks_list}{data}[$selected][0];
-    }
-    update_on_network_change($droam);
-}
-
-sub update_on_network_change {
-    my ($droam) = @_;
-
-    $droam->{gui}{buttons}{connect}->set_label(toggle_would_disconnect($droam) ? N("Disconnect") : N("Connect"));
-    #- always allow to disconnect if connected
-    $droam->{gui}{buttons}{connect}->set_sensitive($droam->{connection} && ($droam->{connection}->get_status || $droam->{connection}{network}));
-    #- allow to configure only if a network is selected
-    $droam->{gui}{buttons}{configure}->set_sensitive($droam->{connection} && $droam->{connection}{network});
-}
-
-sub toggle_would_disconnect {
-    my ($droam) = @_;
-
-    my $network = $droam->{connection} && $droam->{connection}->get_selected_network;
-    $droam->{connection} && $droam->{connection}->get_status &&
-      (!$network || keys(%{$droam->{connection}{networks}}) <= 1 || $network->{current});
-}
-
-sub toggle_connection {
-    my ($droam) = @_;
-
-    if (toggle_would_disconnect($droam)) {
-        gtkset_mousecursor_wait($droam->{gui}{w}{window}->window);
-        my $_wait = $droam->{in}->wait_message(N("Please wait"), N("Disconnecting..."));
-        $droam->{connection}->disconnect;
-        gtkset_mousecursor_normal($droam->{gui}{w}{window}->window);
-    } elsif ($droam->{connection}) {
-        $droam->{connection}{network} or return;
-        connect_to_network($droam);
-    }
-    update_on_network_change($droam);
-}
-
-sub build_drakroam_gui {
-    my ($droam, $dbus) = @_;
-
-    $droam->{gui}{model} = Gtk2::ListStore->new('Gtk2::Gdk::Pixbuf', 'Glib::String');
-    $droam->{gui}{connections_combo} = Gtk2::ComboBox->new($droam->{gui}{model});
-    my $pix_r = Gtk2::CellRendererPixbuf->new;
-    $droam->{gui}{connections_combo}->pack_start($pix_r, 0,);
-    $droam->{gui}{connections_combo}->add_attribute($pix_r, pixbuf => 0);
-    my $text_r = Gtk2::CellRendererText->new;
-    $droam->{gui}{connections_combo}->pack_start($text_r, 1);
-    $droam->{gui}{connections_combo}->add_attribute($text_r, text => 1);
-
-    $droam->{gui}{pixbuf_size} = 32;
-    $droam->{gui}{empty_pixbuf} = Gtk2::Gdk::Pixbuf->new('rgb', 1, 8, $droam->{gui}{pixbuf_size}, $droam->{gui}{pixbuf_size});
-    $droam->{gui}{empty_pixbuf}->fill(0);
-
-    $droam->{gui}{networks_list} = Gtk2::SimpleList->new(
-        "AP" => "hidden",
-        '' => "pixbuf",
-        N("SSID") => "text",
-        N("Signal strength") => "pixbuf",
-        '' => "pixbuf",
-        N("Encryption") => "text",
-        N("Operating Mode") => "text",
-    );
-    $droam->{gui}{networks_list}->get_selection->set_mode('single');
-
-    my $status_bar = Gtk2::Statusbar->new;
-    my $status_bar_cid = $status_bar->get_context_id("Network event");
-    if ($dbus) {
-        eval { $droam->{net}{monitor} = network::monitor->new($dbus) };
-        $dbus->{connection}->add_filter(sub {
-                                            my ($_con, $msg) = @_;
-                                            my $member = $msg->get_member;
-                                            my $message = get_network_event_message($droam, $member, $msg->get_args_list) or return;
-                                            my $m_id = $status_bar->push($status_bar_cid, $message);
-                                            Glib::Timeout->add(20000, sub { $status_bar->remove($status_bar_cid, $m_id); 0 });
-                                            update_networks($droam) if $member eq 'status';
-                                        });
-        $dbus->{connection}->add_match("type='signal',interface='com.mandriva.network'");
-        dbus_object::set_gtk2_watch_helper($dbus);
-    }
-
-    $droam->{gui}{pixbufs} = {
-        state => { map { $_ => gtkcreate_pixbuf($_) } qw(connected disconnected refresh) },
-        link_level => { map {
-            $_ => gtkcreate_pixbuf('wifi-' . sprintf('%03d', $_) . '.png')->scale_simple(24, 24, 'hyper');
-        } qw(20 40 60 80 100) },
-        encryption => { map {
-            $_ => gtkcreate_pixbuf("encryption-$_-24.png");
-        } qw(open weak strong) },
-    };
-
-    my $title = N("Wireless connection");
-    my $icon = '/usr/share/mcc/themes/default/drakroam-mdk.png';
-
-    $ugtk2::wm_icon = $icon;
-    $droam->{gui}{w} = ugtk2->new($title);
-    #- so that transient_for is defined, for wait messages and popups to be centered
-    $::main_window = $droam->{gui}{w}{real_window};
-
-    gtkadd($droam->{gui}{w}{window},
-           gtknew('VBox', spacing => 5, children => [
-               $::isEmbedded ? () : (0, Gtk2::Banner->new($icon, $title)),
-               0, gtknew('HBox', children_tight => [ gtknew('Label_Left', text => N("Device: "), alignment => [ 0.5, 0.5 ]),
-                                                     gtksignal_connect($droam->{gui}{connections_combo}, changed => sub { select_connection($droam) }) ]),
-               1, gtknew('ScrolledWindow', width => 500, height => 300, child => $droam->{gui}{networks_list}),
-               0, gtknew('HButtonBox', layout => 'edge', children_loose => [
-                   $droam->{gui}{buttons}{configure} = gtknew('Button', text => N("Configure"), clicked => sub { configure_network($droam) }),
-                   $droam->{gui}{buttons}{connect} = gtknew('Button', relief => 'half', clicked => sub { toggle_connection($droam) }),
-                   $droam->{gui}{buttons}{refresh} = gtknew('Button', text => N("Refresh"), clicked => sub { update_networks($droam) }),
-                   gtknew('Button', text => N("Quit"), clicked => sub { Gtk2->main_quit })
-               ]),
-               0, $status_bar,
-           ]),
-       );
-    $droam->{gui}{networks_list}->get_selection->signal_connect('changed' => \&select_network);
-}
-
-sub main {
-    my ($in, $net, $dbus, $o_interface, $o_ap) = @_;
-
-    my $droam = { in => $in, net => $net };
-    build_drakroam_gui($droam, $dbus);
-
-    my @connection_types = qw(network::connection::wireless network::connection::cellular_card);
-    @{$droam->{all_connections}} = map { $_->get_connections(automatic_only => 1) } @connection_types;
-    $droam->{connection} = $o_interface && find { $_->get_interface eq $o_interface } @{$droam->{all_connections}};
-    $droam->{connection} ||= find { !$_->network_scan_is_slow } @{$droam->{all_connections}};
-    update_connections_list($droam);
-    update_on_connection_change($droam);
-
-    if ($o_ap && $droam->{connection}) {
-        $droam->{connection}{network} = $o_ap;
-        $droam->{gui}{w}->show;
-        connect_to_network($droam);
-    }
-
-    $droam->{gui}{w}->main;
-}
+use network::drakroam;
 
 my %args = map { if_(/^--(\w+)=(.*)$/ && member($1, qw(ap interface)), $1 => $2) } @ARGV;
 
@@ -362,4 +22,5 @@ my $net = {};
 network::network::read_net_conf($net);
 my $dbus;
 eval { $dbus = dbus_object::system_bus() };
-main($in, $net, $dbus, $args{interface}, $args{ap});
+
+network::drakroam::main($in, $net, $dbus, $args{interface}, $args{ap});
-- 
cgit v1.2.1