diff options
| -rw-r--r-- | TODO | 5 | ||||
| -rwxr-xr-x | control-center3 | 33 |
2 files changed, 18 insertions, 20 deletions
@@ -2,15 +2,12 @@ TODO: root passwd pb: when should it be asked? pb of user apps and root apps -> daouda (done) splash screen: we need a splash png 540*460 ->dadou -drakboot crashes. ->damien +drakboot crashes. -yves> drakgw should maybe be reworked -> gc layout of drakxtool should be corrected (pack start pb) -> damien -aurora config tool should be integrated and packaged ->yvounet cyclik table to kill less used tool to save memory -> daouda (is this needed?) i18n -> pablo + yves -add connection to mandrakeexpert and mandrakecampus -> done (daouda) correct call to netscape -> nearly done -reduce window size -> damien drakxservices should be included ->damien + improvement (start at boot) icons -> dadou diff --git a/control-center3 b/control-center3 index 3ae95650..d035d3fc 100755 --- a/control-center3 +++ b/control-center3 @@ -42,8 +42,6 @@ Gtk::Gdk::ImlibImage->init; use Data::Dumper; my $in = vnew interactive ('su'); -my $false = 0; -my $true = 1; my $_xbindir = "/usr/X11R6/bin"; my $_bindir = "/usr/bin"; @@ -259,9 +257,9 @@ sub about_mdk_cc my $style1 = new Gtk::Style; $style1->font(Gtk::Gdk::Font->fontset_load(_("-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"))); $label->set_style($style1); - $window_about->vbox->pack_start( $label, $true, $true, 0 ); + $window_about->vbox->pack_start( $label, 1, 1, 0 ); - $window_about->vbox->pack_start( new Gtk::Label( _("Authors: ") . "\n\n Daouda Lo <daouda\@mandrakesoft.com> \n \n Damien Krotkine <dams\@mandrakesoft.com>\n"), $true, $true, 0 ); + $window_about->vbox->pack_start( new Gtk::Label( _("Authors: ") . "\n\n Daouda Lo <daouda\@mandrakesoft.com> \n \n Damien Krotkine <dams\@mandrakesoft.com>\n"), 1, 1, 0 ); $window_about->show_all(); $window_about->set_modal(1); @@ -284,7 +282,7 @@ sub splash_warning my $style1 = new Gtk::Style; # $style1->font(Gtk::Gdk::Font->fontset_load(_("-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"))); # $lab->set_style($style1); - $win_about->vbox->pack_start( $lab, $true, $true, 0 ); + $win_about->vbox->pack_start( $lab, 1, 1, 0 ); $win_about->show_all(); $win_about->set_modal(1); @@ -400,7 +398,7 @@ sub xpm_label_box my ( $parent, $xpm_filename, $label_text ) = @_; # Create box for xpm and label - my $box = new Gtk::HBox( $false, 0 ); + my $box = new Gtk::HBox( 0, 0 ); # Get the style of the button to get the background color. my $style = $parent->get_style()->bg( 'normal' ); @@ -413,8 +411,8 @@ sub xpm_label_box my $label = new Gtk::Label( $label_text ); # Pack the pixmap and label into the box - $box->pack_start( $pixmapwid, $false, $false, 3 ); - $box->pack_start( $label, $false, $false, 3 ); + $box->pack_start( $pixmapwid, 0, 0, 3 ); + $box->pack_start( $label, 0, 0, 3 ); $box->border_width( 2 ); $pixmapwid->show(); @@ -426,15 +424,20 @@ sub xpm_label_box sub exec_treeitem { my ($label, $exec_string) = @_; if ($exec_string) { - print _("SELECTED\n"); if ($tree_launched{$label}==-1) { - print _("yes\n"); + my $vbox = new Gtk::VBox(0, 0); + $vbox->show; +# my $label = new Gtk::Label "Please be patient"; +# $vbox->pack_start( $label, 0, 0, 0); +# $label->show; my $socket = new Gtk::Socket; + $vbox->pack_start( $socket, 0, 0, 1); $socket->show; - $notebook_global->append_page($socket, ""); + $notebook_global->append_page($vbox, ""); $socket->realize; - printf (_("The XID of the sockets window nr. %s is [%s]\n"), "", $socket->window->XWINDOW ); - printf (_("My PID is [%s]\n"), $$ ); +# $label->destroy; + printf ("The XID of the sockets window nr. %s is [%s]\n", "", $socket->window->XWINDOW ); + printf ("My PID is [%s]\n", $$ ); my $a = $exec_string . " --embedded " . $socket->window->XWINDOW . " " . $$; print "$a\n"; my $pid; @@ -442,14 +445,12 @@ sub exec_treeitem { unless ($pid = fork) { splash_warning("cannot fork: $~") unless defined $pid; exec("$a"); - my $kid = waitpid(-1,&WNOHANG); } - $pid_launched[$nb_pages] = $kid; + $pid_launched[$nb_pages] = undef; $nb_pages++; $tree_launched{$label}=$nb_pages; $notebook_global->set_page($nb_pages); } else { - print _("no\n"); $notebook_global->set_page($tree_launched{$label}); } } |