Remove ui_toolbar.xml Configuration Files menu item.

Add a real toolbar editor dialog.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3898 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2009-06-25  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * data/ui_toolbar.xml, doc/geany.txt, doc/geany.html, src/ui_utils.c,
+   src/toolbar.c, src/toolbar.h:
+   Remove ui_toolbar.xml Configuration Files menu item.
+   Add a real toolbar editor dialog.
+
+
 2009-06-25  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/dialogs.c:

data/ui_toolbar.xml

 <!--
+<!--
 This is Geany's toolbar UI definition.
-The DTD can be found at http://library.gnome.org/devel/gtk/stable/GtkUIManager.html#GtkUIManager.description.
+The DTD can be found at
+http://library.gnome.org/devel/gtk/stable/GtkUIManager.html#GtkUIManager.description.
 
 You can re-order all items and freely add and remove available actions.
 You cannot add new actions which are not listed in the documentation.
 Everything you add or change must be inside the /ui/toolbar/ path.
 
-For changes to take effect, simply save this file within Geany or restart Geany.
+For changes to take effect, you need to restart Geany. Alternatively you can use the toolbar
+editor in Geany.
 
 A list of available actions can be found in the documentation included with Geany or
 at http://www.geany.org/manual/current/index.html#customizing-the-toolbar.

doc/geany.txt

@@ -3527,8 +3527,14 @@ fileheader     The file header template. This wildcard       file header, snippe
 Customizing the toolbar
 -----------------------
 
-You can add, remove and reorder the elements in the toolbar by editing
-the file ``ui_toolbar.xml``.
+You can add, remove and reorder the elements in the toolbar by using the toolbar editor
+by manually editing the file ``ui_toolbar.xml``.
+
+The toolbar editor can be opened from the preferences editor on the Toolbar tab or
+by right-clicking on the toolbar itself and choosing it from the menu.
+
+Manually editing of the toolbar layout
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 To override the system-wide configuration file, copy it from
 ``$prefix/share/geany`` to your configuration directory, usually

src/toolbar.h

@@ -45,8 +45,6 @@ GtkAction *toolbar_get_action_by_name(const gchar *name);
 
 gint toolbar_get_insert_position(void);
 
-void toolbar_add_config_file_menu_item(void);
-
 void toolbar_update_ui(void);
 
 void toolbar_apply_settings(void);
@@ -57,4 +55,6 @@ GtkWidget *toolbar_init(void);
 
 void toolbar_finalize(void);
 
+void toolbar_configure(void);
+
 #endif

src/ui_utils.c

@@ -1862,7 +1862,6 @@ void ui_init(void)
 	ui_init_toolbar_widgets();
 	init_document_widgets();
 	create_config_files_menu();
-	toolbar_add_config_file_menu_item();
 }