Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move settings to be private member of class MainWindow

Browse Source
This commit is contained in:
Andrew Udvare 2010-02-27 08:57:43 +00:00
parent f7d99ad720
commit bdae62d502
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mainwindow.cpp
View File

@ -58,7 +58,6 @@ MainWindow::MainWindow(QWidget *parent)
ui_.setupUi(this); ui_.setupUi(this);
tray_icon_->setIcon(windowIcon()); tray_icon_->setIcon(windowIcon());
tray_icon_->setToolTip(QCoreApplication::applicationName()); tray_icon_->setToolTip(QCoreApplication::applicationName());
//tray_icon_->show();
ui_.volume->setValue(player_->GetVolume()); ui_.volume->setValue(player_->GetVolume());
@ -272,7 +271,6 @@ MainWindow::MainWindow(QWidget *parent)
} }
// Load settings // Load settings
QSettings settings;
settings.beginGroup(kSettingsGroup); settings.beginGroup(kSettingsGroup);
restoreGeometry(settings.value("geometry").toByteArray()); restoreGeometry(settings.value("geometry").toByteArray());
@ -309,8 +307,6 @@ MainWindow::~MainWindow() {
} }
void MainWindow::HideShowTrayIcon() { void MainWindow::HideShowTrayIcon() {
QSettings settings;
if (!isHidden() && tray_icon_->isVisible()) { if (!isHidden() && tray_icon_->isVisible()) {
tray_icon_->setVisible(false); tray_icon_->setVisible(false);
ui_.action_hide_tray_icon->setText(tr("&Show tray icon")); ui_.action_hide_tray_icon->setText(tr("&Show tray icon"));
@ -320,7 +316,6 @@ void MainWindow::HideShowTrayIcon() {
ui_.action_hide_tray_icon->setText("&Hide tray icon"); ui_.action_hide_tray_icon->setText("&Hide tray icon");
} }
settings.beginGroup(kSettingsGroup);
settings.setValue("showtray", tray_icon_->isVisible()); settings.setValue("showtray", tray_icon_->isVisible());
} }
@ -397,8 +392,6 @@ void MainWindow::resizeEvent(QResizeEvent*) {
} }
void MainWindow::SaveGeometry() { void MainWindow::SaveGeometry() {
QSettings settings;
settings.beginGroup(kSettingsGroup);
settings.setValue("geometry", saveGeometry()); settings.setValue("geometry", saveGeometry());
settings.setValue("state", saveState(kStateVersion)); settings.setValue("state", saveState(kStateVersion));
} }
@ -452,15 +445,11 @@ void MainWindow::closeEvent(QCloseEvent* event) {
SetHiddenInTray(true); SetHiddenInTray(true);
} }
else { else {
QSettings settings;
settings.beginGroup(kSettingsGroup);
settings.setValue("showtray", tray_icon_->isVisible()); settings.setValue("showtray", tray_icon_->isVisible());
} }
} }
void MainWindow::SetHiddenInTray(bool hidden) { void MainWindow::SetHiddenInTray(bool hidden) {
QSettings settings;
settings.beginGroup(kSettingsGroup);
settings.setValue("hidden", hidden); settings.setValue("hidden", hidden);
if (hidden) { if (hidden) {
@ -479,8 +468,6 @@ void MainWindow::ClearLibraryFilter() {
} }
void MainWindow::FilePathChanged(const QString& path) { void MainWindow::FilePathChanged(const QString& path) {
QSettings settings;
settings.beginGroup(kSettingsGroup);
settings.setValue("file_path", path); settings.setValue("file_path", path);
} }
@ -616,11 +603,8 @@ void MainWindow::PlayerInitFinished() {
} }
void MainWindow::AddMedia() { void MainWindow::AddMedia() {
QSettings s;
s.beginGroup(kSettingsGroup);
// Last used directory // Last used directory
QString directory = s.value("add_media_path", QDir::currentPath()).toString(); QString directory = settings.value("add_media_path", QDir::currentPath()).toString();
// Show dialog // Show dialog
QStringList file_names = QFileDialog::getOpenFileNames(this, "Add media", directory); QStringList file_names = QFileDialog::getOpenFileNames(this, "Add media", directory);
@ -628,7 +612,7 @@ void MainWindow::AddMedia() {
return; return;
// Save last used directory // Save last used directory
s.setValue("add_media_path", file_names[0]); settings.setValue("add_media_path", file_names[0]);
// Add media // Add media
QList<QUrl> urls; QList<QUrl> urls;

2
src/mainwindow.h
View File

@ -2,6 +2,7 @@
#define MAINWINDOW_H #define MAINWINDOW_H
#include <QMainWindow> #include <QMainWindow>
#include <QSettings>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
@ -110,6 +111,7 @@ class MainWindow : public QMainWindow {
QSortFilterProxyModel* library_sort_model_; QSortFilterProxyModel* library_sort_model_;
QTimer* track_position_timer_; QTimer* track_position_timer_;
QSettings settings;
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H