fix merge issues, make console window work again

gui/consolewindow.cpp

@@ -4,70 +4,71 @@
 #include <QScrollBar>
 
 ConsoleWindow::ConsoleWindow(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::ConsoleWindow),
-    m_mayclose(true)
+	QDialog(parent),
+	ui(new Ui::ConsoleWindow),
+	m_mayclose(true)
 {
-    ui->setupUi(this);
+	ui->setupUi(this);
 }
 
 ConsoleWindow::~ConsoleWindow()
 {
-    delete ui;
+	delete ui;
 }
 
 void ConsoleWindow::writeColor(QString text, const char *color)
 {
-    // append a paragraph
-    if (color != nullptr)
-        ui->text->appendHtml(QString("<font color=%1>%2</font>").arg(color).arg(text));
-    else
-        ui->text->appendPlainText(text);
-    // scroll down
-    QScrollBar *bar = ui->text->verticalScrollBar();
-    bar->setValue(bar->maximum());
+	// append a paragraph
+	if (color != nullptr)
+		ui->text->appendHtml(QString("<font color=%1>%2</font>").arg(color).arg(text));
+	else
+		ui->text->appendPlainText(text);
+	// scroll down
+	QScrollBar *bar = ui->text->verticalScrollBar();
+	bar->setValue(bar->maximum());
 }
 
-void ConsoleWindow::write(QString data, WriteMode mode)
+void ConsoleWindow::write(QString data, MessageLevel::Enum mode)
 {
-    if (data.endsWith('\n'))
-        data = data.left(data.length()-1);
-    QStringList paragraphs = data.split('\n');
-    QListIterator<QString> iter(paragraphs);
-    if (mode == MULTIMC)
-        while(iter.hasNext())
-            writeColor(iter.next(), "blue");
-    else if (mode == ERROR)
-        while(iter.hasNext())
-            writeColor(iter.next(), "red");
-    else
-        while(iter.hasNext())
-            writeColor(iter.next());
+	if (data.endsWith('\n'))
+		data = data.left(data.length()-1);
+	QStringList paragraphs = data.split('\n');
+	QListIterator<QString> iter(paragraphs);
+	if (mode == MessageLevel::MultiMC)
+		while(iter.hasNext())
+			writeColor(iter.next(), "blue");
+	else if (mode == MessageLevel::Error)
+		while(iter.hasNext())
+			writeColor(iter.next(), "red");
+	// TODO: implement other MessageLevels
+	else
+		while(iter.hasNext())
+			writeColor(iter.next());
 }
 
 void ConsoleWindow::clear()
 {
-    ui->text->clear();
+	ui->text->clear();
 }
 
 void ConsoleWindow::on_closeButton_clicked()
 {
-    close();
+	close();
 }
 
 void ConsoleWindow::setMayClose(bool mayclose)
 {
-    m_mayclose = mayclose;
-    if (mayclose)
-        ui->closeButton->setEnabled(true);
-    else
-        ui->closeButton->setEnabled(false);
+	m_mayclose = mayclose;
+	if (mayclose)
+		ui->closeButton->setEnabled(true);
+	else
+		ui->closeButton->setEnabled(false);
 }
 
 void ConsoleWindow::closeEvent(QCloseEvent * event)
 {
-    if(!m_mayclose)
-        event->ignore();
-    else
-        QDialog::closeEvent(event);
+	if(!m_mayclose)
+		event->ignore();
+	else
+		QDialog::closeEvent(event);
 }

gui/consolewindow.h

@@ -2,6 +2,7 @@
 #define CONSOLEWINDOW_H
 
 #include <QDialog>
+#include "minecraftprocess.h"
 
 namespace Ui {
 class ConsoleWindow;
@@ -9,61 +10,51 @@ class ConsoleWindow;
 
 class ConsoleWindow : public QDialog
 {
-    Q_OBJECT
+	Q_OBJECT
 
 public:
-    /**
-     * @brief The WriteMode enum
-     * defines how stuff is displayed
-     */
-    enum WriteMode {
-        DEFAULT,
-        ERROR,
-        MULTIMC
-    };
+	explicit ConsoleWindow(QWidget *parent = 0);
+	~ConsoleWindow();
 
-    explicit ConsoleWindow(QWidget *parent = 0);
-    ~ConsoleWindow();
-
-    /**
-     * @brief specify if the window is allowed to close
-     * @param mayclose
-     * used to keep it alive while MC runs
-     */
-    void setMayClose(bool mayclose);
+	/**
+	 * @brief specify if the window is allowed to close
+	 * @param mayclose
+	 * used to keep it alive while MC runs
+	 */
+	void setMayClose(bool mayclose);
 
 public slots:
-    /**
-     * @brief write a string
-     * @param data the string
-     * @param mode the WriteMode
-     * lines have to be put through this as a whole!
-     */
-    void write(QString data, WriteMode mode=MULTIMC);
+	/**
+	 * @brief write a string
+	 * @param data the string
+	 * @param mode the WriteMode
+	 * lines have to be put through this as a whole!
+	 */
+	void write(QString data, MessageLevel::Enum level=MessageLevel::MultiMC);
 
-    /**
-     * @brief write a colored paragraph
-     * @param data the string
-     * @param color the css color name
-     * this will only insert a single paragraph.
-     * \n are ignored. a real \n is always appended.
-     */
-    void writeColor(QString data, const char *color=nullptr);
+	/**
+	 * @brief write a colored paragraph
+	 * @param data the string
+	 * @param color the css color name
+	 * this will only insert a single paragraph.
+	 * \n are ignored. a real \n is always appended.
+	 */
+	void writeColor(QString data, const char *color=nullptr);
 
-    /**
-     * @brief clear the text widget
-     */
-    void clear();
+	/**
+	 * @brief clear the text widget
+	 */
+	void clear();
 
 private slots:
-    void on_closeButton_clicked();
+	void on_closeButton_clicked();
 
 protected:
-    void closeEvent(QCloseEvent *);
+	void closeEvent(QCloseEvent *);
 
 private:
-    Ui::ConsoleWindow *ui;
-    bool m_mayclose;
+	Ui::ConsoleWindow *ui;
+	bool m_mayclose;
 };
 
 #endif // CONSOLEWINDOW_H