add back tv cards configuration since now we can configure tv cards

kernel modules

1 files changed, 74 insertions, 74 deletions

diff --git a/control-center b/control-center
index 821a873e..38c2ae8b 100755
--- a/control-center
+++ b/control-center
@@ -124,7 +124,7 @@ my $exec_hash =
    _("Software Sources Manager") => [ "rpmdrake", "$_sbindir/edit-urpm-sources.pl", -1 ],
 
    
-#   _("TV Cards") => [ "drakxtv", "$_sbindir/drakxtv", 1 ],
+   _("TV Cards") => [ "drakxtv", "$_sbindir/drakxtv", 1 ],
 
    _("DNS Client") => ["Client wizard", "drakwizard $_wizdir/client_wizard/client.wiz", -1 ],
    _("DHCP") => ["DHCP wizard", "drakwizard $_wizdir/dhcp_wizard/dhcp.wiz",  -1 ],
@@ -171,11 +171,11 @@ my @tree =
       [_("Monitor"),'XFdrake-mdk'],
       [_("Resolution"),'XFdrake-mdk'],
       [_("Display"),'XFdrake-mdk'],
+      [_("TV Cards"),'XFdrake-mdk'],
       [_("Keyboard"), 'keyboard-mdk'],
       [_("Mouse"), 'mousedrake-mdk'],
       [_("Printer"),'printer-mdk'],
       [_("Scanner"),'scanner-mdk'],
-#      [_("TV Cards"), 'unknown-mdk' ],
      ]
     ],
     [_("Mount Points"),'partition-mdk',
@@ -287,56 +287,56 @@ foreach (@tree) {
     $darea_left->set_events(['exposure_mask', 'enter_notify_mask', 'leave_notify_mask', 'button_press_mask', 'button_release_mask' ]);
     $darea_left->signal_connect(size_allocate => sub { $dbl_area_left = undef });
     $darea_left->signal_connect(expose_event => sub {
-				     my ($dx, $dy) = ($darea_left->allocation->[2], $darea_left->allocation->[3]);
-				     if (!defined($dbl_area_left) || $darea_left->{state} != $dbl_area_left->{state}) {
-					 my $state = $darea_left->{state};
-					 my ($pix, $width, $height) = create_pix_text($darea_left, $text, "#0#0#0",
-									$darea_left->style->font,
-								       max($dx-40, 0), $dy, 0, 0, $back[$state], 160, 45, 0, 1, $state); 
-					 $dbl_area_left = new Gtk::Gdk::Pixmap($darea_left->window, $dx, $dy);
-					 $dbl_area_left->{state} = $darea_left->{state};
-					 $darea_left->{dbl} = $dbl_area_left;
-					 fill_tiled($darea_left, $dbl_area_left, $back[$state], 40, $dy, 40, 45);
-					 $dbl_area_left->draw_pixmap($darea_left->style->bg_gc('normal'),
-								     $icon[$state], 0, 0, 4, int(($dy-35)/2/5)*5, 35, 35);
-					 $dbl_area_left->draw_pixmap($darea_left->style->bg_gc('normal'),
-								     $pix, 0, 0, 40, 0, $width, $height);
-				     }
-				     $darea_left->window->draw_pixmap($darea_left->style->bg_gc('normal'),
-								      $dbl_area_left, 0, 0, 0, 0, ($dx, $dy));
-				 });
+	   my ($dx, $dy) = ($darea_left->allocation->[2], $darea_left->allocation->[3]);
+	   if (!defined($dbl_area_left) || $darea_left->{state} != $dbl_area_left->{state}) {
+		  my $state = $darea_left->{state};
+		  my ($pix, $width, $height) = create_pix_text($darea_left, $text, "#0#0#0",
+											  $darea_left->style->font,
+											  max($dx-40, 0), $dy, 0, 0, $back[$state], 160, 45, 0, 1, $state); 
+		  $dbl_area_left = new Gtk::Gdk::Pixmap($darea_left->window, $dx, $dy);
+		  $dbl_area_left->{state} = $darea_left->{state};
+		  $darea_left->{dbl} = $dbl_area_left;
+		  fill_tiled($darea_left, $dbl_area_left, $back[$state], 40, $dy, 40, 45);
+		  $dbl_area_left->draw_pixmap($darea_left->style->bg_gc('normal'),
+								$icon[$state], 0, 0, 4, int(($dy-35)/2/5)*5, 35, 35);
+		  $dbl_area_left->draw_pixmap($darea_left->style->bg_gc('normal'),
+								$pix, 0, 0, 40, 0, $width, $height);
+	   }
+	   $darea_left->window->draw_pixmap($darea_left->style->bg_gc('normal'),
+								 $dbl_area_left, 0, 0, 0, 0, ($dx, $dy));
+    });
     $darea_left->signal_connect(realize => sub { $darea_left->window->set_cursor($cursor_hand) });
     $darea_left->signal_connect(enter_notify_event => sub {
-				     if ($darea_left->{state} == 0) {
-					 $darea_left->{state} = 1;
-					 $darea_left->draw(undef);
-				     }
-				 });
+	   if ($darea_left->{state} == 0) {
+		  $darea_left->{state} = 1;
+		  $darea_left->draw(undef);
+	   }
+    });
     $darea_left->signal_connect(leave_notify_event => sub {
-				     if ($darea_left->{state} == 1) {
-					 $darea_left->{state} = 0;
-					 $darea_left->draw(undef);
-				     }
-				 });
+	   if ($darea_left->{state} == 1) {
+		  $darea_left->{state} = 0;
+		  $darea_left->draw(undef);
+	   }
+    });
     $darea_left->signal_connect(button_release_event => sub {
-			     $left_locked and return;
-			     $pending_app && !splash_warning(_("The modifications done in the current module won't be saved."), 1) and return;
-			     clean_socket();
-			     $notebook_global->show;
-			     $darea_left->{state} == 2 and $notebook_global->set_page($index), return;
-			     foreach (@darea_left_list) {
-				 $_->[1]->window->set_cursor($cursor_hand);
-				 if($_->[1]->{state} != 0) {
-				     $_->[1]->{state} = 0;
-				     $_->[1]->draw(undef);
-				 }
-			     }
-			     $darea_left->window->set_cursor($cursor_normal);
-			     $darea_left->{state} = 2, $darea_left->draw(undef);
-			     $notebook_global->set_page($index);
-			     $darea_left_sav = $darea_left;
-			 });
-
+	   $left_locked and return;
+	   $pending_app && !splash_warning(_("The modifications done in the current module won't be saved."), 1) and return;
+	   clean_socket();
+	   $notebook_global->show;
+	   $darea_left->{state} == 2 and $notebook_global->set_page($index), return;
+	   foreach (@darea_left_list) {
+		  $_->[1]->window->set_cursor($cursor_hand);
+		  if($_->[1]->{state} != 0) {
+			 $_->[1]->{state} = 0;
+			 $_->[1]->draw(undef);
+		  }
+	   }
+	   $darea_left->window->set_cursor($cursor_normal);
+	   $darea_left->{state} = 2, $darea_left->draw(undef);
+	   $notebook_global->set_page($index);
+	   $darea_left_sav = $darea_left;
+    });
+    
     push @darea_left_list, [ ($index-1)*45, $darea_left ];
 }
 
