From 2825703044107f3c3436058b49b108b69a0396e8 Mon Sep 17 00:00:00 2001 From: itisyang Date: Sun, 24 Jun 2018 11:13:39 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E9=9F=B3=E9=87=8F=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- playerdemo/globalhelper.cpp | 10 ++++++---- playerdemo/mainwid.cpp | 13 ++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/playerdemo/globalhelper.cpp b/playerdemo/globalhelper.cpp index fe864fe..ea1b000 100644 --- a/playerdemo/globalhelper.cpp +++ b/playerdemo/globalhelper.cpp @@ -6,6 +6,8 @@ #include "globalhelper.h" +const QString PLAYER_CONFIG_BASEDIR = QDir::tempPath(); + const QString PLAYER_CONFIG = "player_config.ini"; GlobalHelper::GlobalHelper() @@ -42,7 +44,7 @@ void GlobalHelper::SetIcon(QPushButton* btn, int iconSize, QChar icon) void GlobalHelper::SavePlaylist(QStringList& playList) { //QString strPlayerConfigFileName = QCoreApplication::applicationDirPath() + QDir::separator() + PLAYER_CONFIG; - QString strPlayerConfigFileName = QDir::tempPath() + QDir::separator() + PLAYER_CONFIG; + QString strPlayerConfigFileName = PLAYER_CONFIG_BASEDIR + QDir::separator() + PLAYER_CONFIG; QSettings settings(strPlayerConfigFileName, QSettings::IniFormat); settings.beginWriteArray("playlist"); for (int i = 0; i < playList.size(); ++i) @@ -56,7 +58,7 @@ void GlobalHelper::SavePlaylist(QStringList& playList) void GlobalHelper::GetPlaylist(QStringList& playList) { //QString strPlayerConfigFileName = QCoreApplication::applicationDirPath() + QDir::separator() + PLAYER_CONFIG; - QString strPlayerConfigFileName = QDir::tempPath() + QDir::separator() + PLAYER_CONFIG; + QString strPlayerConfigFileName = PLAYER_CONFIG_BASEDIR + QDir::separator() + PLAYER_CONFIG; QSettings settings(strPlayerConfigFileName, QSettings::IniFormat); int size = settings.beginReadArray("playlist"); @@ -70,14 +72,14 @@ void GlobalHelper::GetPlaylist(QStringList& playList) void GlobalHelper::SavePlayVolume(double& nVolume) { - QString strPlayerConfigFileName = QCoreApplication::applicationDirPath() + QDir::separator() + PLAYER_CONFIG; + QString strPlayerConfigFileName = PLAYER_CONFIG_BASEDIR + QDir::separator() + PLAYER_CONFIG; QSettings settings(strPlayerConfigFileName, QSettings::IniFormat); settings.setValue("volume/size", nVolume); } void GlobalHelper::GetPlayVolume(double& nVolume) { - QString strPlayerConfigFileName = QCoreApplication::applicationDirPath() + QDir::separator() + PLAYER_CONFIG; + QString strPlayerConfigFileName = PLAYER_CONFIG_BASEDIR + QDir::separator() + PLAYER_CONFIG; QSettings settings(strPlayerConfigFileName, QSettings::IniFormat); QString str = settings.value("volume/size").toString(); nVolume = settings.value("volume/size", nVolume).toDouble(); diff --git a/playerdemo/mainwid.cpp b/playerdemo/mainwid.cpp index 4c4bb91..6f890ff 100644 --- a/playerdemo/mainwid.cpp +++ b/playerdemo/mainwid.cpp @@ -84,6 +84,13 @@ MainWid::~MainWid() bool MainWid::Init() { + + //连接自定义信号与槽 + if (ConnectSignalSlots() == false) + { + return false; + } + if (ui->CtrlBarWid->Init() == false || ui->PlaylistWid->Init() == false || ui->ShowWid->Init() == false || @@ -92,11 +99,7 @@ bool MainWid::Init() return false; } - //连接自定义信号与槽 - if (ConnectSignalSlots() == false) - { - return false; - } + return true; }