[gq-commit] gq/src prefs.c,1.28,1.29
Status: Beta
Brought to you by:
sur5r
From: <sta...@us...> - 2002-10-11 13:58:47
|
Update of /cvsroot/gqclient/gq/src In directory usw-pr-cvs1:/tmp/cvs-serv29614 Modified Files: prefs.c Log Message: * Unify container border widths * Changed to S_ for long tooltip texts * Allow less space for label in some dialogs (no GTK_EXPAND for labels), thus yielding more space for entry widgets. * Tooltips for Browse-preferences Index: prefs.c =================================================================== RCS file: /cvsroot/gqclient/gq/src/prefs.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** prefs.c 27 Sep 2002 00:22:15 -0000 1.28 --- prefs.c 11 Oct 2002 13:58:43 -0000 1.29 *************** *** 45,48 **** --- 45,49 ---- #include "debug.h" #include "i18n.h" + #include "input.h" *************** *** 342,346 **** main_vbox = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(main_vbox), 10); gtk_widget_show(main_vbox); gtk_container_add(GTK_CONTAINER(editwindow), main_vbox); --- 343,348 ---- main_vbox = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(main_vbox), ! CONTAINER_BORDER_WIDTH); gtk_widget_show(main_vbox); gtk_container_add(GTK_CONTAINER(editwindow), main_vbox); *************** *** 357,361 **** gtk_object_set_data(GTK_OBJECT(editwindow), "vbox1", vbox1); gtk_widget_show(vbox1); ! gtk_container_border_width(GTK_CONTAINER(vbox1), 10); label = gtk_label_new(_("General")); gtk_widget_show(label); --- 359,364 ---- gtk_object_set_data(GTK_OBJECT(editwindow), "vbox1", vbox1); gtk_widget_show(vbox1); ! gtk_container_border_width(GTK_CONTAINER(vbox1), ! CONTAINER_BORDER_WIDTH); label = gtk_label_new(_("General")); gtk_widget_show(label); *************** *** 366,370 **** gtk_widget_show(table1); gtk_box_pack_start(GTK_BOX(vbox1), table1, FALSE, FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(table1), 10); gtk_table_set_row_spacings(GTK_TABLE(table1), 5); gtk_table_set_col_spacings(GTK_TABLE(table1), 13); --- 369,374 ---- gtk_widget_show(table1); gtk_box_pack_start(GTK_BOX(vbox1), table1, FALSE, FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(table1), ! CONTAINER_BORDER_WIDTH); gtk_table_set_row_spacings(GTK_TABLE(table1), 5); gtk_table_set_col_spacings(GTK_TABLE(table1), 13); *************** *** 375,379 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table1), label, 0, 1, 0, 1, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT); --- 379,383 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table1), label, 0, 1, 0, 1, ! GTK_FILL, GTK_FILL, 0, 0); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT); *************** *** 390,395 **** gtk_tooltips_set_tip(tips, entry, _("The nickname of the server definition"), ! _("The nickname is used to refer to this server " ! "definition throughout this application")); /* LDAP host */ --- 394,401 ---- gtk_tooltips_set_tip(tips, entry, _("The nickname of the server definition"), ! S_("tooltip|The nickname is used to refer to this " ! "server " ! "definition throughout this application") ! ); /* LDAP host */ *************** *** 398,402 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table1), label, 0, 1, 1, 2, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); host = entry = gtk_entry_new(); --- 404,408 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table1), label, 0, 1, 1, 2, ! GTK_FILL, GTK_FILL, 0, 0); host = entry = gtk_entry_new(); *************** *** 411,418 **** gtk_tooltips_set_tip(tips, entry, _("The host name or LDAP URI of the LDAP server"), ! _("Either use the name or IP address of the server " ! "or an LDAP URI (either ldap or ldaps). An URI " ! "is recognized through the existance of a colon " ! "in this field")); /* Port */ --- 417,426 ---- gtk_tooltips_set_tip(tips, entry, _("The host name or LDAP URI of the LDAP server"), ! S_("tooltip|Either use the name or IP address of " ! "the server " ! "or an LDAP URI (either ldap or ldaps). An URI " ! "is recognized through the existance of a colon " ! "in this field") ! ); /* Port */ *************** *** 421,425 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table1), label, 0, 1, 2, 3, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); entry = gtk_entry_new(); --- 429,433 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table1), label, 0, 1, 2, 3, ! GTK_FILL, GTK_FILL, 0, 0); entry = gtk_entry_new(); *************** *** 439,445 **** gtk_tooltips_set_tip(tips, entry, _("The port the LDAP server listens on"), ! _("If empty, the well-known LDAP port (389) is " ! "assumed. This field is not available if an LDAP " ! "URI is used.")); /* Callback on HOST to enable/disable port if user enters a colon... */ --- 447,454 ---- gtk_tooltips_set_tip(tips, entry, _("The port the LDAP server listens on"), ! S_("tooltip|If empty, the well-known LDAP port (389) " ! "is assumed. This field is not available if an " ! "LDAP URI is used.") ! ); /* Callback on HOST to enable/disable port if user enters a colon... */ *************** *** 456,460 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table1), label, 0, 1, 3, 4, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); entry = gtk_entry_new(); --- 465,469 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table1), label, 0, 1, 3, 4, ! GTK_FILL, GTK_FILL, 0, 0); entry = gtk_entry_new(); *************** *** 469,475 **** gtk_tooltips_set_tip(tips, entry, _("The base DN of the server"), ! _("This base DN gets used in search mode, usually " ! "though, this application queries the server " ! "for its 'namingContexts'")); /* "Details" tab */ --- 478,486 ---- gtk_tooltips_set_tip(tips, entry, _("The base DN of the server"), ! S_("tooltip|This base DN gets used in search mode, " ! "usually " ! "though, this application queries the server " ! "for its 'namingContexts'") ! ); /* "Details" tab */ *************** *** 478,482 **** gtk_object_set_data(GTK_OBJECT(editwindow), "vbox2", vbox2); gtk_widget_show(vbox2); ! gtk_container_border_width(GTK_CONTAINER(vbox2), 10); label = gtk_label_new(_("Details")); gtk_widget_show(label); --- 489,494 ---- gtk_object_set_data(GTK_OBJECT(editwindow), "vbox2", vbox2); gtk_widget_show(vbox2); ! gtk_container_border_width(GTK_CONTAINER(vbox2), ! CONTAINER_BORDER_WIDTH); label = gtk_label_new(_("Details")); gtk_widget_show(label); *************** *** 487,491 **** gtk_widget_show(table2); gtk_box_pack_start(GTK_BOX(vbox2), table2, TRUE, TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(table2), 10); gtk_table_set_row_spacings(GTK_TABLE(table2), 5); gtk_table_set_col_spacings(GTK_TABLE(table2), 13); --- 499,504 ---- gtk_widget_show(table2); gtk_box_pack_start(GTK_BOX(vbox2), table2, TRUE, TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(table2), ! CONTAINER_BORDER_WIDTH); gtk_table_set_row_spacings(GTK_TABLE(table2), 5); gtk_table_set_col_spacings(GTK_TABLE(table2), 13); *************** *** 496,500 **** gtk_widget_show(table3); gtk_box_pack_start(GTK_BOX(vbox2), table3, TRUE, TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(table3), 10); gtk_table_set_row_spacings(GTK_TABLE(table3), 5); gtk_table_set_col_spacings(GTK_TABLE(table3), 13); --- 509,514 ---- gtk_widget_show(table3); gtk_box_pack_start(GTK_BOX(vbox2), table3, TRUE, TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(table3), ! CONTAINER_BORDER_WIDTH); gtk_table_set_row_spacings(GTK_TABLE(table3), 5); gtk_table_set_col_spacings(GTK_TABLE(table3), 13); *************** *** 506,510 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); entry = gtk_entry_new(); --- 520,524 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_FILL, GTK_FILL, 0, 0); entry = gtk_entry_new(); *************** *** 520,525 **** gtk_tooltips_set_tip(tips, entry, _("The DN to bind with to the LDAP server"), ! _("This is equivalent to a 'username'. Ask the " ! "LDAP administrator for the DN to use.")); /* Bind Password */ --- 534,541 ---- gtk_tooltips_set_tip(tips, entry, _("The DN to bind with to the LDAP server"), ! S_("tooltip|This is equivalent to a 'username'. " ! "Ask the " ! "LDAP administrator for the DN to use.") ! ); /* Bind Password */ *************** *** 528,532 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); bindpw = entry = gtk_entry_new(); --- 544,548 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_FILL, GTK_FILL, 0, 0); bindpw = entry = gtk_entry_new(); *************** *** 546,555 **** gtk_tooltips_set_tip(tips, entry, _("The password to bind with to the LDAP server"), ! _("This is related to the bind DN. Note that the " ! "password gets stored in a configuration file. " ! "Recent versions of this application actually " ! "scramble the password, but this scrambling can " ! "easily be reverted. Do not use a valuable " ! "password here.")); --- 562,572 ---- gtk_tooltips_set_tip(tips, entry, _("The password to bind with to the LDAP server"), ! S_("This is related to the bind DN. Note that the " ! "password gets stored in a configuration file. " ! "Recent versions of this application actually " ! "scramble the password, but this scrambling can " ! "easily be reverted. Do not use a valuable " ! "password here.") ! ); *************** *** 560,564 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); bindpw2 = entry = gtk_entry_new(); --- 577,581 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_FILL, GTK_FILL, 0, 0); bindpw2 = entry = gtk_entry_new(); *************** *** 577,582 **** gtk_tooltips_set_tip(tips, entry, ! _("The password to bind with to the LDAP server (again)"), ! _("")); /* Bind type */ --- 594,601 ---- gtk_tooltips_set_tip(tips, entry, ! _("The password to bind with to the LDAP server " ! "(again)"), ! S_("tooltip|") ! ); /* Bind type */ *************** *** 585,589 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); bindtype = gtk_combo_new(); --- 604,608 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_FILL, GTK_FILL, 0, 0); bindtype = gtk_combo_new(); *************** *** 611,616 **** gtk_tooltips_set_tip(tips, GTK_WIDGET(GTK_COMBO(bindtype)->entry), _("How to bind to the LDAP server"), ! _("gq supports several different bind types, " ! "like Simple, Kerberos or SASL binds.")); /* Search attribute */ --- 630,636 ---- gtk_tooltips_set_tip(tips, GTK_WIDGET(GTK_COMBO(bindtype)->entry), _("How to bind to the LDAP server"), ! S_("tooltip|gq supports several different bind " ! "types, like Simple, Kerberos or SASL binds.") ! ); /* Search attribute */ *************** *** 619,623 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); entry = gtk_entry_new(); --- 639,643 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_FILL, GTK_FILL, 0, 0); entry = gtk_entry_new(); *************** *** 633,639 **** gtk_tooltips_set_tip(tips, entry, _("The attribute to 'search' in a search tab."), ! _("Search mode in the search tab searches this " ! "attribute. This alleviates the user to always " ! "use a proper LDAP filter.")); /* Maximum entries */ --- 653,660 ---- gtk_tooltips_set_tip(tips, entry, _("The attribute to 'search' in a search tab."), ! S_("tooltip|Search mode in the search tab searches " ! "this attribute. This alleviates the user to " ! "always use a proper LDAP filter.") ! ); /* Maximum entries */ *************** *** 642,646 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); entry = gtk_entry_new(); --- 663,667 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_FILL, GTK_FILL, 0, 0); entry = gtk_entry_new(); *************** *** 656,661 **** gtk_tooltips_set_tip(tips, entry, ! _("The maximum number of entries to return in search mode."), ! _("NOTE: A server might impose stricter limits")); #if HAVE_LDAP_CLIENT_CACHE --- 677,685 ---- gtk_tooltips_set_tip(tips, entry, ! _("The maximum number of entries to return in " ! "search mode."), ! S_("tooltip|NOTE: A server might impose stricter " ! "limits") ! ); #if HAVE_LDAP_CLIENT_CACHE *************** *** 665,669 **** gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); entry = gtk_entry_new(); --- 689,693 ---- gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table2), label, 0, 1, y, y + 1, ! GTK_FILL, GTK_FILL, 0, 0); entry = gtk_entry_new(); *************** *** 679,685 **** gtk_tooltips_set_tip(tips, entry, ! _("Should the OpenLDAP client-side cache be used? And what is its timeout? Anything greater than -1 turns on the cache."), ! _("Using this might speed up LDAP operations, but " ! "it may also lead to slightly out-of-date data.")); #endif --- 703,713 ---- gtk_tooltips_set_tip(tips, entry, ! _("Should the OpenLDAP client-side cache be used? " ! "And what is its timeout? Anything greater than " ! "-1 turns on the cache."), ! S_("tooltip|Using this might speed up LDAP " ! "operations, but it may also lead to slightly " ! "out-of-date data.") ! ); #endif *************** *** 703,709 **** gtk_tooltips_set_tip(tips, button, _("Should the application ask for a bind password?"), ! _("This disables the password entered via the " ! "preferences dialog. ")); ! /* Hide internal attributes */ button = gtk_check_button_new_with_label(_("Hide internal attributes")); --- 731,738 ---- gtk_tooltips_set_tip(tips, button, _("Should the application ask for a bind password?"), ! S_("tooltip|This disables the password entered via " ! "the preferences dialog. ") ! ); ! /* Hide internal attributes */ button = gtk_check_button_new_with_label(_("Hide internal attributes")); *************** *** 717,724 **** z++; gtk_tooltips_set_tip(tips, button, ! _("Do not show attributes internal to the LDAP server"), ! _("At least OpenLDAP allows to view several " ! "interesting attributes. Setting this option " ! "turns them off.")); /* Cache connections */ --- 746,756 ---- z++; gtk_tooltips_set_tip(tips, button, ! _("Do not show attributes internal to the LDAP " ! "server"), ! S_("tooltip|At least OpenLDAP allows to view " ! "several " ! "interesting attributes. Setting this option " ! "turns them off.") ! ); /* Cache connections */ *************** *** 733,742 **** gtk_tooltips_set_tip(tips, button, ! _("If set: Do not close the connection between LDAP operations"), ! _("Setting this may speed up LDAP operations, as " ! "it does not require the overhead to open a new " ! "connection to the server for every operation. " ! "OTOH it might put additional stress on the " ! "server (depends on what you call 'stress')")); /* Show ref */ --- 765,777 ---- gtk_tooltips_set_tip(tips, button, ! _("If set: Do not close the connection between " ! "LDAP operations"), ! S_("tooltip|Setting this may speed up LDAP " ! "operations, as it does not require the overhead " ! "to open a new " ! "connection to the server for every operation. " ! "OTOH it might put additional stress on the " ! "server (depends on what you call 'stress')") ! ); /* Show ref */ *************** *** 754,758 **** gtk_tooltips_set_tip(tips, button, _("Try to show LDAP references."), ! _("")); /* Enable TLS */ --- 789,794 ---- gtk_tooltips_set_tip(tips, button, _("Try to show LDAP references."), ! S_("tooltip|") ! ); /* Enable TLS */ *************** *** 769,773 **** gtk_tooltips_set_tip(tips, button, _("Should we use Transport Layer Security?"), ! _("Almost but not quite entirely SSL.")); /* OK and Cancel buttons */ --- 805,810 ---- gtk_tooltips_set_tip(tips, button, _("Should we use Transport Layer Security?"), ! S_("tooltip|Almost but not quite entirely SSL.") ! ); /* OK and Cancel buttons */ *************** *** 983,987 **** prefswindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_widget_set_usize(prefswindow, 520, 470); ! gtk_container_border_width(GTK_CONTAINER(prefswindow), 5); gtk_window_set_title(GTK_WINDOW(prefswindow), _("Preferences")); gtk_window_set_policy(GTK_WINDOW(prefswindow), TRUE, TRUE, FALSE); --- 1020,1025 ---- prefswindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_widget_set_usize(prefswindow, 520, 470); ! gtk_container_border_width(GTK_CONTAINER(prefswindow), ! CONTAINER_BORDER_WIDTH); gtk_window_set_title(GTK_WINDOW(prefswindow), _("Preferences")); gtk_window_set_policy(GTK_WINDOW(prefswindow), TRUE, TRUE, FALSE); *************** *** 1000,1004 **** /* Search Options tab */ vbox_search_options = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_search_options), 10); create_search_optionstab(vbox_search_options, prefswindow); gtk_widget_show(vbox_search_options); --- 1038,1043 ---- /* Search Options tab */ vbox_search_options = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_search_options), ! CONTAINER_BORDER_WIDTH); create_search_optionstab(vbox_search_options, prefswindow); gtk_widget_show(vbox_search_options); *************** *** 1010,1014 **** /* Browse Options tab */ vbox_browse_options = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_browse_options), 10); create_browse_optionstab(vbox_browse_options, prefswindow); gtk_widget_show(vbox_browse_options); --- 1049,1054 ---- /* Browse Options tab */ vbox_browse_options = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_browse_options), ! CONTAINER_BORDER_WIDTH); create_browse_optionstab(vbox_browse_options, prefswindow); gtk_widget_show(vbox_browse_options); *************** *** 1039,1043 **** /* LDIF tab */ vbox_ldif = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_ldif), 10); create_ldiftab(vbox_ldif, prefswindow); gtk_widget_show(vbox_ldif); --- 1079,1084 ---- /* LDIF tab */ vbox_ldif = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_ldif), ! CONTAINER_BORDER_WIDTH); create_ldiftab(vbox_ldif, prefswindow); gtk_widget_show(vbox_ldif); *************** *** 1083,1087 **** gtk_widget_show(vbox1); gtk_container_add(GTK_CONTAINER(target), vbox1); ! gtk_container_border_width(GTK_CONTAINER(vbox1), 10); hbox2 = gtk_hbox_new(FALSE, 25); --- 1124,1129 ---- gtk_widget_show(vbox1); gtk_container_add(GTK_CONTAINER(target), vbox1); ! gtk_container_border_width(GTK_CONTAINER(vbox1), ! CONTAINER_BORDER_WIDTH); hbox2 = gtk_hbox_new(FALSE, 25); *************** *** 1152,1157 **** gtk_widget_show(hbox1); gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(hbox1), 10); ! } --- 1194,1199 ---- gtk_widget_show(hbox1); gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(hbox1), ! CONTAINER_BORDER_WIDTH); } *************** *** 1167,1171 **** gtk_widget_show(vbox1); gtk_container_add(GTK_CONTAINER(target), vbox1); ! gtk_container_border_width(GTK_CONTAINER(vbox1), 10); hbox1 = gtk_hbox_new(FALSE, 10); --- 1209,1214 ---- gtk_widget_show(vbox1); gtk_container_add(GTK_CONTAINER(target), vbox1); ! gtk_container_border_width(GTK_CONTAINER(vbox1), ! CONTAINER_BORDER_WIDTH); hbox1 = gtk_hbox_new(FALSE, 10); *************** *** 1272,1276 **** gtk_box_pack_start(GTK_BOX(hbox_options), stframe, FALSE, TRUE, 0); vbox_st = gtk_vbox_new(TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_st), 5); gtk_widget_show(vbox_st); gtk_container_add(GTK_CONTAINER(stframe), vbox_st); --- 1315,1320 ---- gtk_box_pack_start(GTK_BOX(hbox_options), stframe, FALSE, TRUE, 0); vbox_st = gtk_vbox_new(TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_st), ! CONTAINER_BORDER_WIDTH); gtk_widget_show(vbox_st); gtk_container_add(GTK_CONTAINER(stframe), vbox_st); *************** *** 1317,1321 **** gtk_box_pack_start(GTK_BOX(hbox_options), sortframe, FALSE, TRUE, 0); vbox_sort = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_sort), 5); gtk_widget_show(vbox_sort); gtk_container_add(GTK_CONTAINER(sortframe), vbox_sort); --- 1361,1366 ---- gtk_box_pack_start(GTK_BOX(hbox_options), sortframe, FALSE, TRUE, 0); vbox_sort = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_sort), ! CONTAINER_BORDER_WIDTH); gtk_widget_show(vbox_sort); gtk_container_add(GTK_CONTAINER(sortframe), vbox_sort); *************** *** 1335,1339 **** gtk_box_pack_start(GTK_BOX(target), viewframe, TRUE, TRUE, 5); vbox_view = gtk_vbox_new(TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_view), 5); gtk_widget_show(vbox_view); gtk_container_add(GTK_CONTAINER(viewframe), vbox_view); --- 1380,1385 ---- gtk_box_pack_start(GTK_BOX(target), viewframe, TRUE, TRUE, 5); vbox_view = gtk_vbox_new(TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_view), ! CONTAINER_BORDER_WIDTH); gtk_widget_show(vbox_view); gtk_container_add(GTK_CONTAINER(viewframe), vbox_view); *************** *** 1372,1375 **** --- 1418,1424 ---- GtkWidget *viewframe, *vbox_view; GtkWidget *show_rdn_only_button, *sort_browse_button; + GtkTooltips *tips; + + tips = gtk_tooltips_new(); /* View frame in Options tab */ *************** *** 1378,1382 **** gtk_box_pack_start(GTK_BOX(target), viewframe, FALSE, TRUE, 5); vbox_view = gtk_vbox_new(TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_view), 5); gtk_widget_show(vbox_view); gtk_container_add(GTK_CONTAINER(viewframe), vbox_view); --- 1427,1432 ---- gtk_box_pack_start(GTK_BOX(target), viewframe, FALSE, TRUE, 5); vbox_view = gtk_vbox_new(TRUE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox_view), ! CONTAINER_BORDER_WIDTH); gtk_widget_show(vbox_view); gtk_container_add(GTK_CONTAINER(viewframe), vbox_view); *************** *** 1388,1391 **** --- 1438,1448 ---- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(show_rdn_only_button), TRUE); GTK_WIDGET_UNSET_FLAGS(GTK_CHECK_BUTTON(show_rdn_only_button), GTK_CAN_FOCUS); + + gtk_tooltips_set_tip(tips, show_rdn_only_button, + _("If set, only show the most specific part of the " + "DN in the object tree."), + S_("tooltip|") + ); + gtk_widget_show(show_rdn_only_button); gtk_box_pack_start(GTK_BOX(vbox_view), show_rdn_only_button, FALSE, FALSE, 5); *************** *** 1397,1400 **** --- 1454,1465 ---- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sort_browse_button), TRUE); GTK_WIDGET_UNSET_FLAGS(GTK_CHECK_BUTTON(sort_browse_button), GTK_CAN_FOCUS); + + gtk_tooltips_set_tip(tips, sort_browse_button, + _("If set, turns on sorting of entries shown in a " + "browse tree. Changing this only has an effect " + "for new browse tabs."), + S_("tooltip|") + ); + gtk_widget_show(sort_browse_button); gtk_box_pack_start(GTK_BOX(vbox_view), sort_browse_button, FALSE, FALSE, 5); *************** *** 1417,1421 **** vbox1 = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox1), 10); gtk_container_add(GTK_CONTAINER(formatframe), vbox1); gtk_widget_show(vbox1); --- 1482,1487 ---- vbox1 = gtk_vbox_new(FALSE, 0); ! gtk_container_border_width(GTK_CONTAINER(vbox1), ! CONTAINER_BORDER_WIDTH); gtk_container_add(GTK_CONTAINER(formatframe), vbox1); gtk_widget_show(vbox1); |