diff --git a/CHANGELOG b/CHANGELOG index df8cf9a2..b8331f2a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ - Don't save and restore the "Last Played" tracks column width - Save databases if they have been upgraded - Don't duplicate tracks in the library after a defrag +- Remove "Add New ..." menubutton and replace with Add Library Path button 6.5.0-rc: - Convert to CMake/CTest diff --git a/gui/collection.c b/gui/collection.c index 77ff6aec..c1e2ca92 100644 --- a/gui/collection.c +++ b/gui/collection.c @@ -19,7 +19,7 @@ static void __collection_add(GtkFileChooser *chooser) g_free(filename); } -void __collection_choose(GtkMenuItem *item, gpointer data) +void __collection_choose(GtkButton *button, gpointer data) { GtkFileFilter *filter; GtkWidget *dialog; diff --git a/share/ocarina/ocarina.ui b/share/ocarina/ocarina.ui index 3bc7b44d..53630e36 100644 --- a/share/ocarina/ocarina.ui +++ b/share/ocarina/ocarina.ui @@ -25,40 +25,6 @@ emblem-favorite 1 - - True - False - folder-new - - - True - False - document-new - - - True - False - - - Library Path - True - False - image21 - False - - - - - - Playlist - True - False - image22 - False - - - - True False @@ -119,6 +85,11 @@ False 6 + + True + False + folder-new + @@ -826,59 +797,18 @@ audio-volume-medium - + + Add Library Path True True True - menu1 - up - - - True - False - - - True - False - list-add - - - False - True - 0 - - - - - True - False - Add New ... - - - True - True - 1 - - - - - True - False - up - - - False - True - 2 - - - - + image3 + False True - 3 + 2