From e2f3652a0f5fc51736cbda7ac4e337a597f3aed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 10 Aug 2016 08:41:58 +0200 Subject: Revert "NOISSUE rework of minecraft log" This reverts commit fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a. --- application/pages/LogPage.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'application/pages/LogPage.h') diff --git a/application/pages/LogPage.h b/application/pages/LogPage.h index 71e23977..e902ad13 100644 --- a/application/pages/LogPage.h +++ b/application/pages/LogPage.h @@ -21,13 +21,13 @@ #include "launch/LaunchTask.h" #include "BasePage.h" #include +#include namespace Ui { class LogPage; } class QTextCharFormat; -class LogFormatProxyModel; class LogPage : public QWidget, public BasePage { @@ -57,6 +57,13 @@ public: virtual void setParentContainer(BasePageContainer *) override; private slots: + /** + * @brief write a string + * @param data the string + * @param level the @MessageLevel the string should be written under + * lines have to be put through this as a whole! + */ + void write(QString data, MessageLevel::Enum level = MessageLevel::MultiMC); void on_btnPaste_clicked(); void on_btnCopy_clicked(); void on_btnClear_clicked(); @@ -72,12 +79,6 @@ private slots: void on_InstanceLaunchTask_changed(std::shared_ptr proc); - void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last); - void rowsInserted(const QModelIndex &parent, int first, int last); - -private: /* methods */ - void findImpl(bool reverse); - private: Ui::LogPage *ui; InstancePtr m_instance; @@ -87,9 +88,8 @@ private: int m_saved_offset = 0; bool m_write_active = true; bool m_stopOnOverflow = true; - bool m_autoScroll = false; + QTextCharFormat * defaultFormat; BasePageContainer * m_parentContainer; - LogFormatProxyModel * m_proxy; - shared_qobject_ptr m_model; + std::unique_ptr m_colors; }; -- cgit v1.2.3