fix calling the appropriate contextual help index by ensuring tab order doesn't alter help ID

2 files changed, 18 insertions, 17 deletions

diff --git a/NEWS b/NEWS
index 426935b3..3b1dc8e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 - do call the appropriate help index
+- fix calling the appropriate contextual help index:
+  o ensure tab order doesn't alter help ID
 
 Version 10.23 - 15 September 2008, Thierry Vignaud
 
diff --git a/control-center b/control-center
index d3e92ca8..3ebe4eca 100755
--- a/control-center
+++ b/control-center
@@ -148,7 +148,7 @@ sub wizard_format {
 my @tree = (
     if_($isRpmDrake || $isParkRpmDrake,
         [
-            N("Software Management"), 'software',
+            N("Software Management"), 'software', 'software-management',
             [
                 if_($isRpmDrake,
                     {
@@ -174,7 +174,7 @@ my @tree = (
 
     if_(0, [ N("Server wizards"), 'wizard-mdk' ]),
     [
-        N("Sharing"), 'file-sharing-mdk',
+        N("Sharing"), 'file-sharing-mdk', 'wiz-client',
         [
             {
                 title => N("Sharing"),
@@ -202,7 +202,7 @@ my @tree = (
         ]
     ],
     [
-        N("Network Services"), 'network-services-mdk',
+        N("Network Services"), 'network-services-mdk', 'mcc-network',
         [
             {
                 title => N("Network Services"),
@@ -231,7 +231,7 @@ my @tree = (
     ],
 
     [ 
-        N("Authentication"), 'drakauth-mdk',
+        N("Authentication"), 'drakauth-mdk', '',
         [
             {
                 title => N("Authentication"),
@@ -252,7 +252,7 @@ my @tree = (
     ],
 
     [ 
-        N("Groupware"), 'groupware-mdk',
+        N("Groupware"), 'groupware-mdk', '',
         [
             {
                 title => N("Groupware"),
@@ -276,7 +276,7 @@ my @tree = (
 
     if_($isWebAdmin || $isRfbDrake,
         [
-            N("Online Administration"), 'online-administration-mdk',
+            N("Online Administration"), 'online-administration-mdk', '',
             [
                 {
                     title => N("Online Administration"),
@@ -312,7 +312,7 @@ my @tree = (
         ]),
 
     [
-        N("Hardware"), 'drakhard-mdk',
+        N("Hardware"), 'drakhard-mdk', 'mcc-hardware',
         [
             {
                 title => N("Manage your hardware"),
@@ -353,7 +353,7 @@ my @tree = (
     ],
 
     [
-        N("Network & Internet"), 'net-mdk',
+        N("Network & Internet"), 'net-mdk', 'mcc-network',
         [
             {
                 title => N("Manage your network devices"),
@@ -387,7 +387,7 @@ my @tree = (
     ],
 
     [
-        N("System"), 'system-mdk',
+        N("System"), 'system-mdk', 'mcc-system', 
         [
             {
                 title => N("Manage system services"),
@@ -422,7 +422,7 @@ my @tree = (
     ],
 
     [
-        N("Network Sharing"), 'network-sharing-mdk',
+        N("Network Sharing"), 'network-sharing-mdk', '',
         [
             {
                 title => N("Configure Windows(R) shares"),
@@ -448,7 +448,7 @@ my @tree = (
     ],
 
     [
-        N("Local disks"), 'partition-mdk',
+        N("Local disks"), 'partition-mdk', 'mcc-mountpoints',
         [
             {
                 title => N("Local disks"),
@@ -495,7 +495,7 @@ my @tree = (
     ],
 
     [
-        N("Security"), 'security-mdk',
+        N("Security"), 'security-mdk', 'mcc-security',
         [
             {
                 title => N("Security"),
@@ -511,7 +511,7 @@ my @tree = (
     ],
 
     [
-        N("Boot"), 'boot-mdk',
+        N("Boot"), 'boot-mdk', 'mcc-boot',
         [
             {
                 title => N("Configure boot steps"),
@@ -585,8 +585,6 @@ $window_global->set_icon(gtkcreate_pixbuf("/usr/share/icons/drakconf.png"));
 my $pending_app = 0;
 
 my $help_on_context = 'drakconf-intro';
-#Please replace with correct contextual help page
-my @ctx = qw(drakconf-intro mcc-boot mcc-hardware mcc-mountpoints mcc-network mcc-security mcc-system software-management wiz-client);
 
 my @themes = grep { -d "$themes_dir/$_" } all($themes_dir);
 
@@ -787,7 +785,7 @@ sub clean_list {
 
 my @labels;
 foreach (@tree) {
-    my ($text, $icon, $subtrees) = @$_;
+    my ($text, $icon, $help, $subtrees) = @$_;
 
     my @subtrees = grep { $_->{list} = [ clean_list($_->{list}) ]; !is_empty_array_ref($_->{list}) } @$subtrees;
 
@@ -893,6 +891,7 @@ foreach (@tree) {
     $document->open_stream("text/html");
     $document->write_stream($string);
     $labels[$index-1]{text} = $text;
+    $labels[$index-1]{help} = $help;
 
     gtkappend_page($notebook_global,
                  my $_w_ret = create_scrolled_window(gtkset_border_width($view, 5),
@@ -974,7 +973,7 @@ set_page_raw(0);
 my $old_index;
 $notebook_global->signal_connect(switch_page => sub {
     my ($notebook, $page, $new_index) = @_;
-    $help_on_context = $ctx[$new_index];
+    $help_on_context = $labels[$new_index]{help} || 'drakconf-intro';
     return if !$labels[$new_index]{widget};
     my $page = $notebook_global->get_current_page;
     $labels[$old_index]{widget}->set_markup($labels[$old_index]{text}) if -1 < $old_index;