Skip to content

Commit 72a1022

Browse files
deepin-ci-robot18202781743
deepin-ci-robot
authored and
18202781743
committed
sync: from linuxdeepin/dtkwidget
Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: linuxdeepin/dtkwidget#691
1 parent 7db9850 commit 72a1022

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+430
-334
lines changed

‎include/DWidget/DBlurEffectWithBorderWidget‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "dblureffectwithborderwidget.h"

‎include/DWidget/DPrintPreviewSettingInfo‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "dprintpreviewsettinginfo.h"

‎include/DWidget/DPrintPreviewSettingInterface‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "dprintpreviewsettinginterface.h"

‎include/widgets/dblureffectwithborderwidget.h‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// SPDX-FileCopyrightText: 2017 - 2024 UnionTech Software Technology Co., Ltd.
2+
//
3+
// SPDX-License-Identifier: LGPL-3.0-or-later
4+
#ifndef DBLUREFFECTWITHBORDERWIDGET_H
5+
#define DBLUREFFECTWITHBORDERWIDGET_H
6+
7+
#include <dblureffectwidget.h>
8+
9+
DWIDGET_BEGIN_NAMESPACE
10+
11+
class DBlurEffectWithBorderWidgetPrivate;
12+
class DBlurEffectWithBorderWidget : public DBlurEffectWidget
13+
{
14+
Q_OBJECT
15+
public:
16+
explicit DBlurEffectWithBorderWidget(QWidget *parent = nullptr);
17+
18+
protected:
19+
void paintEvent(QPaintEvent *e) override;
20+
21+
private:
22+
D_DECLARE_PRIVATE(DBlurEffectWithBorderWidget)
23+
};
24+
25+
DWIDGET_END_NAMESPACE
26+
27+
#endif // DBLUREFFECTWITHBORDERWIDGET_H

‎include/widgets/dpasswordedit.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class LIBDTKWIDGETSHARED_EXPORT DPasswordEdit : public DLineEdit
3333
Q_PRIVATE_SLOT(d_func(), void _q_toggleEchoMode())
3434

3535
void changeEvent(QEvent *event) override;
36+
bool eventFilter(QObject* watcher, QEvent* event) override;
3637
};
3738

3839
DWIDGET_END_NAMESPACE

‎src/translations/dtkwidget.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ SPDX-License-Identifier: LGPL-3.0-or-later
234234
<location filename="../widgets/dprintpreviewdialog.cpp" line="1679"/>
235235
<location filename="../widgets/dprintpreviewdialog.cpp" line="1694"/>
236236
<source>Color</source>
237-
<translation>Color</translation>
237+
<translation type="vanished">Color</translation>
238238
</message>
239239
<message>
240240
<location filename="../widgets/dprintpreviewdialog.cpp" line="475"/>
@@ -539,6 +539,10 @@ SPDX-License-Identifier: LGPL-3.0-or-later
539539
<source>Images</source>
540540
<translation>Images</translation>
541541
</message>
542+
<message>
543+
<source>Full Color</source>
544+
<translation>Full Color</translation>
545+
</message>
542546
</context>
543547
<context>
544548
<name>DPrintPreviewWidget</name>

‎src/translations/dtkwidget_zh_CN.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ SPDX-License-Identifier: LGPL-3.0-or-later
234234
<location filename="../widgets/dprintpreviewdialog.cpp" line="1679"/>
235235
<location filename="../widgets/dprintpreviewdialog.cpp" line="1694"/>
236236
<source>Color</source>
237-
<translation>彩色</translation>
237+
<translation type="vanished">颜色</translation>
238238
</message>
239239
<message>
240240
<location filename="../widgets/dprintpreviewdialog.cpp" line="475"/>
@@ -539,6 +539,10 @@ SPDX-License-Identifier: LGPL-3.0-or-later
539539
<source>Images</source>
540540
<translation>图片文件</translation>
541541
</message>
542+
<message>
543+
<source>Full Color</source>
544+
<translation>彩色</translation>
545+
</message>
542546
</context>
543547
<context>
544548
<name>DPrintPreviewWidget</name>

‎src/translations/dtkwidget_zh_HK.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ SPDX-License-Identifier: LGPL-3.0-or-later
234234
<location filename="../widgets/dprintpreviewdialog.cpp" line="1679"/>
235235
<location filename="../widgets/dprintpreviewdialog.cpp" line="1694"/>
236236
<source>Color</source>
237-
<translation>彩色</translation>
237+
<translation type="vanished">顏色</translation>
238238
</message>
239239
<message>
240240
<location filename="../widgets/dprintpreviewdialog.cpp" line="475"/>
@@ -539,6 +539,10 @@ SPDX-License-Identifier: LGPL-3.0-or-later
539539
<source>Images</source>
540540
<translation>圖片文件</translation>
541541
</message>
542+
<message>
543+
<source>Full Color</source>
544+
<translation>彩色</translation>
545+
</message>
542546
</context>
543547
<context>
544548
<name>DPrintPreviewWidget</name>

‎src/translations/dtkwidget_zh_TW.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ SPDX-License-Identifier: LGPL-3.0-or-later
234234
<location filename="../widgets/dprintpreviewdialog.cpp" line="1679"/>
235235
<location filename="../widgets/dprintpreviewdialog.cpp" line="1694"/>
236236
<source>Color</source>
237-
<translation>彩色</translation>
237+
<translation type="vanished">顏色</translation>
238238
</message>
239239
<message>
240240
<location filename="../widgets/dprintpreviewdialog.cpp" line="475"/>
@@ -539,6 +539,10 @@ SPDX-License-Identifier: LGPL-3.0-or-later
539539
<source>Images</source>
540540
<translation>圖片文件</translation>
541541
</message>
542+
<message>
543+
<source>Full Color</source>
544+
<translation>彩色</translation>
545+
</message>
542546
</context>
543547
<context>
544548
<name>DPrintPreviewWidget</name>

‎src/widgets/assets/icons/dark/actions/splitscreen_left_36px.svg‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)