[easytag] Rearrange menus and menu items
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag] Rearrange menus and menu items
- Date: Wed, 8 May 2013 21:38:23 +0000 (UTC)
commit 4c1e6a0f7bf4fa57e44b1085035689a8f4336302
Author: David King <amigadave amigadave com>
Date: Wed May 8 22:36:41 2013 +0100
Rearrange menus and menu items
Attempt to comply with the GNOME HIG with regards to the style and
placement of menus.
src/bar.c | 73 ++++++++++++++++++++++--------
src/bar.h | 2 +
src/browser.c | 4 +-
src/misc.c | 4 +-
src/scan.c | 2 +-
src/ui_manager.h | 129 +++++++++++++++++++++++++++++-------------------------
6 files changed, 131 insertions(+), 83 deletions(-)
---
diff --git a/src/bar.c b/src/bar.c
index abfe603..42f9227 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -137,8 +137,10 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
* Main Menu Actions
*/
{ MENU_FILE, NULL, _("_File"),
NULL, NULL, NULL},
- { MENU_FILE_SORT_TAG, GTK_STOCK_SORT_ASCENDING, _("Sort list by tag"),
NULL, NULL, NULL },
- { MENU_FILE_SORT_PROP, GTK_STOCK_SORT_ASCENDING, _("Sort list by property"),
NULL, NULL, NULL },
+ { MENU_FILE_SORT_TAG, GTK_STOCK_SORT_ASCENDING, _("Sort List by Tag"),
+ NULL, NULL, NULL },
+ { MENU_FILE_SORT_PROP, GTK_STOCK_SORT_ASCENDING,
+ _("Sort List by Property"), NULL, NULL, NULL },
{ AM_SORT_ASCENDING_FILENAME, GTK_STOCK_SORT_ASCENDING, _("Ascending by filename"),
NULL, _("Ascending by filename"), G_CALLBACK(Menu_Sort_Action) },
{ AM_SORT_DESCENDING_FILENAME, GTK_STOCK_SORT_DESCENDING, _("Descending by filename"),
NULL, _("Descending by filename"), G_CALLBACK(Menu_Sort_Action) },
{ AM_SORT_ASCENDING_CREATION_DATE, GTK_STOCK_SORT_ASCENDING, _("Ascending by creation date"),
NULL, _("Ascending by creation date"), G_CALLBACK(Menu_Sort_Action) },
@@ -184,11 +186,16 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
{ AM_SORT_ASCENDING_FILE_SAMPLERATE, GTK_STOCK_SORT_ASCENDING, _("Ascending by samplerate"),
NULL, _("Ascending by samplerate"), G_CALLBACK(Menu_Sort_Action) },
{ AM_SORT_DESCENDING_FILE_SAMPLERATE, GTK_STOCK_SORT_DESCENDING, _("Descending by samplerate"),
NULL, _("Descending by samplerate"), G_CALLBACK(Menu_Sort_Action) },
- { AM_OPEN_FILE_WITH, GTK_STOCK_OPEN, _("Open Files With…"), NULL,
_("Open files with…"), G_CALLBACK(Browser_Open_Run_Program_List_Window) },
+ { AM_OPEN_FILE_WITH, GTK_STOCK_OPEN, _("Open Files With…"),
+ "<Control><Shift>O", _("Run a command on the selected files"),
+ G_CALLBACK (Browser_Open_Run_Program_List_Window) },
{ AM_SELECT_ALL, GTK_STOCK_SELECT_ALL, NULL, "<Control>A",
_("Select all"), G_CALLBACK (et_on_action_select_all) },
{ AM_UNSELECT_ALL_FILES, "easytag-unselect-all", _("Unselect All Files"),
"<Shift><Control>A", _("Unselect all files"), G_CALLBACK(Action_Unselect_All_Files) },
- { AM_INVERT_SELECTION, "easytag-invert-selection", _("Invert Files Selection"), "<Control>I",
_("Invert files selection"), G_CALLBACK(Action_Invert_Files_Selection) },
+ { AM_INVERT_SELECTION, "easytag-invert-selection",
+ _("Invert File Selection"), "<Control>I",
+ _("Invert file selection"),
+ G_CALLBACK (Action_Invert_Files_Selection) },
{ AM_DELETE_FILE, GTK_STOCK_DELETE, _("Delete Files"), NULL,
_("Delete files"), G_CALLBACK(Action_Delete_Selected_Files) },
{ AM_FIRST, GTK_STOCK_GOTO_FIRST, _("_First File"),
"<Control>Home", _("First file"), G_CALLBACK(Action_Select_First_File) },
{ AM_PREV, GTK_STOCK_GO_BACK, _("_Previous File"), "Page_Up",
_("Previous file"), G_CALLBACK(Action_Select_Prev_File) },
@@ -200,39 +207,67 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
{ AM_UNDO, GTK_STOCK_UNDO, _("_Undo Last Files Changes"), "<Control>Z",
_("Undo last Files changes"), G_CALLBACK(Action_Undo_Selected_Files) },
{ AM_REDO, GTK_STOCK_REDO, _("R_edo Last Files Changes"),
"<Shift><Control>Z", _("Redo last files changes"), G_CALLBACK(Action_Redo_Selected_File) },
{ AM_SAVE, GTK_STOCK_SAVE, _("_Save Files"), "<Control>S",
_("Save files"), G_CALLBACK(Action_Save_Selected_Files) },
- { AM_SAVE_FORCED, GTK_STOCK_SAVE, _("_Force Saving Files"),
"<Shift><Control>S", _("Force saving files"), G_CALLBACK(Action_Force_Saving_Selected_Files) },
+ { AM_SAVE_FORCED, GTK_STOCK_SAVE, _("_Force Save Files"),
+ "<Shift><Control>S", _("Force saving files"),
+ G_CALLBACK (Action_Force_Saving_Selected_Files) },
{ AM_UNDO_HISTORY, GTK_STOCK_UNDO, _("Undo Last Changes"), NULL,
_("Undo last changes"), G_CALLBACK(Action_Undo_From_History_List) },
{ AM_REDO_HISTORY, GTK_STOCK_REDO, _("Redo Last Changes"), NULL,
_("Redo last changes"), G_CALLBACK(Action_Redo_From_History_List) },
{ AM_QUIT, GTK_STOCK_QUIT, _("_Quit"), "<Control>Q",
_("Quit"), G_CALLBACK(Quit_MainWindow) },
{ MENU_BROWSER, NULL, _("_Browser"), NULL,
NULL, NULL },
- { AM_LOAD_HOME_DIR, GTK_STOCK_HOME, _("Go to _Home Directory"),
"<Alt>Home", _("Go to home directory"), G_CALLBACK(Browser_Load_Home_Directory) },
- { AM_LOAD_DESKTOP_DIR, "user-desktop", _("Go to Desktop Directory"), NULL,
_("Go to desktop directory"), G_CALLBACK(Browser_Load_Desktop_Directory) },
- { AM_LOAD_DOCUMENTS_DIR, "folder-documents", _("Go to Documents Directory"), NULL,
_("Go to documents directory"), G_CALLBACK(Browser_Load_Documents_Directory) },
- { AM_LOAD_DOWNLOADS_DIR, "folder-download", _("Go to Downloads Directory"), NULL,
_("Go to downloads directory"), G_CALLBACK(Browser_Load_Downloads_Directory) },
- { AM_LOAD_MUSIC_DIR, "folder-music", _("Go to Music Directory"), NULL,
_("Go to music directory"), G_CALLBACK(Browser_Load_Music_Directory) },
- { AM_LOAD_DEFAULT_DIR, GTK_STOCK_JUMP_TO, _("Go to _Default Directory"),
"<Control>D", _("Go to default directory"), G_CALLBACK(Browser_Load_Default_Directory) },
+ { AM_LOAD_HOME_DIR, GTK_STOCK_HOME, _("_Home Directory"), "<Alt>Home",
+ _("Go to home directory"),
+ G_CALLBACK (Browser_Load_Home_Directory) },
+ { AM_LOAD_DESKTOP_DIR, "user-desktop", _("Desktop Directory"), NULL,
+ _("Go to desktop directory"),
+ G_CALLBACK (Browser_Load_Desktop_Directory) },
+ { AM_LOAD_DOCUMENTS_DIR, "folder-documents", _("Documents Directory"),
+ NULL, _("Go to documents directory"),
+ G_CALLBACK (Browser_Load_Documents_Directory) },
+ { AM_LOAD_DOWNLOADS_DIR, "folder-download", _("Downloads Directory"),
+ NULL, _("Go to downloads directory"),
+ G_CALLBACK (Browser_Load_Downloads_Directory) },
+ { AM_LOAD_MUSIC_DIR, "folder-music", _("Music Directory"), NULL,
+ _("Go to music directory"),
+ G_CALLBACK (Browser_Load_Music_Directory) },
+ { AM_LOAD_DEFAULT_DIR, GTK_STOCK_JUMP_TO, _("_Default Directory"),
+ "<Control>D", _("Go to default directory"),
+ G_CALLBACK (Browser_Load_Default_Directory) },
{ AM_SET_PATH_AS_DEFAULT, GTK_STOCK_DIRECTORY, _("Set _Current Path as Default"), NULL,
_("Set current path as default"), G_CALLBACK(Set_Current_Path_As_Default) },
{ AM_RENAME_DIR, GTK_STOCK_INDEX, _("Rename Directory…"), "F2",
_("Rename directory"), G_CALLBACK(Browser_Open_Rename_Directory_Window) },
{ AM_RELOAD_DIRECTORY, GTK_STOCK_REFRESH, _("Reload Directory"), "F5",
_("Reload directory"), G_CALLBACK(Browser_Reload_Directory) },
- { AM_BROWSE_DIRECTORY_WITH, GTK_STOCK_EXECUTE, _("Browse Directory with…"), NULL,
_("Browse directory with…"), G_CALLBACK(Browser_Open_Run_Program_Tree_Window) },
+ { AM_BROWSE_DIRECTORY_WITH, GTK_STOCK_EXECUTE,
+ _("Browse Directory With…"), NULL,
+ _("Run a command on the directory"),
+ G_CALLBACK (Browser_Open_Run_Program_Tree_Window) },
{ AM_COLLAPSE_TREE, NULL, _("_Collapse Tree"),
"<Control><Shift>C", _("_Collapse tree"), G_CALLBACK(Browser_Tree_Collapse) },
- { AM_INITIALIZE_TREE, GTK_STOCK_REFRESH, _("_Refresh Tree"),
"<Control><Shift>R", _("_Refresh tree"), G_CALLBACK(Browser_Tree_Rebuild) },
+ { AM_INITIALIZE_TREE, GTK_STOCK_REFRESH, _("_Reload Tree"),
+ "<Control><Shift>R", _("_Reload directory tree"),
+ G_CALLBACK (Browser_Tree_Rebuild) },
- { MENU_SCANNER, NULL, _("S_canner"), NULL,
NULL, NULL },
+ { MENU_SCANNER, NULL, _("S_canner Mode"), NULL, NULL, NULL },
{ MENU_MISC, NULL, _("_Miscellaneous"),
NULL, NULL, NULL },
- { AM_SEARCH_FILE, GTK_STOCK_FIND, _("Find _Files…"), "<Control>F",
_("Find files"), G_CALLBACK(Open_Search_File_Window) },
+ { AM_SEARCH_FILE, GTK_STOCK_FIND, _("_Find…"), "<Control>F",
+ _("Search filenames and tags"),
+ G_CALLBACK (Open_Search_File_Window) },
{ AM_CDDB_SEARCH, GTK_STOCK_CDROM, _("CDD_B Search…"), "<Control>B",
_("CDDB search"), G_CALLBACK (Open_Cddb_Window) },
- { AM_FILENAME_FROM_TXT, GTK_STOCK_OPEN, _("Load Filenames From Text File…"),
"<Alt>T", _("Load filenames from text file"), G_CALLBACK(Open_Load_Filename_Window) },
+ { AM_FILENAME_FROM_TXT, GTK_STOCK_OPEN,
+ _("Load Filenames From a Text File…"), "<Alt>T",
+ _("Load filenames from a text file"),
+ G_CALLBACK (Open_Load_Filename_Window) },
{ AM_WRITE_PLAYLIST, GTK_STOCK_SAVE_AS, _("Generate Playlist…"),
"<Alt>W", _("Generate a playlist"),
G_CALLBACK (Open_Write_Playlist_Window) },
{ AM_RUN_AUDIO_PLAYER, GTK_STOCK_MEDIA_PLAY, _("Run Audio Player"),
"<Alt>X", _("Run audio player"), G_CALLBACK(Run_Audio_Player_Using_Selection) },
{ MENU_EDIT, NULL, _("_Edit"), NULL, NULL, NULL },
- { AM_OPEN_OPTIONS_WINDOW, GTK_STOCK_PREFERENCES, _("_Preferences"), "<Alt>P",
_("Preferences"), G_CALLBACK(Open_OptionsWindow) },
+ { AM_OPEN_OPTIONS_WINDOW, GTK_STOCK_PREFERENCES, _("_Preferences"),
+ NULL, _("Preferences"), G_CALLBACK (Open_OptionsWindow) },
+
+ { MENU_VIEW, NULL, _("_View"), NULL, NULL, NULL },
+ { MENU_GO, NULL, _("_Go"), NULL, NULL, NULL },
{ MENU_HELP, NULL, _("_Help"), NULL,
NULL, NULL },
{ AM_OPEN_ABOUT_WINDOW, GTK_STOCK_ABOUT, _("_About"), NULL,
_("About"), G_CALLBACK(Show_About_Window) },
@@ -276,10 +311,10 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
GtkRadioActionEntry view_mode_entries[] =
{
- { AM_TREE_VIEW_MODE, "audio-x-generic", _("Tree Browser View"), NULL,
+ { AM_TREE_VIEW_MODE, "audio-x-generic", _("Tree Browser"), NULL,
_("View by directory tree"), 0 },
{ AM_ARTIST_VIEW_MODE, "easytag-artist-album",
- _("Artist and Album View"), NULL,
+ _("Artist and Album"), NULL,
_("View by artist and album"), 1 }
};
diff --git a/src/bar.h b/src/bar.h
index d478010..2347268 100644
--- a/src/bar.h
+++ b/src/bar.h
@@ -36,6 +36,8 @@ GtkWidget *CheckMenuItemBrowseHiddenDirMainMenu;
#define MENU_FILE "FileMenu"
#define MENU_EDIT "EditMenu"
+#define MENU_VIEW "ViewMenu"
+#define MENU_GO "GoMenu"
#define MENU_BROWSER "BrowserMenu"
#define MENU_SCANNER "ScannerMenu"
#define MENU_MISC "MiscMenu"
diff --git a/src/browser.c b/src/browser.c
index 19fa27f..5244f0d 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -4068,7 +4068,7 @@ void Browser_Open_Run_Program_Tree_Window (void)
if (!current_directory || strlen(current_directory)==0)
return;
- RunProgramTreeWindow = gtk_dialog_new_with_buttons (_("Browse Directory with…"),
+ RunProgramTreeWindow = gtk_dialog_new_with_buttons (_("Browse Directory With"),
GTK_WINDOW (MainWindow),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL,
@@ -4188,7 +4188,7 @@ void Browser_Open_Run_Program_List_Window (void)
return;
}
- RunProgramListWindow = gtk_dialog_new_with_buttons (_("Open File with…"),
+ RunProgramListWindow = gtk_dialog_new_with_buttons (_("Open Files With"),
GTK_WINDOW (MainWindow),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL,
diff --git a/src/misc.c b/src/misc.c
index 24f5bbc..14428c8 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -2652,7 +2652,7 @@ void Open_Load_Filename_Window (void)
LoadFileContentList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(LoadFileContentListModel));
renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(_("Content of TXT file"),
+ column = gtk_tree_view_column_new_with_attributes (_("Content of Text File"),
renderer, "text", LOAD_FILE_CONTENT_TEXT, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(LoadFileContentList), column);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(LoadFileContentList), TRUE);
@@ -2745,7 +2745,7 @@ void Open_Load_Filename_Window (void)
LoadFileNameList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(LoadFileNameListModel));
renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(_("List of files"),
+ column = gtk_tree_view_column_new_with_attributes(_("List of Files"),
renderer, "text", LOAD_FILE_NAME_TEXT, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(LoadFileNameList), column);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(LoadFileNameList), TRUE);
diff --git a/src/scan.c b/src/scan.c
index f7c09b2..f6ebb83 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -4017,7 +4017,7 @@ Scanner_Option_Menu_Activate_Item (GtkWidget *combo, gpointer data)
GtkRadioAction *radio_action;
radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (UIManager,
- "/MenuBar/ScannerMenu/FillTag"));
+ "/MenuBar/ViewMenu/ScannerMenu/FillTag"));
SCANNER_TYPE = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
gtk_radio_action_set_current_value (radio_action, SCANNER_TYPE);
diff --git a/src/ui_manager.h b/src/ui_manager.h
index a6ad998..bccfdb4 100644
--- a/src/ui_manager.h
+++ b/src/ui_manager.h
@@ -12,6 +12,55 @@ static const gchar *ui_xml =
" <menubar name='MenuBar'>"
" <menu action='FileMenu'>"
+" <menuitem action='OpenFile' />"
+" <menuitem action='RunAudio' />"
+" <separator />"
+
+" <menuitem action='UnselAll' />"
+" <menuitem action='SelInv' />"
+" <separator />"
+
+" <menuitem action='DeleteFile' />"
+" <separator />"
+
+" <menuitem action='UndoFile' />"
+" <menuitem action='RedoFile' />"
+" <menuitem action='SaveFile' />"
+" <menuitem action='SaveFileForced' />"
+" <separator />"
+
+" <menuitem action='Quit' />"
+" </menu>"
+
+
+" <menu action='EditMenu'>"
+" <menuitem action='SearchFile' />"
+" <menuitem action='SelAll' />"
+" <separator />"
+
+" <menuitem action='Undo' />"
+" <menuitem action='Redo' />"
+" <separator />"
+
+" <menuitem action='RemoveTag' />"
+" <separator />"
+
+" <menuitem action='Preferences' />"
+" </menu>"
+
+" <menu action='ViewMenu'>"
+" <menuitem action='ShowScanner' />"
+" <menu action='ScannerMenu'>"
+" <menuitem action='FillTag' />"
+" <menuitem action='RenameFile' />"
+" <menuitem action='ProcessFields' />"
+" </menu>"
+" <separator />"
+
+" <menuitem action='TreeViewMode'/>"
+" <menuitem action='ArtistViewMode'/>"
+" <separator />"
+
" <menu action='SortTagMenu'>"
" <menuitem action='SortTrackNumAsc' />"
" <menuitem action='SortTrackNumDesc' />"
@@ -54,7 +103,6 @@ static const gchar *ui_xml =
" <separator />"
" <menuitem action='SortEncodedByAsc' />"
" <menuitem action='SortEncodedByDesc' />"
-" <separator />"
" </menu>"
" <menu action='SortPropMenu'>"
@@ -79,89 +127,52 @@ static const gchar *ui_xml =
" <menuitem action='SortSamplerateAsc' />"
" <menuitem action='SortSamplerateDesc' />"
" </menu>"
-
-" <menuitem action='OpenFile' />"
-" <separator />"
-
-" <menuitem action='SelAll' />"
-" <menuitem action='UnselAll' />"
-" <menuitem action='SelInv' />"
" <separator />"
-" <menuitem action='DeleteFile' />"
-" <separator />"
-
-" <menuitem action='FirstFile' />"
-" <menuitem action='PreviousFile' />"
-" <menuitem action='NextFile' />"
-" <menuitem action='LastFile' />"
-" <separator />"
-
-" <menuitem action='RemoveTag' />"
-" <menuitem action='UndoFile' />"
-" <menuitem action='RedoFile' />"
-" <menuitem action='SaveFile' />"
-" <menuitem action='SaveFileForced' />"
+" <menuitem action='CollapseTree' />"
+" <menuitem action='RefreshTree' />"
" <separator />"
-" <menuitem action='Undo' />"
-" <menuitem action='Redo' />"
+" <menuitem action='ReloadDir' />"
" <separator />"
-" <menuitem action='Quit' />"
-" </menu>"
-
-
-" <menu action='EditMenu'>"
-" <menuitem action='Preferences' />"
+#ifndef G_OS_WIN32
+" <menuitem action='BrowseHiddenDir' />"
+#endif /* !G_OS_WIN32 */
" </menu>"
" <menu action='BrowserMenu'>"
-" <menuitem action='GoToHome' />"
-" <menuitem action='GoToDesktop' />"
-" <menuitem action='GoToDocument' />"
-" <menuitem action='GoToDownload' />"
-" <menuitem action='GoToMusic' />"
-" <separator />"
-" <menuitem action='GoToDefaultPath' />"
" <menuitem action='SetDefaultPath' />"
" <separator />"
-" <menuitem action='TreeViewMode'/>"
-" <menuitem action='ArtistViewMode'/>"
-" <separator />"
-
" <menuitem action='RenameDir' />"
-" <menuitem action='ReloadDir' />"
" <menuitem action='BrowseDir' />"
" <separator />"
" <menuitem action='BrowseSubdir' />"
-#ifndef G_OS_WIN32
-" <menuitem action='BrowseHiddenDir' />"
-#endif /* !G_OS_WIN32 */
-" <separator />"
-
-" <menuitem action='CollapseTree' />"
-" <menuitem action='RefreshTree' />"
-" </menu>"
-
-" <menu action='ScannerMenu'>"
-" <menuitem action='FillTag' />"
-" <menuitem action='RenameFile' />"
-" <menuitem action='ProcessFields' />"
-" <separator />"
-" <menuitem action='ShowScanner' />"
" </menu>"
" <menu action='MiscMenu'>"
-" <menuitem action='SearchFile' />"
" <menuitem action='CDDBSearch' />"
" <separator />"
" <menuitem action='LoadFilenames' />"
" <menuitem action='WritePlaylist' />"
-" <menuitem action='RunAudio' />"
+" </menu>"
+
+" <menu action='GoMenu'>"
+" <menuitem action='GoToHome' />"
+" <menuitem action='GoToDesktop' />"
+" <menuitem action='GoToDocument' />"
+" <menuitem action='GoToDownload' />"
+" <menuitem action='GoToMusic' />"
+" <menuitem action='GoToDefaultPath' />"
+" <separator />"
+
+" <menuitem action='FirstFile' />"
+" <menuitem action='PreviousFile' />"
+" <menuitem action='NextFile' />"
+" <menuitem action='LastFile' />"
" </menu>"
" <menu action='HelpMenu'>"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
