From 5615c406eac76595cceabdb9e6ff7568f12e7f9f Mon Sep 17 00:00:00 2001 From: Denis Kormalev Date: Mon, 27 Apr 2015 01:13:35 +0300 Subject: [PATCH] ToDo: Proper filenames eliding It is more reasonable to elide filenames at left and messages at right Change-Id: I980026eb558c6528da85a5ddb1a7125bb3d7fdce Reviewed-by: Eike Ziller --- src/plugins/todo/todo.pro | 6 ++- src/plugins/todo/todo.qbs | 2 + src/plugins/todo/todooutputtreeview.cpp | 3 ++ .../todo/todooutputtreeviewdelegate.cpp | 50 +++++++++++++++++++ src/plugins/todo/todooutputtreeviewdelegate.h | 49 ++++++++++++++++++ 5 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 src/plugins/todo/todooutputtreeviewdelegate.cpp create mode 100644 src/plugins/todo/todooutputtreeviewdelegate.h diff --git a/src/plugins/todo/todo.pro b/src/plugins/todo/todo.pro index eb5e38916a8..f430c04daf0 100644 --- a/src/plugins/todo/todo.pro +++ b/src/plugins/todo/todo.pro @@ -15,7 +15,8 @@ HEADERS += todoplugin.h \ cpptodoitemsscanner.h \ qmljstodoitemsscanner.h \ lineparser.h \ - todooutputtreeview.h + todooutputtreeview.h \ + todooutputtreeviewdelegate.h SOURCES += todoplugin.cpp \ keyword.cpp \ todooutputpane.cpp \ @@ -29,7 +30,8 @@ SOURCES += todoplugin.cpp \ cpptodoitemsscanner.cpp \ qmljstodoitemsscanner.cpp \ lineparser.cpp \ - todooutputtreeview.cpp + todooutputtreeview.cpp \ + todooutputtreeviewdelegate.cpp RESOURCES += \ todoplugin.qrc diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs index 78640179250..cfeae575cdd 100644 --- a/src/plugins/todo/todo.qbs +++ b/src/plugins/todo/todo.qbs @@ -43,6 +43,8 @@ QtcPlugin { "todooutputpane.h", "todooutputtreeview.cpp", "todooutputtreeview.h", + "todooutputtreeviewdelegate.cpp", + "todooutputtreeviewdelegate.h", "todoplugin.cpp", "todoplugin.h", "todoplugin.qrc", diff --git a/src/plugins/todo/todooutputtreeview.cpp b/src/plugins/todo/todooutputtreeview.cpp index 612d1761b1f..3039c324e44 100644 --- a/src/plugins/todo/todooutputtreeview.cpp +++ b/src/plugins/todo/todooutputtreeview.cpp @@ -28,7 +28,9 @@ ** ****************************************************************************/ + #include "todooutputtreeview.h" +#include "todooutputtreeviewdelegate.h" #include "constants.h" #include @@ -50,6 +52,7 @@ TodoOutputTreeView::TodoOutputTreeView(QWidget *parent) : setSortingEnabled(true); setAttribute(Qt::WA_MacShowFocusRect, false); setSelectionBehavior(QTreeView::SelectRows); + setItemDelegate(new TodoOutputTreeViewDelegate(this)); header()->setSectionResizeMode(QHeaderView::Interactive); header()->setStretchLastSection(true); diff --git a/src/plugins/todo/todooutputtreeviewdelegate.cpp b/src/plugins/todo/todooutputtreeviewdelegate.cpp new file mode 100644 index 00000000000..5af37fbfa6e --- /dev/null +++ b/src/plugins/todo/todooutputtreeviewdelegate.cpp @@ -0,0 +1,50 @@ +/************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing +** +** 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 The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information +** use the contact form at http://www.qt.io/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 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ +#include "todooutputtreeviewdelegate.h" +#include "constants.h" + +namespace Todo { +namespace Internal { + +TodoOutputTreeViewDelegate::TodoOutputTreeViewDelegate(QObject *parent) : + QStyledItemDelegate(parent) +{ +} + +void TodoOutputTreeViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const +{ + QStyleOptionViewItem newOption = option; + newOption.textElideMode = index.column() == Constants::OUTPUT_COLUMN_FILE ? Qt::ElideLeft : Qt::ElideRight; + QStyledItemDelegate::paint(painter, newOption, index); +} + +} // namespace Internal +} // namespace Todo + diff --git a/src/plugins/todo/todooutputtreeviewdelegate.h b/src/plugins/todo/todooutputtreeviewdelegate.h new file mode 100644 index 00000000000..9202cdc8255 --- /dev/null +++ b/src/plugins/todo/todooutputtreeviewdelegate.h @@ -0,0 +1,49 @@ +/************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing +** +** 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 The Qt Company. For licensing terms and +** conditions see http://www.qt.io/terms-conditions. For further information +** use the contact form at http://www.qt.io/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 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ +#ifndef TODO_INTERNAL_TODOOUTPUTTREEVIEWDELEGATE_H +#define TODO_INTERNAL_TODOOUTPUTTREEVIEWDELEGATE_H + +#include + +namespace Todo { +namespace Internal { + +class TodoOutputTreeViewDelegate : public QStyledItemDelegate +{ + Q_OBJECT +public: + explicit TodoOutputTreeViewDelegate(QObject *parent = 0); + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; +}; + +} // namespace Internal +} // namespace Todo + +#endif // TODO_INTERNAL_TODOOUTPUTTREEVIEWDELEGATE_H