@@ -429,29 +429,29 @@ $fixed_title->signal_connect(realize => sub { $fixed_title->window->set_back_pix
 $darea_title->signal_connect(realize => sub { $darea_title->window->set_cursor($cursor_hand) });
 $darea_title->set_events([ 'button_release_mask' ]);
 $darea_title->signal_connect(button_release_event => sub {
-				  clean_socket();
-				  $notebook_global->show;
-				  $notebook_global->set_page(0);
-				  foreach (@darea_left_list) {
-				      $_->[1]->window->set_cursor($cursor_normal);
-				      $_->[1]->{state} = 0;
-				      $_->[1]->draw(undef);
-				  }
-			      });
+    clean_socket();
+    $notebook_global->show;
+    $notebook_global->set_page(0);
+    foreach (@darea_left_list) {
+	   $_->[1]->window->set_cursor($cursor_normal);
+	   $_->[1]->{state} = 0;
+	   $_->[1]->draw(undef);
+    }
+});
 $darea_title->signal_connect(configure_event => sub { $dbl_area = undef });
 
 $darea_title->signal_connect(expose_event => sub {
-				  my @dim = @{$_[1]->{area}};
-				  my ($dx, $dy) = ($darea_title->allocation->[2], $darea_title->allocation->[3]);
-				  if (!defined($dbl_area)) {
-				      $dbl_area = new Gtk::Gdk::Pixmap($darea_title->window, $dx, $dy);
-				      fill_tiled($darea_title, $dbl_area, $pixmap_back, 110, 55, $dx, $dy);
-				      $dbl_area->draw_pixmap($darea_title->style->bg_gc('normal'),
-							     $pixmap_icon, 0, 0, 0, 0, 325, 55);
-				  }
-				  $darea_title->window->draw_pixmap($darea_title->style->bg_gc('normal'),
-								    $dbl_area, $dim[0], $dim[1], $dim[0], $dim[1], $dim[2], $dim[3]);
-			      });
+    my @dim = @{$_[1]->{area}};
+    my ($dx, $dy) = ($darea_title->allocation->[2], $darea_title->allocation->[3]);
+    if (!defined($dbl_area)) {
+	   $dbl_area = new Gtk::Gdk::Pixmap($darea_title->window, $dx, $dy);
+	   fill_tiled($darea_title, $dbl_area, $pixmap_back, 110, 55, $dx, $dy);
+	   $dbl_area->draw_pixmap($darea_title->style->bg_gc('normal'),
+						 $pixmap_icon, 0, 0, 0, 0, 325, 55);
+    }
+    $darea_title->window->draw_pixmap($darea_title->style->bg_gc('normal'),
+							   $dbl_area, $dim[0], $dim[1], $dim[0], $dim[1], $dim[2], $dim[3]);
+});
 
 my ($pixmap_back_right, undef) = gtkcreate_png_('mcc-core-back');
 
@@ -494,18 +494,18 @@ foreach (@tree) {
 }
 Gtk->main_iteration while Gtk->events_pending;
 $notebook_global->signal_connect(switch_page => sub {
-				      my (undef, $tab_widget, $tab_number) = @_;
-				      $tab_number > 0 or return;
-				      $tab_widget->child->child->child->{redraw_function}->();
-				  });
+    my (undef, $tab_widget, $tab_number) = @_;
+    $tab_number > 0 or return;
+    $tab_widget->child->child->child->{redraw_function}->();
+});
 $window_global->show_all;
 $window_global->window->move(-715, -515);
 Gtk->main_iteration while Gtk->events_pending;
 $emb_box->hide;
 my $p = $#tree + ($::isWiz ? 1 : 0);
 foreach (0..$p) {
-  $notebook_global->set_page($_);
-  Gtk->main_iteration while Gtk->events_pending;
+    $notebook_global->set_page($_);
+    Gtk->main_iteration while Gtk->events_pending;
 }
 Gtk->timeout_remove($timer_splash);
 $notebook_global->set_page(0);