diff --git a/src/resources/themes/v_detorte/v_detorte.palette b/src/resources/themes/v_detorte/v_detorte.palette index 8ba2bcab..c50b84c3 100644 --- a/src/resources/themes/v_detorte/v_detorte.palette +++ b/src/resources/themes/v_detorte/v_detorte.palette @@ -9,7 +9,7 @@ mdhl_file=v_detorte.mdhl css_file=v_detorte.css codeblock_css_file=v_detorte_codeblock.css mermaid_css_file=v_detorte_mermaid.css -version=8 +version=9 ; This mapping will be used to translate colors when the content of HTML is copied ; without background. You could just specify the foreground colors mapping here. @@ -175,6 +175,7 @@ toolbox_icon_active_fg=@master_fg toolbox_title_border=@master_bg ; Dockwidget. +dockwidget_bg=@base_bg dockwidget_title_fg=@title_fg dockwidget_title_bg=@title_bg dockwidget_button_hover_bg=@hover_bg diff --git a/src/resources/themes/v_detorte/v_detorte.qss b/src/resources/themes/v_detorte/v_detorte.qss index e5fbfef4..5d9ae6cc 100644 --- a/src/resources/themes/v_detorte/v_detorte.qss +++ b/src/resources/themes/v_detorte/v_detorte.qss @@ -151,6 +151,7 @@ QToolButton::menu-arrow { /* DockWidget */ QDockWidget { color: @dockwidget_title_fg; + background: @dockwidget_bg; titlebar-close-icon: url(close.svg); titlebar-normal-icon: url(float.svg); } diff --git a/src/resources/themes/v_moonlight/v_moonlight.palette b/src/resources/themes/v_moonlight/v_moonlight.palette index 63cbec8c..c7ba142a 100644 --- a/src/resources/themes/v_moonlight/v_moonlight.palette +++ b/src/resources/themes/v_moonlight/v_moonlight.palette @@ -7,7 +7,7 @@ mdhl_file=v_moonlight.mdhl css_file=v_moonlight.css codeblock_css_file=v_moonlight_codeblock.css mermaid_css_file=v_moonlight_mermaid.css -version=19 +version=20 ; This mapping will be used to translate colors when the content of HTML is copied ; without background. You could just specify the foreground colors mapping here. @@ -173,6 +173,7 @@ toolbox_icon_active_fg=@master_fg toolbox_title_border=@master_bg ; Dockwidget. +dockwidget_bg=@base_bg dockwidget_title_fg=@title_fg dockwidget_title_bg=@title_bg dockwidget_button_hover_bg=@hover_bg diff --git a/src/resources/themes/v_moonlight/v_moonlight.qss b/src/resources/themes/v_moonlight/v_moonlight.qss index 124d7d01..ade1814f 100644 --- a/src/resources/themes/v_moonlight/v_moonlight.qss +++ b/src/resources/themes/v_moonlight/v_moonlight.qss @@ -151,6 +151,7 @@ QToolButton::menu-arrow { /* DockWidget */ QDockWidget { color: @dockwidget_title_fg; + background: @dockwidget_bg; titlebar-close-icon: url(close.svg); titlebar-normal-icon: url(float.svg); } diff --git a/src/resources/themes/v_pure/v_pure.palette b/src/resources/themes/v_pure/v_pure.palette index 0f6f581d..3b44e553 100644 --- a/src/resources/themes/v_pure/v_pure.palette +++ b/src/resources/themes/v_pure/v_pure.palette @@ -7,7 +7,7 @@ mdhl_file=v_pure.mdhl css_file=v_pure.css codeblock_css_file=v_pure_codeblock.css mermaid_css_file=v_pure_mermaid.css -version=17 +version=18 [phony] ; Abstract color attributes. @@ -165,6 +165,7 @@ toolbox_icon_active_fg=@master_fg toolbox_title_border=@master_bg ; Dockwidget. +dockwidget_bg=@base_bg dockwidget_title_fg=@title_fg dockwidget_title_bg=@title_bg dockwidget_button_hover_bg=@hover_bg diff --git a/src/resources/themes/v_pure/v_pure.qss b/src/resources/themes/v_pure/v_pure.qss index 381b68b1..a8f15da0 100644 --- a/src/resources/themes/v_pure/v_pure.qss +++ b/src/resources/themes/v_pure/v_pure.qss @@ -151,6 +151,7 @@ QToolButton::menu-arrow { /* DockWidget */ QDockWidget { color: @dockwidget_title_fg; + background: @dockwidget_bg; titlebar-close-icon: url(close.svg); titlebar-normal-icon: url(float.svg); } diff --git a/src/vsearchresulttree.cpp b/src/vsearchresulttree.cpp index e56acbe9..0799f0ad 100644 --- a/src/vsearchresulttree.cpp +++ b/src/vsearchresulttree.cpp @@ -11,6 +11,7 @@ #include "vcart.h" #include "vhistorylist.h" #include "vexplorer.h" +#include "vuniversalentry.h" extern VNote *g_vnote; @@ -112,7 +113,15 @@ void VSearchResultTree::appendItem(const QSharedPointer &p_it QTreeWidgetItem *item = new QTreeWidgetItem(this); item->setData(0, Qt::UserRole, m_data.size() - 1); - item->setText(0, p_item->m_text.isEmpty() ? p_item->m_path : p_item->m_text); + QString text; + if (p_item->m_text.isEmpty()) { + text = p_item->m_path; + } else if (p_item->m_type != VSearchResultItem::Notebook) { + text = VUniversalEntry::fileNameWithDir(p_item->m_text, p_item->m_path); + } else { + text = p_item->m_text; + } + item->setText(0, text); item->setToolTip(0, p_item->m_path); switch (p_item->m_type) {