Merge branch 'master' of https://github.com/fourtf/idontknowcppplsdontjudge

widgets/chatwidget.cpp

@@ -83,5 +83,27 @@ ChatWidget::paintEvent(QPaintEvent *)
 
     painter.fillRect(this->rect(), ColorScheme::getInstance().ChatBackground);
 }
+
+void
+ChatWidget::load(const boost::property_tree::ptree &tree)
+{
+    // Load tab text
+    try {
+        this->setChannelName(
+            QString::fromStdString(tree.get<std::string>("channelName")));
+    } catch (boost::property_tree::ptree_error) {
+    }
 }
+
+boost::property_tree::ptree
+ChatWidget::save()
+{
+    boost::property_tree::ptree tree;
+
+    tree.put("channelName", this->getChannelName().toStdString());
+
+    return tree;
 }
+
+}  // namespace widgets
+}  // namespace chatterino

widgets/chatwidget.h

@@ -10,6 +10,7 @@
 #include <QFont>
 #include <QVBoxLayout>
 #include <QWidget>
+#include <boost/property_tree/ptree.hpp>
 
 namespace chatterino {
 namespace widgets {
@@ -56,8 +57,13 @@ private:
     ChatWidgetHeader header;
     ChatWidgetView view;
     ChatWidgetInput input;
+
+public:
+    void load(const boost::property_tree::ptree &tree);
+    boost::property_tree::ptree save();
 };
-}
-}
+
+}  // namespace widgets
+}  // namespace chatterino
 
 #endif  // CHATWIDGET_H

widgets/notebook.cpp

@@ -226,6 +226,13 @@ Notebook::save(boost::property_tree::ptree &tree)
     // Iterate through all tabs and add them to our tabs property thing
     for (const auto &page : this->pages) {
         boost::property_tree::ptree pTab = page->tab->save();
+
+        boost::property_tree::ptree pChats = page->save();
+
+        if (pChats.size() > 0) {
+            pTab.add_child("columns", pChats);
+        }
+
         tabs.push_back(std::make_pair("", pTab));
     }
 

widgets/notebookpage.cpp

@@ -6,6 +6,7 @@
 #include <QDebug>
 #include <QHBoxLayout>
 #include <QMimeData>
+#include <QObject>
 #include <QPainter>
 #include <QVBoxLayout>
 #include <QWidget>
@@ -124,7 +125,8 @@ void
 NotebookPage::mouseReleaseEvent(QMouseEvent *event)
 {
     if (this->hbox.count() == 0 && event->button() == Qt::LeftButton) {
-        addToLayout(new ChatWidget(), std::pair<int, int>(-1, -1));
+        // "Add Chat" was clicked
+        this->addToLayout(new ChatWidget(), std::pair<int, int>(-1, -1));
 
         setCursor(QCursor(Qt::ArrowCursor));
     }
@@ -241,12 +243,106 @@ NotebookPage::paintEvent(QPaintEvent *)
     }
 }
 
-void
-NotebookPage::load(const boost::property_tree::ptree &v)
+static std::pair<int, int>
+getWidgetPositionInLayout(QLayout *layout, const ChatWidget *chatWidget)
 {
-    const std::string &tabName = v.get<std::string>("name", "UNNAMED");
+    for (int i = 0; i < layout->count(); ++i) {
+        printf("xD\n");
+    }
 
-    qDebug() << "tab name :" << tabName.c_str();
+    return std::make_pair(-1, -1);
+}
+
+std::pair<int, int>
+NotebookPage::getChatPosition(const ChatWidget *chatWidget)
+{
+    auto layout = this->hbox.layout();
+
+    if (layout == nullptr) {
+        return std::make_pair(-1, -1);
+    }
+
+    return getWidgetPositionInLayout(layout, chatWidget);
+}
+
+void
+NotebookPage::load(const boost::property_tree::ptree &tree)
+{
+    try {
+        int column = 0;
+        for (const auto &v : tree.get_child("columns.")) {
+            int row = 0;
+            for (const auto &innerV : v.second.get_child("")) {
+                auto widget = new ChatWidget();
+                widget->load(innerV.second);
+                this->addToLayout(widget, std::pair<int, int>(column, row));
+                ++row;
+            }
+            ++column;
+        }
+    } catch (boost::property_tree::ptree_error &) {
+        // can't read tabs
+    }
+}
+
+static void
+saveFromLayout(QLayout *layout, boost::property_tree::ptree &tree)
+{
+    for (int i = 0; i < layout->count(); ++i) {
+        auto item = layout->itemAt(i);
+
+        auto innerLayout = item->layout();
+        if (innerLayout != nullptr) {
+            boost::property_tree::ptree innerLayoutTree;
+
+            saveFromLayout(innerLayout, innerLayoutTree);
+
+            if (innerLayoutTree.size() > 0) {
+                tree.push_back(std::make_pair("", innerLayoutTree));
+            }
+
+            continue;
+        }
+
+        auto widget = item->widget();
+
+        if (widget == nullptr) {
+            // This layoutitem does not manage a widget for some reason
+            continue;
+        }
+
+        ChatWidget *chatWidget = qobject_cast<ChatWidget *>(widget);
+
+        if (chatWidget != nullptr) {
+            boost::property_tree::ptree chat = chatWidget->save();
+
+            tree.push_back(std::make_pair("", chat));
+            continue;
+        }
+    }
+}
+
+boost::property_tree::ptree
+NotebookPage::save()
+{
+    boost::property_tree::ptree tree;
+
+    auto layout = this->hbox.layout();
+
+    saveFromLayout(layout, tree);
+
+    /*
+    for (const auto &chat : this->chatWidgets) {
+        boost::property_tree::ptree child = chat->save();
+
+        // Set child position
+        child.put("position", "5,3");
+
+        tree.push_back(std::make_pair("", child));
+    }
+    */
+
+    return tree;
 }
 
 }  // namespace widgets

