ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix message dialog progress bars never reaching 100% 

and clean up a bit
This commit is contained in:
Megamouse 2018-06-04 10:21:44 +02:00 committed by kd-11
parent da9affb348
commit 38e88253cc
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rpcs3/rpcs3qt/msg_dialog_frame.cpp
View File

@ -39,6 +39,7 @@ void msg_dialog_frame::Create(const std::string& msg)
text = new QLabel("", m_dialog);
bar = new QProgressBar(m_dialog);
bar->setRange(0, m_gauge_max);
bar->setValue(0);
bar->setFixedWidth(barWidth());
bar->setAlignment(Qt::AlignCenter);
@ -66,7 +67,7 @@ void msg_dialog_frame::Create(const std::string& msg)
m_tb_progress->setVisible(true);
#elif HAVE_QTDBUS
UpdateProgress(0);
progressValue = new int(0);
progressValue = 0;
#endif
}
@ -321,12 +322,9 @@ msg_dialog_frame::~msg_dialog_frame()
m_tb_button->deleteLater();
}
#elif HAVE_QTDBUS
if (progressValue)
{
UpdateProgress(0, false);
delete progressValue;
}
UpdateProgress(0, false);
#endif
if (m_dialog)
{
m_dialog->deleteLater();
@ -358,7 +356,7 @@ void msg_dialog_frame::ProgressBarReset(u32 index)
{
if (index == 0 && m_gauge1)
{
m_gauge1->reset();
m_gauge1->setValue(0);
#ifdef _WIN32
m_tb_progress->reset();
#elif HAVE_QTDBUS
@ -368,7 +366,7 @@ void msg_dialog_frame::ProgressBarReset(u32 index)
if (index == 1 && m_gauge2)
{
m_gauge2->reset();
m_gauge2->setValue(0);
}
}
@ -382,8 +380,8 @@ void msg_dialog_frame::ProgressBarInc(u32 index, u32 delta)
#ifdef _WIN32
m_tb_progress->setValue(m_tb_progress->value() + delta);
#elif HAVE_QTDBUS
*progressValue += delta;
UpdateProgress(*progressValue);
progressValue += delta;
UpdateProgress(progressValue);
#endif
}
@ -413,9 +411,12 @@ void msg_dialog_frame::ProgressBarSetLimit(u32 index, u32 limit)
#ifdef HAVE_QTDBUS
void msg_dialog_frame::UpdateProgress(int progress, bool disable)
{
QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/"),
QStringLiteral("com.canonical.Unity.LauncherEntry"),
QStringLiteral("Update"));
QDBusMessage message = QDBusMessage::createSignal
(
QStringLiteral("/"),
QStringLiteral("com.canonical.Unity.LauncherEntry"),
QStringLiteral("Update")
);
QVariantMap properties;
if (disable)
properties.insert(QStringLiteral("progress-visible"), false);

2
rpcs3/rpcs3qt/msg_dialog_frame.h
View File

@ -39,7 +39,7 @@ class msg_dialog_frame : public QObject, public MsgDialogBase
QWinTaskbarProgress* m_tb_progress = nullptr;
#elif HAVE_QTDBUS
int* progressValue = nullptr;
int progressValue = 0;
#endif
custom_dialog* m_dialog =nullptr;
QLabel* m_text = nullptr;