commit 7ca435864993e2aa0ff97ce363f07001b472a9c9
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Thu Dec 16 21:47:48 2010 +0000
Small fixes in playlist display and anjuta framework
* anjuta-app.c
* Reset dock layout action not working since layout.xml renamed to
dock-layout.xml in gtkpod. Modifies this accordingly
* playlist_display
* Move create playlist sub-menu under music menu
* Remove "menu" label from create playlist submenu as unnecessary
* Thanks for Daniel Forsi for pointing these out!
plugins/playlist_display/playlist_display.ui | 31 +++++++++++++------------
plugins/playlist_display/plugin.c | 2 +-
src/anjuta-app.c | 6 +---
3 files changed, 19 insertions(+), 20 deletions(-)
---
diff --git a/plugins/playlist_display/playlist_display.ui
b/plugins/playlist_display/playlist_display.ui
index 0ffeefe..1b22e0d 100644
--- a/plugins/playlist_display/playlist_display.ui
+++ b/plugins/playlist_display/playlist_display.ui
@@ -8,21 +8,6 @@
<menuitem name="Add Files"
action="ActionAddFiles" />
<menuitem name="Add Directory"
action="ActionAddDirectory" />
<menuitem name="Add Playlist"
action="ActionAddPlaylist" />
- </placeholder>
- <placeholder name="PlaceholderFileMenus">
- <menu name="Update Tracks from File"
action="ActionUpdateMenu">
- <menuitem name="Selected Playlist"
action="ActionUpdatePlaylist" />
- </menu>
- <menuitem name="Sync Playlist with Dir(s)"
action="ActionSyncPlaylistWithDir"/>
- </placeholder>
- </menu>
- <menu name="MenuEdit" action="ActionMenuEdit">
- <placeholder name="PlaceholderEditMenus">
- <menu name="Delete"
action="ActionEditDeleteMenu">
- <menuitem name="Selected Playlist"
action="ActionDeleteSelectedPlaylist" />
- <menuitem name="Selected Playlist
including Tracks from Database" action="ActionDeleteSelectedPlaylistIncDb" />
- <menuitem name="Selected Playlist
including Tracks from Device" action="ActionDeleteSelectedPlaylistIncDev" />
- </menu>
<separator/>
<menu name="Playlist Menu"
action="ActionNewPlaylistMenu">
<menuitem name="Empty Playlist"
action="ActionNewEmptyPlaylist"/> <!-- on_new_playlist1_activate" --> <!--
playlist -->
@@ -45,6 +30,22 @@
<menuitem name="One for each Rating"
action="ActionNewOnePerRatingPlaylist"/> <!-- on_pl_for_each_rating_activate -->
</menu>
<separator/>
+ </placeholder>
+ <placeholder name="PlaceholderFileMenus">
+ <menu name="Update Tracks from File"
action="ActionUpdateMenu">
+ <menuitem name="Selected Playlist"
action="ActionUpdatePlaylist" />
+ </menu>
+ <menuitem name="Sync Playlist with Dir(s)"
action="ActionSyncPlaylistWithDir"/>
+ </placeholder>
+ </menu>
+ <menu name="MenuEdit" action="ActionMenuEdit">
+ <placeholder name="PlaceholderEditMenus">
+ <menu name="Delete"
action="ActionEditDeleteMenu">
+ <menuitem name="Selected Playlist"
action="ActionDeleteSelectedPlaylist" />
+ <menuitem name="Selected Playlist
including Tracks from Database" action="ActionDeleteSelectedPlaylistIncDb" />
+ <menuitem name="Selected Playlist
including Tracks from Device" action="ActionDeleteSelectedPlaylistIncDev" />
+ </menu>
+ <separator/>
</placeholder>
</menu>
</menubar>
diff --git a/plugins/playlist_display/plugin.c
b/plugins/playlist_display/plugin.c
index 93acc84..67d7f79 100644
--- a/plugins/playlist_display/plugin.c
+++ b/plugins/playlist_display/plugin.c
@@ -105,7 +105,7 @@ static GtkActionEntry playlist_actions[] =
{
ACTION_NEW_PLAYLIST_MENU,
NULL,
- N_("_New Playlist Menu")
+ N_("_New Playlist")
},
{
"ActionNewEmptyPlaylist",
diff --git a/src/anjuta-app.c b/src/anjuta-app.c
index a0c1ff2..4ef6aad 100644
--- a/src/anjuta-app.c
+++ b/src/anjuta-app.c
@@ -611,12 +611,10 @@ static void anjuta_app_layout_load(AnjutaApp *app, const
gchar *layout_filename,
g_return_if_fail (ANJUTA_IS_APP (app));
if (!layout_filename ||
!gdl_dock_layout_load_from_file(app->layout_manager, layout_filename)) {
- gchar *datadir, *filename;
- datadir = anjuta_res_get_data_dir();
+ gchar *filename;
- filename = g_build_filename(datadir, "layout.xml", NULL);
+ filename = g_build_filename(get_data_dir(), "dock-layout.xml", NULL);
DEBUG_PRINT ("Layout = %s", filename);
- g_free(datadir);
if (!gdl_dock_layout_load_from_file(app->layout_manager, filename))
g_warning ("Loading layout from '%s' failed!!", filename);
g_free(filename);
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
