From 1031656784e8741b4d837530da92cfe807804319 Mon Sep 17 00:00:00 2001 From: zhangjiarui Date: Tue, 8 Sep 2026 16:32:10 +0800 Subject: [PATCH 1/2] fix(viewer): enable navigation in the image information dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Forward Left and Right shortcuts from the image information dialog to the existing image navigation handlers and remove the incorrect focus call. 将图片信息窗口的左右方向键转发至现有图片切换处理，并移除错误的 焦点设置。 Log: 修复打开图片信息后无法使用左右方向键切换图片的问题 PMS: BUG-375299 Influence: 图片信息窗口打开时可使用左右方向键切图并同步刷新图片信息。 --- libimageviewer/viewpanel/viewpanel.cpp | 4 ++-- libimageviewer/widgets/extensionpanel.cpp | 9 +++++++++ libimageviewer/widgets/extensionpanel.h | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libimageviewer/viewpanel/viewpanel.cpp b/libimageviewer/viewpanel/viewpanel.cpp index 4623d58b..b2708154 100644 --- a/libimageviewer/viewpanel/viewpanel.cpp +++ b/libimageviewer/viewpanel/viewpanel.cpp @@ -448,6 +448,8 @@ void LibViewPanel::initExtensionPanel() if (!m_extensionPanel) { m_extensionPanel = new ExtensionPanel(this); connect(m_info, &LibImageInfoWidget::extensionPanelHeight, m_extensionPanel, &ExtensionPanel::updateRectWithContent); + connect(m_extensionPanel, &ExtensionPanel::previousRequested, this, &LibViewPanel::showPrevious); + connect(m_extensionPanel, &ExtensionPanel::nextRequested, this, &LibViewPanel::showNext); connect(m_view, &LibImageGraphicsView::clicked, this, [ = ] { this->m_extensionPanel->hide(); this->m_info->show(); @@ -1906,8 +1908,6 @@ void LibViewPanel::onMenuItemClicked(QAction *action) m_info->setImagePath(path); //执行强制重刷 m_info->show(); m_extensionPanel->setContent(m_info); - //清除焦点 - m_extensionPanel->setFocus(Qt::NoFocusReason); m_extensionPanel->show(); if (this->window()->isFullScreen() || this->window()->isMaximized()) { m_extensionPanel->move(this->window()->width() - m_extensionPanel->width() - 24, diff --git a/libimageviewer/widgets/extensionpanel.cpp b/libimageviewer/widgets/extensionpanel.cpp index 1bb194eb..312e6121 100755 --- a/libimageviewer/widgets/extensionpanel.cpp +++ b/libimageviewer/widgets/extensionpanel.cpp @@ -192,6 +192,15 @@ void ExtensionPanel::init() // emit hideExtensionPanel(); this->hide(); }); + + QShortcut *previousShortcut = new QShortcut(QKeySequence(Qt::Key_Left), this); + previousShortcut->setContext(Qt::WindowShortcut); + connect(previousShortcut, &QShortcut::activated, this, &ExtensionPanel::previousRequested); + + QShortcut *nextShortcut = new QShortcut(QKeySequence(Qt::Key_Right), this); + nextShortcut->setContext(Qt::WindowShortcut); + connect(nextShortcut, &QShortcut::activated, this, &ExtensionPanel::nextRequested); + // Esc m_scEsc = new QShortcut(QKeySequence(Qt::Key_Escape), this); m_scEsc->setContext(Qt::WindowShortcut); diff --git a/libimageviewer/widgets/extensionpanel.h b/libimageviewer/widgets/extensionpanel.h index e6cb63e5..4449f032 100755 --- a/libimageviewer/widgets/extensionpanel.h +++ b/libimageviewer/widgets/extensionpanel.h @@ -30,6 +30,8 @@ class ExtensionPanel : public DAbstractDialog void init(); signals: void requestStopAnimation(); + void previousRequested(); + void nextRequested(); public slots: void updateRectWithContent(int height); private: From 1fc5c726ccc72de0aaa5d3a7a2954d299d0c13b7 Mon Sep 17 00:00:00 2001 From: zhangjiarui Date: Tue, 8 Sep 2026 16:35:11 +0800 Subject: [PATCH 2/2] chore: update SPDX copyright years MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the copyright year range in files modified for BUG-375299. 更新 BUG-375299 修改文件的版权年份范围。 Log: 更新修改文件的 SPDX 版权年份 PMS: BUG-375299 Influence: 仅更新版权声明，不影响运行行为。 --- libimageviewer/viewpanel/viewpanel.cpp | 2 +- libimageviewer/widgets/extensionpanel.cpp | 2 +- libimageviewer/widgets/extensionpanel.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libimageviewer/viewpanel/viewpanel.cpp b/libimageviewer/viewpanel/viewpanel.cpp index b2708154..c33ebff1 100644 --- a/libimageviewer/viewpanel/viewpanel.cpp +++ b/libimageviewer/viewpanel/viewpanel.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2020 - 2024 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2020-2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/libimageviewer/widgets/extensionpanel.cpp b/libimageviewer/widgets/extensionpanel.cpp index 312e6121..5b26cde0 100755 --- a/libimageviewer/widgets/extensionpanel.cpp +++ b/libimageviewer/widgets/extensionpanel.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2020 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2020-2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/libimageviewer/widgets/extensionpanel.h b/libimageviewer/widgets/extensionpanel.h index 4449f032..5b74960f 100755 --- a/libimageviewer/widgets/extensionpanel.h +++ b/libimageviewer/widgets/extensionpanel.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2020 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2020-2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later