[pgadmin-hackers] CVS Commit by andreas: more Hint enhancements

[cvs]

Log Message:
-----------
more Hint enhancements

Modified Files:
--------------
    pgadmin3/src/ui:
        events.cpp (r1.130 -> r1.131)
        frmHint.cpp (r1.7 -> r1.8)


Index: frmHint.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmHint.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/ui/frmHint.cpp -Lsrc/ui/frmHint.cpp -u -w -r1.7 -r1.8
--- src/ui/frmHint.cpp
+++ src/ui/frmHint.cpp
@@ -149,23 +149,6 @@
     wxArrayInt hintnos;
     hintnos.Add(hintno);
     SetHint(hintnos, info);
-#if 0
-
-    wxString page=GetPage(hintArray[hintno].hintPage);
-
-    if (!info.IsEmpty())
-        page.Replace(wxT("<INFO>"), info);
-
-    htmlHint->SetPage(page);
-    chkSuppress->SetValue(false);
-    if (force || !(hintArray[hintno].flags & HINT_CANSUPPRESS))
-        chkSuppress->Disable();
-    if (force || !(hintArray[hintno].flags & HINT_CANABORT))
-        btnCancel->Disable();
-    if (!(hintArray[hintno].flags & HINT_CANFIX))
-        btnFix->Hide();
-    currentHint = hintno;
-#endif
 };
 
 
@@ -174,11 +157,17 @@
 {
     currentHint = hintnos.Item(0);
     if (hintnos.GetCount() == 1)
+    {
         SetTitle(_("pgAdmin III Guru Hint") + wxString(wxT(" - ")) + 
wxGetTranslation(hintArray[currentHint].hintCaption));
-    else
-        SetTitle(_("pgAdmin III Guru Hints"));
 
+        wxString page=GetPage(hintArray[currentHint].hintPage);
+        page.Replace(wxT("<INFO>"), info);
 
+        htmlHint->SetPage(page);
+    }
+    else
+    {
+        SetTitle(_("pgAdmin III Guru Hints"));
 
     wxString header = GetPage(wxT("multiple"));
     wxString pages;
@@ -237,6 +226,7 @@
     pages.Replace(wxT("<INFO>"), info);
 
     htmlHint->SetPage(header + wxT("</p>") + pages + wxT("</body></html>\n"));
+    }
 
     chkSuppress->SetValue(false);
 
Index: events.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/events.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -Lsrc/ui/events.cpp -Lsrc/ui/events.cpp -u -w -r1.130 -r1.131
--- src/ui/events.cpp
+++ src/ui/events.cpp
@@ -830,8 +830,6 @@
          canGrantWizard=false,
          canCount=false;
 
-    bool canHint=data->GetCanHint();
-
     bool showTree=true;
 
     switch (type)
@@ -1003,6 +1001,7 @@
     else
     {
     }
+    bool canHint=data->GetCanHint();
     toolsMenu->Enable(MNU_CONNECT, canConnect);
     toolsMenu->Enable(MNU_DISCONNECT, canDisconnect);
     toolsMenu->Enable(MNU_GRANTWIZARD, canGrantWizard);
@@ -1011,6 +1010,7 @@
     fileMenu->Enable(MNU_PASSWORD, canDisconnect);
     viewMenu->Enable(MNU_COUNT, canCount);
     helpMenu->Enable(MNU_HINT, canHint);
+    toolBar->EnableTool(MNU_HINT, canHint);
 //    toolsMenu->Enable(MNU_INDEXCHECK, canIndexCheck);
 }
 
---------------------------(end of broadcast)---------------------------
TIP 3: if posting/reading through Usenet, please send an appropriate
      subscribe-nomail command to [EMAIL PROTECTED] so that your
      message can get through to the mailing list cleanly