SF.net SVN: geany: [564] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Sat Jul 15 18:15:43 UTC 2006
Revision: 564
Author: eht16
Date: 2006-07-15 11:15:30 -0700 (Sat, 15 Jul 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=564&view=rev
Log Message:
-----------
Toolbar items for file operations can also be hidden.
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.glade
trunk/src/geany.h
trunk/src/interface.c
trunk/src/keyfile.c
trunk/src/prefs.c
trunk/src/utils.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-07-15 12:40:12 UTC (rev 563)
+++ trunk/ChangeLog 2006-07-15 18:15:30 UTC (rev 564)
@@ -2,6 +2,9 @@
* src/keybindings.c, src/sci_cb.c:
Show auto completion list immediately when called by a keybinding.
+ * geany.glade, src/interface.c, src/prefs.c, src/geany.h,
+ src/keyfile.c, src/utils.c:
+ Toolbar items for file operations can also be hidden.
2006-07-15 Nick Treleaven <nick.treleaven at btinternet.com>
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2006-07-15 12:40:12 UTC (rev 563)
+++ trunk/geany.glade 2006-07-15 18:15:30 UTC (rev 564)
@@ -3713,6 +3713,25 @@
<property name="spacing">0</property>
<child>
+ <widget class="GtkCheckButton" id="check_toolbar_fileops">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Display the New, Open, Close, Save and Reload buttons in the toolbar</property>
+ <property name="label" translatable="yes">Show file operation buttons</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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkCheckButton" id="check_toolbar_compile">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Display the Compile and Run buttons in the toolbar</property>
Modified: trunk/src/geany.h
===================================================================
--- trunk/src/geany.h 2006-07-15 12:40:12 UTC (rev 563)
+++ trunk/src/geany.h 2006-07-15 18:15:30 UTC (rev 564)
@@ -170,6 +170,7 @@
gboolean pref_toolbar_show_compile;
gboolean pref_toolbar_show_zoom;
gboolean pref_toolbar_show_colour;
+ gboolean pref_toolbar_show_fileops;
gint tab_pos_editor;
gint tab_pos_msgwin;
gint tab_pos_sidebar;
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2006-07-15 12:40:12 UTC (rev 563)
+++ trunk/src/interface.c 2006-07-15 18:15:30 UTC (rev 564)
@@ -1948,6 +1948,7 @@
GtkWidget *frame11;
GtkWidget *alignment14;
GtkWidget *vbox16;
+ GtkWidget *check_toolbar_fileops;
GtkWidget *check_toolbar_compile;
GtkWidget *check_toolbar_colour;
GtkWidget *check_toolbar_zoom;
@@ -2480,6 +2481,13 @@
gtk_widget_show (vbox16);
gtk_container_add (GTK_CONTAINER (alignment14), vbox16);
+ check_toolbar_fileops = gtk_check_button_new_with_mnemonic (_("Show file operation buttons"));
+ gtk_widget_show (check_toolbar_fileops);
+ gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_fileops, FALSE, FALSE, 0);
+ GTK_WIDGET_UNSET_FLAGS (check_toolbar_fileops, GTK_CAN_FOCUS);
+ gtk_tooltips_set_tip (tooltips, check_toolbar_fileops, _("Display the New, Open, Close, Save and Reload buttons in the toolbar"), NULL);
+ gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_fileops), FALSE);
+
check_toolbar_compile = gtk_check_button_new_with_mnemonic (_("Show Compile and Run"));
gtk_widget_show (check_toolbar_compile);
gtk_box_pack_start (GTK_BOX (vbox16), check_toolbar_compile, FALSE, FALSE, 0);
@@ -3132,6 +3140,7 @@
GLADE_HOOKUP_OBJECT (prefs_dialog, frame11, "frame11");
GLADE_HOOKUP_OBJECT (prefs_dialog, alignment14, "alignment14");
GLADE_HOOKUP_OBJECT (prefs_dialog, vbox16, "vbox16");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_fileops, "check_toolbar_fileops");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_compile, "check_toolbar_compile");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_colour, "check_toolbar_colour");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_toolbar_zoom, "check_toolbar_zoom");
Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c 2006-07-15 12:40:12 UTC (rev 563)
+++ trunk/src/keyfile.c 2006-07-15 18:15:30 UTC (rev 564)
@@ -129,6 +129,7 @@
g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_undo", app->pref_toolbar_show_undo);
g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_compile", app->pref_toolbar_show_compile);
g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_colour", app->pref_toolbar_show_colour);
+ g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_fileops", app->pref_toolbar_show_fileops);
g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_style", app->toolbar_icon_style);
g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_size", app->toolbar_icon_size);
g_key_file_set_boolean(config, PACKAGE, "pref_editor_new_line", app->pref_editor_new_line);
@@ -298,6 +299,7 @@
app->pref_toolbar_show_compile = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_compile", TRUE);
app->pref_toolbar_show_undo = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_undo", FALSE);
app->pref_toolbar_show_colour = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_colour", TRUE);
+ app->pref_toolbar_show_fileops = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show_fileops", TRUE);
#ifdef HAVE_VTE
app->load_vte = utils_get_setting_boolean(config, PACKAGE, "load_vte", TRUE);
app->terminal_settings = utils_get_setting_string(config, PACKAGE, "terminal_settings", "");
Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c 2006-07-15 12:40:12 UTC (rev 563)
+++ trunk/src/prefs.c 2006-07-15 18:15:30 UTC (rev 564)
@@ -163,7 +163,10 @@
widget = lookup_widget(app->prefs_dialog, "check_toolbar_colour");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_toolbar_show_colour);
+ widget = lookup_widget(app->prefs_dialog, "check_toolbar_fileops");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_toolbar_show_fileops);
+
switch (app->toolbar_icon_style)
{
case 0: widget = lookup_widget(app->prefs_dialog, "radio_toolbar_image"); break;
@@ -436,6 +439,9 @@
widget = lookup_widget(app->prefs_dialog, "check_toolbar_colour");
app->pref_toolbar_show_colour = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ widget = lookup_widget(app->prefs_dialog, "check_toolbar_fileops");
+ app->pref_toolbar_show_fileops = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+
widget = lookup_widget(app->prefs_dialog, "radio_toolbar_imagetext");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) app->toolbar_icon_style = 2;
else
Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c 2006-07-15 12:40:12 UTC (rev 563)
+++ trunk/src/utils.c 2006-07-15 18:15:30 UTC (rev 564)
@@ -2500,6 +2500,15 @@
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), FALSE);
}
+ // fileops
+ utils_widget_show_hide(lookup_widget(app->window, "menutoolbutton1"), app->pref_toolbar_show_fileops);
+ utils_widget_show_hide(lookup_widget(app->window, "toolbutton9"), app->pref_toolbar_show_fileops);
+ utils_widget_show_hide(lookup_widget(app->window, "toolbutton10"), app->pref_toolbar_show_fileops);
+ utils_widget_show_hide(lookup_widget(app->window, "toolbutton22"), app->pref_toolbar_show_fileops);
+ utils_widget_show_hide(lookup_widget(app->window, "toolbutton23"), app->pref_toolbar_show_fileops);
+ utils_widget_show_hide(lookup_widget(app->window, "toolbutton15"), app->pref_toolbar_show_fileops);
+ utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem7"), app->pref_toolbar_show_fileops);
+ utils_widget_show_hide(lookup_widget(app->window, "separatortoolitem2"), app->pref_toolbar_show_fileops);
// search
utils_widget_show_hide(lookup_widget(app->window, "entry1"), app->pref_toolbar_show_search);
utils_widget_show_hide(lookup_widget(app->window, "toolbutton18"), app->pref_toolbar_show_search);
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