From d8773e5ee602c749fdf8627f65dad2f0e59fc044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Sat, 20 Feb 2021 23:25:36 +0100 Subject: [PATCH] enh: gui prefs: add a visual indication of tooltips --- GNUmakefile.template | 9 +++++- icons/nothing.png | Bin 0 -> 193 bytes icons/tooltip.png | Bin 0 -> 421 bytes src/closure.c | 4 +++ src/dvdisaster.h | 3 ++ src/help-dialogs.c | 7 ++++ src/icon-factory.c | 4 +++ src/preferences.c | 71 +++++++++++++++++++++++++++++++++-------- src/rs01-window.c | 5 +++ src/rs02-window.c | 44 +++++++++++++++++++------ src/rs03-preferences.c | 10 ++++++ 11 files changed, 133 insertions(+), 24 deletions(-) create mode 100644 icons/nothing.png create mode 100644 icons/tooltip.png diff --git a/GNUmakefile.template b/GNUmakefile.template index ae58d85..c85b07b 100644 --- a/GNUmakefile.template +++ b/GNUmakefile.template @@ -89,8 +89,12 @@ ${BUILDTMP}/build.o : src/build.c src/build.h @echo "Compiling:" src/build.o @$(CC) $(COPTS) -c src/build.c -o $@ +${BUILDTMP}/closure.o : src/closure.c src/inlined-icons.h + @echo "Compiling:" src/closure.c + @$(CC) $(COPTS) -c src/closure.c -o $@ + ${BUILDTMP}/icon-factory.o : src/icon-factory.c src/inlined-icons.h - @echo "Compiling:" src/icon-factory.o + @echo "Compiling:" src/icon-factory.c @$(CC) $(COPTS) -c src/icon-factory.c -o $@ # Building the dvdisaster binary @@ -109,6 +113,7 @@ dvdisaster: $(ICONS) $(OFILES) fi src/inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png icons/strip.png icons/open-ecc.png icons/open-img.png icons/cd.png icons/gtk-help.png icons/gtk-index.png icons/gtk-preferences.png icons/gtk-quit.png icons/gtk-stop.png + @echo "Building:" src/inlined-icons.h @gdk-pixbuf-csource --raw --name=dvdisaster_read icons/read.png >src/inlined-icons.h @gdk-pixbuf-csource --raw --name=dvdisaster_create icons/create.png >>src/inlined-icons.h @gdk-pixbuf-csource --raw --name=dvdisaster_scan icons/scan.png >>src/inlined-icons.h @@ -123,6 +128,8 @@ src/inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.pn @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>src/inlined-icons.h @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>src/inlined-icons.h @gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>src/inlined-icons.h + @gdk-pixbuf-csource --raw --name=dvdisaster_tooltip icons/tooltip.png >>src/inlined-icons.h + @gdk-pixbuf-csource --raw --name=dvdisaster_nothing icons/nothing.png >>src/inlined-icons.h $(BUILDTMP)/help-dialogs.o: src/help-dialogs.c simple-md5sum @if test -e fingerprints.md5; \ diff --git a/icons/nothing.png b/icons/nothing.png new file mode 100644 index 0000000000000000000000000000000000000000..ac4fd070ec19a8f3a5aaff46bea25d92e7f327a2 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>?NMQuIx{lL#`~WpF9n*-;OXk;vd$@?2>@vBHShoc literal 0 HcmV?d00001 diff --git a/icons/tooltip.png b/icons/tooltip.png new file mode 100644 index 0000000000000000000000000000000000000000..e7716ed75b04cd95e3c3de87f1148b053153a0c3 GIT binary patch literal 421 zcmV;W0b2fvP)XI zLg^d86Hr29Noi+?iMhmvvABQ9-g*)fCi#=Qnfd?B&i-reP8w!b0{6gJ0N4tz?!Idg z+#QJ+Fav5}2P}XGVWC{D9y{_9@)Gz0ra(}>2lVtEfVo7LQ6vh?M7~ZY>I3gWKgo~c zB=PvA64ThE!T|UX23hS0*8ZUvOBOkdarkSector = g_malloc0(sizeof(GdkColor)); DefaultColors(); + + Closure->tooltipOn = gdk_pixbuf_new_from_inline(-1, dvdisaster_tooltip, FALSE, NULL); + Closure->tooltipOff = gdk_pixbuf_new_from_inline(-1, dvdisaster_nothing, FALSE, NULL); #endif memset(Closure->bs, '\b', 255); diff --git a/src/dvdisaster.h b/src/dvdisaster.h index 7ab4c8f..ca4dc82 100644 --- a/src/dvdisaster.h +++ b/src/dvdisaster.h @@ -331,6 +331,8 @@ typedef struct _GlobalClosure GtkWindow *window; /* main window */ GtkTooltips *tooltips; /* our global tooltips structure */ GdkPixbuf *windowIcon; /* main window icon */ + GdkPixbuf *tooltipOn; /* pixbuf of the tooltip icon */ + GdkPixbuf *tooltipOff; /* pixbuf of a fully transparent icon */ GtkWidget *fileMenuImage; /* Select image entry */ GtkWidget *fileMenuEcc; /* Select Parity File entry */ @@ -810,6 +812,7 @@ typedef struct _LabelWithOnlineHelp GtkWidget *linkBox; GtkWidget *linkLabel; GtkWidget *vbox; + GtkWidget *tooltip; GPtrArray *lastSizes; /* for breaking expose loops between the help windows */ char *windowTitle; diff --git a/src/help-dialogs.c b/src/help-dialogs.c index ea48d26..530608d 100644 --- a/src/help-dialogs.c +++ b/src/help-dialogs.c @@ -83,11 +83,13 @@ static gint help_cb(GtkWidget *widget, GdkEvent *event, gpointer data) case GDK_ENTER_NOTIFY: gtk_label_set_markup(GTK_LABEL(lab), lwoh->highlitText); lwoh->inside = TRUE; + gtk_image_set_from_pixbuf(GTK_IMAGE(lwoh->tooltip), Closure->tooltipOn); break; case GDK_LEAVE_NOTIFY: gtk_label_set_markup(GTK_LABEL(lab), lwoh->normalText); lwoh->inside = FALSE; + gtk_image_set_from_pixbuf(GTK_IMAGE(lwoh->tooltip), Closure->tooltipOff); break; default: break; @@ -115,6 +117,10 @@ LabelWithOnlineHelp* CreateLabelWithOnlineHelp(char *title, char *ascii_text) lwoh->windowTitle = g_locale_to_utf8(title, -1, NULL, NULL, NULL); SetOnlineHelpLinkText(lwoh, ascii_text); + /*** Add a tooltip image */ + lwoh->tooltip = gtk_image_new(); + gtk_image_set_from_pixbuf(GTK_IMAGE(lwoh->tooltip), Closure->tooltipOff); + gtk_label_set_markup(GTK_LABEL(lwoh->normalLabel), lwoh->normalText); /*** Create the help window */ @@ -174,6 +180,7 @@ LabelWithOnlineHelp* CloneLabelWithOnlineHelp(LabelWithOnlineHelp *orig, char *a lwoh->linkLabel = gtk_label_new(NULL); lwoh->linkBox = ebox; lwoh->windowTitle = g_strdup("ignore"); + lwoh->tooltip = orig->tooltip; SetOnlineHelpLinkText(lwoh, ascii_text); diff --git a/src/icon-factory.c b/src/icon-factory.c index bf1337d..6d54a5f 100644 --- a/src/icon-factory.c +++ b/src/icon-factory.c @@ -74,6 +74,10 @@ void CreateIconFactory() create_icon(ifact, "dvdisaster-verify", dvdisaster_verify); create_icon(ifact, "dvdisaster-strip", dvdisaster_strip); + /*** Tooltip icon in preferences */ + create_icon(ifact, "dvdisaster-tooltip", dvdisaster_tooltip); + create_icon(ifact, "dvdisaster-nothing", dvdisaster_nothing); + /*** Stock GTK icons to defeat theming */ create_icon(ifact, "dvdisaster-gtk-help", dvdisaster_gtk_help); diff --git a/src/preferences.c b/src/preferences.c index c683b86..bc6565e 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -981,7 +981,8 @@ static gchar* non_linear_format_cb(GtkScale *scale, gdouble value, gpointer data static GtkWidget* non_linear_scale(GtkWidget **hbox_out, non_linear_info *nli, GtkWidget *label, prefs_context *pc, - int action, int *values, int n, int value) + int action, int *values, int n, int value, + int addTooltip) { GtkWidget *scale; GtkWidget *hbox; char *text,*utf; @@ -1012,6 +1013,7 @@ static GtkWidget* non_linear_scale(GtkWidget **hbox_out, non_linear_info *nli, if(nli->lwoh) { SetOnlineHelpLinkText(nli->lwoh, text); + if (addTooltip) gtk_box_pack_start(GTK_BOX(hbox), nli->lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), nli->lwoh->linkBox, FALSE, FALSE, 0); } else gtk_box_pack_start(GTK_BOX(hbox), nli->label, FALSE, FALSE, 0); @@ -1456,6 +1458,7 @@ void CreatePreferencesWindow(void) GtkWidget *lab, *radio1, *radio2; gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); radio1 = gtk_radio_button_new(NULL); if(!i) pc->radioLinearA = radio1; @@ -1510,6 +1513,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); spin1 = gtk_spin_button_new_with_range(0, 10000000, 1000); if(!i) pc->rangeSpin1A = spin1; @@ -1565,6 +1569,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); if(!i) pc->recogRS02A = button; else pc->recogRS02B = button; @@ -1604,6 +1609,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); if(!i) pc->recogRS03A = button; else pc->recogRS03B = button; @@ -1652,6 +1658,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); if(!i) pc->ignoreISOSizeA = button; else pc->ignoreISOSizeB = button; @@ -1691,6 +1698,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); if(!i) pc->daoButtonA = button; else pc->daoButtonB = button; @@ -1735,6 +1743,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); if(!i) pc->dsmButtonA = button; else pc->dsmButtonB = button; @@ -1778,6 +1787,7 @@ void CreatePreferencesWindow(void) g_signal_connect(check, "toggled", G_CALLBACK(bytefill_check_cb), pc); gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); entry = gtk_entry_new(); g_signal_connect(entry, "activate", G_CALLBACK(bytefill_cb), pc); @@ -1853,6 +1863,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh_clone->normalLabel : lwoh_clone->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh_clone->tooltip, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(hbox), 10); if(!i) @@ -1890,6 +1901,7 @@ void CreatePreferencesWindow(void) char value[11]; gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); radio1 = gtk_radio_button_new(NULL); if(!i) pc->radioRawMode20A = radio1; @@ -1984,6 +1996,7 @@ void CreatePreferencesWindow(void) GtkWidget *spin; gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); spin = gtk_spin_button_new_with_range(-1, 10, 1); gtk_entry_set_width_chars(GTK_ENTRY(spin), 3); @@ -2038,6 +2051,7 @@ void CreatePreferencesWindow(void) if(!i) { pc->fatalSenseA = toggle; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), hbox); gtk_container_set_border_width(GTK_CONTAINER(hbox), 12); } @@ -2078,6 +2092,7 @@ void CreatePreferencesWindow(void) if(!i) { pc->ejectA = toggle; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), hbox); gtk_container_set_border_width(GTK_CONTAINER(hbox), 12); } @@ -2121,6 +2136,7 @@ void CreatePreferencesWindow(void) button = gtk_check_button_new(); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); if(!i) pc->rawButtonA = button; else pc->rawButtonB = button; @@ -2170,7 +2186,7 @@ void CreatePreferencesWindow(void) i ? pc->minAttemptsScaleInfoB : pc->minAttemptsScaleInfoA, i ? lwoh->normalLabel : lwoh->linkLabel, pc, SLIDER_MIN_READ_ATTEMPTS, min_attempts_values, MIN_ATTEMPTS_VALUE_LENGTH, - Closure->minReadAttempts); + Closure->minReadAttempts, !i); if(!i) pc->minAttemptsScaleA = scale; else pc->minAttemptsScaleB = scale; @@ -2209,7 +2225,7 @@ void CreatePreferencesWindow(void) i ? pc->maxAttemptsScaleInfoB : pc->maxAttemptsScaleInfoA, i ? lwoh->normalLabel : lwoh->linkLabel, pc, SLIDER_MAX_READ_ATTEMPTS, max_attempts_values, MAX_ATTEMPTS_VALUE_LENGTH, - Closure->maxReadAttempts); + Closure->maxReadAttempts, !i); if(!i) pc->maxAttemptsScaleA = scale; else pc->maxAttemptsScaleB = scale; @@ -2263,7 +2279,7 @@ void CreatePreferencesWindow(void) i ? pc->jumpScaleInfoB : pc->jumpScaleInfoA, i ? lwoh->normalLabel : lwoh->linkLabel, pc, SLIDER_JUMP, jump_values, JUMP_VALUE_LENGTH, - Closure->sectorSkip); + Closure->sectorSkip, !i); if(!i) pc->jumpScaleA = scale; else pc->jumpScaleB = scale; @@ -2314,6 +2330,7 @@ void CreatePreferencesWindow(void) GtkWidget *label; gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); spin = gtk_spin_button_new_with_range(1, 200, 1); gtk_entry_set_width_chars(GTK_ENTRY(spin), 3); gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), @@ -2358,14 +2375,17 @@ void CreatePreferencesWindow(void) for(i=0; i<2; i++) { GtkWidget *table = gtk_table_new(3,2,FALSE); GtkWidget *hbox = gtk_hbox_new(FALSE, 0); + GtkWidget *tinybox = gtk_hbox_new(FALSE, 0); GtkWidget *label = gtk_label_new(Closure->dDumpDir); GtkWidget *select = gtk_button_new_with_label(_utf("Select")); button = gtk_check_button_new(); - gtk_table_attach(GTK_TABLE(table), button, - 0, 1, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0); - gtk_table_attach(GTK_TABLE(table), i ? lwoh->normalLabel : lwoh->linkBox, - 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_box_pack_start(GTK_BOX(tinybox), button, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if (!i) gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); gtk_misc_set_alignment(GTK_MISC(lwoh->normalLabel), 0.0, 0.0); @@ -2425,6 +2445,8 @@ void CreatePreferencesWindow(void) GtkWidget *entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); + g_signal_connect(entry, "activate", G_CALLBACK(defective_prefix_cb), pc); gtk_entry_set_width_chars(GTK_ENTRY(entry), 20); gtk_entry_set_text(GTK_ENTRY(entry), Closure->dDumpPrefix); @@ -2458,6 +2480,7 @@ void CreatePreferencesWindow(void) int j; gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); chooser = gtk_combo_box_new_text(); @@ -2559,6 +2582,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); activate_toggle_button(GTK_TOGGLE_BUTTON(button), Closure->autoSuffix); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), GINT_TO_POINTER(TOGGLE_SUFFIX)); @@ -2598,6 +2622,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); activate_toggle_button(GTK_TOGGLE_BUTTON(button), Closure->readAndCreate); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), GINT_TO_POINTER(TOGGLE_READ_CREATE)); @@ -2628,6 +2653,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); activate_toggle_button(GTK_TOGGLE_BUTTON(button), Closure->unlinkImage); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), GINT_TO_POINTER(TOGGLE_UNLINK)); @@ -2666,6 +2692,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); activate_toggle_button(GTK_TOGGLE_BUTTON(button), Closure->confirmDeletion); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), GINT_TO_POINTER(TOGGLE_CONFIRM_DELETION)); @@ -2722,6 +2749,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->greenA = cbi; } @@ -2751,6 +2779,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->yellowA = cbi; } @@ -2780,6 +2809,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->redA = cbi; } @@ -2809,6 +2839,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->darkA = cbi; } @@ -2838,6 +2869,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->blueA = cbi; } @@ -2868,6 +2900,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->whiteA = cbi; } @@ -2908,6 +2941,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->greenTextA = cbi; } @@ -2937,6 +2971,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->redTextA = cbi; } @@ -2975,6 +3010,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->curveColorA = cbi; } @@ -3005,6 +3041,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->logColorA = cbi; } @@ -3036,6 +3073,7 @@ void CreatePreferencesWindow(void) if(!i) { gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0); pc->barColorA = cbi; } @@ -3081,6 +3119,7 @@ void CreatePreferencesWindow(void) gtk_container_set_border_width(GTK_CONTAINER(hbox), 10); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if (!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); activate_toggle_button(GTK_TOGGLE_BUTTON(button), Closure->reverseCancelOK); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), GINT_TO_POINTER(TOGGLE_CANCEL_OK)); @@ -3122,6 +3161,7 @@ void CreatePreferencesWindow(void) gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if (!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); activate_toggle_button(GTK_TOGGLE_BUTTON(button), Closure->verbose); g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), GINT_TO_POINTER(TOGGLE_VERBOSE)); @@ -3151,23 +3191,26 @@ void CreatePreferencesWindow(void) for(i=0; i<2; i++) { GtkWidget *table = gtk_table_new(4,2,FALSE); GtkWidget *hbox = gtk_hbox_new(FALSE, 0); + GtkWidget *tinybox = gtk_hbox_new(FALSE, 0); GtkWidget *label = gtk_label_new(Closure->logFile); GtkWidget *select = gtk_button_new_with_label(_utf("Select")); GtkWidget *delete = gtk_button_new_with_label(_utf("Delete")); button = gtk_check_button_new(); - gtk_table_attach(GTK_TABLE(table), button, - 0, 1, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0); - gtk_table_attach(GTK_TABLE(table), i ? lwoh->normalLabel : lwoh->linkBox, - 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_box_pack_start(GTK_BOX(tinybox), button, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if (!i) gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); + gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); gtk_misc_set_alignment(GTK_MISC(lwoh->normalLabel), 0.0, 0.0); - gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END); + gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_MIDDLE); hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); gtk_table_attach(GTK_TABLE(table), hbox, - 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); + 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_table_attach(GTK_TABLE(table), select, 2, 3, 0, 2, GTK_SHRINK, GTK_SHRINK, 10, 0); diff --git a/src/rs01-window.c b/src/rs01-window.c index 8424243..f720cb8 100644 --- a/src/rs01-window.c +++ b/src/rs01-window.c @@ -688,6 +688,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent) if(!i) { wl->radio1A = radio; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); } else @@ -717,6 +718,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent) if(!i) { wl->radio2A = radio; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); } else @@ -747,6 +749,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent) if(!i) { wl->radio3A = radio; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); } else { wl->radio3B = radio; @@ -793,6 +796,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent) if(!i) { wl->radio4A = radio; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); } else { wl->radio4B = radio; @@ -899,6 +903,7 @@ void CreateRS01PrefsPage(Method *method, GtkWidget *parent) { wl->cacheScaleA = scale; gtk_container_set_border_width(GTK_CONTAINER(hbox), 10); gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), hbox); } else diff --git a/src/rs02-window.c b/src/rs02-window.c index 29b4f89..e2c7dbc 100644 --- a/src/rs02-window.c +++ b/src/rs02-window.c @@ -760,7 +760,7 @@ void ReadRS02Preferences(Method *method) void CreateRS02PrefsPage(Method *method, GtkWidget *parent) { RS02Widgets *wl = (RS02Widgets*)method->widgetList; - GtkWidget *frame, *hbox, *vbox, *vbox2, *lab, *scale, *table; + GtkWidget *frame, *hbox, *vbox, *vbox2, *tinybox, *lab, *scale, *table; GtkWidget *radio, *icon; LabelWithOnlineHelp *lwoh; unsigned int index; @@ -820,7 +820,10 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0); gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_table_attach(GTK_TABLE(table), lwoh->linkBox, 0, 5, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); + tinybox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 5, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); /* CD capacity table row */ @@ -828,7 +831,10 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) RegisterPreferencesHelpWindow(lwoh); gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_table_attach(GTK_TABLE(table), lwoh->linkBox, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); + tinybox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); wl->cdEntryA = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(wl->cdEntryA), 9); @@ -888,7 +894,10 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) RegisterPreferencesHelpWindow(lwoh); gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_table_attach(GTK_TABLE(table), lwoh->linkBox, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); + tinybox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); wl->dvdEntry1A = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(wl->dvdEntry1A), 9); @@ -948,7 +957,10 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) RegisterPreferencesHelpWindow(lwoh); gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_table_attach(GTK_TABLE(table), lwoh->linkBox, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); + tinybox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); wl->dvdEntry2A = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(wl->dvdEntry2A), 9); @@ -1008,7 +1020,10 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) RegisterPreferencesHelpWindow(lwoh); gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_table_attach(GTK_TABLE(table), lwoh->linkBox, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); + tinybox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 4, 5, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); wl->bdEntry1A = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(wl->bdEntry1A), 9); @@ -1067,7 +1082,10 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) RegisterPreferencesHelpWindow(lwoh); gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_table_attach(GTK_TABLE(table), lwoh->linkBox, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); + tinybox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 5, 6, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); wl->bdEntry2A = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(wl->bdEntry2A), 9); @@ -1126,7 +1144,10 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) RegisterPreferencesHelpWindow(lwoh); gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_table_attach(GTK_TABLE(table), lwoh->linkBox, 0, 1, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); + tinybox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 6, 7, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); wl->bdEntry3A = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(wl->bdEntry3A), 9); @@ -1187,7 +1208,10 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) RegisterPreferencesHelpWindow(lwoh); gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0); - gtk_table_attach(GTK_TABLE(table), lwoh->linkBox, 0, 1, 7, 8, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); + tinybox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(tinybox), lwoh->tooltip, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), tinybox, 0, 1, 7, 8, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 5, 5); wl->bdEntry4A = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(wl->bdEntry4A), 9); @@ -1280,6 +1304,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) gtk_box_pack_start(GTK_BOX(hbox), radio, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), !i ? lwoh->linkBox : lwoh->normalLabel, FALSE, FALSE, 0); + if (!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); entry = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(entry), 9); @@ -1366,6 +1391,7 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent) { wl->cacheScaleA = scale; gtk_container_set_border_width(GTK_CONTAINER(hbox), 10); gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), hbox); } else diff --git a/src/rs03-preferences.c b/src/rs03-preferences.c index 4f99a9b..ef223bd 100644 --- a/src/rs03-preferences.c +++ b/src/rs03-preferences.c @@ -500,6 +500,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) GtkWidget *radio1, *radio2; gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if (!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); radio1 = gtk_radio_button_new(NULL); g_signal_connect(G_OBJECT(radio1), "toggled", G_CALLBACK(eccmethod_cb), (gpointer)wl); @@ -594,11 +595,13 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) if(!i) { wl->radio1A = radio; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); } else { wl->radio1B = radio; gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0); + if (!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); AddHelpWidget(lwoh, hbox); } } @@ -623,6 +626,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) if(!i) { wl->radio2A = radio; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); } else @@ -653,6 +657,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) if(!i) { wl->radio3A = radio; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); } else { wl->radio3B = radio; @@ -699,6 +704,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) if(!i) { wl->radio4A = radio; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); } else { wl->radio4B = radio; @@ -810,6 +816,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) if(!i) { wl->prefetchScaleA = scale; gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); } else @@ -840,6 +847,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) GtkWidget *radio1, *radio2; gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); radio1 = gtk_radio_button_new(NULL); g_signal_connect(G_OBJECT(radio1), "toggled", G_CALLBACK(io_strategy_cb), (gpointer)wl); @@ -925,6 +933,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) { wl->threadsScaleA = scale; gtk_container_set_border_width(GTK_CONTAINER(hbox), 10); gtk_box_pack_start(GTK_BOX(hbox), lwoh->linkBox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), hbox); } else @@ -965,6 +974,7 @@ void CreateRS03PrefsPage(Method *method, GtkWidget *parent) GtkWidget *radio1, *radio2, *radio3=NULL, *radio4; gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); + if(!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); radio1 = gtk_radio_button_new(NULL); g_signal_connect(G_OBJECT(radio1), "toggled", G_CALLBACK(encoding_alg_cb), (gpointer)wl);