Add resize feature for TODO output pane

Settings will be saved between restarts

Change-Id: Id7924dc5e7f52045e77ebe45ff6c30f6f6003c14
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

src/plugins/todo/constants.h

@@ -65,6 +65,8 @@ const char SETTINGS_GROUP[] = "TodoPlugin";
 const char SCANNING_SCOPE[] = "ScanningScope";
 const char ITEMS_DISPLAY_PLACE[] = "ItemsDisplayPlace";
 const char KEYWORDS_LIST[] = "Keywords";
+const char OUTPUT_PANE_TEXT_WIDTH[] = "OutputPaneTextColumnWidth";
+const char OUTPUT_PANE_FILE_WIDTH[] = "OutputPaneFileColumnWidth";
 
 // TODO Output TreeWidget columns
 enum OutputColumnIndex {

src/plugins/todo/todo.pro

@@ -18,7 +18,8 @@ HEADERS += todoplugin.h \
     todoitemsscanner.h \
     cpptodoitemsscanner.h \
     qmljstodoitemsscanner.h \
-    lineparser.h
+    lineparser.h \
+    todooutputtreeview.h
 SOURCES += todoplugin.cpp \
     keyword.cpp \
     todooutputpane.cpp \
@@ -31,7 +32,8 @@ SOURCES += todoplugin.cpp \
     todoitemsscanner.cpp \
     cpptodoitemsscanner.cpp \
     qmljstodoitemsscanner.cpp \
-    lineparser.cpp
+    lineparser.cpp \
+    todooutputtreeview.cpp
 OTHER_FILES += \
     Todo.pluginspec.in
 

src/plugins/todo/todo.qbs

@@ -42,6 +42,8 @@ QtcPlugin {
         "todoitemsscanner.h",
         "todooutputpane.cpp",
         "todooutputpane.h",
+        "todooutputtreeview.cpp",
+        "todooutputtreeview.h",
         "todoplugin.cpp",
         "todoplugin.h",
         "todoplugin.qrc",

src/plugins/todo/todooutputpane.cpp

@@ -31,10 +31,10 @@
 #include "todooutputpane.h"
 #include "constants.h"
 #include "todoitemsmodel.h"
+#include "todooutputtreeview.h"
 
 #include <QIcon>
 #include <QHeaderView>
-#include <QTreeView>
 #include <QToolButton>
 #include <QButtonGroup>
 
@@ -173,20 +173,8 @@ void TodoOutputPane::updateTodoCount()
 
 void TodoOutputPane::createTreeView()
 {
-    m_todoTreeView = new QTreeView();
-
-    m_todoTreeView->setRootIsDecorated(false);
-    m_todoTreeView->setFrameStyle(QFrame::NoFrame);
-    m_todoTreeView->setSortingEnabled(true);
+    m_todoTreeView = new TodoOutputTreeView();
     m_todoTreeView->setModel(m_todoItemsModel);
-    m_todoTreeView->setAttribute(Qt::WA_MacShowFocusRect, false);
-
-    QHeaderView *header = m_todoTreeView->header();
-    header->setResizeMode(Constants::OUTPUT_COLUMN_TEXT, QHeaderView::Stretch);
-    header->setResizeMode(Constants::OUTPUT_COLUMN_LINE, QHeaderView::ResizeToContents);
-    header->setResizeMode(Constants::OUTPUT_COLUMN_FILE, QHeaderView::ResizeToContents);
-    header->setStretchLastSection(false);
-    header->setMovable(false);
 
     connect(m_todoTreeView, SIGNAL(clicked(QModelIndex)), SLOT(todoTreeViewClicked(QModelIndex)));
 }

src/plugins/todo/todooutputpane.h

@@ -36,7 +36,6 @@
 #include <coreplugin/ioutputpane.h>
 
 QT_BEGIN_NAMESPACE
-class QTreeView;
 class QToolButton;
 class QButtonGroup;
 class QModelIndex;
@@ -48,6 +47,7 @@ namespace Internal {
 
 class TodoItem;
 class TodoItemsModel;
+class TodoOutputTreeView;
 
 class TodoOutputPane : public Core::IOutputPane
 {
@@ -84,7 +84,7 @@ private slots:
     void updateTodoCount();
 
 private:
-    QTreeView *m_todoTreeView;
+    TodoOutputTreeView *m_todoTreeView;
     QToolButton *m_currentFileButton;
     QToolButton *m_wholeProjectButton;
     QWidget *m_spacer;

src/plugins/todo/todooutputtreeview.cpp

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "todooutputtreeview.h"
+#include "constants.h"
+
+#include <coreplugin/icore.h>
+
+#include <QResizeEvent>
+#include <QHeaderView>
+#include <QSettings>
+
+namespace Todo {
+namespace Internal {
+
+TodoOutputTreeView::TodoOutputTreeView(QWidget *parent) :
+    QTreeView(parent),
+    m_textColumnDefaultWidth(0),
+    m_fileColumnDefaultWidth(0)
+{
+    setRootIsDecorated(false);
+    setFrameStyle(QFrame::NoFrame);
+    setSortingEnabled(true);
+    setAttribute(Qt::WA_MacShowFocusRect, false);
+
+    header()->setResizeMode(QHeaderView::Interactive);
+    header()->setStretchLastSection(true);
+    header()->setMovable(false);
+    connect(header(), SIGNAL(sectionResized(int,int,int)), SLOT(todoColumnResized(int,int,int)));
+    loadDisplaySettings();
+}
+
+TodoOutputTreeView::~TodoOutputTreeView()
+{
+    saveDisplaySettings();
+}
+
+void TodoOutputTreeView::saveDisplaySettings()
+{
+    QSettings *settings = Core::ICore::settings();
+    settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP));
+    settings->setValue(QLatin1String(Constants::OUTPUT_PANE_TEXT_WIDTH),
+                       columnWidth(Constants::OUTPUT_COLUMN_TEXT));
+    settings->setValue(QLatin1String(Constants::OUTPUT_PANE_FILE_WIDTH),
+                       columnWidth(Constants::OUTPUT_COLUMN_FILE));
+    settings->endGroup();
+}
+
+void TodoOutputTreeView::loadDisplaySettings()
+{
+    QSettings *settings = Core::ICore::settings();
+    settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP));
+    m_textColumnDefaultWidth = settings->value(
+                QLatin1String(Constants::OUTPUT_PANE_TEXT_WIDTH), 0).toInt();
+    m_fileColumnDefaultWidth = settings->value(
+                QLatin1String(Constants::OUTPUT_PANE_FILE_WIDTH), 0).toInt();
+    settings->endGroup();
+}
+
+void TodoOutputTreeView::resizeEvent(QResizeEvent *event)
+{
+    int widthText = m_textColumnDefaultWidth;
+    int widthFile = m_fileColumnDefaultWidth;
+
+    if ((event->oldSize().width() == 0) || (event->oldSize().width() == -1)) {
+        if (widthText == 0)
+            widthText = 0.55 * event->size().width();
+        if (widthFile == 0)
+            widthFile = 0.35 * event->size().width();
+    } else {
+        const qreal scale = static_cast<qreal>(event->size().width())
+                / static_cast<qreal>(event->oldSize().width());
+        widthText = scale * columnWidth(Constants::OUTPUT_COLUMN_TEXT);
+        widthFile = scale * columnWidth(Constants::OUTPUT_COLUMN_FILE);
+    }
+
+    setColumnWidth(Constants::OUTPUT_COLUMN_TEXT, widthText);
+    setColumnWidth(Constants::OUTPUT_COLUMN_FILE, widthFile);
+}
+
+void TodoOutputTreeView::todoColumnResized(int column, int oldSize, int newSize)
+{
+    Q_UNUSED(oldSize);
+    if (column == Constants::OUTPUT_COLUMN_TEXT)
+        m_textColumnDefaultWidth = newSize;
+    else if (column == Constants::OUTPUT_COLUMN_FILE)
+        m_fileColumnDefaultWidth = newSize;
+}
+
+} // namespace Internal
+} // namespace Todo

src/plugins/todo/todooutputtreeview.h

+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef TODO_INTERNAL_TODOOUTPUTTREEVIEW_H
+#define TODO_INTERNAL_TODOOUTPUTTREEVIEW_H
+
+#include <QTreeView>
+
+namespace Todo {
+namespace Internal {
+
+class TodoOutputTreeView : public QTreeView
+{
+    Q_OBJECT
+public:
+    explicit TodoOutputTreeView(QWidget *parent = 0);
+    ~TodoOutputTreeView();
+
+    void resizeEvent(QResizeEvent *event);
+
+private slots:
+    void todoColumnResized(int column, int oldSize, int newSize);
+
+private:
+    void saveDisplaySettings();
+    void loadDisplaySettings();
+
+    qreal m_textColumnDefaultWidth;
+    qreal m_fileColumnDefaultWidth;
+};
+
+} // namespace Internal
+} // namespace Todo
+
+#endif // TODO_INTERNAL_TODOOUTPUTTREEVIEW_H