Add missing modifications

This commit is contained in:
Arnaud Bienner 2012-01-09 20:08:09 +01:00
parent 483c36748e
commit ea063e1c39
8 changed files with 4690 additions and 1 deletions

View File

@ -57,6 +57,7 @@ set(SOURCES
analyzers/sonogram.cpp
analyzers/turbine.cpp
core/appearance.cpp
core/backgroundstreams.cpp
core/backgroundthread.cpp
core/closure.cpp
@ -258,6 +259,7 @@ set(SOURCES
ui/albumcovermanager.cpp
ui/albumcovermanagerlist.cpp
ui/albumcoversearcher.cpp
ui/appearancesettingspage.cpp
ui/backgroundstreamssettingspage.cpp
ui/behavioursettingspage.cpp
ui/coverfromurldialog.cpp
@ -484,6 +486,7 @@ set(HEADERS
ui/albumcovermanager.h
ui/albumcovermanagerlist.h
ui/albumcoversearcher.h
ui/appearancesettingspage.h
ui/backgroundstreamssettingspage.h
ui/behavioursettingspage.h
ui/coverfromurldialog.h
@ -589,6 +592,7 @@ set(UI
ui/addstreamdialog.ui
ui/albumcovermanager.ui
ui/albumcoversearcher.ui
ui/appearancesettingspage.ui
ui/backgroundstreamssettingspage.ui
ui/behavioursettingspage.ui
ui/coverfromurldialog.ui

View File

@ -18,7 +18,6 @@
#include "stylesheetloader.h"
#include "core/logging.h"
#include <QtDebug>
#include <QFile>
#include <QEvent>

View File

@ -24,6 +24,7 @@
#endif // Q_OS_WIN32
#include "config.h"
#include "core/appearance.h"
#include "core/commandlineoptions.h"
#include "core/crashreporting.h"
#include "core/database.h"
@ -357,6 +358,9 @@ int main(int argc, char *argv[]) {
// Icons
IconLoader::Init();
// Appearance (UI costumization)
Appearance appearance;
Echonest::Config::instance()->setAPIKey("DFLFLJBUF4EGTXHIG");
Echonest::Config::instance()->setNetworkAccessManager(new NetworkAccessManager);

File diff suppressed because it is too large Load Diff

View File

@ -17,6 +17,7 @@
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "core/appearance.h"
#include "core/backgroundstreams.h"
#include "core/commandlineoptions.h"
#include "core/database.h"
@ -690,6 +691,8 @@ MainWindow::MainWindow(
// Load theme
StyleSheetLoader* css_loader = new StyleSheetLoader(this);
css_loader->SetStyleSheet(this, ":mainwindow.css");
appearance_ = new Appearance(this);
appearance_->Load();
// Load playlists
playlists_->Init(library_->backend(), playlist_backend_,

View File

@ -34,6 +34,7 @@
class About;
class AddStreamDialog;
class AlbumCoverManager;
class Appearance;
class ArtistInfoView;
class ArtLoader;
class BackgroundStreams;
@ -264,6 +265,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
Ui_MainWindow* ui_;
Windows7ThumbBar* thumbbar_;
Appearance* appearance_;
SystemTrayIcon* tray_icon_;
OSD* osd_;
boost::scoped_ptr<EditTagDialog> edit_tag_dialog_;

View File

@ -15,6 +15,7 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/
#include "appearancesettingspage.h"
#include "backgroundstreamssettingspage.h"
#include "behavioursettingspage.h"
#include "config.h"
@ -128,6 +129,7 @@ SettingsDialog::SettingsDialog(BackgroundStreams* streams, QWidget* parent)
QTreeWidgetItem* iface = AddCategory(tr("User interface"));
AddPage(Page_GlobalShortcuts, new GlobalShortcutsSettingsPage(this), iface);
AddPage(Page_GlobalSearch, new GlobalSearchSettingsPage(this), iface);
AddPage(Page_Appearance, new AppearanceSettingsPage(this), iface);
AddPage(Page_SongInformation, new SongInfoSettingsPage(this), iface);
AddPage(Page_Notifications, new NotificationsSettingsPage(this), iface);

View File

@ -61,6 +61,7 @@ public:
Page_SongInformation,
Page_GlobalShortcuts,
Page_GlobalSearch,
Page_Appearance,
Page_Notifications,
Page_Library,
Page_Lastfm,