widgets/notebookpage.h

@@ -72,8 +72,11 @@ protected:
 private:
     void setPreviewRect(QPoint mousePos);
 
+    std::pair<int, int> getChatPosition(const ChatWidget *chatWidget);
+
 public:
-    void load(const boost::property_tree::ptree &v);
+    void load(const boost::property_tree::ptree &tree);
+    boost::property_tree::ptree save();
 };
 
 }  // namespace widgets

widgets/notebooktab.cpp

@@ -14,7 +14,7 @@ NotebookTab::NotebookTab(Notebook *notebook)
     , posAnimated(false)
     , posAnimationDesired()
     , notebook(notebook)
-    , text("<no title>")
+    , title("<no title>")
     , selected(false)
     , mouseOver(false)
     , mouseDown(false)
@@ -52,9 +52,9 @@ void
 NotebookTab::calcSize()
 {
     if (Settings::getInstance().hideTabX.get()) {
-        this->resize(this->fontMetrics().width(this->text) + 8, 24);
+        this->resize(this->fontMetrics().width(this->title) + 8, 24);
     } else {
-        this->resize(this->fontMetrics().width(this->text) + 8 + 24, 24);
+        this->resize(this->fontMetrics().width(this->title) + 8 + 24, 24);
     }
 }
 
@@ -115,7 +115,7 @@ NotebookTab::paintEvent(QPaintEvent *)
                width() - (Settings::getInstance().hideTabX.get() ? 0 : 16),
                height());
 
-    painter.drawText(rect, this->text, QTextOption(Qt::AlignCenter));
+    painter.drawText(rect, this->title, QTextOption(Qt::AlignCenter));
 
     if (!Settings::getInstance().hideTabX.get() &&
         (this->mouseOver || this->selected)) {
@@ -207,9 +207,9 @@ NotebookTab::mouseMoveEvent(QMouseEvent *event)
 void
 NotebookTab::load(const boost::property_tree::ptree &tree)
 {
-    // Load tab text
+    // Load tab title
     try {
-        this->setText(QString::fromStdString(tree.get<std::string>("text")));
+        this->setTitle(QString::fromStdString(tree.get<std::string>("title")));
     } catch (boost::property_tree::ptree_error) {
     }
 }
@@ -219,7 +219,7 @@ NotebookTab::save()
 {
     boost::property_tree::ptree tree;
 
-    tree.put("text", this->getText().toStdString());
+    tree.put("title", this->getTitle().toStdString());
 
     return tree;
 }

widgets/notebooktab.h

@@ -30,15 +30,15 @@ public:
     NotebookPage *page;
 
     const QString &
-    getText() const
+    getTitle() const
     {
-        return this->text;
+        return this->title;
     }
 
     void
-    setText(const QString &text)
+    setTitle(const QString &title)
     {
-        this->text = text;
+        this->title = title;
     }
 
     bool
@@ -95,7 +95,7 @@ private:
 
     Notebook *notebook;
 
-    QString text;
+    QString title;
 
     bool selected;
     bool mouseOver;