Revision: 3430 http://geany.svn.sourceforge.net/geany/?rev=3430&view=rev Author: eht16 Date: 2008-12-29 10:43:04 +0000 (Mon, 29 Dec 2008)
Log Message: ----------- Use a GeanyWrapLabel for the project indentation settings warning text in the prefs dialog.
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/prefs.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-12-29 10:41:04 UTC (rev 3429) +++ trunk/ChangeLog 2008-12-29 10:43:04 UTC (rev 3430) @@ -3,6 +3,9 @@ * src/symbols.c: Avoid unnecessary critical warnings when setting tooltips for the symbol list with non-UTF-8 files (closes #2473376). + * geany.glade, src/interface.c, src/prefs.c: + Use a GeanyWrapLabel for the project indentation settings warning + text in the prefs dialog.
2008-12-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-12-29 10:41:04 UTC (rev 3429) +++ trunk/geany.glade 2008-12-29 10:43:04 UTC (rev 3430) @@ -4997,22 +4997,14 @@ <property name="spacing">6</property>
<child> - <widget class="GtkLabel" id="label_project_indent_warning"> + <widget class="GtkVBox" id="label_project_indent_warning"> <property name="visible">True</property> - <property name="label" translatable="yes"><i>Warning: these settings are overridden by the current project. See <b>Project->Properties</b>.</i></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">6</property> - <property name="ypad">6</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <placeholder/> + </child> </widget> <packing> <property name="padding">0</property>
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-12-29 10:41:04 UTC (rev 3429) +++ trunk/src/interface.c 2008-12-29 10:43:04 UTC (rev 3430) @@ -3315,13 +3315,9 @@ gtk_widget_show (vbox40); gtk_container_add (GTK_CONTAINER (notebook4), vbox40);
- label_project_indent_warning = gtk_label_new (_("<i>Warning: these settings are overridden by the current project. See <b>Project->Properties</b>.</i>")); + label_project_indent_warning = gtk_vbox_new (FALSE, 0); gtk_widget_show (label_project_indent_warning); gtk_box_pack_start (GTK_BOX (vbox40), label_project_indent_warning, FALSE, FALSE, 0); - gtk_label_set_use_markup (GTK_LABEL (label_project_indent_warning), TRUE); - gtk_label_set_line_wrap (GTK_LABEL (label_project_indent_warning), TRUE); - gtk_misc_set_alignment (GTK_MISC (label_project_indent_warning), 0, 0.5); - gtk_misc_set_padding (GTK_MISC (label_project_indent_warning), 6, 6);
frame27 = gtk_frame_new (NULL); gtk_widget_show (frame27);
Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-12-29 10:41:04 UTC (rev 3429) +++ trunk/src/prefs.c 2008-12-29 10:43:04 UTC (rev 3430) @@ -1470,6 +1470,13 @@ gtk_label_set_use_markup(GTK_LABEL(label), TRUE); gtk_box_pack_start(GTK_BOX(ui_lookup_widget(ui_widgets.prefs_dialog, "vbox15")), label, FALSE, TRUE, 5); + /* page Editor->Indentation */ + label = geany_wrap_label_new(_("<i>Warning: these settings are overridden by the current project. See <b>Project->Properties</b>.</i>")); + gtk_widget_show(label); + gtk_label_set_use_markup(GTK_LABEL(label), TRUE); + gtk_misc_set_padding(GTK_MISC(label), 6, 0); + gtk_box_pack_start(GTK_BOX(ui_lookup_widget(ui_widgets.prefs_dialog, + "label_project_indent_warning")), label, FALSE, TRUE, 5);
#ifdef HAVE_VTE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.