From 93f613592b4c121bd6d4782eec961d4ff66c6e4c Mon Sep 17 00:00:00 2001 From: "zoujunnan@kylinos.cn" Date: Tue, 3 Jan 2023 16:40:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(=E4=BB=85bug=E4=BF=AE=E5=A4=8D=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E5=85=B6=E4=BB=96=E5=BD=B1=E5=93=8D):=20issue?= =?UTF-8?q?=EF=BC=9Awayland=E4=B8=8B=E7=9C=8B=E5=9B=BE=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 9 +++++++++ showImageComponent.qml | 7 +++++++ src/view/showimagewidget.cpp | 8 ++++++++ src/view/showimagewidget.h | 3 +++ 4 files changed, 27 insertions(+) diff --git a/debian/changelog b/debian/changelog index 351f946..779338d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +kylin-photo-viewer (1.3.0.3-ok9) yangtze; urgency=medium + + * BUG号：无 + * 需求号：无 + * 其他改动说明：issue【看图】【需求15193】无法复制图片 + * 影响域：仅bug修复，无其他影响 + + -- zoujunnan Tue, 03 Jan 2023 18:43:28 +0800 + kylin-photo-viewer (1.3.0.3-ok8) yangtze; urgency=medium * BUG号：无 diff --git a/showImageComponent.qml b/showImageComponent.qml index e97c493..76311b6 100644 --- a/showImageComponent.qml +++ b/showImageComponent.qml @@ -16,7 +16,14 @@ Rectangle { property bool mouseIsDoubleClick: false signal changeImage(var nextOrBack) signal doubleSignal() + signal copyShortCuts() property int signListLength: variables.operateTime + Shortcut { + sequence: StandardKey.Copy + onActivated: { + copyShortCuts() + } + } Variables { diff --git a/src/view/showimagewidget.cpp b/src/view/showimagewidget.cpp index d02a6fe..eb3797f 100644 --- a/src/view/showimagewidget.cpp +++ b/src/view/showimagewidget.cpp @@ -428,6 +428,7 @@ void ShowImageWidget::copy() } QMimeData *data = new QMimeData; data->setUrls(copyfile); + data->setText(m_imagePath); QClipboard *clipBoard = QApplication::clipboard(); clipBoard->setMimeData(data); @@ -1116,6 +1117,7 @@ void ShowImageWidget::initQmlObject() QObject::connect(m_qmlObj, SIGNAL(sendDropImagePath(QVariant)), this, SLOT(getDropImagePath(QVariant))); QObject::connect(m_qmlObj, SIGNAL(changeImage(QVariant)), this, SLOT(needChangeImage(QVariant))); QObject::connect(m_qmlObj, SIGNAL(doubleSignal()), this, SIGNAL(doubleEventToMainWid())); + QObject::connect(m_qmlObj, SIGNAL(copyShortCuts()), this, SLOT(copyFromQml())); //操作方式 connect(InteractiveQml::getInstance(), SIGNAL(operateWayChanged(QVariant)), m_qmlObj, SLOT(setOperateWay(QVariant))); @@ -1401,6 +1403,12 @@ void ShowImageWidget::qmlAndWidgetConnectMovie(QObject *obj) connect(obj, SIGNAL(buriedPoint()), this, SLOT(zoomBuriedPoint())); } +void ShowImageWidget::copyFromQml() +{ + m_copyFromQml = true; + this->copy(); +} + void ShowImageWidget::zoomBuriedPoint() { if (m_timer->isActive()) { diff --git a/src/view/showimagewidget.h b/src/view/showimagewidget.h index dbcc8e3..c5d5d81 100644 --- a/src/view/showimagewidget.h +++ b/src/view/showimagewidget.h @@ -94,6 +94,7 @@ public Q_SLOTS: void textPaint(QVariant textContent, QVariant startPos, QVariant type); void blurPaint(QVariant blurRect); void zoomBuriedPoint(); + void copyFromQml(); private: @@ -242,6 +243,8 @@ private: bool m_hasConnectedNormal = false; bool m_hasConnectedMovie = false; + bool m_copyFromQml = false; + Q_SIGNALS: void perRate(QString num, QString path); //改变工具栏的缩小的百分比 void toShowImage(); //告诉主界面需要show和hide的控件 From 8fa1fa7ded92ecfb46524d773b8708a5af010acf Mon Sep 17 00:00:00 2001 From: "zoujunnan@kylinos.cn" Date: Wed, 4 Jan 2023 10:27:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(=E4=BF=AE=E6=94=B9changelog=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0painterpath=E5=A4=B4=E6=96=87=E4=BB=B6):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9changelog=EF=BC=8C=E6=B7=BB=E5=8A=A0painterpa?= =?UTF-8?q?th=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 4 ++-- src/view/brushsettings.h | 1 + src/view/painterthick.h | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 779338d..5f35178 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ kylin-photo-viewer (1.3.0.3-ok9) yangtze; urgency=medium - * BUG号：无 + * BUG号：# issue I64UTA【看图】【需求15193】无法复制图片 * 需求号：无 - * 其他改动说明：issue【看图】【需求15193】无法复制图片 + * 其他改动说明：无 * 影响域：仅bug修复，无其他影响 -- zoujunnan Tue, 03 Jan 2023 18:43:28 +0800 diff --git a/src/view/brushsettings.h b/src/view/brushsettings.h index db4df7e..8cf1579 100644 --- a/src/view/brushsettings.h +++ b/src/view/brushsettings.h @@ -21,6 +21,7 @@ #include #include #include +#include #include "sizedate.h" #include "painterthick.h" #include "global/variable.h" diff --git a/src/view/painterthick.h b/src/view/painterthick.h index 5f89dbc..b40f5cd 100644 --- a/src/view/painterthick.h +++ b/src/view/painterthick.h @@ -5,16 +5,17 @@ #include #include #include +#include class PainterThick : public QCheckBox { Q_OBJECT public: PainterThick(int diameter, bool type, QColor color, QWidget *parent = nullptr); void paintEvent(QPaintEvent *event); - int m_diameter;//按钮直径或长宽 - bool m_type = false;//判断是圆形粗细设置还是方形颜色设置--默认为圆形 - QColor m_color;//按钮颜色 - QString m_themeChange;//主题变化 + int m_diameter; //按钮直径或长宽 + bool m_type = false; //判断是圆形粗细设置还是方形颜色设置--默认为圆形 + QColor m_color; //按钮颜色 + QString m_themeChange; //主题变化 }; #endif // PAINTERTHICK_H From ce3f654b0ffc7a4e686a4843826366fbfbc73e28 Mon Sep 17 00:00:00 2001 From: "zoujunnan@kylinos.cn" Date: Wed, 4 Jan 2023 14:08:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5f35178..104048c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -kylin-photo-viewer (1.3.0.3-ok9) yangtze; urgency=medium +kylin-photo-viewer (1.3.0.3-ok9build1) yangtze; urgency=medium * BUG号：# issue I64UTA【看图】【需求15193】无法复制图片 * 需求号：无 From 4469c713b4591618958f2d0bf6b2b5380e14b67b Mon Sep 17 00:00:00 2001 From: "zoujunnan@kylinos.cn" Date: Wed, 4 Jan 2023 16:22:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 104048c..2a251fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -kylin-photo-viewer (1.3.0.3-ok9build1) yangtze; urgency=medium +kylin-photo-viewer (1.3.0.3-ok9build2) yangtze; urgency=medium * BUG号：# issue I64UTA【看图】【需求15193】无法复制图片 * 需求号：无