diff --git a/src/core/configmgr.cpp b/src/core/configmgr.cpp index f9848e55..31e1e159 100644 --- a/src/core/configmgr.cpp +++ b/src/core/configmgr.cpp @@ -128,6 +128,7 @@ void ConfigMgr::checkAppConfig() auto defaultVersion = MainConfig::getVersion(defaultSettings->getJson()); auto appVersion = MainConfig::getVersion(appSettings->getJson()); if (defaultVersion != appVersion) { + qInfo() << "new version" << appVersion << defaultVersion; needUpdate = true; } } diff --git a/src/widgets/mainwindow.cpp b/src/widgets/mainwindow.cpp index b4af0be8..37b88d29 100644 --- a/src/widgets/mainwindow.cpp +++ b/src/widgets/mainwindow.cpp @@ -413,6 +413,8 @@ void MainWindow::setupOutlineViewer() m_outlineViewer = new OutlineViewer(QString(), this); m_outlineViewer->setObjectName("OutlineViewer.vnotex"); + NavigationModeMgr::getInst().registerNavigationTarget(m_outlineViewer->getNavigationModeWrapper()); + connect(m_viewArea, &ViewArea::currentViewWindowChanged, this, [this]() { auto win = m_viewArea->getCurrentViewWindow(); diff --git a/src/widgets/outlineviewer.cpp b/src/widgets/outlineviewer.cpp index bf20dcc2..91347f47 100644 --- a/src/widgets/outlineviewer.cpp +++ b/src/widgets/outlineviewer.cpp @@ -61,8 +61,6 @@ void OutlineViewer::setupUI(const QString &p_title) TreeWidget::setupSingleColumnHeaderlessTree(m_tree, false, false); m_tree->setSelectionMode(QAbstractItemView::SingleSelection); TreeWidget::showHorizontalScrollbar(m_tree); - m_navigationWrapper.reset(new NavigationModeWrapper(m_tree)); - NavigationModeMgr::getInst().registerNavigationTarget(m_navigationWrapper.data()); mainLayout->addWidget(m_tree); connect(m_tree, &QTreeWidget::currentItemChanged, this, [this](QTreeWidgetItem *p_cur, QTreeWidgetItem *p_pre) { @@ -79,6 +77,14 @@ void OutlineViewer::setupUI(const QString &p_title) setFocusProxy(m_tree); } +NavigationModeWrapper *OutlineViewer::getNavigationModeWrapper() +{ + if (!m_navigationWrapper) { + m_navigationWrapper.reset(new NavigationModeWrapper(m_tree)); + } + return m_navigationWrapper.data(); +} + TitleBar *OutlineViewer::setupTitleBar(const QString &p_title, QWidget *p_parent) { auto titleBar = new TitleBar(p_title, TitleBar::Action::None, p_parent); diff --git a/src/widgets/outlineviewer.h b/src/widgets/outlineviewer.h index e0f68735..5d5c71dc 100644 --- a/src/widgets/outlineviewer.h +++ b/src/widgets/outlineviewer.h @@ -26,6 +26,8 @@ namespace vnotex void setOutlineProvider(const QSharedPointer &p_provider); + NavigationModeWrapper *getNavigationModeWrapper(); + static void updateTreeToOutline(QTreeWidget *p_tree, const Outline &p_outline); signals: