BeatBox

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

  1. bug934439
  2. Merge into 0.3.5
Proposed by Andrea Basso
Status: Merged
Approved by: Victor Martinez
Approved revision: 554
Merged at revision: 568
Proposed branch: lp:~voluntatefaber/beat-box/bug934439
Merge into: lp:beat-box/1.x
Diff against target: 37 lines (+4/-4)
1 file modified
src/Widgets/SideTreeView.vala (+4/-4)
To merge this branch: bzr merge lp:~voluntatefaber/beat-box/bug934439
Reviewer Review Type Date Requested Status
Victor Martinez (community) Approve
Review via email: mp+93640@code.launchpad.net

Commit message

Fixes bug #934439

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/SideTreeView.vala'
2--- src/Widgets/SideTreeView.vala 2012-02-17 01:24:32 +0000
3+++ src/Widgets/SideTreeView.vala 2012-02-17 19:48:17 +0000
4@@ -114,7 +114,7 @@
5 radioMenu = new Gtk.Menu();
6 radioImportStations = new Gtk.MenuItem.with_label(_("Import Station"));
7 radioMenu.append(radioImportStations);
8- radioImportStations.activate.connect(playlistImportClicked);
9+ radioImportStations.activate.connect(()=> {playlistImportClicked ("Station");});
10 radioMenu.show_all();
11
12 //playlist right click menu
13@@ -139,7 +139,7 @@
14 playlistRemove.activate.connect(playlistMenuRemoveClicked);
15 playlistSave.activate.connect(playlistSaveClicked);
16 playlistExport.activate.connect(playlistExportClicked);
17- playlistImport.activate.connect(playlistImportClicked);
18+ playlistImport.activate.connect(()=>{playlistImportClicked ();});
19 playlistMenu.show_all();
20
21 this.button_press_event.connect(sideListClick);
22@@ -945,13 +945,13 @@
23 p.name = original_name;
24 }
25
26- void playlistImportClicked() {
27+ void playlistImportClicked(string title = "Playlist") {
28 if(lm.doing_file_operations())
29 return;
30
31 string file = "";
32 string name = "";
33- var file_chooser = new FileChooserDialog ("Import Playlist", lw,
34+ var file_chooser = new FileChooserDialog ("Import " + title, lw,
35 FileChooserAction.OPEN,
36 Gtk.Stock.CANCEL, ResponseType.CANCEL,
37 Gtk.Stock.OPEN, ResponseType.ACCEPT);

Subscribers

People subscribed via source and target branches

to all changes: