diff -Nru deepin-screenshot-4.0.10.4/CHANGELOG.md deepin-screenshot-4.0.11/CHANGELOG.md --- deepin-screenshot-4.0.10.4/CHANGELOG.md 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/CHANGELOG.md 2018-03-07 08:46:04.000000000 +0000 @@ -1,9 +1,17 @@ -deepin-screenshot(4.0.10.4) 2017-11-24 - *Release 4.0.10.4 -deepin-screenshot(4.0.10.3) 2017-11-7 - *Release 4.0.10.3 -deepin-screenshot(4.0.10.2) 2017-11-7 - *Release 4.0.10.2 - update some translations. -deepin-screenshot(4.0.10.1) 2017-11-7 - *Release 4.0.10.1 + +## 4.0.11 (2018-03-07) + + +#### Bug Fixes + +* top level window shortcut misplaced ([83e8b94c](83e8b94c)) +* Adapt lintian ([51eef7f5](51eef7f5)) +* correct a typo in screenshot.cpp ([14f4b936](14f4b936)) +* check controlcenter and hotzone dbus is valid ([32625d1a](32625d1a)) +* **hidpi:** window background misplaced ([a3e50aa5](a3e50aa5)) + +#### Features + +* add manual id ([15cd1c85](15cd1c85)) +* add dbus service ([d1bdd2a4](d1bdd2a4)) +* **hidpi:** basic hidpi support ([575a326e](575a326e)) diff -Nru deepin-screenshot-4.0.10.4/controller/menucontroller.cpp deepin-screenshot-4.0.11/controller/menucontroller.cpp --- deepin-screenshot-4.0.10.4/controller/menucontroller.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/controller/menucontroller.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/controller/menucontroller.h deepin-screenshot-4.0.11/controller/menucontroller.h --- deepin-screenshot-4.0.10.4/controller/menucontroller.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/controller/menucontroller.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbuscontrolcenter.cpp deepin-screenshot-4.0.11/dbusinterface/dbuscontrolcenter.cpp --- deepin-screenshot-4.0.10.4/dbusinterface/dbuscontrolcenter.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbuscontrolcenter.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbuscontrolcenter.h deepin-screenshot-4.0.11/dbusinterface/dbuscontrolcenter.h --- deepin-screenshot-4.0.10.4/dbusinterface/dbuscontrolcenter.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbuscontrolcenter.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbusinterface.pri deepin-screenshot-4.0.11/dbusinterface/dbusinterface.pri --- deepin-screenshot-4.0.10.4/dbusinterface/dbusinterface.pri 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbusinterface.pri 2018-03-07 08:46:04.000000000 +0000 @@ -2,12 +2,10 @@ $$PWD/dbuscontrolcenter.h \ $$PWD/dbusnotify.h \ $$PWD/dbussoundeffect.h \ - $$PWD/dbuszone.h \ - $$PWD/dbusscreenshot.h + $$PWD/dbuszone.h SOURCES += \ $$PWD/dbuscontrolcenter.cpp \ $$PWD/dbusnotify.cpp \ $$PWD/dbussoundeffect.cpp \ - $$PWD/dbuszone.cpp \ - $$PWD/dbusscreenshot.cpp + $$PWD/dbuszone.cpp diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbusnotify.cpp deepin-screenshot-4.0.11/dbusinterface/dbusnotify.cpp --- deepin-screenshot-4.0.10.4/dbusinterface/dbusnotify.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbusnotify.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbusnotify.h deepin-screenshot-4.0.11/dbusinterface/dbusnotify.h --- deepin-screenshot-4.0.10.4/dbusinterface/dbusnotify.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbusnotify.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbusscreenshot.cpp deepin-screenshot-4.0.11/dbusinterface/dbusscreenshot.cpp --- deepin-screenshot-4.0.10.4/dbusinterface/dbusscreenshot.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbusscreenshot.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. - * - * Maintainer: Peng Hui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -c DBusScreenshot -p dbusscreenshot com.deepin.Screenshot.xml - * - * qdbusxml2cpp is Copyright (C) 2016 The Qt Company Ltd. - * - * This is an auto-generated file. - * This file may have been hand-edited. Look for HAND-EDIT comments - * before re-generating it. - */ - -#include "dbusscreenshot.h" - -/* - * Implementation of interface class DBusScreenshot - */ - -const QString SCREENSHOT_DBUS_NAME = "com.deepin.Screenshot"; -const QString SCREENSHOT_DBUS_PATH = "/com/deepin/Screenshot"; - -DBusScreenshot::DBusScreenshot(QObject* parent) - : QDBusAbstractInterface(SCREENSHOT_DBUS_NAME, SCREENSHOT_DBUS_PATH, - staticInterfaceName(), QDBusConnection::sessionBus(), parent) - { - QDBusConnection::sessionBus().connect(this->service(), this->path(), - "org.freedesktop.DBus.Properties", "PropertiesChanged","sa{sv}as", - this, SLOT(__propertyChanged__(QDBusMessage))); - } - - DBusScreenshot::~DBusScreenshot() - { - QDBusConnection::sessionBus().disconnect(service(), path(), - "org.freedesktop.DBus.Properties", "PropertiesChanged", "sa{sv}as", - this, SLOT(propertyChanged(QDBusMessage))); - } - - diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbusscreenshot.h deepin-screenshot-4.0.11/dbusinterface/dbusscreenshot.h --- deepin-screenshot-4.0.10.4/dbusinterface/dbusscreenshot.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbusscreenshot.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -c DBusScreenshot -p dbusscreenshot screenshot.xml - * - * qdbusxml2cpp is Copyright (C) 2016 The Qt Company Ltd. - * - * This is an auto-generated file. - * Do not edit! All changes made to it will be lost. - */ - -#ifndef DBUSSCREENSHOT_H -#define DBUSSCREENSHOT_H - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Proxy class for interface com.deepin.Screenshot - */ -class DBusScreenshot: public QDBusAbstractInterface -{ - Q_OBJECT -public: - static inline const char *staticInterfaceName() - { return "com.deepin.Screenshot"; } - -public: - DBusScreenshot(QObject *parent = 0); - - ~DBusScreenshot(); - -public Q_SLOTS: // METHODS - inline QDBusPendingReply<> DelayScreenshot(qlonglong in0) - { - QList argumentList; - argumentList << QVariant::fromValue(in0); - return asyncCallWithArgumentList(QStringLiteral("DelayScreenshot"), argumentList); - } - - inline QDBusPendingReply<> FullscreenScreenshot() - { - QList argumentList; - return asyncCallWithArgumentList(QStringLiteral("FullscreenScreenshot"), argumentList); - } - - inline QDBusPendingReply<> NoNotifyScreenshot() - { - QList argumentList; - return asyncCallWithArgumentList(QStringLiteral("NoNotifyScreenshot"), argumentList); - } - - inline QDBusPendingReply<> SavePathScreenshot(const QString &in0) - { - QList argumentList; - argumentList << QVariant::fromValue(in0); - return asyncCallWithArgumentList(QStringLiteral("SavePathScreenshot"), argumentList); - } - - inline QDBusPendingReply<> StartScreenshot() - { - QList argumentList; - return asyncCallWithArgumentList(QStringLiteral("StartScreenshot"), argumentList); - } - - inline QDBusPendingReply<> TopWindowScreenshot() - { - QList argumentList; - return asyncCallWithArgumentList(QStringLiteral("TopWindowScreenshot"), argumentList); - } - -Q_SIGNALS: // SIGNALS -}; - -namespace com { - namespace deepin { - typedef ::DBusScreenshot Screenshot; - } -} -#endif diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbussoundeffect.cpp deepin-screenshot-4.0.11/dbusinterface/dbussoundeffect.cpp --- deepin-screenshot-4.0.10.4/dbusinterface/dbussoundeffect.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbussoundeffect.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbussoundeffect.h deepin-screenshot-4.0.11/dbusinterface/dbussoundeffect.h --- deepin-screenshot-4.0.10.4/dbusinterface/dbussoundeffect.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbussoundeffect.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbuszone.cpp deepin-screenshot-4.0.11/dbusinterface/dbuszone.cpp --- deepin-screenshot-4.0.10.4/dbusinterface/dbuszone.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbuszone.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru deepin-screenshot-4.0.10.4/dbusinterface/dbuszone.h deepin-screenshot-4.0.11/dbusinterface/dbuszone.h --- deepin-screenshot-4.0.10.4/dbusinterface/dbuszone.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusinterface/dbuszone.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * Peng Hui diff -Nru deepin-screenshot-4.0.10.4/dbusservice/dbusscreenshotservice.cpp deepin-screenshot-4.0.11/dbusservice/dbusscreenshotservice.cpp --- deepin-screenshot-4.0.10.4/dbusservice/dbusscreenshotservice.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusservice/dbusscreenshotservice.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/dbusservice/dbusscreenshotservice.h deepin-screenshot-4.0.11/dbusservice/dbusscreenshotservice.h --- deepin-screenshot-4.0.10.4/dbusservice/dbusscreenshotservice.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/dbusservice/dbusscreenshotservice.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/debian/changelog deepin-screenshot-4.0.11/debian/changelog --- deepin-screenshot-4.0.10.4/debian/changelog 2018-02-05 01:35:26.000000000 +0000 +++ deepin-screenshot-4.0.11/debian/changelog 2018-05-07 03:19:07.000000000 +0000 @@ -1,23 +1,11 @@ -deepin-screenshot (4.0.10.4-2) artful; urgency=medium +deepin-screenshot (4.0.11-1.1) bionic; urgency=medium - * disable dman install. + * Non-maintainer upload. - -- lilongyu Mon, 05 Feb 2018 09:35:18 +0800 + -- lilongyu Mon, 07 May 2018 11:19:01 +0800 -deepin-screenshot (4.0.10.4-1) artful; urgency=medium +deepin-screenshot (4.0.11-1) unstable; urgency=low - * Sync to ppa artful. + * Auto Version update. - -- lilongyu Sun, 03 Dec 2017 21:47:47 +0800 - -deepin-screenshot (4.0.10.4-1) unstable; urgency=medium - - * Release 4.0.10.4. - - -- Deepin Package Builder Sun, 03 Dec 2017 20:22:45 +0800 - -deepin-screenshot (4.0.0) unstable; urgency=medium - - * Initial test - - -- Deepin Packages Builder Wed, 24 Feb 2016 14:15:54 +0800 + -- shuttle Fri, 09 Mar 2018 11:53:52 +0000 diff -Nru deepin-screenshot-4.0.10.4/debian/control deepin-screenshot-4.0.11/debian/control --- deepin-screenshot-4.0.10.4/debian/control 2018-02-05 01:36:07.000000000 +0000 +++ deepin-screenshot-4.0.11/debian/control 2018-03-07 08:46:04.000000000 +0000 @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Deepin Packages Builder -Build-Depends: debhelper (>=9), qt5-qmake, qt5-default, qtbase5-dev, pkg-config, libqt5svg5-dev, libqt5x11extras5-dev, +Build-Depends: debhelper (>=9), qt5-qmake, qtbase5-dev, pkg-config, libqt5svg5-dev, libqt5x11extras5-dev, qttools5-dev-tools, libxcb-util0-dev, libstartup-notification0-dev, qtbase5-private-dev,qtmultimedia5-dev, x11proto-xext-dev, libmtdev-dev, libegl1-mesa-dev, x11proto-record-dev,libxtst-dev, libudev-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libxrender-dev, libdtkwidget-dev, libdtkwm-dev, deepin-gettext-tools @@ -12,6 +12,6 @@ Package: deepin-screenshot Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: deepin-shortcut-viewer (>> 1.3.1-1), deepin-notifications (>> 2.3.8-1) +Recommends: deepin-shortcut-viewer, deepin-notifications Description: Advanced screen shoting tool Easy-to-use screenshot tool for linuxdeepin desktop environment. diff -Nru deepin-screenshot-4.0.10.4/debian/patches/disable-dman-install.patch deepin-screenshot-4.0.11/debian/patches/disable-dman-install.patch --- deepin-screenshot-4.0.10.4/debian/patches/disable-dman-install.patch 2018-02-05 01:35:15.000000000 +0000 +++ deepin-screenshot-4.0.11/debian/patches/disable-dman-install.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ ---- deepin-screenshot-4.0.10.4.orig/deepin-screenshot.pro -+++ deepin-screenshot-4.0.10.4/deepin-screenshot.pro -@@ -42,7 +42,6 @@ include (dbusinterface/dbusinterface.pri - - BINDIR = $$PREFIX/bin - APPSHAREDIR = $$PREFIX/share/deepin-screenshot --MANDIR = $$PREFIX/share/dman/deepin-screenshot - MANICONDIR = $$PREFIX/share/icons/hicolor/scalable/apps - APPICONDIR = $$PREFIX/share/icons/deepin/apps/scalable - -@@ -56,10 +55,6 @@ desktop.files = deepin-screenshot.deskt - icons.path = $$APPSHAREDIR/icons - icons.files = resources/images/* - --manual.path = $$MANDIR --manual.files = doc/* --manual_icon.path = $$MANICONDIR --manual_icon.files = doc/common/deepin-screenshot.svg - app_icon.path = $$APPICONDIR - app_icon.files = doc/common/deepin-screenshot.svg - diff -Nru deepin-screenshot-4.0.10.4/debian/patches/series deepin-screenshot-4.0.11/debian/patches/series --- deepin-screenshot-4.0.10.4/debian/patches/series 2018-02-05 01:35:10.000000000 +0000 +++ deepin-screenshot-4.0.11/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -disable-dman-install.patch diff -Nru deepin-screenshot-4.0.10.4/debian/rules deepin-screenshot-4.0.11/debian/rules --- deepin-screenshot-4.0.10.4/debian/rules 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/debian/rules 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export QT_SELECT=5 + %: dh $@ --parallel diff -Nru deepin-screenshot-4.0.10.4/deepin-screenshot.desktop deepin-screenshot-4.0.11/deepin-screenshot.desktop --- deepin-screenshot-4.0.10.4/deepin-screenshot.desktop 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/deepin-screenshot.desktop 2018-03-07 08:46:04.000000000 +0000 @@ -7,6 +7,7 @@ Name=Deepin Screenshot StartupNotify=false Type=Application +X-Deepin-ManualID=deepin-screenshot # Translations: # Do not manually modify! @@ -16,9 +17,10 @@ Comment[ast]=Aplicación de captura de pantalla Comment[az]=Ekran çəkmə tətbiqetməsi Comment[bg]=Програма за заснемане на екрана +Comment[ca]=Aplicació per fer una captura de la pantalla Comment[cs]=Program na zachytávání obrazovky Comment[da]=Skærmbilledprogram -Comment[de]=Bildschirmfoto Aufnahmesoftware +Comment[de]=Bildschirmfoto-Aufnahmesoftware Comment[el]=Εφαρμογή καταγραφής οθόνης Comment[en_AU]=Screen capture application Comment[eo]=Ekrankaptado apliko @@ -34,7 +36,7 @@ Comment[he]=תוכנת צילום מסך Comment[hi_IN]=अनुप्रयोग का दृश्य लें Comment[hr]=Aplikacija snimke zaslona -Comment[hu]=Képernyőkép rögzítő alkalmazás +Comment[hu]=Képernyőkép mentés készítő alkalmazás Comment[hy]=Էկրանից նկար ստեղծող հավելված Comment[id]=Aplikasi penangkap layar Comment[it]=Applicazione per screenshot @@ -58,16 +60,17 @@ Comment[uk]=Програма для створення знімків екрана Comment[zh_CN]=屏幕截图程序 Comment[zh_HK]=螢幕擷取程式 -Comment[zh_TW]=螢幕截圖工具 +Comment[zh_TW]=具編輯功能的螢幕截圖工具 GenericName[am]=መመልከቻውን ፎቶ ማንሻ መተግበሪያ GenericName[am_ET]=መመልከቻውን ፎቶ ማንሻ መተግበሪያ GenericName[ar]=تطبيق التقاط صور للشاشة GenericName[ast]=Aplicación de captura de pantalla GenericName[az]=Ekran çəkmə tətbiqetməsi GenericName[bg]=Програма за заснемане на екрана +GenericName[ca]=Aplicació per fer una captura de la pantalla GenericName[cs]=Program na zachytávání obrazovky GenericName[da]=Skærmbilledprogram -GenericName[de]=Bildschirmfoto Aufnahmesoftware +GenericName[de]=Bildschirmfoto-Aufnahmesoftware GenericName[el]=Εφαρμογή καταγραφής οθόνης GenericName[en_AU]=Screen capture application GenericName[eo]=Ekrankaptado apliko @@ -83,7 +86,7 @@ GenericName[he]=תוכנת צילום מסך GenericName[hi_IN]=अनुप्रयोग का दृश्य लें GenericName[hr]=Aplikacija snimke zaslona -GenericName[hu]=Képernyőkép rögzítő alkalmazás +GenericName[hu]=Képernyőkép mentés készítő alkalmazás GenericName[hy]=Էկրանից նկար ստեղծող հավելված GenericName[id]=Aplikasi penangkap layar GenericName[it]=Applicazione per screenshot @@ -107,20 +110,21 @@ GenericName[uk]=Програма для створення знімків екрана GenericName[zh_CN]=屏幕截图程序 GenericName[zh_HK]=螢幕擷取程式 -GenericName[zh_TW]=螢幕截圖工具 +GenericName[zh_TW]=具編輯功能的螢幕截圖工具 Name[am]=መመልከቻውን ፎቶ ማንሻ Name[am_ET]=የ ዲፕኢን መመልከቻ ፎቶ Name[ar]=مصور الشاشة ديبين Name[ast]=Capturador Deepin de pantalla Name[az]=Deepin Ekran Görüntüsü Name[bg]=Deepin Снимка на екрана +Name[ca]=Capturador de pantalla del Deepin Name[cs]=Snímek obrazovky Name[da]=Deepin skærmbillede Name[de]=Deepin Screenshot Name[el]=Στιγμιότυπο οθόνης Deepin Name[en_AU]=Deepin Screenshot Name[eo]=Deepin ekranbildo -Name[es]=Captura de pantalla deepin +Name[es]=Capturadora Deepin Name[es_419]=Captura de pantalla Deepin Name[es_AR]=Capturador de Pantalla Deepin Name[es_CL]=Captura de pantalla Deepin @@ -145,7 +149,7 @@ Name[nl]=Deepin Schermafdruk Name[pam]=Deepin Screenshot Name[pl]=Zrzuty ekranu Deepin -Name[pt]=Captura de ecrã Deepin +Name[pt]=Deepin Screenshot Name[pt_BR]=Deepin Screenshot Name[ro]=Captura de ecran Deepin Name[ru]=Приложение для снимков экрана Deepin @@ -167,13 +171,15 @@ # Translations: # Do not manually modify! +Name[am_ET]=የ መመልከቻውን ፎቶ ማዘግያ Name[ar]=تأخير لقطة الشاشة Name[ast]=Retrasar captura Name[bg]=Забавена снимка на екрана +Name[ca]=Ajorna la captura Name[cs]=Zpozdit snímek obrazovky Name[da]=Forsink skærmbillede Name[de]=Bildschirmfoto verzögern -Name[es]=Demora de captura +Name[es]=Captura temporizada Name[es_419]=Retardo de captura Name[fr]=Délai de capture d'écran Name[gl_ES]=Atraso na captura @@ -181,7 +187,10 @@ Name[hu]=Felvétel késleltetése Name[id]=Tangkapan layar tunda Name[it]=Screenshot ritardato +Name[ko]=지연 스크린샷 Name[lt]=Uždelsti ekrano kopiją +Name[ms]=Lengah Cekupan Skrin +Name[nl]=Schermafdruk uitstellen Name[pl]=Opóźnij wykonanie zrzutu ekranu Name[pt]=Atraso da captura Name[pt_BR]=Atraso em captura de tela @@ -189,6 +198,7 @@ Name[sk]=Oneskorená snímka obrazovky Name[sl]=Zamakni slikanje zaslona Name[tr]=Ekran Görüntüsü +Name[uk]=Затримка знімку екрану Name[zh_CN]=延时截图 Name[zh_TW]=延時截圖 @@ -198,9 +208,11 @@ # Translations: # Do not manually modify! +Name[am_ET]=ሙሉ የ መመልከቻ ፎቶ Name[ar]=لقطة لكامل الشاشة Name[ast]=Caputura a pantalla completa Name[bg]=Пълна снимка на екрана +Name[ca]=Captura de pantalla completa Name[cs]=Plný snímek obrazovky Name[da]=Fuldt skærmbillede Name[de]=Vollbildschirm-Foto @@ -212,7 +224,10 @@ Name[hu]=Teljes képernyőkép Name[id]=Tangkapan layar penuh Name[it]=Screenshot +Name[ko]=전체 스크린샷 Name[lt]=Viso ekrano kopija +Name[ms]=Cekupan Skrin Penuh +Name[nl]=Volledige schermafdruk Name[pl]=Zrzut pełnego ekranu Name[pt]=Captura Total Name[pt_BR]=Captura em tela cheia @@ -220,6 +235,7 @@ Name[sk]=Plná snímka obrazovky Name[sl]=Zajem celega zaslona Name[tr]=Tam Ekran Görüntüsü +Name[uk]=Повний знімок екрана Name[zh_CN]=全屏截图 Name[zh_TW]=全螢幕截圖 diff -Nru deepin-screenshot-4.0.10.4/eventcontainer.cpp deepin-screenshot-4.0.11/eventcontainer.cpp --- deepin-screenshot-4.0.10.4/eventcontainer.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/eventcontainer.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/eventcontainer.h deepin-screenshot-4.0.11/eventcontainer.h --- deepin-screenshot-4.0.10.4/eventcontainer.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/eventcontainer.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/main.cpp deepin-screenshot-4.0.11/main.cpp --- deepin-screenshot-4.0.10.4/main.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/main.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * @@ -26,7 +26,6 @@ #include "screenshot.h" #include "dbusservice/dbusscreenshotservice.h" -#include "dbusinterface/dbusscreenshot.h" DWIDGET_USE_NAMESPACE diff -Nru deepin-screenshot-4.0.10.4/mainwindow.cpp deepin-screenshot-4.0.11/mainwindow.cpp --- deepin-screenshot-4.0.10.4/mainwindow.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/mainwindow.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * @@ -1081,9 +1081,15 @@ this->hide(); emit this->hideScreenshotUI(); + + const qreal ratio = this->devicePixelRatioF(); + QRect target( m_recordX * ratio, + m_recordY * ratio, + m_recordWidth * ratio, + m_recordHeight * ratio ); + // using namespace utils; - QPixmap screenShotPix = m_backgroundPixmap.copy( - m_recordX, m_recordY, m_recordWidth, m_recordHeight); + QPixmap screenShotPix = m_backgroundPixmap.copy(target); qDebug() << "topWindow grabImage is null:" << m_backgroundPixmap.isNull() << QRect(m_recordX, m_recordY, m_recordWidth, m_recordHeight) << "\n" diff -Nru deepin-screenshot-4.0.10.4/mainwindow.h deepin-screenshot-4.0.11/mainwindow.h --- deepin-screenshot-4.0.10.4/mainwindow.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/mainwindow.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/README.md deepin-screenshot-4.0.11/README.md --- deepin-screenshot-4.0.10.4/README.md 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/README.md 2018-03-07 08:46:04.000000000 +0000 @@ -3,6 +3,7 @@ **Description**: This is a default screenshot app for Linux Deepin. ## Dependencies +- Qt (>=5.6), - debhelper (>=9), - qt5-qmake, qt5-default, qtbase5-dev, pkg-config, libqt5svg5-dev, libqt5x11extras5-dev, qttools5-dev-tools, - libxcb-util0-dev, libstartup-notification0-dev, diff -Nru deepin-screenshot-4.0.10.4/screenshot.cpp deepin-screenshot-4.0.11/screenshot.cpp --- deepin-screenshot-4.0.10.4/screenshot.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/screenshot.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/translations/deepin-screenshot_ast.ts deepin-screenshot-4.0.11/translations/deepin-screenshot_ast.ts --- deepin-screenshot-4.0.10.4/translations/deepin-screenshot_ast.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/deepin-screenshot_ast.ts 2018-03-07 08:46:04.000000000 +0000 @@ -4,7 +4,7 @@ select-area - + select-area diff -Nru deepin-screenshot-4.0.10.4/translations/deepin-screenshot_bn.ts deepin-screenshot-4.0.11/translations/deepin-screenshot_bn.ts --- deepin-screenshot-4.0.10.4/translations/deepin-screenshot_bn.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/deepin-screenshot_bn.ts 2018-03-07 08:46:04.000000000 +0000 @@ -1,12 +1,10 @@ - - - + MainWindow select-area - + @@ -20,29 +18,29 @@ DeepinScreenshot - + View - + Picture has been saved to %1 - + PNG (*.png);;JPEG (*.jpg *.jpeg);; BMP (*.bmp);; PGM (*.pgm);;XBM (*.xbm);;XPM(*.xpm) - + Picture has been saved to clipboard - + @@ -50,67 +48,67 @@ Rectangle - + Ellipse - + Arrow - + Pencil - + Text - + Undo - + Save - + Save to desktop - + Autosave - + Save to specified folder - + Copy to clipboard - + Autosave and copy to clipboard - + Exit - + @@ -118,7 +116,7 @@ Deepin Screenshot will start after %1 seconds - + @@ -126,123 +124,123 @@ Start/Screenshot - + Save - + Painting - + Size Adjustment - + Quick start - + Full screenshot - + সম্পূর্ণ স্ক্রিনশট Delay screenshot - + বিলম্ব স্ক্রিনশট Undo - + Exit - + Copy to clipboard - + Rectangle - + Ellipse - + Arrow - + Pencil - + Text - + Color - + Increase height up - + Increase height down - + Increase width left - + Increase width right - + Decrease height up - + Decrease height down - + Decrease width left - + Decrease width right - + @@ -250,44 +248,37 @@ Save to desktop - + Autosave - + Save to specified folder - + Copy to clipboard - + Autosave and copy to clipboard - + Low - + High - + - - WindowManager - - Desktop - ডেস্কটপ - - - + \ No newline at end of file diff -Nru deepin-screenshot-4.0.10.4/translations/deepin-screenshot_ca.ts deepin-screenshot-4.0.11/translations/deepin-screenshot_ca.ts --- deepin-screenshot-4.0.10.4/translations/deepin-screenshot_ca.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/deepin-screenshot_ca.ts 2018-03-07 08:46:04.000000000 +0000 @@ -4,7 +4,7 @@ select-area - + selecciona-àrea @@ -18,7 +18,7 @@ DeepinScreenshot - + Capturador de pantalla del Deepin @@ -30,17 +30,17 @@ Picture has been saved to %1 - + La imatge s'ha desat a %1. PNG (*.png);;JPEG (*.jpg *.jpeg);; BMP (*.bmp);; PGM (*.pgm);;XBM (*.xbm);;XPM(*.xpm) - + PNG (*.png);;JPEG (*.jpg *.jpeg);; BMP (*.bmp);; PGM (*.pgm);;XBM (*.xbm);;XPM(*.xpm) Picture has been saved to clipboard - + La imatge s'ha desat al porta-retalls @@ -48,22 +48,22 @@ Rectangle - + Rectangle Ellipse - + El·lipse Arrow - + Fletxa Pencil - + Llapis @@ -73,7 +73,7 @@ Undo - + Desfés @@ -83,27 +83,27 @@ Save to desktop - + Desa a l'escriptori Autosave - + Desa-ho automàticament Save to specified folder - + Desa a la carpeta especificada Copy to clipboard - + Copia al porta-retalls Autosave and copy to clipboard - + Desa-ho automàticament i copia-ho al porta-retalls @@ -116,7 +116,7 @@ Deepin Screenshot will start after %1 seconds - + El capturador de pantalla del Deepin s'iniciarà d'aquí a %1 segons. @@ -124,7 +124,7 @@ Start/Screenshot - + Inicia / Captura de pantalla @@ -135,32 +135,32 @@ Painting - + Pintura Size Adjustment - + Ajust de la mida Quick start - + Inici ràpid Full screenshot - + Captura de pantalla completa Delay screenshot - + Ajorna la captura Undo - + Desfés @@ -170,27 +170,27 @@ Copy to clipboard - + Copia al porta-retalls Rectangle - + Rectangle Ellipse - + El·lipse Arrow - + Fletxa Pencil - + Llapis @@ -200,47 +200,47 @@ Color - + Color Increase height up - + Augmenta l'alçada amunt Increase height down - + Augmenta l'alçada avall Increase width left - + Augmenta l'amplada cap a l'esquerra Increase width right - + Augmenta l'amplada cap a la dreta Decrease height up - + Redueix l'alçada amunt Decrease height down - + Redueix l'alçada avall Decrease width left - + Redueix l'amplada cap a l'esquerra Decrease width right - + Redueix l'amplada cap a la dreta @@ -248,37 +248,37 @@ Save to desktop - + Desa a l'escriptori Autosave - + Desa automàticament Save to specified folder - + Desa-ho a la carpeta especificada Copy to clipboard - + Copia al porta-retalls Autosave and copy to clipboard - + Desa-ho automàticament i copia-ho al porta-retalls Low - + Baixa High - + Alta \ No newline at end of file diff -Nru deepin-screenshot-4.0.10.4/translations/deepin-screenshot_da.ts deepin-screenshot-4.0.11/translations/deepin-screenshot_da.ts --- deepin-screenshot-4.0.10.4/translations/deepin-screenshot_da.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/deepin-screenshot_da.ts 2018-03-07 08:46:04.000000000 +0000 @@ -108,7 +108,7 @@ Exit - Forlad + Afslut @@ -165,7 +165,7 @@ Exit - Forlad + Afslut diff -Nru deepin-screenshot-4.0.10.4/translations/deepin-screenshot_de.ts deepin-screenshot-4.0.11/translations/deepin-screenshot_de.ts --- deepin-screenshot-4.0.10.4/translations/deepin-screenshot_de.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/deepin-screenshot_de.ts 2018-03-07 08:46:04.000000000 +0000 @@ -155,7 +155,7 @@ Delay screenshot - Bildschrimfoto verzögern + Bildschirmfoto verzögern diff -Nru deepin-screenshot-4.0.10.4/translations/deepin-screenshot_ko.ts deepin-screenshot-4.0.11/translations/deepin-screenshot_ko.ts --- deepin-screenshot-4.0.10.4/translations/deepin-screenshot_ko.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/deepin-screenshot_ko.ts 2018-03-07 08:46:04.000000000 +0000 @@ -24,18 +24,18 @@ View - ㅂㅗ기 + 보기 Picture has been saved to %1 - + %1 으로 사진이 저장되었습니다 PNG (*.png);;JPEG (*.jpg *.jpeg);; BMP (*.bmp);; PGM (*.pgm);;XBM (*.xbm);;XPM(*.xpm) - + PNG (*.png);;JPEG (*.jpg *.jpeg);; BMP (*.bmp);; PGM (*.pgm);;XBM (*.xbm);;XPM(*.xpm) @@ -63,7 +63,7 @@ Pencil - + 연필 @@ -83,7 +83,7 @@ Save to desktop - 데스크톱으로 저장하기 + 바탕화면에 저장하기 @@ -98,7 +98,7 @@ Copy to clipboard - 클립보드 복사 + 클립보드에 복사 @@ -190,7 +190,7 @@ Pencil - + 연필 diff -Nru deepin-screenshot-4.0.10.4/translations/deepin-screenshot_pt.ts deepin-screenshot-4.0.11/translations/deepin-screenshot_pt.ts --- deepin-screenshot-4.0.10.4/translations/deepin-screenshot_pt.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/deepin-screenshot_pt.ts 2018-03-07 08:46:04.000000000 +0000 @@ -116,7 +116,7 @@ Deepin Screenshot will start after %1 seconds - A Captura de ecrã do Deepin será iniciada em %1 segundos + O Deepin Screenshot será iniciado em %1 segundos diff -Nru deepin-screenshot-4.0.10.4/translations/deepin-screenshot_uk.ts deepin-screenshot-4.0.11/translations/deepin-screenshot_uk.ts --- deepin-screenshot-4.0.10.4/translations/deepin-screenshot_uk.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/deepin-screenshot_uk.ts 2018-03-07 08:46:04.000000000 +0000 @@ -4,7 +4,7 @@ select-area - + вибрати-область @@ -30,12 +30,12 @@ Picture has been saved to %1 - + Зображення було збережено до %1 PNG (*.png);;JPEG (*.jpg *.jpeg);; BMP (*.bmp);; PGM (*.pgm);;XBM (*.xbm);;XPM(*.xpm) - + PNG (*.png);;JPEG (*.jpg *.jpeg);; BMP (*.bmp);; PGM (*.pgm);;XBM (*.xbm);;XPM(*.xpm) @@ -63,7 +63,7 @@ Pencil - + Олівець @@ -116,7 +116,7 @@ Deepin Screenshot will start after %1 seconds - + Знімок екрану Deepin запуститься за %1 секунди @@ -190,7 +190,7 @@ Pencil - + Олівець diff -Nru deepin-screenshot-4.0.10.4/translations/desktop/desktop_ca.ts deepin-screenshot-4.0.11/translations/desktop/desktop_ca.ts --- deepin-screenshot-4.0.10.4/translations/desktop/desktop_ca.ts 1970-01-01 00:00:00.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/desktop/desktop_ca.ts 2018-03-07 08:46:04.000000000 +0000 @@ -0,0 +1,26 @@ + + + desktop + + + Deepin Screenshot + Capturador de pantalla del Deepin + + + + Delay Screenshot + Ajorna la captura + + + + Full Screenshot + Captura de pantalla completa + + + + + Screen capturing application + Aplicació per fer una captura de la pantalla + + + \ No newline at end of file diff -Nru deepin-screenshot-4.0.10.4/translations/desktop/desktop_de.ts deepin-screenshot-4.0.11/translations/desktop/desktop_de.ts --- deepin-screenshot-4.0.10.4/translations/desktop/desktop_de.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/desktop/desktop_de.ts 2018-03-07 08:46:04.000000000 +0000 @@ -20,7 +20,7 @@ Screen capturing application - Bildschirmfoto Aufnahmesoftware + Bildschirmfoto-Aufnahmesoftware \ No newline at end of file diff -Nru deepin-screenshot-4.0.10.4/translations/desktop/desktop_ko.ts deepin-screenshot-4.0.11/translations/desktop/desktop_ko.ts --- deepin-screenshot-4.0.10.4/translations/desktop/desktop_ko.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/desktop/desktop_ko.ts 2018-03-07 08:46:04.000000000 +0000 @@ -9,12 +9,12 @@ Delay Screenshot - + 지연 스크린샷 Full Screenshot - + 전체 스크린샷 diff -Nru deepin-screenshot-4.0.10.4/translations/desktop/desktop_pt.ts deepin-screenshot-4.0.11/translations/desktop/desktop_pt.ts --- deepin-screenshot-4.0.10.4/translations/desktop/desktop_pt.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/desktop/desktop_pt.ts 2018-03-07 08:46:04.000000000 +0000 @@ -4,7 +4,7 @@ Deepin Screenshot - Captura de ecrã Deepin + Deepin Screenshot diff -Nru deepin-screenshot-4.0.10.4/translations/desktop/desktop_uk.ts deepin-screenshot-4.0.11/translations/desktop/desktop_uk.ts --- deepin-screenshot-4.0.10.4/translations/desktop/desktop_uk.ts 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/translations/desktop/desktop_uk.ts 2018-03-07 08:46:04.000000000 +0000 @@ -9,12 +9,12 @@ Delay Screenshot - + Затримка знімку екрану Full Screenshot - + Повний знімок екрана diff -Nru deepin-screenshot-4.0.10.4/utils/baseutils.h deepin-screenshot-4.0.11/utils/baseutils.h --- deepin-screenshot-4.0.10.4/utils/baseutils.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/baseutils.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/calculaterect.h deepin-screenshot-4.0.11/utils/calculaterect.h --- deepin-screenshot-4.0.10.4/utils/calculaterect.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/calculaterect.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/configsettings.h deepin-screenshot-4.0.11/utils/configsettings.h --- deepin-screenshot-4.0.10.4/utils/configsettings.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/configsettings.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/screenutils.cpp deepin-screenshot-4.0.11/utils/screenutils.cpp --- deepin-screenshot-4.0.10.4/utils/screenutils.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/screenutils.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/screenutils.h deepin-screenshot-4.0.11/utils/screenutils.h --- deepin-screenshot-4.0.10.4/utils/screenutils.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/screenutils.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/shapesutils.cpp deepin-screenshot-4.0.11/utils/shapesutils.cpp --- deepin-screenshot-4.0.10.4/utils/shapesutils.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/shapesutils.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/shapesutils.h deepin-screenshot-4.0.11/utils/shapesutils.h --- deepin-screenshot-4.0.10.4/utils/shapesutils.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/shapesutils.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/shortcut.cpp deepin-screenshot-4.0.11/utils/shortcut.cpp --- deepin-screenshot-4.0.10.4/utils/shortcut.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/shortcut.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/shortcut.h deepin-screenshot-4.0.11/utils/shortcut.h --- deepin-screenshot-4.0.10.4/utils/shortcut.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/shortcut.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/tempfile.cpp deepin-screenshot-4.0.11/utils/tempfile.cpp --- deepin-screenshot-4.0.10.4/utils/tempfile.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/tempfile.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/utils/tempfile.h deepin-screenshot-4.0.11/utils/tempfile.h --- deepin-screenshot-4.0.10.4/utils/tempfile.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/utils/tempfile.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/bigcolorbutton.cpp deepin-screenshot-4.0.11/widgets/bigcolorbutton.cpp --- deepin-screenshot-4.0.10.4/widgets/bigcolorbutton.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/bigcolorbutton.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/bigcolorbutton.h deepin-screenshot-4.0.11/widgets/bigcolorbutton.h --- deepin-screenshot-4.0.10.4/widgets/bigcolorbutton.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/bigcolorbutton.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/colorbutton.cpp deepin-screenshot-4.0.11/widgets/colorbutton.cpp --- deepin-screenshot-4.0.10.4/widgets/colorbutton.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/colorbutton.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/colorbutton.h deepin-screenshot-4.0.11/widgets/colorbutton.h --- deepin-screenshot-4.0.10.4/widgets/colorbutton.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/colorbutton.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/fontsizewidget.cpp deepin-screenshot-4.0.11/widgets/fontsizewidget.cpp --- deepin-screenshot-4.0.10.4/widgets/fontsizewidget.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/fontsizewidget.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/fontsizewidget.h deepin-screenshot-4.0.11/widgets/fontsizewidget.h --- deepin-screenshot-4.0.10.4/widgets/fontsizewidget.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/fontsizewidget.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/majtoolbar.cpp deepin-screenshot-4.0.11/widgets/majtoolbar.cpp --- deepin-screenshot-4.0.10.4/widgets/majtoolbar.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/majtoolbar.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/majtoolbar.h deepin-screenshot-4.0.11/widgets/majtoolbar.h --- deepin-screenshot-4.0.10.4/widgets/majtoolbar.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/majtoolbar.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/savebutton.cpp deepin-screenshot-4.0.11/widgets/savebutton.cpp --- deepin-screenshot-4.0.10.4/widgets/savebutton.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/savebutton.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/savebutton.h deepin-screenshot-4.0.11/widgets/savebutton.h --- deepin-screenshot-4.0.10.4/widgets/savebutton.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/savebutton.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/savetips.cpp deepin-screenshot-4.0.11/widgets/savetips.cpp --- deepin-screenshot-4.0.10.4/widgets/savetips.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/savetips.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/savetips.h deepin-screenshot-4.0.11/widgets/savetips.h --- deepin-screenshot-4.0.10.4/widgets/savetips.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/savetips.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/shapeswidget.cpp deepin-screenshot-4.0.11/widgets/shapeswidget.cpp --- deepin-screenshot-4.0.10.4/widgets/shapeswidget.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/shapeswidget.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/shapeswidget.h deepin-screenshot-4.0.11/widgets/shapeswidget.h --- deepin-screenshot-4.0.10.4/widgets/shapeswidget.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/shapeswidget.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/subtoolbar.cpp deepin-screenshot-4.0.11/widgets/subtoolbar.cpp --- deepin-screenshot-4.0.10.4/widgets/subtoolbar.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/subtoolbar.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/subtoolbar.h deepin-screenshot-4.0.11/widgets/subtoolbar.h --- deepin-screenshot-4.0.10.4/widgets/subtoolbar.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/subtoolbar.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/textbutton.cpp deepin-screenshot-4.0.11/widgets/textbutton.cpp --- deepin-screenshot-4.0.10.4/widgets/textbutton.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/textbutton.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/textbutton.h deepin-screenshot-4.0.11/widgets/textbutton.h --- deepin-screenshot-4.0.10.4/widgets/textbutton.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/textbutton.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/textedit.cpp deepin-screenshot-4.0.11/widgets/textedit.cpp --- deepin-screenshot-4.0.10.4/widgets/textedit.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/textedit.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/textedit.h deepin-screenshot-4.0.11/widgets/textedit.h --- deepin-screenshot-4.0.10.4/widgets/textedit.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/textedit.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/toolbar.cpp deepin-screenshot-4.0.11/widgets/toolbar.cpp --- deepin-screenshot-4.0.10.4/widgets/toolbar.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/toolbar.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/toolbar.h deepin-screenshot-4.0.11/widgets/toolbar.h --- deepin-screenshot-4.0.10.4/widgets/toolbar.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/toolbar.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/toolbutton.h deepin-screenshot-4.0.11/widgets/toolbutton.h --- deepin-screenshot-4.0.10.4/widgets/toolbutton.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/toolbutton.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/toptips.cpp deepin-screenshot-4.0.11/widgets/toptips.cpp --- deepin-screenshot-4.0.10.4/widgets/toptips.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/toptips.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/toptips.h deepin-screenshot-4.0.11/widgets/toptips.h --- deepin-screenshot-4.0.10.4/widgets/toptips.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/toptips.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * diff -Nru deepin-screenshot-4.0.10.4/widgets/zoomIndicator.cpp deepin-screenshot-4.0.11/widgets/zoomIndicator.cpp --- deepin-screenshot-4.0.10.4/widgets/zoomIndicator.cpp 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/zoomIndicator.cpp 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui * @@ -54,7 +54,7 @@ // using namespace utils; QPoint centerPos = this->cursor().pos(); centerPos = QPoint(std::max(centerPos.x() - this->window()->x(), 0), - std::max(centerPos.y(), 0)); + std::max(centerPos.y() - this->window()->y(), 0)); QPainter painter(this); if (m_updatePos) { diff -Nru deepin-screenshot-4.0.10.4/widgets/zoomIndicator.h deepin-screenshot-4.0.11/widgets/zoomIndicator.h --- deepin-screenshot-4.0.10.4/widgets/zoomIndicator.h 2017-11-24 07:19:13.000000000 +0000 +++ deepin-screenshot-4.0.11/widgets/zoomIndicator.h 2018-03-07 08:46:04.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 ~ 2017 Deepin Technology Co., Ltd. + * Copyright (C) 2017 ~ 2018 Deepin Technology Co., Ltd. * * Maintainer: Peng Hui *