diff options
| author | Jonathan Waddell <jwaddell@nvidia.com> | 2017-08-08 11:16:52 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2017-10-03 10:28:25 -0700 |
| commit | 34bd15d6822f8789f4ea3a14de7b6578e6c8c44a (patch) | |
| tree | 1be3f60f19ff94593886259cfda98d585fed23c5 /src | |
| parent | 245cc37e62bd15d8fa90d30270bb7300de617d73 (diff) | |
Add text to the help page for widgets missing entries.
This change adds help text for the "Save Current Configuration" button on the "nvidia-settings Configuration" page and re-enables a flag that allows the help text for "Sync to this display device" on the XVideo Settings page.
Also removes the per entry tooltip text for the "Sync to this display device" and adds the tooltip to the entire container widget since it exists for the entire lifetime of the application.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtk+-2.x/ctkconfig.c | 3 | ||||
| -rw-r--r-- | src/gtk+-2.x/ctkxvideo.c | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/gtk+-2.x/ctkconfig.c b/src/gtk+-2.x/ctkconfig.c index d82b37a..e5ca3e4 100644 --- a/src/gtk+-2.x/ctkconfig.c +++ b/src/gtk+-2.x/ctkconfig.c @@ -544,6 +544,9 @@ GtkTextBuffer *ctk_config_create_help(CtkConfig *ctk_config, GtkTextTagTable *ta "consecutive polls (in milliseconds). The Active " "Timers table is only visible when timers are active."); + ctk_help_heading(b, &i, "Save Current Configuration"); + ctk_help_para(b, &i, "%s", __save_current_config_help); + ctk_help_finish(b); return b; diff --git a/src/gtk+-2.x/ctkxvideo.c b/src/gtk+-2.x/ctkxvideo.c index d48b6be..68ea0c3 100644 --- a/src/gtk+-2.x/ctkxvideo.c +++ b/src/gtk+-2.x/ctkxvideo.c @@ -229,9 +229,6 @@ static GtkWidget *xv_sync_to_display_radio_button_add(CtkXVideo *ctk_xvideo, G_CALLBACK(xv_sync_to_display_id_toggled), (gpointer) ctk_xvideo); - ctk_config_set_tooltip(ctk_xvideo->ctk_config, button, - __xv_sync_to_display_help); - return button; } @@ -281,6 +278,8 @@ static void xv_sync_to_display_rebuild_buttons(CtkXVideo *ctk_xvideo, } + ctk_xvideo->active_attributes |= __XV_SYNC_TO_DISPLAY; + /* Add a button for No Display Specified */ last_button = NULL; button = xv_sync_to_display_radio_button_add(ctk_xvideo, NULL, @@ -548,6 +547,10 @@ GtkWidget* ctk_xvideo_new(CtrlTarget *ctrl_target, gtk_container_add(GTK_CONTAINER(frame), vbox); ctk_xvideo->xv_sync_to_display_button_box = vbox; + ctk_config_set_tooltip(ctk_xvideo->ctk_config, + ctk_xvideo->xv_sync_to_display_button_box, + __xv_sync_to_display_help); + xv_sync_to_display_rebuild_buttons(ctk_xvideo, FALSE); g_signal_connect(G_OBJECT(ctk_event), |