Revision: 4752 http://geany.svn.sourceforge.net/geany/?rev=4752&view=rev Author: ntrel Date: 2010-03-10 16:30:15 +0000 (Wed, 10 Mar 2010)
Log Message: ----------- Edit/tidy 'Long line marker' labels.
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-10 16:20:34 UTC (rev 4751) +++ trunk/ChangeLog 2010-03-10 16:30:15 UTC (rev 4752) @@ -8,6 +8,8 @@ src/editor.h, geany.glade: Apply patch from Eugene Arshinov to add project long line marker customisation (thanks). + * src/interface.c, geany.glade: + Edit/tidy 'Long line marker' labels.
2010-03-10 Lex Trotman <elextr.at.gmail.dot.com>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2010-03-10 16:20:34 UTC (rev 4751) +++ trunk/geany.glade 2010-03-10 16:30:15 UTC (rev 4752) @@ -6879,7 +6879,7 @@ <child> <widget class="GtkTable" id="table7"> <property name="visible">True</property> - <property name="n_rows">3</property> + <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> @@ -6888,7 +6888,7 @@ <child> <widget class="GtkLabel" id="label133"> <property name="visible">True</property> - <property name="label" translatable="yes">Long line marker:</property> + <property name="label" translatable="yes">Column:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6906,8 +6906,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -6916,7 +6916,7 @@ <child> <widget class="GtkLabel" id="label134"> <property name="visible">True</property> - <property name="label" translatable="yes">Long line marker color:</property> + <property name="label" translatable="yes">Color:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6934,8 +6934,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -6962,8 +6962,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -6981,8 +6981,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -7004,8 +7004,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -7061,10 +7061,32 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_long_line"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Enabled</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> <property name="top_attach">0</property> <property name="bottom_attach">1</property> <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="y_options"></property> </packing> </child> </widget> @@ -7073,16 +7095,22 @@ </child>
<child> - <widget class="GtkCheckButton" id="check_long_line"> + <widget class="GtkLabel" id="label242"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Long line marker</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"><b>Long line marker</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</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> </widget> <packing> <property name="type">label_item</property> @@ -10007,7 +10035,7 @@ <child> <widget class="GtkLabel" id="label240"> <property name="visible">True</property> - <property name="label" translatable="yes">Long line marker:</property> + <property name="label" translatable="yes">Column:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2010-03-10 16:20:34 UTC (rev 4751) +++ trunk/src/interface.c 2010-03-10 16:30:15 UTC (rev 4752) @@ -2580,6 +2580,7 @@ GSList *radio_long_line_line_group = NULL; GtkWidget *radio_long_line_background; GtkWidget *check_long_line; + GtkWidget *label242; GtkWidget *frame40; GtkWidget *alignment47; GtkWidget *vbox48; @@ -3937,36 +3938,36 @@ gtk_container_add (GTK_CONTAINER (frame8), alignment11); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment11), 0, 0, 12, 0);
- table7 = gtk_table_new (3, 2, FALSE); + table7 = gtk_table_new (4, 2, FALSE); gtk_widget_show (table7); gtk_container_add (GTK_CONTAINER (alignment11), table7); gtk_table_set_row_spacings (GTK_TABLE (table7), 3); gtk_table_set_col_spacings (GTK_TABLE (table7), 24);
- label133 = gtk_label_new (_("Long line marker:")); + label133 = gtk_label_new (_("Column:")); gtk_widget_show (label133); - gtk_table_attach (GTK_TABLE (table7), label133, 0, 1, 1, 2, + gtk_table_attach (GTK_TABLE (table7), label133, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label133), 0, 0.5);
- label134 = gtk_label_new (_("Long line marker color:")); + label134 = gtk_label_new (_("Color:")); gtk_widget_show (label134); - gtk_table_attach (GTK_TABLE (table7), label134, 0, 1, 2, 3, + gtk_table_attach (GTK_TABLE (table7), label134, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label134), 0, 0.5);
label156 = gtk_label_new (_("Type:")); gtk_widget_show (label156); - gtk_table_attach (GTK_TABLE (table7), label156, 0, 1, 0, 1, + gtk_table_attach (GTK_TABLE (table7), label156, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label156), 0, 0.5);
long_line_color = gtk_color_button_new (); gtk_widget_show (long_line_color); - gtk_table_attach (GTK_TABLE (table7), long_line_color, 1, 2, 2, 3, + gtk_table_attach (GTK_TABLE (table7), long_line_color, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, long_line_color, _("Sets the color of the long line marker"), NULL); @@ -3975,7 +3976,7 @@ spin_long_line_adj = gtk_adjustment_new (72, 0, 1000, 1, 10, 0); spin_long_line = gtk_spin_button_new (GTK_ADJUSTMENT (spin_long_line_adj), 1, 0); gtk_widget_show (spin_long_line); - gtk_table_attach (GTK_TABLE (table7), spin_long_line, 1, 2, 1, 2, + gtk_table_attach (GTK_TABLE (table7), spin_long_line, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, spin_long_line, _("The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear."), NULL); @@ -3984,7 +3985,7 @@
hbox5 = gtk_hbox_new (FALSE, 12); gtk_widget_show (hbox5); - gtk_table_attach (GTK_TABLE (table7), hbox5, 1, 2, 0, 1, + gtk_table_attach (GTK_TABLE (table7), hbox5, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0);
@@ -4002,10 +4003,17 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_long_line_background), radio_long_line_line_group); radio_long_line_line_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_long_line_background));
- check_long_line = gtk_check_button_new_with_mnemonic (_("Long line marker")); + check_long_line = gtk_check_button_new_with_mnemonic (_("Enabled")); gtk_widget_show (check_long_line); - gtk_frame_set_label_widget (GTK_FRAME (frame8), check_long_line); + gtk_table_attach (GTK_TABLE (table7), check_long_line, 0, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0);
+ label242 = gtk_label_new (_("<b>Long line marker</b>")); + gtk_widget_show (label242); + gtk_frame_set_label_widget (GTK_FRAME (frame8), label242); + gtk_label_set_use_markup (GTK_LABEL (label242), TRUE); + frame40 = gtk_frame_new (NULL); gtk_widget_show (frame40); gtk_box_pack_start (GTK_BOX (vbox24), frame40, FALSE, TRUE, 0); @@ -4986,6 +4994,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, radio_long_line_line, "radio_long_line_line"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_long_line_background, "radio_long_line_background"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_long_line, "check_long_line"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label242, "label242"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame40, "frame40"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment47, "alignment47"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox48, "vbox48"); @@ -5326,7 +5335,7 @@ (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label241), 0, 0.5);
- label240 = gtk_label_new (_("Long line marker:")); + label240 = gtk_label_new (_("Column:")); gtk_widget_show (label240); gtk_table_attach (GTK_TABLE (table18), label240, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.