SF.net SVN: geany:[2798] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Mon Jul 21 17:25:19 UTC 2008
Revision: 2798
http://geany.svn.sourceforge.net/geany/?rev=2798&view=rev
Author: ntrel
Date: 2008-07-21 17:25:18 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Rename above pref 'Open new documents...'.
Group encodings prefs together in the Files tab.
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.glade
trunk/src/interface.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-07-21 14:39:47 UTC (rev 2797)
+++ trunk/ChangeLog 2008-07-21 17:25:18 UTC (rev 2798)
@@ -6,6 +6,9 @@
* src/interface.c, src/prefs.c, src/keyfile.c, src/document.h,
src/main.c, geany.glade:
Add new Files pref 'Allow new documents from the command-line'.
+ * src/interface.c, geany.glade:
+ Rename above pref 'Open new documents...'.
+ Group encodings prefs together in the Files tab.
2008-07-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2008-07-21 14:39:47 UTC (rev 2797)
+++ trunk/geany.glade 2008-07-21 17:25:18 UTC (rev 2798)
@@ -6707,7 +6707,7 @@
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Start a new file for each command-line filename that doesn't exist</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Allow new documents from the command-line</property>
+ <property name="label" translatable="yes">Open new documents from the command-line</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -6723,28 +6723,19 @@
</child>
<child>
- <widget class="GtkTable" id="table5">
+ <widget class="GtkTable" id="table15">
<property name="visible">True</property>
- <property name="n_rows">4</property>
+ <property name="n_rows">1</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">3</property>
- <property name="column_spacing">0</property>
+ <property name="column_spacing">24</property>
<child>
- <widget class="GtkEventBox" id="eventbox1">
+ <widget class="GtkComboBox" id="combo_eol">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property>
- <property name="visible_window">True</property>
- <property name="above_child">False</property>
-
- <child>
- <widget class="GtkComboBox" id="combo_new_encoding">
- <property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -6757,9 +6748,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label153">
+ <widget class="GtkLabel" id="label210">
<property name="visible">True</property>
- <property name="label" translatable="yes">Default encoding (new files):</property>
+ <property name="label" translatable="yes">Default end of line characters:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6783,125 +6774,6 @@
<property name="y_options"></property>
</packing>
</child>
-
- <child>
- <widget class="GtkLabel" id="label_open_encoding">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Default encoding (existing files):</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</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="left_attach">0</property>
- <property name="right_attach">1</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>
- </child>
-
- <child>
- <widget class="GtkEventBox" id="eventbox3">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Sets the default encoding for opening existing files.</property>
- <property name="visible_window">True</property>
- <property name="above_child">False</property>
-
- <child>
- <widget class="GtkComboBox" id="combo_open_encoding">
- <property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
- </widget>
- <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="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="check_open_encoding">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed).</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use fixed encoding when opening files</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">False</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">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label210">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Default end of line characters:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</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="left_attach">0</property>
- <property name="right_attach">1</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>
- </child>
-
- <child>
- <widget class="GtkComboBox" id="combo_eol">
- <property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -6952,6 +6824,196 @@
</child>
<child>
+ <widget class="GtkFrame" id="frame37">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment40">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkTable" id="table5">
+ <property name="visible">True</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">24</property>
+
+ <child>
+ <widget class="GtkEventBox" id="eventbox1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property>
+ <property name="visible_window">True</property>
+ <property name="above_child">False</property>
+
+ <child>
+ <widget class="GtkComboBox" id="combo_new_encoding">
+ <property name="visible">True</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</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>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label153">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Default encoding (new files):</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label_open_encoding">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Default encoding (existing files):</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</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="left_attach">0</property>
+ <property name="right_attach">1</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>
+ </child>
+
+ <child>
+ <widget class="GtkEventBox" id="eventbox3">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Sets the default encoding for opening existing files.</property>
+ <property name="visible_window">True</property>
+ <property name="above_child">False</property>
+
+ <child>
+ <widget class="GtkComboBox" id="combo_open_encoding">
+ <property name="visible">True</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ </child>
+ </widget>
+ <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="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="check_open_encoding">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed).</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use fixed encoding when opening files</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">False</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">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label219">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Encodings</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>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2008-07-21 14:39:47 UTC (rev 2797)
+++ trunk/src/interface.c 2008-07-21 17:25:18 UTC (rev 2798)
@@ -2768,6 +2768,12 @@
GtkWidget *vbox8;
GtkWidget *vbox38;
GtkWidget *check_cmdline_new_files;
+ GtkWidget *table15;
+ GtkWidget *combo_eol;
+ GtkWidget *label210;
+ GtkWidget *label109;
+ GtkWidget *frame37;
+ GtkWidget *alignment40;
GtkWidget *table5;
GtkWidget *eventbox1;
GtkWidget *combo_new_encoding;
@@ -2776,9 +2782,7 @@
GtkWidget *eventbox3;
GtkWidget *combo_open_encoding;
GtkWidget *check_open_encoding;
- GtkWidget *label210;
- GtkWidget *combo_eol;
- GtkWidget *label109;
+ GtkWidget *label219;
GtkWidget *frame2;
GtkWidget *alignment3;
GtkWidget *vbox6;
@@ -4012,15 +4016,50 @@
gtk_widget_show (vbox38);
gtk_box_pack_start (GTK_BOX (vbox8), vbox38, FALSE, TRUE, 0);
- check_cmdline_new_files = gtk_check_button_new_with_mnemonic (_("Allow new documents from the command-line"));
+ check_cmdline_new_files = gtk_check_button_new_with_mnemonic (_("Open new documents from the command-line"));
gtk_widget_show (check_cmdline_new_files);
gtk_box_pack_start (GTK_BOX (vbox38), check_cmdline_new_files, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, check_cmdline_new_files, _("Start a new file for each command-line filename that doesn't exist"), NULL);
- table5 = gtk_table_new (4, 2, FALSE);
+ table15 = gtk_table_new (1, 2, FALSE);
+ gtk_widget_show (table15);
+ gtk_box_pack_start (GTK_BOX (vbox38), table15, TRUE, TRUE, 0);
+ gtk_table_set_row_spacings (GTK_TABLE (table15), 3);
+ gtk_table_set_col_spacings (GTK_TABLE (table15), 24);
+
+ combo_eol = gtk_combo_box_new_text ();
+ gtk_widget_show (combo_eol);
+ gtk_table_attach (GTK_TABLE (table15), combo_eol, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+ label210 = gtk_label_new (_("Default end of line characters:"));
+ gtk_widget_show (label210);
+ gtk_table_attach (GTK_TABLE (table15), label210, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label210), 0, 0.5);
+
+ label109 = gtk_label_new (_("<b>New files</b>"));
+ gtk_widget_show (label109);
+ gtk_frame_set_label_widget (GTK_FRAME (frame6), label109);
+ gtk_label_set_use_markup (GTK_LABEL (label109), TRUE);
+
+ frame37 = gtk_frame_new (NULL);
+ gtk_widget_show (frame37);
+ gtk_box_pack_start (GTK_BOX (vbox18), frame37, FALSE, TRUE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame37), GTK_SHADOW_NONE);
+
+ alignment40 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment40);
+ gtk_container_add (GTK_CONTAINER (frame37), alignment40);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment40), 0, 0, 12, 0);
+
+ table5 = gtk_table_new (3, 2, FALSE);
gtk_widget_show (table5);
- gtk_box_pack_start (GTK_BOX (vbox38), table5, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (alignment40), table5);
gtk_table_set_row_spacings (GTK_TABLE (table5), 3);
+ gtk_table_set_col_spacings (GTK_TABLE (table5), 24);
eventbox1 = gtk_event_box_new ();
gtk_widget_show (eventbox1);
@@ -4066,24 +4105,11 @@
gtk_tooltips_set_tip (tooltips, check_open_encoding, _("This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed)."), NULL);
gtk_button_set_focus_on_click (GTK_BUTTON (check_open_encoding), FALSE);
- label210 = gtk_label_new (_("Default end of line characters:"));
- gtk_widget_show (label210);
- gtk_table_attach (GTK_TABLE (table5), label210, 0, 1, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label210), 0, 0.5);
+ label219 = gtk_label_new (_("<b>Encodings</b>"));
+ gtk_widget_show (label219);
+ gtk_frame_set_label_widget (GTK_FRAME (frame37), label219);
+ gtk_label_set_use_markup (GTK_LABEL (label219), TRUE);
- combo_eol = gtk_combo_box_new_text ();
- gtk_widget_show (combo_eol);
- gtk_table_attach (GTK_TABLE (table5), combo_eol, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
-
- label109 = gtk_label_new (_("<b>New files</b>"));
- gtk_widget_show (label109);
- gtk_frame_set_label_widget (GTK_FRAME (frame6), label109);
- gtk_label_set_use_markup (GTK_LABEL (label109), TRUE);
-
frame2 = gtk_frame_new (NULL);
gtk_widget_show (frame2);
gtk_box_pack_start (GTK_BOX (vbox18), frame2, FALSE, TRUE, 0);
@@ -4931,6 +4957,12 @@
GLADE_HOOKUP_OBJECT (prefs_dialog, vbox8, "vbox8");
GLADE_HOOKUP_OBJECT (prefs_dialog, vbox38, "vbox38");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_cmdline_new_files, "check_cmdline_new_files");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, table15, "table15");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, combo_eol, "combo_eol");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, label210, "label210");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, label109, "label109");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, frame37, "frame37");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, alignment40, "alignment40");
GLADE_HOOKUP_OBJECT (prefs_dialog, table5, "table5");
GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox1, "eventbox1");
GLADE_HOOKUP_OBJECT (prefs_dialog, combo_new_encoding, "combo_new_encoding");
@@ -4939,9 +4971,7 @@
GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox3, "eventbox3");
GLADE_HOOKUP_OBJECT (prefs_dialog, combo_open_encoding, "combo_open_encoding");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_open_encoding, "check_open_encoding");
- GLADE_HOOKUP_OBJECT (prefs_dialog, label210, "label210");
- GLADE_HOOKUP_OBJECT (prefs_dialog, combo_eol, "combo_eol");
- GLADE_HOOKUP_OBJECT (prefs_dialog, label109, "label109");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, label219, "label219");
GLADE_HOOKUP_OBJECT (prefs_dialog, frame2, "frame2");
GLADE_HOOKUP_OBJECT (prefs_dialog, alignment3, "alignment3");
GLADE_HOOKUP_OBJECT (prefs_dialog, vbox6, "vbox6");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list