SF.net SVN: geany: [916] trunk

[eht16 at users.sourceforge.net]

Revision: 916
          http://svn.sourceforge.net/geany/?rev=916&view=rev
Author:   eht16
Date:     2006-10-22 09:38:04 -0700 (Sun, 22 Oct 2006)

Log Message:
-----------
Removed previously added configuration option and removed the right alignment of the toolbar quit button.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/geany.glade
    trunk/src/geany.h
    trunk/src/interface.c
    trunk/src/keyfile.c
    trunk/src/main.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-10-22 16:07:36 UTC (rev 915)
+++ trunk/ChangeLog	2006-10-22 16:38:04 UTC (rev 916)
@@ -2,6 +2,9 @@
 
  * src/geany.h, src/keyfile.c, src/main.c:
    Added configuration option for the alignment of toolbar quit button.
+ * geany.glade, src/interface.c, src/geany.h, src/keyfile.c,
+   src/main.c: Removed previously added configuration option and
+               removed the right alignment of the toolbar quit button.
 
 
 2006-10-22  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2006-10-22 16:07:36 UTC (rev 915)
+++ trunk/geany.glade	2006-10-22 16:38:04 UTC (rev 916)
@@ -1642,7 +1642,7 @@
 	      <property name="visible_vertical">True</property>
 	    </widget>
 	    <packing>
-	      <property name="expand">True</property>
+	      <property name="expand">False</property>
 	      <property name="homogeneous">False</property>
 	    </packing>
 	  </child>

Modified: trunk/src/geany.h
===================================================================
--- trunk/src/geany.h	2006-10-22 16:07:36 UTC (rev 915)
+++ trunk/src/geany.h	2006-10-22 16:38:04 UTC (rev 916)
@@ -81,7 +81,6 @@
 	gboolean			 ignore_callback;
 	gboolean			 ignore_global_tags;
 	gboolean			 toolbar_visible;
-	gboolean			 align_quit_button_on_right;
 	gboolean			 sidebar_symbol_visible;
 	gboolean			 sidebar_openfiles_visible;
 	gboolean			 sidebar_visible;

Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c	2006-10-22 16:07:36 UTC (rev 915)
+++ trunk/src/interface.c	2006-10-22 16:38:04 UTC (rev 916)
@@ -992,7 +992,6 @@
 
   separatortoolitem8 = (GtkWidget*) gtk_separator_tool_item_new ();
   gtk_widget_show (separatortoolitem8);
-  gtk_tool_item_set_expand (GTK_TOOL_ITEM (separatortoolitem8), TRUE);
   gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem8);
   gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (separatortoolitem8), FALSE);
 

Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2006-10-22 16:07:36 UTC (rev 915)
+++ trunk/src/keyfile.c	2006-10-22 16:38:04 UTC (rev 916)
@@ -97,7 +97,6 @@
 	g_key_file_set_integer(config, PACKAGE, "autocompletion_max_height", app->autocompletion_max_height);
 	g_key_file_set_integer(config, PACKAGE, "long_line_column", app->long_line_column);
 	g_key_file_set_string(config, PACKAGE, "long_line_color", app->long_line_color);
-	g_key_file_set_boolean(config, PACKAGE, "align_quit_button_on_right", app->align_quit_button_on_right);
 	g_key_file_set_boolean(config, PACKAGE, "beep_on_errors", app->beep_on_errors);
 	g_key_file_set_boolean(config, PACKAGE, "sidebar_symbol_visible", app->sidebar_symbol_visible);
 	g_key_file_set_boolean(config, PACKAGE, "sidebar_openfiles_visible", app->sidebar_openfiles_visible);
@@ -288,7 +287,6 @@
 		app->toolbar_icon_style = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_style", tb_style);
 		app->toolbar_icon_size = utils_get_setting_integer(config, PACKAGE, "pref_toolbar_icon_size", tb_iconsize);
 	}
-	app->align_quit_button_on_right = utils_get_setting_boolean(config, PACKAGE, "align_quit_button_on_right", TRUE);
 	app->beep_on_errors = utils_get_setting_boolean(config, PACKAGE, "beep_on_errors", TRUE);
 	app->mru_length = utils_get_setting_integer(config, PACKAGE, "mru_length", GEANY_DEFAULT_MRU_LENGTH);
 	app->long_line_type = utils_get_setting_integer(config, PACKAGE, "long_line_type", 0);

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2006-10-22 16:07:36 UTC (rev 915)
+++ trunk/src/main.c	2006-10-22 16:38:04 UTC (rev 916)
@@ -216,11 +216,6 @@
 	gtk_notebook_set_tab_pos(GTK_NOTEBOOK(msgwindow.notebook), app->tab_pos_msgwin);
 	gtk_notebook_set_tab_pos(GTK_NOTEBOOK(app->treeview_notebook), app->tab_pos_sidebar);
 
-	// align quit button on the right
-	if (! app->align_quit_button_on_right)
-		gtk_tool_item_set_expand(GTK_TOOL_ITEM(
-					lookup_widget(app->window, "separatortoolitem8")), FALSE);
-	
 	ui_update_toolbar_items();
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.