Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt/RSX: add window title to the shader compilation msg_dialog

Browse Source
This commit is contained in:
Megamouse
2018-06-04 20:17:05 +02:00
committed by kd-11
parent 7aa2cddb05
commit edc9e9b4ec
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/Cell/Modules/cellMsgDialog.h
+1 -1
View File
@@ -82,7 +82,7 @@ public:
std::function<void()> on_osk_input_entered;
virtual ~MsgDialogBase();
virtual void Create(const std::string& msg) = 0;
virtual void Create(const std::string& msg, const std::string& title = "") = 0;
virtual void CreateOsk(const std::string& msg, char16_t* osk_text, u32 charlimit) = 0;
virtual void SetMsg(const std::string& msg) = 0;
virtual void ProgressBarSetMsg(u32 progressBarIndex, const std::string& msg) = 0;
rpcs3/Emu/RSX/rsx_cache.h
+1 -1
View File
@@ -423,7 +423,7 @@ namespace rsx
Emu.CallAfter([&]()
{
dlg->Create("Preloading cached shaders from disk.\nPlease wait...");
dlg->Create("Preloading cached shaders from disk.\nPlease wait...", "Shader Compilation");
initialized.store(true);
});
rpcs3/rpcs3qt/msg_dialog_frame.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
constexpr auto qstr = QString::fromStdString;
void msg_dialog_frame::Create(const std::string& msg)
void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
{
static const auto& barWidth = [](){return QLabel("This is the very length of the progressbar due to hidpi reasons.").sizeHint().width();};
@@ -18,7 +18,7 @@ void msg_dialog_frame::Create(const std::string& msg)
}
m_dialog = new custom_dialog(type.disable_cancel);
m_dialog->setWindowTitle(type.se_normal ? "Normal dialog" : "Error dialog");
m_dialog->setWindowTitle(title.empty() ? (type.se_normal ? "Normal dialog" : "Error dialog") : qstr(title));
m_dialog->setWindowOpacity(type.bg_invisible ? 1. : 0.75);
m_text = new QLabel(qstr(msg));
rpcs3/rpcs3qt/msg_dialog_frame.h
+1 -1
View File
@@ -61,7 +61,7 @@ class msg_dialog_frame : public QObject, public MsgDialogBase
public:
msg_dialog_frame(QWindow* taskbarTarget);
~msg_dialog_frame();
virtual void Create(const std::string& msg) override;
virtual void Create(const std::string& msg, const std::string& title = "") override;
virtual void CreateOsk(const std::string& msg, char16_t* osk_text, u32 charlimit) override;
virtual void SetMsg(const std::string& msg) override;
virtual void ProgressBarSetMsg(u32 progressBarIndex, const std::string& msg) override;