From b14d15e266f3fe8ad5f151e248ccff6362de0967 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sat, 24 Dec 2016 09:32:05 +0800 Subject: [PATCH] add icon to indicate the read/edit mode of tab Signed-off-by: Le Tan --- src/resources/icons/editing.svg | 13 +++++++++++++ src/resources/icons/reading.svg | 14 ++++++++++++++ src/veditwindow.cpp | 16 ++++++++-------- src/vnote.qrc | 2 ++ 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 src/resources/icons/editing.svg create mode 100644 src/resources/icons/reading.svg diff --git a/src/resources/icons/editing.svg b/src/resources/icons/editing.svg new file mode 100644 index 00000000..a0be3454 --- /dev/null +++ b/src/resources/icons/editing.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/src/resources/icons/reading.svg b/src/resources/icons/reading.svg new file mode 100644 index 00000000..ca798b03 --- /dev/null +++ b/src/resources/icons/reading.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/src/veditwindow.cpp b/src/veditwindow.cpp index 94e5ec46..c186e471 100644 --- a/src/veditwindow.cpp +++ b/src/veditwindow.cpp @@ -94,8 +94,8 @@ void VEditWindow::removeEditTab(int p_index) int VEditWindow::insertEditTab(int p_index, VFile *p_file, QWidget *p_page) { int idx = insertTab(p_index, p_page, p_file->getName()); - QTabBar *tabs = tabBar(); - tabs->setTabToolTip(idx, generateTooltip(p_file)); + setTabToolTip(idx, generateTooltip(p_file)); + setTabIcon(idx, QIcon(":/resources/icons/reading.svg")); return idx; } @@ -293,9 +293,10 @@ void VEditWindow::noticeTabStatus(int p_index) bool editMode = editor->getIsEditMode(); // Update tab text - QTabBar *tabs = tabBar(); - tabs->setTabText(p_index, generateTabText(file->getName(), file->isModified())); - tabs->setTabToolTip(p_index, generateTooltip(file)); + setTabText(p_index, generateTabText(file->getName(), file->isModified())); + setTabToolTip(p_index, generateTooltip(file)); + setTabIcon(p_index, editMode ? QIcon(":/resources/icons/editing.svg") : + QIcon(":/resources/icons/reading.svg")); emit tabStatusChanged(file, editor, editMode); } @@ -387,12 +388,11 @@ void VEditWindow::updateTabListMenu() } int curTab = currentIndex(); - QTabBar *tabbar = tabBar(); - int nrTab = tabbar->count(); + int nrTab = count(); for (int i = 0; i < nrTab; ++i) { VEditTab *editor = getTab(i); QPointer file = editor->getFile(); - QAction *action = new QAction(tabbar->tabText(i), tabListAct); + QAction *action = new QAction(tabIcon(i), tabText(i), tabListAct); action->setStatusTip(generateTooltip(file)); action->setData(QVariant::fromValue(file)); if (i == curTab) { diff --git a/src/vnote.qrc b/src/vnote.qrc index 6ab9a756..dcc0c085 100644 --- a/src/vnote.qrc +++ b/src/vnote.qrc @@ -74,5 +74,7 @@ resources/icons/vnote.png resources/icons/insert_image.svg resources/icons/import_note.svg + resources/icons/editing.svg + resources/icons/reading.svg