From 58c85068556aaac257c106fb5acf61b3a92bd21f Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sat, 24 Dec 2016 15:46:07 +0800 Subject: [PATCH] use different color of the corner icon in current window Signed-off-by: Le Tan --- src/resources/icons/corner_menu_cur.svg | 9 +++++++++ src/resources/icons/corner_tablist_cur.svg | 11 +++++++++++ src/veditarea.cpp | 9 ++++++++- src/veditwindow.cpp | 11 +++++++++++ src/veditwindow.h | 2 ++ src/vnote.cpp | 11 +++++++++++ src/vnote.qrc | 2 ++ 7 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/resources/icons/corner_menu_cur.svg create mode 100644 src/resources/icons/corner_tablist_cur.svg diff --git a/src/resources/icons/corner_menu_cur.svg b/src/resources/icons/corner_menu_cur.svg new file mode 100644 index 00000000..fc8e3569 --- /dev/null +++ b/src/resources/icons/corner_menu_cur.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/src/resources/icons/corner_tablist_cur.svg b/src/resources/icons/corner_tablist_cur.svg new file mode 100644 index 00000000..89f9e8c5 --- /dev/null +++ b/src/resources/icons/corner_tablist_cur.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/veditarea.cpp b/src/veditarea.cpp index 518818ee..39cc40be 100644 --- a/src/veditarea.cpp +++ b/src/veditarea.cpp @@ -133,15 +133,22 @@ void VEditArea::setCurrentTab(int windowIndex, int tabIndex, bool setFocus) void VEditArea::setCurrentWindow(int windowIndex, bool setFocus) { + int nrWin = splitter->count(); if (curWindowIndex == windowIndex) { goto out; } curWindowIndex = windowIndex; if (curWindowIndex > -1 && setFocus) { - getWindow(windowIndex)->focusWindow(); + getWindow(curWindowIndex)->focusWindow(); } out: + for (int i = 0; i < nrWin; ++i) { + getWindow(i)->setCurrentWindow(false); + } + if (curWindowIndex > -1) { + getWindow(curWindowIndex)->setCurrentWindow(true); + } // Update status updateWindowStatus(); } diff --git a/src/veditwindow.cpp b/src/veditwindow.cpp index 7250b869..b5993849 100644 --- a/src/veditwindow.cpp +++ b/src/veditwindow.cpp @@ -694,3 +694,14 @@ bool VEditWindow::addEditTab(QWidget *p_widget) noticeTabStatus(idx); return true; } + +void VEditWindow::setCurrentWindow(bool p_current) +{ + if (p_current) { + rightBtn->setIcon(QIcon(":/resources/icons/corner_menu_cur.svg")); + leftBtn->setIcon(QIcon(":/resources/icons/corner_tablist_cur.svg")); + } else { + rightBtn->setIcon(QIcon(":/resources/icons/corner_menu.svg")); + leftBtn->setIcon(QIcon(":/resources/icons/corner_tablist.svg")); + } +} diff --git a/src/veditwindow.h b/src/veditwindow.h index a1e2970c..b4d07081 100644 --- a/src/veditwindow.h +++ b/src/veditwindow.h @@ -43,6 +43,8 @@ public: VEditTab *currentEditTab(); // Insert a tab with @p_widget. @p_widget is a fully initialized VEditTab. bool addEditTab(QWidget *p_widget); + // Set whether it is the current window. + void setCurrentWindow(bool p_current); protected: void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; diff --git a/src/vnote.cpp b/src/vnote.cpp index 42664396..086efe86 100644 --- a/src/vnote.cpp +++ b/src/vnote.cpp @@ -55,6 +55,17 @@ void VNote::initPalette(QPalette palette) m_palette.append(QPair("Grey6", "#757575")); m_palette.append(QPair("Grey7", "#616161")); m_palette.append(QPair("Grey8", "#424242")); + + m_palette.append(QPair("Green0", "#E8F5E9")); + m_palette.append(QPair("Green1", "#C8E6C9")); + m_palette.append(QPair("Green2", "#A5D6A7")); + m_palette.append(QPair("Green3", "#81C784")); + m_palette.append(QPair("Green4", "#66BB6A")); + m_palette.append(QPair("Green5", "#4CAF50")); + m_palette.append(QPair("Green6", "#43A047")); + m_palette.append(QPair("Green7", "#388E3C")); + m_palette.append(QPair("Green8", "#2E7D32")); + m_palette.append(QPair("Green9", "#1B5E20")); } QString VNote::getColorFromPalette(const QString &p_name) const diff --git a/src/vnote.qrc b/src/vnote.qrc index 49f86cd0..b44b2617 100644 --- a/src/vnote.qrc +++ b/src/vnote.qrc @@ -79,5 +79,7 @@ resources/icons/locate_note.svg resources/icons/move_tab_left.svg resources/icons/move_tab_right.svg + resources/icons/corner_menu_cur.svg + resources/icons/corner_tablist_cur.svg