BeatBox

Merge lp:~voluntatefaber/beat-box/bug952227 into lp:beat-box/1.x

  1. bug952227
  2. Merge into 0.3.5
Proposed by Victor Martinez
Status: Merged
Approved by: Victor Martinez
Approved revision: 587
Merged at revision: 591
Proposed branch: lp:~voluntatefaber/beat-box/bug952227
Merge into: lp:beat-box/1.x
Diff against target: 42 lines (+0/-5)
1 file modified
src/LibraryWindow.vala (+0/-5)
To merge this branch: bzr merge lp:~voluntatefaber/beat-box/bug952227
Reviewer Review Type Date Requested Status
Victor Martinez (community) Approve
Review via email: mp+96953@code.launchpad.net

Commit message

Remove "Set Music Folder" from the Menu, fixes bug #952227

Description of the change

Fix for bug #952227

To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) wrote :

Looks fine. Thanks Andrea.

review: Approve
Revision history for this message
Victor Martinez (victored) wrote :

Sorry for the delay. I thought RabbitBot would handle the merge automatically.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/LibraryWindow.vala'
2--- src/LibraryWindow.vala 2012-03-11 11:13:43 +0000
3+++ src/LibraryWindow.vala 2012-03-12 01:47:21 +0000
4@@ -84,7 +84,6 @@
5 // basic file stuff
6 ImageMenuItem libraryOperations;
7 Gtk.Menu libraryOperationsMenu;
8- Gtk.MenuItem fileSetMusicFolder;
9 Gtk.MenuItem fileImportMusic;
10 Gtk.MenuItem fileRescanMusicFolder;
11 Gtk.MenuItem editEqualizer;
12@@ -216,7 +215,6 @@
13 sideTreeScroll = new ScrolledWindow(null, null);
14 libraryOperations = new ImageMenuItem.from_stock("library-music", null);
15 libraryOperationsMenu = new Gtk.Menu();
16- fileSetMusicFolder = new Gtk.MenuItem.with_label(_("Set Music Folder"));
17 fileImportMusic = new Gtk.MenuItem.with_label(_("Import to Library"));
18 fileRescanMusicFolder = new Gtk.MenuItem.with_label(_("Rescan Music Folder"));
19 editEqualizer = new Gtk.MenuItem.with_label(_("Equalizer"));
20@@ -282,7 +280,6 @@
21 updateSensitivities();
22
23 /* create appmenu menu */
24- libraryOperationsMenu.append(fileSetMusicFolder);
25 libraryOperationsMenu.append(fileImportMusic);
26 libraryOperationsMenu.append(fileRescanMusicFolder);
27 libraryOperations.submenu = libraryOperationsMenu;
28@@ -293,7 +290,6 @@
29 settingsMenu.append(editEqualizer);
30 settingsMenu.append(editPreferences);
31
32- fileSetMusicFolder.activate.connect(editPreferencesClick);
33 fileImportMusic.activate.connect(fileImportMusicClick);
34 fileRescanMusicFolder.activate.connect(fileRescanMusicFolderClick);
35
36@@ -582,7 +578,6 @@
37 bool showingMusicList = sideTree.convertToChild(sideTree.getSelectedIter()) == sideTree.library_music_iter;
38 bool showMainViews = (haveSongs || (haveMedias &&!showingMusicList));
39
40- fileSetMusicFolder.set_sensitive(!doingOps);
41 fileImportMusic.set_sensitive(!doingOps && folderSet);
42 fileRescanMusicFolder.set_sensitive(!doingOps && folderSet);
43

Subscribers

People subscribed via source and target branches

to all changes: