dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 22:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

OutlineViewer: do not register Navigation Mode by default

Browse Source
This commit is contained in:
Le Tan 2020-12-22 19:57:57 +08:00
parent 334a3ae0a5
commit 99207f570e
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/configmgr.cpp
View File

@ -128,6 +128,7 @@ void ConfigMgr::checkAppConfig()
auto defaultVersion = MainConfig::getVersion(defaultSettings->getJson()); auto defaultVersion = MainConfig::getVersion(defaultSettings->getJson());
auto appVersion = MainConfig::getVersion(appSettings->getJson()); auto appVersion = MainConfig::getVersion(appSettings->getJson());
if (defaultVersion != appVersion) { if (defaultVersion != appVersion) {
qInfo() << "new version" << appVersion << defaultVersion;
needUpdate = true; needUpdate = true;
} }
} }

2
src/widgets/mainwindow.cpp
View File

@ -413,6 +413,8 @@ void MainWindow::setupOutlineViewer()
m_outlineViewer = new OutlineViewer(QString(), this); m_outlineViewer = new OutlineViewer(QString(), this);
m_outlineViewer->setObjectName("OutlineViewer.vnotex"); m_outlineViewer->setObjectName("OutlineViewer.vnotex");
NavigationModeMgr::getInst().registerNavigationTarget(m_outlineViewer->getNavigationModeWrapper());
connect(m_viewArea, &ViewArea::currentViewWindowChanged, connect(m_viewArea, &ViewArea::currentViewWindowChanged,
this, [this]() { this, [this]() {
auto win = m_viewArea->getCurrentViewWindow(); auto win = m_viewArea->getCurrentViewWindow();

10
src/widgets/outlineviewer.cpp
View File

@ -61,8 +61,6 @@ void OutlineViewer::setupUI(const QString &p_title)
TreeWidget::setupSingleColumnHeaderlessTree(m_tree, false, false); TreeWidget::setupSingleColumnHeaderlessTree(m_tree, false, false);
m_tree->setSelectionMode(QAbstractItemView::SingleSelection); m_tree->setSelectionMode(QAbstractItemView::SingleSelection);
TreeWidget::showHorizontalScrollbar(m_tree); TreeWidget::showHorizontalScrollbar(m_tree);
m_navigationWrapper.reset(new NavigationModeWrapper<QTreeWidget, QTreeWidgetItem>(m_tree));
NavigationModeMgr::getInst().registerNavigationTarget(m_navigationWrapper.data());
mainLayout->addWidget(m_tree); mainLayout->addWidget(m_tree);
connect(m_tree, &QTreeWidget::currentItemChanged, connect(m_tree, &QTreeWidget::currentItemChanged,
this, [this](QTreeWidgetItem *p_cur, QTreeWidgetItem *p_pre) { this, [this](QTreeWidgetItem *p_cur, QTreeWidgetItem *p_pre) {
@ -79,6 +77,14 @@ void OutlineViewer::setupUI(const QString &p_title)
setFocusProxy(m_tree); setFocusProxy(m_tree);
} }
NavigationModeWrapper<QTreeWidget, QTreeWidgetItem> *OutlineViewer::getNavigationModeWrapper()
{
if (!m_navigationWrapper) {
m_navigationWrapper.reset(new NavigationModeWrapper<QTreeWidget, QTreeWidgetItem>(m_tree));
}
return m_navigationWrapper.data();
}
TitleBar *OutlineViewer::setupTitleBar(const QString &p_title, QWidget *p_parent) TitleBar *OutlineViewer::setupTitleBar(const QString &p_title, QWidget *p_parent)
{ {
auto titleBar = new TitleBar(p_title, TitleBar::Action::None, p_parent); auto titleBar = new TitleBar(p_title, TitleBar::Action::None, p_parent);

2
src/widgets/outlineviewer.h
View File

@ -26,6 +26,8 @@ namespace vnotex
void setOutlineProvider(const QSharedPointer<OutlineProvider> &p_provider); void setOutlineProvider(const QSharedPointer<OutlineProvider> &p_provider);
NavigationModeWrapper<QTreeWidget, QTreeWidgetItem> *getNavigationModeWrapper();
static void updateTreeToOutline(QTreeWidget *p_tree, const Outline &p_outline); static void updateTreeToOutline(QTreeWidget *p_tree, const Outline &p_outline);
signals: signals: