Rename Help->What's this? as Help->Tooltips.

Don't change the cursor to a ? when the tooltips are enabled.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3789 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9147c7b612802373b624c026996a1dbe27d3a616..f2c15b6cf220229c3142d14d7a2ce6343b63e5c5 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * ui/default.ui: Change "What's this?" to "Tooltips".
+
 2002-03-19  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * create_fonts_dir: 

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index 7781300158ff4282be0327f1a23257334d88396f..f7c1b0ec3feef150e4a67dd40209e1527962ac05 100644 (file)
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -316,7 +316,7 @@ Menuset
 # HELP MENU
 #
     Menu "help"
-       Item "What's this?|W" "toggle-tooltips"
+       Item "Tooltips|o" "toggle-tooltips"
         Separator
        Item "Introduction|I" "help-open Intro"
        Item "Tutorial|T" "help-open Tutorial"

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 899e332e5fb17cf27d82f2bee61d0eb15e136bcd..bad395c44ef5285420f5588eee51702c75304725 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-20  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * xforms_helpers.C (setCursorColor):
+       * Tooltips.C (set): remove XC_question_arrow code.
+
 2002-03-19  André Pönitz <poenitz@gmx.net>
 
        * FormParagraph.C: whitespace changes
@@ -7,7 +12,7 @@
        * Tooltips.[Ch] (initTooltip): renamed init. In the 0.89 version, no
        longer call fl_set_object_helper as this routine respects line breaks
        only if the dialog is visible.
-       (getTooltip): renamed  get.
+       (getTooltip): renamed get.
        (toggleTooltips): renamed set and made public,
        
        * FormBase.C (show):

diff --git a/src/frontends/xforms/Tooltips.C b/src/frontends/xforms/Tooltips.C
index 545dffc48f53920f89c66ec412def5b3235d078e..fb1283163fd9b7aa7a44f868495ea69f93acf793 100644 (file)
--- a/src/frontends/xforms/Tooltips.C
+++ b/src/frontends/xforms/Tooltips.C
@@ -67,16 +67,6 @@ void Tooltips::set()
                char const * const c_str = enabled_ ? it->second.c_str() : 0;
                fl_set_object_helper(ob, c_str);
        }
-
-       FL_OBJECT * const ob = tooltipsMap.begin()->first;
-
-       // The dialog is not visible
-       if (!ob->form->window)
-               return;
-
-       // Set the cursor to a question mark or back to the default.
-       int const cursor = enabled_ ? XC_question_arrow : FL_DEFAULT_CURSOR;
-       fl_set_cursor(ob->form->window, cursor);
 }
 
 
@@ -145,22 +135,7 @@ void Tooltips::toggleEnabled()
 
 
 void Tooltips::set()
-{
-       if (tooltipsMap.empty())
-               // There are no objects with tooltips in this dialog, so
-               // just go away. Don't change the cursor to a question mark.
-               return;
-
-       FL_OBJECT * const ob = tooltipsMap.begin()->first;
-
-       // The dialog is not visible
-       if (!ob->form->window)
-               return;
-
-       // Set the cursor to a question mark or back to the default.
-       int const cursor = enabled_ ? XC_question_arrow : FL_DEFAULT_CURSOR;
-       fl_set_cursor(ob->form->window, cursor);
-}
+{}
 
 
 void Tooltips::init(FL_OBJECT * ob, string const & tip)

diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C
index c6dd5bc457da99d2e0066629994f13714b89b6ac..fbf3287c47afce9b7fac95c550081882be4d52f5 100644 (file)
--- a/src/frontends/xforms/xforms_helpers.C
+++ b/src/frontends/xforms/xforms_helpers.C
@@ -418,7 +418,6 @@ string formatted(string const & sin, int w, int size, int style)
 void setCursorColor(int color)
 {
        fl_set_cursor_color(FL_DEFAULT_CURSOR, color, FL_WHITE);
-       fl_set_cursor_color(XC_question_arrow, color, FL_WHITE);
        fl_set_cursor_color(XC_xterm,          color, FL_WHITE);
        fl_set_cursor_color(XC_watch,          color, FL_WHITE);
        fl_set_cursor_color(XC_sb_right_arrow, color, FL_WHITE);