dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Center organise and transcoder dialog on same screen as mainwindow

Browse Source
This commit is contained in:
Jonas Kvinge
2020-04-07 01:26:17 +02:00
parent 3074377b55
commit 307961cc7e
12 changed files with 260 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/mainwindow.cpp
View File

@@ -219,10 +219,14 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
}),
equalizer_(new Equalizer),
organise_dialog_([=]() {
OrganiseDialog *dialog = new OrganiseDialog(app->task_manager(), app->collection_backend());
OrganiseDialog *dialog = new OrganiseDialog(app->task_manager(), app->collection_backend(), this);
dialog->SetDestinationModel(app->collection()->model()->directory_model());
return dialog;
}),
transcode_dialog_([=]() {
TranscodeDialog *dialog = new TranscodeDialog(this);
return dialog;
}),
#ifdef HAVE_SUBSONIC
subsonic_view_(new InternetSongsView(app_, app->internet_services()->ServiceBySource(Song::Source_Subsonic), SubsonicSettingsPage::kSettingsGroup, SettingsDialog::Page_Subsonic, this)),
#endif

6
src/core/mainwindow.h
View File

@@ -222,8 +222,8 @@ class MainWindow : public QMainWindow, public PlatformInterface {
void ShowCoverManager();
void ShowAboutDialog();
void ShowTranscodeDialog();
void ShowErrorDialog(const QString& message);
void ShowTranscodeDialog();
SettingsDialog *CreateSettingsDialog();
EditTagDialog *CreateEditTagDialog();
void OpenSettingsDialog();
@@ -300,14 +300,14 @@ class MainWindow : public QMainWindow, public PlatformInterface {
PlaylistListContainer *playlist_list_;
QueueView *queue_view_;
Lazy<ErrorDialog> error_dialog_;
Lazy<SettingsDialog> settings_dialog_;
Lazy<AlbumCoverManager> cover_manager_;
std::unique_ptr<Equalizer> equalizer_;
Lazy<OrganiseDialog> organise_dialog_;
#ifdef HAVE_GSTREAMER
Lazy<TranscodeDialog> transcode_dialog_;
#endif
Lazy<ErrorDialog> error_dialog_;
Lazy<OrganiseDialog> organise_dialog_;
#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
std::unique_ptr<TagFetcher> tag_fetcher_;