summaryrefslogtreecommitdiffstats
path: root/application/pages/LogPage.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-08-10 08:41:58 +0200
committerPetr Mrázek <peterix@gmail.com>2016-08-10 08:41:58 +0200
commite2f3652a0f5fc51736cbda7ac4e337a597f3aed1 (patch)
treed7d25154db90d2db7724dfb6ee001ce0afee5e21 /application/pages/LogPage.h
parentc60db13af73523c08353f819cc2a8441a7ddbada (diff)
downloadMultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.tar
MultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.tar.gz
MultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.tar.lz
MultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.tar.xz
MultiMC-e2f3652a0f5fc51736cbda7ac4e337a597f3aed1.zip
Revert "NOISSUE rework of minecraft log"
This reverts commit fc198dd3085a2cd33fbaa7a3d2c95c2c8d3ee31a.
Diffstat (limited to 'application/pages/LogPage.h')
-rw-r--r--application/pages/LogPage.h20
1 files changed, 10 insertions, 10 deletions
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 <MultiMC.h>
+#include <ColorCache.h>
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<LaunchTask> 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 <LogModel> m_model;
+ std::unique_ptr<LogColorCache> m_colors;
};