From 7c69f80f17822cec17f45473f5c8db36ec2b1fcb Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Thu, 24 Nov 2016 22:23:50 +0800
Subject: [PATCH] split setupUI() in VMainWindow

Signed-off-by: Le Tan <tamlokveer@gmail.com>
---
 src/vmainwindow.cpp | 78 ++++++++++++++++++++++++---------------------
 src/vmainwindow.h   |  1 +
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp
index 391ca7be..e8748306 100644
--- a/src/vmainwindow.cpp
+++ b/src/vmainwindow.cpp
@@ -38,41 +38,7 @@ VMainWindow::~VMainWindow()
 
 void VMainWindow::setupUI()
 {
-    // Notebook directory browser tree
-    notebookLabel = new QLabel(tr("Notebook"));
-    directoryLabel = new QLabel(tr("Directory"));
-
-    newNotebookBtn = new QPushButton(QIcon(":/resources/icons/create_notebook.svg"), "");
-    newNotebookBtn->setToolTip(tr("Create a new notebook"));
-    newNotebookBtn->setProperty("OnMainWindow", true);
-    deleteNotebookBtn = new QPushButton(QIcon(":/resources/icons/delete_notebook.svg"), "");
-    deleteNotebookBtn->setToolTip(tr("Delete current notebook"));
-    deleteNotebookBtn->setProperty("OnMainWindow", true);
-    notebookInfoBtn = new QPushButton(QIcon(":/resources/icons/notebook_info.svg"), "");
-    notebookInfoBtn->setToolTip(tr("View and edit current notebook's information"));
-    notebookInfoBtn->setProperty("OnMainWindow", true);
-
-    notebookComboBox = new QComboBox();
-    notebookComboBox->setProperty("OnMainWindow", true);
-    notebookComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-    directoryTree = new VDirectoryTree(vnote);
-
-    QHBoxLayout *nbBtnLayout = new QHBoxLayout;
-    nbBtnLayout->addWidget(notebookLabel);
-    nbBtnLayout->addStretch();
-    nbBtnLayout->addWidget(newNotebookBtn);
-    nbBtnLayout->addWidget(deleteNotebookBtn);
-    nbBtnLayout->addWidget(notebookInfoBtn);
-    nbBtnLayout->setContentsMargins(0, 0, 0, 0);
-    QVBoxLayout *nbLayout = new QVBoxLayout;
-    nbLayout->addLayout(nbBtnLayout);
-    nbLayout->addWidget(notebookComboBox);
-    nbLayout->addWidget(directoryLabel);
-    nbLayout->addWidget(directoryTree);
-    nbLayout->setContentsMargins(5, 0, 0, 0);
-    QWidget *nbContainer = new QWidget();
-    nbContainer->setLayout(nbLayout);
-    nbContainer->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding);
+    QWidget *directoryPanel = setupDirectoryPanel();
 
     fileList = new VFileList(vnote);
     fileList->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding);
@@ -83,7 +49,7 @@ void VMainWindow::setupUI()
 
     // Main Splitter
     mainSplitter = new QSplitter();
-    mainSplitter->addWidget(nbContainer);
+    mainSplitter->addWidget(directoryPanel);
     mainSplitter->addWidget(fileList);
     mainSplitter->addWidget(editArea);
     mainSplitter->setStretchFactor(0, 0);
@@ -144,6 +110,46 @@ void VMainWindow::setupUI()
     statusBar();
 }
 
+QWidget *VMainWindow::setupDirectoryPanel()
+{
+    notebookLabel = new QLabel(tr("Notebook"));
+    directoryLabel = new QLabel(tr("Directory"));
+
+    newNotebookBtn = new QPushButton(QIcon(":/resources/icons/create_notebook.svg"), "");
+    newNotebookBtn->setToolTip(tr("Create a new notebook"));
+    newNotebookBtn->setProperty("OnMainWindow", true);
+    deleteNotebookBtn = new QPushButton(QIcon(":/resources/icons/delete_notebook.svg"), "");
+    deleteNotebookBtn->setToolTip(tr("Delete current notebook"));
+    deleteNotebookBtn->setProperty("OnMainWindow", true);
+    notebookInfoBtn = new QPushButton(QIcon(":/resources/icons/notebook_info.svg"), "");
+    notebookInfoBtn->setToolTip(tr("View and edit current notebook's information"));
+    notebookInfoBtn->setProperty("OnMainWindow", true);
+
+    notebookComboBox = new QComboBox();
+    notebookComboBox->setProperty("OnMainWindow", true);
+    notebookComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+    directoryTree = new VDirectoryTree(vnote);
+
+    QHBoxLayout *nbBtnLayout = new QHBoxLayout;
+    nbBtnLayout->addWidget(notebookLabel);
+    nbBtnLayout->addStretch();
+    nbBtnLayout->addWidget(newNotebookBtn);
+    nbBtnLayout->addWidget(deleteNotebookBtn);
+    nbBtnLayout->addWidget(notebookInfoBtn);
+    nbBtnLayout->setContentsMargins(0, 0, 0, 0);
+    QVBoxLayout *nbLayout = new QVBoxLayout;
+    nbLayout->addLayout(nbBtnLayout);
+    nbLayout->addWidget(notebookComboBox);
+    nbLayout->addWidget(directoryLabel);
+    nbLayout->addWidget(directoryTree);
+    nbLayout->setContentsMargins(5, 0, 0, 0);
+    QWidget *nbContainer = new QWidget();
+    nbContainer->setLayout(nbLayout);
+    nbContainer->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding);
+
+    return nbContainer;
+}
+
 void VMainWindow::initActions()
 {
     newRootDirAct = new QAction(QIcon(":/resources/icons/create_rootdir_tb.svg"),
diff --git a/src/vmainwindow.h b/src/vmainwindow.h
index dd11d425..68c43843 100644
--- a/src/vmainwindow.h
+++ b/src/vmainwindow.h
@@ -65,6 +65,7 @@ protected:
 
 private:
     void setupUI();
+    QWidget *setupDirectoryPanel();
     void initActions();
     void initToolBar();
     void initMenuBar();