commit fd0004cf909fd5bf53db9a8dae9f31a4d266ce87
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Sat Jan 1 22:03:03 2011 +0000
Remove 'show toolbar' menu item
* anjuta-actions.h
* gtkpod doesnt look right with a capital 'g'
* Remove toolbar action
* Reformatting for obviousness
* anjuta-app.c
* Remove unused toolbar callback
* gtkpod.ui
* Remove toolbar entry
data/ui/gtkpod.ui | 1 -
src/anjuta-actions.h | 126 +++++++++++++++++++++++++++++++++-----------------
src/anjuta-app.c | 30 +-----------
3 files changed, 84 insertions(+), 73 deletions(-)
---
diff --git a/data/ui/gtkpod.ui b/data/ui/gtkpod.ui
index 8a8ca22..3c5e997 100755
--- a/data/ui/gtkpod.ui
+++ b/data/ui/gtkpod.ui
@@ -28,7 +28,6 @@
<menuitem name="LockLayout"
action="ActionViewLockLayout"/>
<menuitem name="ResetLayout"
action="ActionViewResetLayout"/>
<separator name="separate1"/>
- <menuitem name="Toolbar" action="ActionViewToolbar"/>
</menu>
<menu name="MenuTools" action="ActionMenuTools">
<placeholder name="PlaceholderToolsMenus">
diff --git a/src/anjuta-actions.h b/src/anjuta-actions.h
index 5dc49b6..7f8ebb6 100644
--- a/src/anjuta-actions.h
+++ b/src/anjuta-actions.h
@@ -38,7 +38,7 @@ static GtkActionEntry menu_entries_music[] = {
GTK_STOCK_QUIT,
N_("_Quit"),
"<control>q",
- N_("Quit GtkPod"),
+ N_("Quit gtkpod"),
G_CALLBACK (on_exit1_activate)}
};
@@ -66,26 +66,38 @@ static GtkActionEntry menu_entries_edit[] = {
};
static GtkActionEntry menu_entries_view[] = {
- { "ActionMenuView", NULL, N_("_View")},
- { "ActionViewResetLayout", NULL,
- N_("_Reset Dock Layout"), NULL,
- N_("Reset the widgets docking layout to default"),
- G_CALLBACK (on_reset_layout_activate)}
+ {
+ "ActionMenuView",
+ NULL,
+ N_("_View")
+ },
+ {
+ "ActionViewResetLayout",
+ NULL,
+ N_("_Reset Dock Layout"),
+ NULL,
+ N_("Reset the widgets docking layout to default"),
+ G_CALLBACK (on_reset_layout_activate)
+ }
};
static GtkToggleActionEntry menu_entries_toggle_view[] = {
- { "ActionViewFullscreen", GTK_STOCK_FULLSCREEN,
- N_("_Full Screen"), "F11",
- N_("Toggle fullscreen mode"),
- G_CALLBACK (on_fullscreen_toggle)},
- { "ActionViewLockLayout", NULL,
- N_("_Lock Dock Layout"), NULL,
- N_("Lock the current dock layout so that widgets cannot be moved"),
- G_CALLBACK (on_layout_lock_toggle)},
- { "ActionViewToolbar", NULL,
- N_("_Toolbar"), NULL,
- N_("Show or hide the toolbar"),
- G_CALLBACK (on_toolbar_view_toggled)}
+ {
+ "ActionViewFullscreen",
+ GTK_STOCK_FULLSCREEN,
+ N_("_Full Screen"),
+ "F11",
+ N_("Toggle fullscreen mode"),
+ G_CALLBACK (on_fullscreen_toggle)
+ },
+ {
+ "ActionViewLockLayout",
+ NULL,
+ N_("_Lock Dock Layout"),
+ NULL,
+ N_("Lock the current dock layout so that widgets cannot be moved"),
+ G_CALLBACK (on_layout_lock_toggle)
+ }
};
static GtkActionEntry menu_entries_tools[] = {
@@ -97,29 +109,57 @@ static GtkActionEntry menu_entries_tools[] = {
};
static GtkActionEntry menu_entries_help[] = {
- { "ActionMenuHelp", NULL, N_("_Help")},
- { "ActionHelpUserManual", GTK_STOCK_HELP,
- N_("_User's Manual"), "F1",
- N_("gtkpod user's manual"),
- G_CALLBACK (on_help_manual_activate)},
- { "ActionHelpGtkpodHome", GTK_STOCK_HOME,
- N_("gtkpod _Home Page"), NULL,
- N_("Online documentation and resources"),
- G_CALLBACK (on_url_home_activate)},
- { "ActionHelpBugReport", NULL,
- N_("Report _Bugs/Patches/Requests"), NULL,
- N_("Submit a bug report, patch or feature request for gtkpod"),
- G_CALLBACK (on_url_bugs_activate)},
- { "ActionHelpFaq", NULL,
- N_("Ask a _Question"), NULL,
- N_("Submit a question for FAQs"),
- G_CALLBACK (on_url_faqs_activate)},
- { "ActionAboutGtkpod", GTK_STOCK_ABOUT,
- N_("_About"), NULL,
- N_("About gtkpod"),
- G_CALLBACK (on_about_activate)},
- { "ActionAboutPlugins", GTK_STOCK_ABOUT,
- N_("About External _Plugins"), NULL,
- N_("About third party gtkpod plugins"),
- NULL}
+ {
+ "ActionMenuHelp",
+ NULL,
+ N_("_Help")
+ },
+ {
+ "ActionHelpUserManual",
+ GTK_STOCK_HELP,
+ N_("_User's Manual"),
+ "F1",
+ N_("gtkpod user's manual"),
+ G_CALLBACK (on_help_manual_activate)
+ },
+ {
+ "ActionHelpGtkpodHome",
+ GTK_STOCK_HOME,
+ N_("gtkpod _Home Page"),
+ NULL,
+ N_("Online documentation and resources"),
+ G_CALLBACK (on_url_home_activate)
+ },
+ {
+ "ActionHelpBugReport",
+ NULL,
+ N_("Report _Bugs/Patches/Requests"),
+ NULL,
+ N_("Submit a bug report, patch or feature request for gtkpod"),
+ G_CALLBACK (on_url_bugs_activate)
+ },
+ {
+ "ActionHelpFaq",
+ NULL,
+ N_("Ask a _Question"),
+ NULL,
+ N_("Submit a question for FAQs"),
+ G_CALLBACK (on_url_faqs_activate)
+ },
+ {
+ "ActionAboutGtkpod",
+ GTK_STOCK_ABOUT,
+ N_("_About"),
+ NULL,
+ N_("About gtkpod"),
+ G_CALLBACK (on_about_activate)
+ },
+ {
+ "ActionAboutPlugins",
+ GTK_STOCK_ABOUT,
+ N_("About External _Plugins"),
+ NULL,
+ N_("About third party gtkpod plugins"),
+ NULL
+ }
};
diff --git a/src/anjuta-app.c b/src/anjuta-app.c
index 07edf9f..d43d725 100644
--- a/src/anjuta-app.c
+++ b/src/anjuta-app.c
@@ -55,7 +55,6 @@ static void anjuta_app_layout_load(AnjutaApp *app, const
gchar *layout_filename,
static void anjuta_app_layout_save(AnjutaApp *app, const gchar
*layout_filename, const gchar *name);
static gpointer parent_class = NULL;
-static GtkToolbarStyle style = -1;
static gchar *uifile = NULL;
static GHashTable *id_hash = NULL;
@@ -112,32 +111,6 @@ static void disconnect_proxy_cb(GtkUIManager *manager,
GtkAction *action, GtkWid
}
}
-static void on_toolbar_style_changed(AnjutaPreferences* prefs, const gchar*
key, const gchar* tb_style, gpointer user_data) {
- AnjutaApp* app = ANJUTA_APP (user_data);
-
- if (tb_style) {
- if (strcasecmp(tb_style, "Default") == 0)
- style = -1;
- else if (strcasecmp(tb_style, "Both") == 0)
- style = GTK_TOOLBAR_BOTH;
- else if (strcasecmp(tb_style, "Horiz") == 0)
- style = GTK_TOOLBAR_BOTH_HORIZ;
- else if (strcasecmp(tb_style, "Icons") == 0)
- style = GTK_TOOLBAR_ICONS;
- else if (strcasecmp(tb_style, "Text") == 0)
- style = GTK_TOOLBAR_TEXT;
-
- DEBUG_PRINT ("Toolbar style: %s", tb_style);
- }
-
- if (style != -1) {
- gtk_toolbar_set_style(GTK_TOOLBAR (app->toolbar), style);
- }
- else {
- gtk_toolbar_unset_style(GTK_TOOLBAR (app->toolbar));
- }
-}
-
static void on_gdl_style_changed(AnjutaPreferences* prefs, const gchar* key,
const gchar* pr_style, gpointer user_data) {
AnjutaApp* app = ANJUTA_APP (user_data);
GdlSwitcherStyle style = GDL_SWITCHER_STYLE_BOTH;
@@ -360,13 +333,12 @@ static void anjuta_app_instance_init(AnjutaApp *app) {
GtkWidget *view_menu, *hbox;
GtkWidget *main_box;
GtkWidget *dockbar;
- GtkAction* action;
GList *plugins_dirs = NULL;
gchar * style;
GdkGeometry size_hints =
{ 100, 100, 0, 0, 100, 100, 1, 1, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST };
- DEBUG_PRINT ("%s", "Initializing Anjuta...");
+ DEBUG_PRINT ("%s", "Initializing gtkpod...");
gtk_window_set_geometry_hints(GTK_WINDOW (app), GTK_WIDGET (app),
&size_hints, GDK_HINT_RESIZE_INC);
gtk_window_set_resizable(GTK_WINDOW (app), TRUE);
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
