1 files changed, 54 insertions, 11 deletions

diff --git a/application/pages/LogPage.cpp b/application/pages/LogPage.cpp
index 75e1df7d..0fa1ee67 100644
--- a/application/pages/LogPage.cpp
+++ b/application/pages/LogPage.cpp
@@ -141,13 +141,11 @@ LogPage::LogPage(InstancePtr instance, QWidget *parent)
 		auto launchTask = m_instance->getLaunchTask();
 		if(launchTask)
 		{
-			on_InstanceLaunchTask_changed(launchTask);
+			setInstanceLaunchTaskChanged(launchTask, true);
 		}
-		connect(m_instance.get(), &BaseInstance::launchTaskChanged, this, &LogPage::on_InstanceLaunchTask_changed);
+		connect(m_instance.get(), &BaseInstance::launchTaskChanged, this, &LogPage::onInstanceLaunchTaskChanged);
 	}
 
-	ui->text->setWordWrap(true);
-
 	auto findShortcut = new QShortcut(QKeySequence(QKeySequence::Find), this);
 	connect(findShortcut, SIGNAL(activated()), SLOT(findActivated()));
 	auto findNextShortcut = new QShortcut(QKeySequence(QKeySequence::FindNext), this);
@@ -162,13 +160,53 @@ LogPage::~LogPage()
 	delete ui;
 }
 
-void LogPage::on_InstanceLaunchTask_changed(std::shared_ptr<LaunchTask> proc)
+void LogPage::modelStateToUI()
+{
+	if(m_model->wrapLines())
+	{
+		ui->text->setWordWrap(true);
+		ui->wrapCheckbox->setCheckState(Qt::Checked);
+	}
+	else
+	{
+		ui->text->setWordWrap(false);
+		ui->wrapCheckbox->setCheckState(Qt::Unchecked);
+	}
+	if(m_model->suspended())
+	{
+		ui->trackLogCheckbox->setCheckState(Qt::Unchecked);
+	}
+	else
+	{
+		ui->trackLogCheckbox->setCheckState(Qt::Checked);
+	}
+}
+
+void LogPage::UIToModelState()
+{
+	if(!m_model)
+	{
+		return;
+	}
+	m_model->setLineWrap(ui->wrapCheckbox->checkState() == Qt::Checked);
+	m_model->suspend(ui->trackLogCheckbox->checkState() != Qt::Checked);
+}
+
+void LogPage::setInstanceLaunchTaskChanged(std::shared_ptr<LaunchTask> proc, bool initial)
 {
 	m_process = proc;
 	if(m_process)
 	{
 		m_model = proc->getLogModel();
 		m_proxy->setSourceModel(m_model.get());
+		if(initial)
+		{
+			modelStateToUI();
+		}
+		else
+		{
+			UIToModelState();
+		}
 	}
 	else
 	{
@@ -177,6 +215,11 @@ void LogPage::on_InstanceLaunchTask_changed(std::shared_ptr<LaunchTask> proc)
 	}
 }
 
+void LogPage::onInstanceLaunchTaskChanged(std::shared_ptr<LaunchTask> proc)
+{
+	setInstanceLaunchTaskChanged(proc, false);
+}
+
 bool LogPage::apply()
 {
 	return true;
@@ -218,7 +261,7 @@ void LogPage::on_btnClear_clicked()
 	if(!m_model)
 		return;
 	m_model->clear();
-	m_parentContainer->refreshContainer();
+	m_container->refreshContainer();
 }
 
 void LogPage::on_btnBottom_clicked()
@@ -228,12 +271,17 @@ void LogPage::on_btnBottom_clicked()
 
 void LogPage::on_trackLogCheckbox_clicked(bool checked)
 {
+	if(!m_model)
+		return;
 	m_model->suspend(!checked);
 }
 
 void LogPage::on_wrapCheckbox_clicked(bool checked)
 {
 	ui->text->setWordWrap(checked);
+	if(!m_model)
+		return;
+	m_model->setLineWrap(checked);
 }
 
 void LogPage::on_findButton_clicked()
@@ -262,8 +310,3 @@ void LogPage::findActivated()
 		ui->searchBar->selectAll();
 	}
 }
-
-void LogPage::setParentContainer(BasePageContainer * container)
-{
-	m_parentContainer = container;
-}