Re-enable transcoder and organiser, add transcoder for wavpack

src/core/mainwindow.cpp

@@ -360,6 +360,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
   ui_->action_cover_manager->setIcon(IconLoader::Load("document-download"));
   ui_->action_edit_track->setIcon(IconLoader::Load("edit-rename"));
   ui_->action_equalizer->setIcon(IconLoader::Load("equalizer"));
+  ui_->action_transcoder->setIcon(IconLoader::Load("tools-wizard"));
   ui_->action_update_collection->setIcon(IconLoader::Load("view-refresh"));
   ui_->action_full_collection_scan->setIcon(IconLoader::Load("view-refresh"));
   ui_->action_settings->setIcon(IconLoader::Load("configure"));
@@ -411,10 +412,11 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
   connect(ui_->action_add_folder, SIGNAL(triggered()), SLOT(AddFolder()));
   connect(ui_->action_cover_manager, SIGNAL(triggered()), SLOT(ShowCoverManager()));
   connect(ui_->action_equalizer, SIGNAL(triggered()), equalizer_.get(), SLOT(show()));
+  connect(ui_->action_transcoder, SIGNAL(triggered()), SLOT(ShowTranscodeDialog()));
   connect(ui_->action_jump, SIGNAL(triggered()), ui_->playlist->view(), SLOT(JumpToCurrentlyPlayingTrack()));
   connect(ui_->action_update_collection, SIGNAL(triggered()), app_->collection(), SLOT(IncrementalScan()));
   connect(ui_->action_full_collection_scan, SIGNAL(triggered()), app_->collection(), SLOT(FullScan()));
-  //connect(ui_->action_add_files_to_transcoder, SIGNAL(triggered()), SLOT(AddFilesToTranscoder()));
+  connect(ui_->action_add_files_to_transcoder, SIGNAL(triggered()), SLOT(AddFilesToTranscoder()));
 
   connect(ui_->action_toggle_scrobbling, SIGNAL(triggered()), app_->scrobbler(), SLOT(ToggleScrobbling()));
   connect(app_->scrobbler(), SIGNAL(ErrorMessage(QString)), SLOT(ShowErrorDialog(QString)));
@@ -569,12 +571,12 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
   playlist_menu_->addAction(ui_->action_renumber_tracks);
   playlist_menu_->addAction(ui_->action_selection_set_value);
   playlist_menu_->addAction(ui_->action_auto_complete_tags);
-  //playlist_menu_->addAction(ui_->action_add_files_to_transcoder);
+  playlist_menu_->addAction(ui_->action_add_files_to_transcoder);
   playlist_menu_->addSeparator();
 #ifdef HAVE_GSTREAMER
   playlist_copy_to_collection_ = playlist_menu_->addAction(IconLoader::Load("edit-copy"), tr("Copy to collection..."), this, SLOT(PlaylistCopyToCollection()));
   playlist_move_to_collection_ = playlist_menu_->addAction(IconLoader::Load("go-jump"), tr("Move to collection..."), this, SLOT(PlaylistMoveToCollection()));
-  //playlist_organise_ = playlist_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organise files..."), this, SLOT(PlaylistMoveToCollection()));
+  playlist_organise_ = playlist_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organise files..."), this, SLOT(PlaylistMoveToCollection()));
 #ifndef Q_OS_WIN
   playlist_copy_to_device_ = playlist_menu_->addAction(IconLoader::Load("device"), tr("Copy to device..."), this, SLOT(PlaylistCopyToDevice()));
 #endif
@@ -1429,7 +1431,7 @@ void MainWindow::PlaylistRightClick(const QPoint &global_pos, const QModelIndex
 #ifdef HAVE_GSTREAMER
   playlist_copy_to_collection_->setVisible(false);
   playlist_move_to_collection_->setVisible(false);
-  //playlist_organise_->setVisible(false);
+  playlist_organise_->setVisible(false);
 #ifndef Q_OS_WIN
   playlist_copy_to_device_->setVisible(false);
 #endif
@@ -1493,7 +1495,9 @@ void MainWindow::PlaylistRightClick(const QPoint &global_pos, const QModelIndex
     // Is it a collection item?
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());
     if (item->IsLocalCollectionItem() && item->Metadata().id() != -1) {
-      //playlist_organise_->setVisible(editable);
+#ifdef HAVE_GSTREAMER
+      playlist_organise_->setVisible(editable);
+#endif
       playlist_show_in_collection_->setVisible(editable);
       playlist_open_in_browser_->setVisible(true);
     }

src/core/mainwindow.h

@@ -350,7 +350,7 @@ signals:
   QAction *playlist_play_pause_;
   QAction *playlist_stop_after_;
   QAction *playlist_undoredo_;
-  //QAction *playlist_organise_;
+  QAction *playlist_organise_;
   QAction *playlist_show_in_collection_;
 #ifdef HAVE_GSTREAMER
   QAction *playlist_copy_to_collection_;

src/core/mainwindow.ui

@@ -407,7 +407,7 @@
      <x>0</x>
      <y>0</y>
      <width>1131</width>
-     <height>24</height>
+     <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_music">
@@ -429,7 +429,7 @@
    </widget>
    <widget class="QMenu" name="menu_playlist">
     <property name="title">
-     <string>&amp;Playlist</string>
+     <string>P&amp;laylist</string>
     </property>
     <addaction name="action_add_file"/>
     <addaction name="action_add_folder"/>
@@ -449,7 +449,7 @@
    </widget>
    <widget class="QMenu" name="menu_help">
     <property name="title">
-     <string>&amp;Help</string>
+     <string>Help</string>
     </property>
     <addaction name="action_about_strawberry"/>
     <addaction name="action_about_qt"/>
@@ -461,6 +461,7 @@
     </property>
     <addaction name="action_cover_manager"/>
     <addaction name="action_equalizer"/>
+    <addaction name="action_transcoder"/>
     <addaction name="separator"/>
     <addaction name="action_update_collection"/>
     <addaction name="action_full_collection_scan"/>
@@ -613,7 +614,7 @@
   </action>
   <action name="action_open_cd">
    <property name="text">
-    <string>Open &amp;audio CD...</string>
+    <string>Open audio &amp;CD...</string>
    </property>
   </action>
   <action name="action_cover_manager">
@@ -646,6 +647,11 @@
     <string>&amp;Equalizer</string>
    </property>
   </action>
+  <action name="action_transcoder">
+   <property name="text">
+    <string>&amp;Transcode Music</string>
+   </property>
+  </action>
   <action name="action_add_folder">
    <property name="text">
     <string>Add &amp;folder...</string>
@@ -749,6 +755,20 @@
     <string>Remove &amp;unavailable tracks from playlist</string>
    </property>
   </action>
+  <action name="action_add_files_to_transcoder">
+   <property name="checkable">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Add file(s) to transcoder</string>
+   </property>
+   <property name="toolTip">
+    <string>Add file to transcoder</string>
+   </property>
+   <property name="shortcut">
+    <string notr="true">Ctrl+Shift+T</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>