Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

700 GET 

Code review comments for r699
This commit is contained in:
John Maguire 2010-04-14 21:58:51 +00:00
parent aeaebdb8d6
commit b16f789ac7
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac_startup.mm
View File

@ -58,7 +58,7 @@
- (BOOL) applicationShouldHandleReopen: (NSApplication*)app hasVisibleWindows:(BOOL)flag {
if (application_handler_) {
qApp->postEvent(application_handler_, new QEvent(QEvent::User));
qApp->postEvent(application_handler_, new QEvent(QEvent::ApplicationActivate));
}
return YES;
}

19
src/mainwindow.cpp
View File

@ -91,9 +91,9 @@ MainWindow::MainWindow(QNetworkAccessManager* network, QWidget *parent)
global_shortcuts_(new GlobalShortcuts(this)),
settings_dialog_(new SettingsDialog),
add_stream_dialog_(new AddStreamDialog),
cover_manager_(new AlbumCoverManager(network, this)),
cover_manager_(new AlbumCoverManager(network)),
group_by_dialog_(new GroupByDialog),
equalizer_(new Equalizer(this)),
equalizer_(new Equalizer),
playlist_menu_(new QMenu(this)),
library_sort_model_(new QSortFilterProxyModel(this)),
track_position_timer_(new QTimer(this))
@ -161,8 +161,8 @@ MainWindow::MainWindow(QNetworkAccessManager* network, QWidget *parent)
connect(ui_.action_open_media, SIGNAL(triggered()), SLOT(AddMedia()));
connect(ui_.action_add_media, SIGNAL(triggered()), SLOT(AddMedia()));
connect(ui_.action_add_stream, SIGNAL(triggered()), SLOT(AddStream()));
connect(ui_.action_cover_manager, SIGNAL(triggered()), cover_manager_, SLOT(show()));
connect(ui_.action_equalizer, SIGNAL(triggered()), equalizer_, SLOT(show()));
connect(ui_.action_cover_manager, SIGNAL(triggered()), cover_manager_.get(), SLOT(show()));
connect(ui_.action_equalizer, SIGNAL(triggered()), equalizer_.get(), SLOT(show()));
// Give actions to buttons
ui_.forward_button->setDefaultAction(ui_.action_next_track);
@ -224,7 +224,7 @@ MainWindow::MainWindow(QNetworkAccessManager* network, QWidget *parent)
connect(library_, SIGNAL(ScanStarted()), SLOT(LibraryScanStarted()));
connect(library_, SIGNAL(ScanFinished()), SLOT(LibraryScanFinished()));
connect(library_, SIGNAL(BackendReady(boost::shared_ptr<LibraryBackendInterface>)),
cover_manager_, SLOT(SetBackend(boost::shared_ptr<LibraryBackendInterface>)));
cover_manager_.get(), SLOT(SetBackend(boost::shared_ptr<LibraryBackendInterface>)));
connect(library_, SIGNAL(BackendReady(boost::shared_ptr<LibraryBackendInterface>)),
playlist_, SLOT(SetBackend(boost::shared_ptr<LibraryBackendInterface>)));
@ -370,9 +370,9 @@ MainWindow::MainWindow(QNetworkAccessManager* network, QWidget *parent)
ui_.analyzer->set_engine(player_->GetEngine());
// Equalizer
connect(equalizer_, SIGNAL(ParametersChanged(int,QList<int>)),
connect(equalizer_.get(), SIGNAL(ParametersChanged(int,QList<int>)),
player_->GetEngine(), SLOT(SetEqualizerParameters(int,QList<int>)));
connect(equalizer_, SIGNAL(EnabledChanged(bool)),
connect(equalizer_.get(), SIGNAL(EnabledChanged(bool)),
player_->GetEngine(), SLOT(SetEqualizerEnabled(bool)));
player_->GetEngine()->SetEqualizerEnabled(equalizer_->is_enabled());
player_->GetEngine()->SetEqualizerParameters(
@ -425,7 +425,7 @@ MainWindow::MainWindow(QNetworkAccessManager* network, QWidget *parent)
settings_.setValue("hidden", false);
show();
}
#else
#else // Q_OS_DARWIN
// Always show mainwindow on startup on OS X.
show();
#endif
@ -990,7 +990,8 @@ void MainWindow::ForceShowOSD(const Song &song) {
}
bool MainWindow::event(QEvent* event) {
if (event->type() == QEvent::User) {
// ApplicationActivate is received when the dock is clicked on OS X.
if (event->type() == QEvent::ApplicationActivate) {
show();
return true;
}

4
src/mainwindow.h
View File

@ -151,9 +151,9 @@ class MainWindow : public QMainWindow {
boost::scoped_ptr<SettingsDialog> settings_dialog_;
boost::scoped_ptr<AddStreamDialog> add_stream_dialog_;
AlbumCoverManager* cover_manager_;
boost::scoped_ptr<AlbumCoverManager> cover_manager_;
boost::scoped_ptr<GroupByDialog> group_by_dialog_;
Equalizer* equalizer_;
boost::scoped_ptr<Equalizer> equalizer_;
QMenu* playlist_menu_;
QAction* playlist_play_pause_;