CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1053 move instance update into the launch task (BaseLauncher)

Browse Source
This commit is contained in:
Petr Mrázek
2015-07-04 20:02:43 +02:00
parent 5628d3d379
commit 526a511f45
18 changed files with 303 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/pages/LogPage.cpp
View File

@ -11,12 +11,12 @@
#include <settings/Setting.h>
#include "GuiUtil.h"
LogPage::LogPage(BaseLauncher *proc, QWidget *parent)
LogPage::LogPage(std::shared_ptr<BaseLauncher> proc, QWidget *parent)
: QWidget(parent), ui(new Ui::LogPage), m_process(proc)
{
ui->setupUi(this);
ui->tabWidget->tabBar()->hide();
connect(m_process, SIGNAL(log(QString, MessageLevel::Enum)), this,
connect(m_process.get(), SIGNAL(log(QString, MessageLevel::Enum)), this,
SLOT(write(QString, MessageLevel::Enum)));
// create the format and set its font

4
application/pages/LogPage.h
View File

@ -33,7 +33,7 @@ class LogPage : public QWidget, public BasePage
Q_OBJECT
public:
explicit LogPage(BaseLauncher *proc, QWidget *parent = 0);
explicit LogPage(std::shared_ptr<BaseLauncher> proc, QWidget *parent = 0);
virtual ~LogPage();
virtual QString displayName() const override
{
@ -77,7 +77,7 @@ private slots:
private:
Ui::LogPage *ui;
BaseLauncher *m_process;
std::shared_ptr<BaseLauncher> m_process;
int m_last_scroll_value = 0;
bool m_scroll_active = true;
int m_saved_offset = 0;