← Back to branch summary

~voluntatefaber/beat-box/bug952329

« back to all changes in this revision

Viewing changes to src/Widgets/SideTreeView.vala

  • Committer: Victor Eduardo
  • Date: 2012-02-24 01:49:01 UTC
  • mfrom: (553.1.1 1.x)
  • Revision ID: victoreduardm@gmail.com-20120224014901-lhf6wy3s2n2bzed2
Merge Andrea Basso's fix for lp:934439
(Fixes title of the "Import Station" dialog)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Widgets/SideTreeView.vala
114
114
                radioMenu = new Gtk.Menu();
115
115
                radioImportStations = new Gtk.MenuItem.with_label(_("Import Station"));
116
116
                radioMenu.append(radioImportStations);
117
 
                radioImportStations.activate.connect(playlistImportClicked);
 
117
                radioImportStations.activate.connect(()=> {playlistImportClicked ("Station");});
118
118
                radioMenu.show_all();
119
119
                
120
120
                //playlist right click menu
139
139
                playlistRemove.activate.connect(playlistMenuRemoveClicked);
140
140
                playlistSave.activate.connect(playlistSaveClicked);
141
141
                playlistExport.activate.connect(playlistExportClicked);
142
 
                playlistImport.activate.connect(playlistImportClicked);
 
142
                playlistImport.activate.connect(()=>{playlistImportClicked ();});
143
143
                playlistMenu.show_all();
144
144
                
145
145
                this.button_press_event.connect(sideListClick);
945
945
                p.name = original_name;
946
946
        }
947
947
        
948
 
        void playlistImportClicked() {
 
948
        void playlistImportClicked(string title = "Playlist") {
949
949
                if(lm.doing_file_operations())
950
950
                        return;
951
951
                
952
952
                string file = "";
953
953
                string name = "";
954
 
                var file_chooser = new FileChooserDialog ("Import Playlist", lw,
 
954
                var file_chooser = new FileChooserDialog ("Import " + title, lw,
955
955
                                                                  FileChooserAction.OPEN,
956
956
                                                                  Gtk.Stock.CANCEL, ResponseType.CANCEL,
957
957
                                                                  Gtk.Stock.OPEN, ResponseType.ACCEPT);