BUG#1140: add show_ui_tooltip preference

7 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1bb10c80..6e910057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ dillo-3.0.4 [not released yet]
 
 +- OPTGROUP and INS elements.
  - Some HTML5 elements, etc.
+ - Added show_ui_tooltip preference (BUG#1140).
    Patches: corvid
 +- Make embedding into other applications more reliable (BUG#1127).
  - Add search from address bar.
diff --git a/dillorc b/dillorc
index 13594797..c06d12e8 100644
--- a/dillorc
+++ b/dillorc
@@ -68,7 +68,7 @@
 # Minimum font size in pixels
 #font_min_size=6
 
-# Show tooltip popups for UI and for HTML title attributes
+# Show tooltip popups for HTML title attributes
 #show_tooltip=YES
 
 # Set this to YES if you want to limit the word wrap width to the viewport
@@ -324,6 +324,9 @@ ui_tab_bg_color=#b7beb7
 #show_help=YES
 #show_progress_box=YES
 
+# Show tooltip popups for the UI
+#show_ui_tooltip=YES
+
 # Start dillo with the panels hidden?
 #fullwindow_start=NO
 
diff --git a/src/dillo.cc b/src/dillo.cc
index 567d897f..6a7747ed 100644
--- a/src/dillo.cc
+++ b/src/dillo.cc
@@ -489,8 +489,7 @@ int main(int argc, char **argv)
    Fl::scheme(prefs.theme);
    setColors();
 
-   if (!prefs.show_tooltip) {
-      // turn off UI tooltips
+   if (!prefs.show_ui_tooltip) {
       Fl::option(Fl::OPTION_SHOW_TOOLTIPS, false);
    }
 
diff --git a/src/prefs.c b/src/prefs.c
index 4ab476c8..98406034 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -97,6 +97,7 @@ void a_Prefs_init(void)
    prefs.show_stop = TRUE;
    prefs.show_tools = TRUE;
    prefs.show_tooltip = TRUE;
+   prefs.show_ui_tooltip = TRUE;
    prefs.small_icons = FALSE;
    prefs.start_page = a_Url_new(PREFS_START_PAGE, NULL);
    prefs.theme = dStrdup(PREFS_THEME);
diff --git a/src/prefs.h b/src/prefs.h
index 941c0b51..f0cfce48 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -61,6 +61,7 @@ typedef struct {
    int32_t ui_text_bg_color;
    bool_t contrast_visited_color;
    bool_t show_tooltip;
+   bool_t show_ui_tooltip;
    char *theme;
    int panel_size;
    bool_t small_icons;
diff --git a/src/prefsparser.cc b/src/prefsparser.cc
index dde562b3..a2de1cfa 100644
--- a/src/prefsparser.cc
+++ b/src/prefsparser.cc
@@ -107,6 +107,7 @@ int PrefsParser::parseOption(char *name, char *value)
       { "show_stop", &prefs.show_stop, PREFS_BOOL },
       { "show_tools", &prefs.show_tools, PREFS_BOOL },
       { "show_tooltip", &prefs.show_tooltip, PREFS_BOOL },
+      { "show_ui_tooltip", &prefs.show_ui_tooltip, PREFS_BOOL },
       { "small_icons", &prefs.small_icons, PREFS_BOOL },
       { "start_page", &prefs.start_page, PREFS_URL },
       { "theme", &prefs.theme, PREFS_STRING },
diff --git a/src/tipwin.cc b/src/tipwin.cc
index c8463eb5..01d9a2f4 100644
--- a/src/tipwin.cc
+++ b/src/tipwin.cc
@@ -71,7 +71,7 @@ void TipWin::value(const char *s) {
 
 void TipWin::do_show(void *wid) {
    cur_widget = wid;  // Keep track of requesting widget
-   if (prefs.show_tooltip) {
+   if (prefs.show_ui_tooltip) {
       Fl::add_timeout(recent ? 0.2f : 0.8f, show_timeout);
    }
 }