diff --git a/0001-add-save-dialog.patch b/0001-add-save-dialog.patch deleted file mode 100644 index b1a43af..0000000 --- a/0001-add-save-dialog.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff -Naur kylin-screenshot-1.0.0/kylin-screenshot.pro kylin-screenshot-1.0.0~/kylin-screenshot.pro ---- kylin-screenshot-1.0.0/kylin-screenshot.pro 2021-11-27 02:29:46.641814553 +0800 -+++ kylin-screenshot-1.0.0~/kylin-screenshot.pro 2021-11-27 02:45:56.503760907 +0800 -@@ -88,6 +88,7 @@ - SOURCES += src/main.cpp \ - src/common/CommandLineOptions.cpp \ - src/common/Logger.cpp \ -+ src/utils/mysavedialog.cpp \ - src/widgets/capture/buttonhandler.cpp \ - src/widgets/capture/font_options.cpp \ - src/widgets/capture/font_options2.cpp \ -@@ -178,6 +179,7 @@ - src/common/CommandLineOptions.h \ - src/common/Enum.h \ - src/common/Logger.h \ -+ src/utils/mysavedialog.h \ - src/widgets/capture/font_options.h \ - src/widgets/capture/font_options2.h \ - src/widgets/infowindow.h \ -diff -Naur kylin-screenshot-1.0.0/src/utils/mysavedialog.cpp kylin-screenshot-1.0.0~/src/utils/mysavedialog.cpp ---- kylin-screenshot-1.0.0/src/utils/mysavedialog.cpp 1970-01-01 08:00:00.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/utils/mysavedialog.cpp 2021-11-27 02:45:57.762760838 +0800 -@@ -0,0 +1,53 @@ -+/* -+ * Copyright: 2020 KylinSoft Co., Ltd. -+ * Authors: -+ * huanhuan zhang -+ * -+ * 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 -+ * (at your option) 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 . -+ */ -+#include "mysavedialog.h" -+#include -+#include -+#include -+#include -+#include "src/utils/filenamehandler.h" -+ -+MySaveDialog::MySaveDialog(QWidget *parent) : -+ QFileDialog(parent) -+{ -+ setWindowIcon(QIcon("/usr/share/icons/ukui-icon-theme-default/128x128/apps/kylin-screenshot.png")); -+ setNameFilter(QLatin1String("Portable Network Graphic file (PNG) (*.png);;BMP file (*.bmp);;JPEG file (*.jpg)")); -+ setDirectory(QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).at(0)); -+ setAcceptMode(QFileDialog::AcceptSave); -+ QString a = FileNameHandler().parsedPattern()+".png"; -+ this->findChildren("fileNameEdit").at(0)->setText(a); -+ connect(this->findChildren("fileTypeCombo").at(0), QOverload::of(&QComboBox::currentIndexChanged), -+ [=](int index) -+ { -+ switch (index) { -+ case 0: -+ qDebug()<<"change the type is png"; -+ break; -+ case 1: -+ qDebug()<<"change the type is bmp"; -+ break; -+ case 2: -+ qDebug()<<"change the type is jpg"; -+ break; -+ default: -+ break; -+ } -+ this->findChildren("fileNameEdit").at(0)->setText(a); -+ }); -+} -diff -Naur kylin-screenshot-1.0.0/src/utils/mysavedialog.h kylin-screenshot-1.0.0~/src/utils/mysavedialog.h ---- kylin-screenshot-1.0.0/src/utils/mysavedialog.h 1970-01-01 08:00:00.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/utils/mysavedialog.h 2021-11-27 02:45:57.757760838 +0800 -@@ -0,0 +1,30 @@ -+/* -+ * Copyright: 2020 KylinSoft Co., Ltd. -+ * Authors: -+ * huanhuan zhang -+ * -+ * 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 -+ * (at your option) 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 . -+ */ -+#pragma once -+ -+#include -+#include -+ -+class MySaveDialog :public QFileDialog -+{ -+Q_OBJECT -+public: -+ explicit MySaveDialog(QWidget *parent = 0); -+signals: -+}; -diff -Naur kylin-screenshot-1.0.0/src/utils/screenshotsaver.cpp kylin-screenshot-1.0.0~/src/utils/screenshotsaver.cpp ---- kylin-screenshot-1.0.0/src/utils/screenshotsaver.cpp 2021-01-08 14:21:25.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/utils/screenshotsaver.cpp 2021-11-27 02:45:57.772760837 +0800 -@@ -21,8 +21,8 @@ - #include - #include - #include --#include - #include -+#include "mysavedialog.h" - - ScreenshotSaver::ScreenshotSaver() { - } -@@ -78,11 +78,9 @@ - bool ok = false; - - while (!ok) { -- QString savePath = QFileDialog::getSaveFileName( -- nullptr, -- QString(), -- FileNameHandler().absoluteSavePath() + ".png", -- QLatin1String("Portable Network Graphic file (PNG) (*.png);;BMP file (*.bmp);;JPEG file (*.jpg)")); -+ MySaveDialog *a = new MySaveDialog(nullptr); -+ if(a->exec() == QFileDialog::Accepted){ -+ QString savePath = a->selectedFiles().at(0); - - if (savePath.isNull()) { - break; -@@ -112,5 +110,10 @@ - saveErrBox.exec(); - } - } -+ else -+ { -+ return ok; -+ } -+ } - return ok; - } diff --git a/0001-fix-screenshot-service.patch b/0001-fix-screenshot-service.patch deleted file mode 100644 index 4908e09..0000000 --- a/0001-fix-screenshot-service.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 104239c8a8ad8e53377a6c06c574719eb788290f Mon Sep 17 00:00:00 2001 -From: lvhan -Date: Thu, 14 Jan 2021 16:25:26 +0800 -Subject: [PATCH] fix-screenshot-service - ---- - kylin-screenshot.pro | 11 ++++++----- - openEuler/build_install.sh | 2 +- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/kylin-screenshot.pro b/kylin-screenshot.pro -index f216f23..70fd2cb 100644 ---- a/kylin-screenshot.pro -+++ b/kylin-screenshot.pro -@@ -315,11 +315,12 @@ unix:!macx { - - servicedbus.path = $${PREFIX}/share/dbus-1/services/ - -- packaging { -- servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service -- } else { -- servicedbus.files = dbus/make/org.dharkael.kylinscreenshot.service -- } -+# packaging { -+# servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service -+# } else { -+# servicedbus.files = dbus/make/org.dharkael.kylinscreenshot.service -+# } -+ servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service - - INSTALLS += target \ - icon \ -diff --git a/openEuler/build_install.sh b/openEuler/build_install.sh -index 46643ff..06455e8 100644 ---- a/openEuler/build_install.sh -+++ b/openEuler/build_install.sh -@@ -21,4 +21,4 @@ cd /root/rpmbuild/SPECS/ - rpmbuild -ba $pkg_name.spec - echo "安装rpm包" - cd /root/rpmbuild/RPMS/x86_64/ --rpm -ivh --replacefiles --force --nodeps *.x86_64.rpm -+rpm -Uvh --replacefiles --force --nodeps $pkg_name*.x86_64.rpm --- -2.29.2.windows.2 - diff --git a/0003-change-kylin-screenshot-to-screenshot.patch b/0003-change-kylin-screenshot-to-screenshot.patch deleted file mode 100644 index 74277c8..0000000 --- a/0003-change-kylin-screenshot-to-screenshot.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 03e592209248d972d491dc39a0b189002a9eb8ae Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Fri, 24 Jun 2022 13:58:39 +0800 -Subject: [PATCH] change kylin-screenshot to screenshot - ---- - src/core/controller.cpp | 2 +- - src/widgets/capture/buttonhandler.cpp | 5 +++-- - src/widgets/capturelauncher.cpp | 1 + - src/widgets/infowindow.cpp | 2 +- - 4 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/core/controller.cpp b/src/core/controller.cpp -index fd70486..6cd047d 100755 ---- a/src/core/controller.cpp -+++ b/src/core/controller.cpp -@@ -257,7 +257,7 @@ void Controller::enableTrayIcon() { - trayIconMenu->addAction(quitAction); - - m_trayIcon = new QSystemTrayIcon(); -- m_trayIcon->setToolTip(tr("Kylin-Screenshot")); -+ m_trayIcon->setToolTip(tr("Screenshot")); - m_trayIcon->setContextMenu(trayIconMenu); - //QIcon trayicon = QIcon::fromTheme("kylin-screenshot-tray", QIcon("/usr/share/icons/ukui-icon-theme-default/128x128/apps/kylin-screenshot.png")); - QIcon trayicon = QIcon("/usr/share/icons/ukui-icon-theme-default/128x128/apps/kylin-screenshot.png"); -diff --git a/src/widgets/capture/buttonhandler.cpp b/src/widgets/capture/buttonhandler.cpp -index 5604b91..4086078 100755 ---- a/src/widgets/capture/buttonhandler.cpp -+++ b/src/widgets/capture/buttonhandler.cpp -@@ -336,10 +336,11 @@ void ButtonHandler::positionButtonsInside(int index) { - // selection. - QRect mainArea = m_selection; - mainArea = intersectWithAreas(mainArea); -- const int buttonsPerRow = (mainArea.width()) / (m_buttonExtendedSize); -+ /*const int buttonsPerRow = (mainArea.width()) / (m_buttonExtendedSize); - if (buttonsPerRow == 0) { - return; -- } -+ }*/ -+ const int buttonsPerRow = 19; - QPoint center = QPoint(mainArea.center().x(), - mainArea.bottom() - m_buttonExtendedSize); - -diff --git a/src/widgets/capturelauncher.cpp b/src/widgets/capturelauncher.cpp -index 278ba77..d36e716 100755 ---- a/src/widgets/capturelauncher.cpp -+++ b/src/widgets/capturelauncher.cpp -@@ -41,6 +41,7 @@ CaptureLauncher::CaptureLauncher(QWidget *parent) : - QWidget(parent), m_id(0) - { - setWindowIcon(QIcon("/usr/share/icons/ukui-icon-theme-default/128x128/apps/kylin-screenshot.png")); -+ setWindowTitle(tr("Screenshot")); - setAttribute(Qt::WA_DeleteOnClose); - connect(Controller::getInstance(), &Controller::captureTaken, - this, &CaptureLauncher::captureTaken); -diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp -index 6f1e5ad..b0508f0 100755 ---- a/src/widgets/infowindow.cpp -+++ b/src/widgets/infowindow.cpp -@@ -188,7 +188,7 @@ void InfoWindow::initLabels() { - QLabel *versionTitleLabel = new QLabel(tr("Version"), this); - versionTitleLabel->setAlignment(Qt::AlignHCenter); - m_layout->addWidget(versionTitleLabel); -- QString versionMsg = tr("Kylin-ScreenShot") + "v1.0.0" + "\n" + -+ QString versionMsg = tr("ScreenShot") + "v1.0.0" + "\n" + - tr("Compiled with Qt") - + QT_VERSION_STR; - QLabel *versionLabel = new QLabel(versionMsg, this); --- -2.33.0 - diff --git a/0004-add-log.patch b/0004-add-log.patch deleted file mode 100644 index 042a07d..0000000 --- a/0004-add-log.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 75a0f24336e038f7f2380745abf4639c6d94229f Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Mon, 27 Jun 2022 14:20:06 +0800 -Subject: [PATCH] add log - ---- - debian/control | 2 +- - debian/source/format | 2 +- - kylin-screenshot.pro | 2 +- - src/main.cpp | 2 ++ - 4 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/debian/control b/debian/control -index 2c99e66..4ac86d9 100755 ---- a/debian/control -+++ b/debian/control -@@ -3,7 +3,7 @@ Section: graphics - Priority: optional - Maintainer: Kylin Team - Uploaders: handsome_feng --Build-Depends: debhelper-compat (= 13), -+Build-Depends: debhelper-compat (= 12), - qt5-qmake, - qtbase5-dev, - qttools5-dev-tools, -diff --git a/debian/source/format b/debian/source/format -index 163aaf8..89ae9db 100755 ---- a/debian/source/format -+++ b/debian/source/format -@@ -1 +1 @@ --3.0 (quilt) -+3.0 (native) -diff --git a/kylin-screenshot.pro b/kylin-screenshot.pro -index 3ffbc60..69458fb 100755 ---- a/kylin-screenshot.pro -+++ b/kylin-screenshot.pro -@@ -6,7 +6,7 @@ - - win32:LIBS += -luser32 -lshell32 - --LIBS += -lavutil -lavformat -lavcodec -lswscale -lX11 -lXext -lXtst -lXfixes -lXinerama -lpulse -+LIBS += -lukui-log4qt -lavutil -lavformat -lavcodec -lswscale -lX11 -lXext -lXtst -lXfixes -lXinerama -lpulse - - TAG_VERSION = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags) - isEmpty(TAG_VERSION){ -diff --git a/src/main.cpp b/src/main.cpp -index fc06999..d90685c 100755 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include "src/common/CommandLineOptions.h" -+#include - - #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) - #include "src/core/flameshotdbusadapter.h" -@@ -57,6 +58,7 @@ int main(int argc, char *argv[]) { - - // required for the button serialization - // TODO: change to QVector in v1.0 -+ initUkuiLog4qt("kylin-screenshot"); - if (getScreenWidth() > 2560) { - #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); --- -2.33.0 - diff --git a/0005-fixed-wayland-cannot-screenshot-top-widget.patch b/0005-fixed-wayland-cannot-screenshot-top-widget.patch deleted file mode 100644 index 4e2d597..0000000 --- a/0005-fixed-wayland-cannot-screenshot-top-widget.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0fdf762e789c8f530146a5014f873314cce36f15 Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Tue, 28 Jun 2022 09:37:00 +0800 -Subject: [PATCH] fixed wayland cannot screenshot top widget - ---- - src/utils/screengrabber.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/utils/screengrabber.cpp b/src/utils/screengrabber.cpp -index 7fef395..42b9cb3 100755 ---- a/src/utils/screengrabber.cpp -+++ b/src/utils/screengrabber.cpp -@@ -99,7 +99,7 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) { - - QPixmap ScreenGrabber::grabScreen(int screenNumber, bool &ok) { - QPixmap p; -- bool isVirtual = QApplication::desktop()->isVirtualDesktop(); -+/* bool isVirtual = QApplication::desktop()->isVirtualDesktop(); - if (isVirtual || m_info.waylandDectected()) { - p = grabEntireDesktop(ok); - if (ok) { -@@ -119,11 +119,11 @@ QPixmap ScreenGrabber::grabScreen(int screenNumber, bool &ok) { - p = p.copy(geometry); - } - } -- else { -+ else {*/ - QList windows = KWindowSystem::windows(); - QScreen* screen = QApplication::screens().at(0); - p =screen->grabWindow(KWindowSystem::activeWindow()); - ok = true; -- } -+// } - return p; - } --- -2.33.0 - diff --git a/0006-change-markertool-opacity.patch b/0006-change-markertool-opacity.patch deleted file mode 100644 index 648ea7c..0000000 --- a/0006-change-markertool-opacity.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9949bc701d108f68fbe1e3e16d753db5df98c61b Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Tue, 28 Jun 2022 17:05:35 +0800 -Subject: [PATCH] change markertool opacity - ---- - src/tools/marker/markertool.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tools/marker/markertool.cpp b/src/tools/marker/markertool.cpp -index 980833b..7c16d98 100755 ---- a/src/tools/marker/markertool.cpp -+++ b/src/tools/marker/markertool.cpp -@@ -70,7 +70,7 @@ void MarkerTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUn - updateBackup(pixmap); - } - painter.setCompositionMode(QPainter::CompositionMode_Multiply); -- painter.setOpacity(0.35); -+ painter.setOpacity(0.5); - painter.setPen(QPen(m_color, m_thickness)); - painter.drawLine(m_points.first, m_points.second); - } --- -2.33.0 - diff --git a/0007-change-text-property-in-time.patch b/0007-change-text-property-in-time.patch deleted file mode 100644 index 523fb2e..0000000 --- a/0007-change-text-property-in-time.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 97df00beb618898b290ca2a633d5043c3d58e3db Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Wed, 29 Jun 2022 09:31:14 +0800 -Subject: [PATCH] change text property in time - ---- - src/tools/AbstractActionToolWithWidget.cpp | 4 ++++ - src/tools/AbstractActionToolWithWidget.h | 1 + - src/tools/abstractactiontool.cpp | 4 ++++ - src/tools/abstractactiontool.h | 1 + - src/tools/abstractpathtool.cpp | 4 ++++ - src/tools/abstractpathtool.h | 2 +- - src/tools/abstracttwopointtool.cpp | 4 ++++ - src/tools/abstracttwopointtool.h | 1 + - src/tools/capturetool.h | 2 +- - src/tools/text/texttool.cpp | 11 +++++++++++ - src/tools/text/texttool.h | 1 + - src/widgets/capture/capturewidget.cpp | 9 +++++++-- - src/widgets/capture/capturewidget.h | 1 + - 13 files changed, 41 insertions(+), 4 deletions(-) - -diff --git a/src/tools/AbstractActionToolWithWidget.cpp b/src/tools/AbstractActionToolWithWidget.cpp -index bd07d86..9289683 100644 ---- a/src/tools/AbstractActionToolWithWidget.cpp -+++ b/src/tools/AbstractActionToolWithWidget.cpp -@@ -86,3 +86,7 @@ void AbstractActionToolWithWidget::colorChanged(const QColor &c) { - void AbstractActionToolWithWidget::thicknessChanged(const int th) { - Q_UNUSED(th); - } -+ -+void AbstractActionToolWithWidget::textChanged(const CaptureContext &context) { -+ Q_UNUSED(context); -+} -diff --git a/src/tools/AbstractActionToolWithWidget.h b/src/tools/AbstractActionToolWithWidget.h -index d92e7cd..feb2fbe 100644 ---- a/src/tools/AbstractActionToolWithWidget.h -+++ b/src/tools/AbstractActionToolWithWidget.h -@@ -44,4 +44,5 @@ public slots: - void drawStart(const CaptureContext &context) override; - void colorChanged(const QColor &c) override; - void thicknessChanged(const int th) override; -+ void textChanged(const CaptureContext &context) override; - }; -diff --git a/src/tools/abstractactiontool.cpp b/src/tools/abstractactiontool.cpp -index 2d0c886..df19020 100755 ---- a/src/tools/abstractactiontool.cpp -+++ b/src/tools/abstractactiontool.cpp -@@ -84,3 +84,7 @@ void AbstractActionTool::colorChanged(const QColor &c) { - void AbstractActionTool::thicknessChanged(const int th) { - Q_UNUSED(th); - } -+ -+void AbstractActionTool::textChanged(const CaptureContext &context) { -+ Q_UNUSED(context); -+} -diff --git a/src/tools/abstractactiontool.h b/src/tools/abstractactiontool.h -index 8b8b9c3..3cf57ac 100755 ---- a/src/tools/abstractactiontool.h -+++ b/src/tools/abstractactiontool.h -@@ -42,4 +42,5 @@ public slots: - void drawStart(const CaptureContext &context) override; - void colorChanged(const QColor &c) override; - void thicknessChanged(const int th) override; -+ void textChanged(const CaptureContext &context) override; - }; -diff --git a/src/tools/abstractpathtool.cpp b/src/tools/abstractpathtool.cpp -index 89ab28f..e678c4f 100755 ---- a/src/tools/abstractpathtool.cpp -+++ b/src/tools/abstractpathtool.cpp -@@ -82,3 +82,7 @@ void AbstractPathTool::addPoint(const QPoint &point) { - } - m_points.append(point); - } -+ -+void AbstractPathTool::textChanged(const CaptureContext &context) { -+ Q_UNUSED(context); -+} -diff --git a/src/tools/abstractpathtool.h b/src/tools/abstractpathtool.h -index 172dab8..842fcb1 100755 ---- a/src/tools/abstractpathtool.h -+++ b/src/tools/abstractpathtool.h -@@ -35,7 +35,7 @@ public slots: - void drawMove(const QPoint &p) override; - void colorChanged(const QColor &c) override; - void thicknessChanged(const int th) override; -- -+ void textChanged(const CaptureContext &context) override; - protected: - void updateBackup(const QPixmap &pixmap); - void addPoint(const QPoint &point); -diff --git a/src/tools/abstracttwopointtool.cpp b/src/tools/abstracttwopointtool.cpp -index d968dea..6403190 100755 ---- a/src/tools/abstracttwopointtool.cpp -+++ b/src/tools/abstracttwopointtool.cpp -@@ -133,3 +133,7 @@ QPoint AbstractTwoPointTool::adjustedVector(QPoint v) const { - } - return v; - } -+ -+void AbstractTwoPointTool::textChanged(const CaptureContext &context) { -+ Q_UNUSED(context); -+} -diff --git a/src/tools/abstracttwopointtool.h b/src/tools/abstracttwopointtool.h -index 65ee630..4c684d2 100755 ---- a/src/tools/abstracttwopointtool.h -+++ b/src/tools/abstracttwopointtool.h -@@ -39,6 +39,7 @@ public slots: - void drawMoveWithAdjustment(const QPoint &p) override; - void colorChanged(const QColor &c) override; - void thicknessChanged(const int th) override; -+ void textChanged(const CaptureContext &context) override; - - protected: - void updateBackup(const QPixmap &pixmap); -diff --git a/src/tools/capturetool.h b/src/tools/capturetool.h -index f1eff27..8531aeb 100755 ---- a/src/tools/capturetool.h -+++ b/src/tools/capturetool.h -@@ -191,7 +191,7 @@ public slots: - virtual void colorChanged(const QColor &c) = 0; - // Called when the thickness of the tool is updated in the editor. - virtual void thicknessChanged(const int th) = 0; -- -+ virtual void textChanged(const CaptureContext &context) = 0; - #ifdef ENABLE_RECORD - virtual void pressCalled() { - m_isPressed = !m_isPressed; -diff --git a/src/tools/text/texttool.cpp b/src/tools/text/texttool.cpp -index 43ac557..b70889e 100755 ---- a/src/tools/text/texttool.cpp -+++ b/src/tools/text/texttool.cpp -@@ -201,6 +201,17 @@ void TextTool::thicknessChanged(const int th) { - } - } - -+void TextTool::textChanged(const CaptureContext &context) -+{ -+ m_font.setUnderline(context.underline); -+ m_font.setStrikeOut(context.deleteline); -+ m_font.setItalic(context.italic); -+ m_font.setBold(context.bold); -+ if (m_widget) { -+ m_widget->setFont(m_font); -+ } -+} -+ - void TextTool::updateText(const QString &s) { - m_text = s; - } -diff --git a/src/tools/text/texttool.h b/src/tools/text/texttool.h -index 8981bff..c97a87e 100755 ---- a/src/tools/text/texttool.h -+++ b/src/tools/text/texttool.h -@@ -58,6 +58,7 @@ public slots: - void pressed(const CaptureContext &context) override; - void colorChanged(const QColor &c) override; - void thicknessChanged(const int th) override; -+ void textChanged(const CaptureContext &context) override; - - private slots: - void updateText(const QString &s); -diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp -index 178d7da..b93e08c 100755 ---- a/src/widgets/capture/capturewidget.cpp -+++ b/src/widgets/capture/capturewidget.cpp -@@ -631,6 +631,8 @@ void CaptureWidget::mousePressEvent(QMouseEvent *e) { - m_activeTool, &CaptureTool::thicknessChanged); - connect(m_activeTool, &CaptureTool::requestAction, - this, &CaptureWidget::handleButtonSignal); -+ connect(this,&CaptureWidget::textchanged, -+ m_activeTool, &CaptureTool::textChanged); - m_activeTool->drawStart(m_context); - return; - } -@@ -1266,7 +1268,7 @@ void CaptureWidget::setState(CaptureButton *b) { - new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Left), this, SLOT(leftResize())); - new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Up), this, SLOT(upResize())); - new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Down), this, SLOT(downResize())); -- // new QShortcut(Qt::Key_Space, this, SLOT(togglePanel())); -+ new QShortcut(Qt::Key_Space, this, SLOT(togglePanel())); - new QShortcut(Qt::Key_Escape, this, SLOT(deleteToolwidgetOrClose())); - new QShortcut(Qt::Key_Return, this, SLOT(copyScreenshot())); - new QShortcut(Qt::Key_Enter, this, SLOT(copyScreenshot())); -@@ -1480,19 +1482,22 @@ void CaptureWidget::setState(CaptureButton *b) { - void CaptureWidget::font_bold_clicked(bool b) - { - m_context.bold = b; -+ emit textchanged(m_context); - } - void CaptureWidget::font_delete_clicked(bool b) - { - m_context.deleteline = b; -+ emit textchanged(m_context); - } - void CaptureWidget::font_underline_clicked(bool b) - { - m_context.underline =b; -- -+ emit textchanged(m_context); - } - void CaptureWidget::font_italic_clicked(bool b) - { - m_context.italic =b; -+ emit textchanged(m_context); - } - void CaptureWidget::ClickedSaveType(int i) - { -diff --git a/src/widgets/capture/capturewidget.h b/src/widgets/capture/capturewidget.h -index 1d011d3..ce04f5d 100755 ---- a/src/widgets/capture/capturewidget.h -+++ b/src/widgets/capture/capturewidget.h -@@ -88,6 +88,7 @@ signals: - void captureFailed(uint id); - void colorChanged(const QColor &c); - void thicknessChanged(const int thickness); -+ void textchanged(CaptureContext m_context); - - private slots: - // TODO replace with tools --- -2.33.0 - diff --git a/0008-change-notify-information-about-application-name.patch b/0008-change-notify-information-about-application-name.patch deleted file mode 100644 index f9765d7..0000000 --- a/0008-change-notify-information-about-application-name.patch +++ /dev/null @@ -1,5895 +0,0 @@ -From 7ba2edf97e795334aa64803f96563d288152d5ed Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Wed, 29 Jun 2022 10:07:12 +0800 -Subject: [PATCH] change notify information about application name - ---- - src/utils/systemnotification.cpp | 4 +- - translations/Internationalization_ca.ts | 63 +- - translations/Internationalization_de_DE.ts | 63 +- - translations/Internationalization_es.ts | 63 +- - translations/Internationalization_fr.ts | 63 +- - translations/Internationalization_hu.ts | 599 +++++---- - translations/Internationalization_ja.ts | 63 +- - translations/Internationalization_ka.ts | 63 +- - translations/Internationalization_nl.ts | 1331 +++++++++++--------- - translations/Internationalization_pl.ts | 63 +- - translations/Internationalization_pt_br.ts | 63 +- - translations/Internationalization_ru.ts | 63 +- - translations/Internationalization_sk.ts | 63 +- - translations/Internationalization_sr.ts | 63 +- - translations/Internationalization_tr.ts | 63 +- - translations/Internationalization_uk.ts | 63 +- - translations/Internationalization_zh_CN.ts | 49 +- - translations/Internationalization_zh_TW.ts | 63 +- - 18 files changed, 1622 insertions(+), 1243 deletions(-) - -diff --git a/src/utils/systemnotification.cpp b/src/utils/systemnotification.cpp -index 8471d36..d2ccd06 100755 ---- a/src/utils/systemnotification.cpp -+++ b/src/utils/systemnotification.cpp -@@ -42,7 +42,7 @@ SystemNotification::SystemNotification(QObject *parent) : QObject(parent) { - #endif - - void SystemNotification::sendMessage(const QString &text, const QString &savePath) { -- sendMessage(text, tr("Kylin-ScreenShot Info"), savePath); -+ sendMessage(text, tr("ScreenShot Info"), savePath); - } - - void SystemNotification::sendMessage( -@@ -65,7 +65,7 @@ void SystemNotification::sendMessage( - } - args << (qAppName()) //appname - << static_cast(0) //id -- << "kylin-screenshot" //icon -+ << "screenshot" //icon - << title //summary - << text //body - << QStringList() //actions -diff --git a/translations/Internationalization_ca.ts b/translations/Internationalization_ca.ts -index ec51b3f..24f1eff 100755 ---- a/translations/Internationalization_ca.ts -+++ b/translations/Internationalization_ca.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -228,7 +233,7 @@ - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -657,14 +662,14 @@ - - - -- -- -+ -+ - Key - Tecla - - -- -- -+ -+ - Description - Descripció - -@@ -680,7 +685,7 @@ - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -694,7 +699,7 @@ - <u><b>Dreceres</b></u> - - -- -+ - Available shortcuts in the screen capture mode. - Dreceres disponibles en el mode de captura de pantalla. - -@@ -1429,43 +1434,43 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - S'ha produït un error en guardar - - - - -- -- -+ -+ - Capture saved as - Anomena i guarda la captura - - - - -- -- -+ -+ - Error trying to save as - S'ha produït un error en anomenar i guardar - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - No es pot connectar mitjançant DBus - - -- -+ - Kylin-Screenshot - - -@@ -1773,7 +1778,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_de_DE.ts b/translations/Internationalization_de_DE.ts -index 9abb6cc..b4a4c25 100755 ---- a/translations/Internationalization_de_DE.ts -+++ b/translations/Internationalization_de_DE.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -244,7 +249,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -651,13 +656,13 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - Ändere die Dicke des Werkzeugs - - -- -+ - Available shortcuts in the screen capture mode. - Verfügbare Tastenkürzel im Aufnahmemodus. - - -- -- -+ -+ - Key - Taste - -@@ -687,8 +692,8 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - - - -- -- -+ -+ - Description - Beschreibung - -@@ -704,7 +709,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1448,16 +1453,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - Speicherfehler - - - - -- -- -+ -+ - Capture saved as - Aufnahme gespeichert als - -@@ -1469,27 +1474,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - Fehler beim Speichern unter - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - Kann nicht via DBus verbinden - - -- -+ - Kylin-Screenshot - - -@@ -1792,7 +1797,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_es.ts b/translations/Internationalization_es.ts -index af891c1..041a1dd 100755 ---- a/translations/Internationalization_es.ts -+++ b/translations/Internationalization_es.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -244,7 +249,7 @@ Presiona Espacio para abrir el panel lateral. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -647,13 +652,13 @@ Presiona Espacio para abrir el panel lateral. - Cambiar el grosor de la herramienta - - -- -+ - Available shortcuts in the screen capture mode. - Atajos disponibles en el modo captura de pantalla. - - -- -- -+ -+ - Key - Tecla - -@@ -683,8 +688,8 @@ Presiona Espacio para abrir el panel lateral. - - - -- -- -+ -+ - Description - Descripción - -@@ -700,7 +705,7 @@ Presiona Espacio para abrir el panel lateral. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1444,16 +1449,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - Error al Guardar - - - - -- -- -+ -+ - Capture saved as - Captura guardada como - -@@ -1465,27 +1470,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - Error intentando guardar como - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - Imposible conectar mediante DBus - - -- -+ - Kylin-Screenshot - - -@@ -1788,7 +1793,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_fr.ts b/translations/Internationalization_fr.ts -index 5c649cc..826afc8 100755 ---- a/translations/Internationalization_fr.ts -+++ b/translations/Internationalization_fr.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -244,7 +249,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -643,13 +648,13 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - Changer l'épaisseur des outils - - -- -+ - Available shortcuts in the screen capture mode. - Raccourcis disponibles en mode capture d'écran. - - -- -- -+ -+ - Key - Clé - -@@ -679,8 +684,8 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - - - -- -- -+ -+ - Description - Description - -@@ -696,7 +701,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1440,16 +1445,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - Erreur lors de la sauvegarde - - - - -- -- -+ -+ - Capture saved as - Capture d'écran sauvegardée sous - -@@ -1461,27 +1466,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - Erreur lors de la sauvegarde sous - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - Impossible de se connecter via DBus - - -- -+ - Kylin-Screenshot - - -@@ -1784,7 +1789,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_hu.ts b/translations/Internationalization_hu.ts -index 7f8ae06..02e9e0d 100755 ---- a/translations/Internationalization_hu.ts -+++ b/translations/Internationalization_hu.ts -@@ -50,16 +50,38 @@ - Beállítja a nyíl eszközt festő eszközként - - -+ -+ AudioRecordTool -+ -+ AudioRecord -+ -+ -+ - - BlurTool - - Blur -- Homályosítás -+ Homályosítás - - - Set Blur as the paint tool - Beállítja a Homályosítás eszközt festő eszközként - -+ -+ blur -+ -+ -+ -+ -+ CaptureButton -+ -+ option -+ -+ -+ -+ Save -+ Mentés -+ - - - CaptureLauncher -@@ -75,10 +97,6 @@ - Full Screen (All Monitors) - - -- -- No Delay -- -- - - second - -@@ -99,6 +117,10 @@ - Delay: - - -+ -+ Screenshot -+ -+ - - - CaptureWidget -@@ -120,20 +142,12 @@ Használd a görgőt az eszköz vastagságának állítására. - %1 , %2 - - -- -- Select an area with the mouse, or press Esc to exit. --Press Enter to capture the screen. --Press Right Click to show the color picker. --Use the Mouse Wheel to change the thickness of your tool. --Press Space to open the side panel. -- -- - - %1 * %2 - - - -- Open Directory -+ save as - - - -@@ -189,6 +203,14 @@ Press Space to open the side panel. - &Open Launcher - - -+ -+ Screenshot -+ -+ -+ -+ Unable to use kylin-screenshot -+ -+ - - - CopyTool -@@ -205,6 +227,13 @@ Press Space to open the side panel. - - - -+ -+ CursorRecordTool -+ -+ CursorRecord -+ -+ -+ - - Cut - -@@ -281,10 +310,10 @@ Press Space to open the side panel. - - - -- shotDBusAdapter -+ FollowMouseRecordTool - -- Unable to capture screen -- Nem lehet képernyőképet készíteni -+ FollowMouseRecord -+ - - - -@@ -470,7 +499,7 @@ Press Space to open the side panel. - - - Right Click -- jobb egérgomb -+ jobb egérgomb - - - Mouse Wheel -@@ -502,7 +531,7 @@ Press Space to open the side panel. - - - Show color picker -- Színválasztó mutatása -+ Színválasztó mutatása - - - Change the tool's thickness -@@ -533,11 +562,31 @@ Press Space to open the side panel. - Elérhető gyorsbillentyűk a képernyőfelvétel módban. - - -- SPACEBAR -+ Capturn Full Screen -+ -+ -+ -+ Capture Top Screen - - - -- Toggle visibility of sidebar with options of the selected tool -+ Capture Screen selection -+ -+ -+ -+ <u><b>sysShortcuts</b></u> -+ -+ -+ -+ Available System shortcuts. -+ -+ -+ -+ ScreenShot -+ -+ -+ -+ Compiled with Qt - - - -@@ -1075,6 +1124,17 @@ It is possible that your system doesn't use PulseAudio. - Mozgatja a kiválasztott területet - - -+ -+ OptionRecordTool -+ -+ OptionRecord -+ -+ -+ -+ options record tool -+ -+ -+ - - Options - -@@ -1143,6 +1203,14 @@ It is possible that your system doesn't use PulseAudio. - URL copied to clipboard. - URL másolva a vágólapra. - -+ -+ kylin-screenshot -+ -+ -+ -+ Kylin-Screenshot -+ -+ - - - RectangleTool -@@ -1167,68 +1235,50 @@ It is possible that your system doesn't use PulseAudio. - - - -- SaveTool -- -- Save -- Mentés -- -- -- Save the capture -- Menti a felvételt -- -- -- -- ScreenCap -+ SaveAsTool - -- Options -+ saveas - - - -- options tool -+ Save the capture..... - - - - -- ScreenCapExit -- -- Options -- -- -+ SaveTool - -- options tool -- -+ Save -+ Mentés - -- -- -- ScreenCapOption - -- Options -- -+ Save the capture -+ Menti a felvételt - - -- options tool -+ save - - - - -- ScreenCapStart -+ Save_Location - -- Options -+ save location - - - -- options tool -+ save type - - - - -- ScreenCut -+ Save_Location2 - -- Options -+ save location - - - -- options tool -+ save type - - - -@@ -1239,191 +1289,6 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- ScreenMouse -- -- Options -- -- -- -- options tool -- -- -- -- -- ScreenMouseCursor -- -- Options -- -- -- -- options tool -- -- -- -- -- ScreenRecorder -- -- Frame rate: -- -- -- -- The number of frames per second in the final video. Higher frame rates use more CPU time. -- -- -- -- Container: -- -- -- -- Save as: -- -- -- -- Record cursor -- -- -- -- Record audio -- -- -- -- Cancel recording -- -- -- -- Save recording -- -- -- -- (not installed) -- -- -- -- The container (file format) that will be used to save the recording. --Note that not all codecs are supported by all containers, and that not all media players can read all file formats. --- Matroska (MKV) supports all the codecs, but is less well-known. --- MP4 is the most well-known format and will play on almost any modern media player, but supports only H.264 video -- (and many media players only support AAC audio). --- WebM is intended for embedding video into websites (with the HTML5 <video> tag). The format was created by Google. -- WebM is supported by default in Firefox, Chrome and Opera, and plugins are available for Internet Explorer and Safari. -- It supports only VP8 and Vorbis. --- OGG supports only Theora and Vorbis. -- -- -- -- Save recording as -- -- -- -- %1 files -- This appears in the file dialog, e.g. 'MP4 files' -- -- -- -- Other... -- -- -- -- Uncompressed -- -- -- -- Error: Could not find any suitable container in libavformat! -- -- -- -- Error: Could not find any suitable video codec in libavcodec! -- -- -- -- Error: Could not find any suitable audio codec in libavcodec! -- -- -- -- Starting page ... -- -- -- -- Started page. -- -- -- -- not installed -- -- -- -- not supported by container -- -- -- -- Starting input ... -- -- -- -- Started input. -- -- -- -- Error: Something went wrong during initialization. -- -- -- -- Stopping input ... -- -- -- -- Stopped input. -- -- -- -- Starting output ... -- -- -- -- Pause recording -- -- -- -- Started output. -- -- -- -- Stopping page ... -- -- -- -- Stopped page. -- -- -- -- Stopping output ... -- -- -- -- Stopped output. -- -- -- -- Start recording -- -- -- -- Encoding remaining data ... -- -- -- -- -- ScreenVoice -- -- Options -- -- -- -- options tool -- -- -- - - SelectionTool - -@@ -1465,6 +1330,13 @@ Note that not all codecs are supported by all containers, and that not all media - Mutatja a dimenzióját a kijelölésnek (X Y) - - -+ -+ StartRecordTool -+ -+ StartRecord -+ -+ -+ - - StrftimeChooserWidget - -@@ -1582,7 +1454,7 @@ Note that not all codecs are supported by all containers, and that not all media - - SystemNotification - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -@@ -1702,5 +1574,252 @@ Note that not all codecs are supported by all containers, and that not all media - This appears in the screen labels - - -+ -+ Form -+ -+ -+ -+ store location -+ -+ -+ -+ ... -+ -+ -+ -+ container -+ -+ -+ -+ audio byte rate -+ -+ -+ -+ video frate -+ -+ -+ -+ video res -+ -+ -+ -+ video codec -+ -+ -+ -+ audio codec -+ -+ -+ -+ %1 files -+ This appears in the file dialog, e.g. 'MP4 files' -+ -+ -+ -+ Other... -+ -+ -+ -+ Uncompressed -+ -+ -+ -+ Error: Could not find any suitable container in libavformat! -+ -+ -+ -+ Error: Could not find any suitable video codec in libavcodec! -+ -+ -+ -+ Error: Could not find any suitable audio codec in libavcodec! -+ -+ -+ -+ Save recording as -+ -+ -+ -+ -+ shotDBusAdapter -+ -+ Unable to capture screen -+ Nem lehet képernyőképet készíteni -+ -+ -+ -+ ssrtools -+ -+ Form -+ -+ -+ -+ VideoFrate -+ -+ -+ -+ Width -+ -+ -+ -+ Left -+ -+ -+ -+ Top -+ -+ -+ -+ Height -+ -+ -+ -+ select rectangle -+ -+ -+ -+ select window -+ -+ -+ -+ Information -+ -+ -+ -+ Total time: -+ -+ -+ -+ TextLabel -+ -+ -+ -+ FPS in: -+ -+ -+ -+ FPS out: -+ -+ -+ -+ Size in: -+ -+ -+ -+ Size out: -+ -+ -+ -+ File name: -+ -+ -+ -+ File size: -+ -+ -+ -+ Bit rate: -+ -+ -+ -+ fullscreen -+ -+ -+ -+ fixed -+ -+ -+ -+ cursor -+ -+ -+ -+ record cursor -+ -+ -+ -+ enable audio -+ -+ -+ -+ option -+ -+ -+ -+ start -+ -+ -+ -+ cancel -+ -+ -+ -+ save -+ -+ -+ -+ Starting page ... -+ -+ -+ -+ Started page. -+ -+ -+ -+ Stopping page ... -+ -+ -+ -+ Stopped page. -+ -+ -+ -+ Starting output ... -+ -+ -+ -+ Started output. -+ -+ -+ -+ Error: Something went wrong during initialization. -+ -+ -+ -+ Stopping output ... -+ -+ -+ -+ Stopped output. -+ -+ -+ -+ Starting input ... -+ -+ -+ -+ Started input. -+ -+ -+ -+ Stopping input ... -+ -+ -+ -+ Stopped input. -+ -+ -+ -+ Encoding remaining data ... -+ -+ -+ -+ Pause recording -+ -+ -+ -+ Start recording -+ -+ - - -diff --git a/translations/Internationalization_ja.ts b/translations/Internationalization_ja.ts -index 1a0f2c8..e8e4c70 100755 ---- a/translations/Internationalization_ja.ts -+++ b/translations/Internationalization_ja.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -244,7 +249,7 @@ Enter を押すと画面をキャプチャー。 - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -668,14 +673,14 @@ Enter を押すと画面をキャプチャー。 - - - -- -- -+ -+ - Key - キー - - -- -- -+ -+ - Description - 説明 - -@@ -691,7 +696,7 @@ Enter を押すと画面をキャプチャー。 - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -705,7 +710,7 @@ Enter を押すと画面をキャプチャー。 - <u><b>ショートカット</b></u> - - -- -+ - Available shortcuts in the screen capture mode. - スクリーンキャプチャーモードで利用可能なショートカット。 - -@@ -1440,16 +1445,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - 保存エラー - - - - -- -- -+ -+ - Capture saved as - キャプチャーを保存しました: - -@@ -1461,27 +1466,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - 保存時にエラーが発生しました: - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - DBus に接続できません - - -- -+ - Kylin-Screenshot - - -@@ -1784,7 +1789,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_ka.ts b/translations/Internationalization_ka.ts -index 23dbeaf..f565e44 100755 ---- a/translations/Internationalization_ka.ts -+++ b/translations/Internationalization_ka.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -232,7 +237,7 @@ - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -631,13 +636,13 @@ - ხელსაწყოს სისქის შეცვლა - - -- -+ - Available shortcuts in the screen capture mode. - გადაღების რეჟიმში ხელმისაწვდომი მალსახმობები. - - -- -- -+ -+ - Key - კლავიში - -@@ -667,8 +672,8 @@ - - - -- -- -+ -+ - Description - აღწერა - -@@ -684,7 +689,7 @@ - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1428,16 +1433,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - შეცდომა შენახვისას - - - - -- -- -+ -+ - Capture saved as - სურათი შენახულია როგორც: - -@@ -1449,27 +1454,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - შეცდომა მცდელობისას შენახულიყო როგორც: - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - DBus-ით დაკავშირება ვერ მოხერხდა - - -- -+ - Kylin-Screenshot - - -@@ -1772,7 +1777,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_nl.ts b/translations/Internationalization_nl.ts -index dd1b0e4..c6cf98f 100755 ---- a/translations/Internationalization_nl.ts -+++ b/translations/Internationalization_nl.ts -@@ -4,12 +4,12 @@ - - AppLauncher - -- -+ - App Launcher - App-starter - - -- -+ - Choose an app to open the capture - Kies een app om de schermafdruk mee te openen - -@@ -17,33 +17,33 @@ - - AppLauncherWidget - -- -+ - Open With - Openen met - - -- -+ - Launch in terminal - Openen in terminalvenster - - -- -+ - Keep open after selection - Openhouden na selectie - - -- -- -+ -+ - Error - Fout - - -- -+ - Unable to write in - Kan niet schrijven naar - - -- -+ - Unable to launch in terminal. - Kan niet openen in terminalvenster. - -@@ -51,73 +51,99 @@ - - ArrowTool - -- -+ - Arrow - Cursor - - -- -+ - Set the Arrow as the paint tool - Cursor instellen als verfgereedschap - - -+ -+ AudioRecordTool -+ -+ -+ -+ AudioRecord -+ -+ -+ - - BlurTool - -- - Blur -- Vervaging -+ Vervaging -+ -+ -+ -+ blur -+ - - -- -+ - Set Blur as the paint tool - Vervaging instellen als verfgereedschap - - -+ -+ CaptureButton -+ -+ -+ option -+ -+ -+ -+ -+ Save -+ Opslaan -+ -+ - - CaptureLauncher - -- -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -- No Delay -+ -+ Screenshot - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -125,49 +151,48 @@ - - CaptureWidget - -- -+ - Unable to capture screen - Kan scherm niet vastleggen - - -- -+ -+ save as -+ -+ -+ -+ - %1 , %2 - - - -- - Select an area with the mouse, or press Esc to exit. - Press Enter to capture the screen. - Press Right Click to show the color picker. - Use the Mouse Wheel to change the thickness of your tool. - Press Space to open the side panel. -- Selecteer een gebied met de cursor of druk op Esc om af te sluiten. -+ Selecteer een gebied met de cursor of druk op Esc om af te sluiten. - Druk op Enter om het scherm vast te leggen. - Klik met de rechtermuisknop om de kleurkiezer te tonen. - Gebruik het muiswiel om de gereedschapsdikte aan te passen. - Druk op spatie om het zijpaneel te openen. - - -- -+ -+ - %1 * %2 - - -- -- -- -- Open Directory -- -- - - - CircleTool - -- -+ - Circle - Cirkel - - -- -+ - Set the Circle as the paint tool - Cirkel instellen als verfgereedschap - -@@ -198,53 +223,72 @@ Druk op spatie om het zijpaneel te openen. - - Controller - -- -+ - &Take Screenshot - Schermafdruk &maken - - -- -+ - &Open Launcher - - - -- -+ - &Configuration - &Configuratie - - -- -+ - &Information - &Informatie - - -- -+ - &Quit - &Afsluiten - -+ -+ -+ Screenshot -+ -+ -+ -+ -+ Unable to use kylin-screenshot -+ -+ - - - CopyTool - -- -+ - Copy - Kopiëren - - -- -+ - Copy the selection into the clipboard - Selectie kopiëren naar klembord - - -+ -+ CursorRecordTool -+ -+ -+ -+ CursorRecord -+ -+ -+ - - Cut - -- -+ - Cut - - - -- -+ - cut - - -@@ -252,7 +296,7 @@ Druk op spatie om het zijpaneel te openen. - - DBusUtils - -- -+ - Unable to connect via DBus - Kan niet verbinden via DBus - -@@ -260,12 +304,12 @@ Druk op spatie om het zijpaneel te openen. - - ExitTool - -- -+ - Exit - Afsluiten - - -- -+ - Leave the capture screen - Verlaat het vastlegscherm - -@@ -318,6 +362,15 @@ Druk op spatie om het zijpaneel te openen. - Wist de naam - - -+ -+ FollowMouseRecordTool -+ -+ -+ -+ FollowMouseRecord -+ -+ -+ - - Font_Options - -@@ -326,17 +379,17 @@ Druk op spatie om het zijpaneel te openen. - Doorhalen - - -- -+ - Underline - Onderstrepen - - -- -+ - Bold - Vetgedrukt - - -- -+ - Italic - Cursief - -@@ -344,22 +397,22 @@ Druk op spatie om het zijpaneel te openen. - - Font_Options2 - -- -+ - StrikeOut - Doorhalen - - -- -+ - Underline - Onderstrepen - - -- -+ - Bold - Vetgedrukt - - -- -+ - Italic - Cursief - -@@ -367,112 +420,112 @@ Druk op spatie om het zijpaneel te openen. - - GeneneralConf - -- -- -+ -+ - Import - Importeren - - -- -- -- -+ -+ -+ - Error - Fout - - -- -+ - Unable to read file. - Kan bestand niet uitlezen. - - -- -- -+ -+ - Unable to write file. - Kan bestand niet wegschrijven. - - -- -+ - Save File - Bestand opslaan - - -- -+ - Confirm Reset - Herstellen bevestigen - - -- -+ - Are you sure you want to reset the configuration? - Weet je zeker dat je de standwaardwaarden van de configuratie wilt herstellen? - - -- -+ - Show help message - Uitleg tonen - - -- -+ - Show the help message at the beginning in the capture mode. - Toont een bericht met uitleg bij het openen van de vastlegmodus. - - -- -- -+ -+ - Show desktop notifications - Bureaubladmeldingen tonen - - -- -+ - Show tray icon - Systeemvakpictogram tonen - - -- -+ - Show the systemtray icon - Toont het systeemvakpictogram - - -- -+ - Configuration File - Configuratiebestand - - -- -+ - Export - Exporteren - - -- -+ - Reset - Standaardwaarden - - -- -+ - Launch at startup - Automatisch opstarten - - -- -+ - Launch Kylin-screenshot - - - -- -+ - Close after capture - - - -- -+ - Close after taking a screenshot - - - -- -+ - Copy URL after upload - - - -- -+ - Copy URL and close window after upload - - -@@ -529,12 +582,12 @@ Druk op spatie om het zijpaneel te openen. - - ImgurUploaderTool - -- -+ - Image Uploader - Afbeeldingsuploader - - -- -+ - Upload the selection to Imgur - Upload de selectie naar Imgur - -@@ -547,92 +600,121 @@ Druk op spatie om het zijpaneel te openen. - Over - - -- -- SPACEBAR -- -- -- -- - Right Click -- Rechtsklikken -+ Rechtsklikken - - -- -+ - Mouse Wheel - Muiswiel - - -- -+ - Move selection 1px - Selectie 1px verplaatsen - - -- -+ - Resize selection 1px - Afmetingen van selectie 1px aanpassen - - -- -+ - Quit capture - Vastleggen afsluiten - - -- -+ - Copy to clipboard - Kopiëren naar klembord - - -- -+ - Save selection as a file - Selectie opslaan als bestand - - -- -+ - Undo the last modification - Laatste wijziging ongedaan maken - - -- - Toggle visibility of sidebar with options of the selected tool -- Zijbalk met gereedschapsopties tonen/verbergen -+ Zijbalk met gereedschapsopties tonen/verbergen - - -- - Show color picker -- Kleurkiezer tonen -+ Kleurkiezer tonen - - -- -+ - Change the tool's thickness - Wijzig de gereedschapsdikte - - -- -+ - Available shortcuts in the screen capture mode. - Beschikbare sneltoetsen in de vastlegmodus. - - -- -+ -+ - Key - Toets - - -- -+ -+ Capturn Full Screen -+ -+ -+ -+ -+ Capture Top Screen -+ -+ -+ -+ -+ Capture Screen selection -+ -+ -+ -+ -+ <u><b>sysShortcuts</b></u> -+ -+ -+ -+ -+ Available System shortcuts. -+ -+ -+ -+ -+ - Description - Omschrijving - - -- -+ - <u><b>License</b></u> - <u><b>Лиценца</b></u> - - -- -+ - <u><b>Version</b></u> - <u><b>Верзија</b></u> - - -- -+ -+ ScreenShot -+ -+ -+ -+ -+ Compiled with Qt -+ -+ -+ -+ - <u><b>Shortcuts</b></u> - <u><b>Пречице</b></u> - -@@ -640,12 +722,12 @@ Druk op spatie om het zijpaneel te openen. - - LineTool - -- -+ - Line - Lijn - - -- -+ - Set the Line as the paint tool - Lijn instellen als verfgereedschap - -@@ -653,597 +735,597 @@ Druk op spatie om het zijpaneel te openen. - - Logger - -- -+ - Error: Resample ratio is out of range! - - - -- -+ - Error: Drift ratio is out of range! - - - -- -+ - Resample ratio is %1 (was %2). - - - -- -+ - Warning: Pixel format is not supported (%1 -> %2), using swscale instead. This is not a problem, but performance will be worse. - - - -- -+ - Error: Can't get swscale context: - Don't translate 'swscale' - - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - Warning: Memory is not properly aligned for SSE, using fallback converter instead. This is not a problem, but performance will be worse. - Don't translate 'fallback' - - - -- -+ - Error: pa_mainloop_prepare failed! - Don't translate 'pa_mainloop_prepare' - - - -- -+ - Error: pa_mainloop_poll failed! - Don't translate 'pa_mainloop_poll' - - - -- -+ - Error: pa_mainloop_dispatch failed! - Don't translate 'pa_mainloop_dispatch' - - - -- -+ - Error: Could not create main loop! - - - -- -+ - Error: Could not create context! - - - -- -+ - Error: Could not connect! Reason: %1 - It is possible that your system doesn't use PulseAudio. Try using the ALSA backend instead. - - - -- -+ - Error: Could not connect! Reason: %1 - It is possible that your system doesn't use PulseAudio. - - - -- -+ - Error: Connection attempt failed! Reason: %1 - - - -- -+ - Error: Could not create stream! Reason: %1 - - - -- -+ - Error: Could not connect stream! Reason: %1 - - - -- -+ - Error: Stream connection attempt failed! Reason: %1 - - - -- -+ - Found source: [%1] %2 - - - -- -+ - Generating source list ... - - - -- -+ - Error: Could not get names of sources! Reason: %1 - - - -- -+ - Error: Could not get source info! Reason: %1 - - - -- -+ - Stream is a monitor. - - - -- -+ - Stream is not a monitor. - - - -- -- -+ -+ - Input thread started. - - - -- -+ - Error: pa_stream_peek failed! - Don't translate 'pa_stream_peek' - - - -- -+ - Warning: Audio source was suspended. The current segment will be stopped until the source is resumed. - - - -- -+ - Warning: Stream was moved to a different source. - - - -- -- -+ -+ - Input thread stopped. - - - -- -- -+ -+ - Exception '%1' in input thread. - - - -- -- -+ -+ - Unknown exception in input thread. - - - -- -+ - Error: Unsupported X11 image pixel format! - - - -- -- -+ -+ - Error: Width or height is zero! - - - -- -- -+ -+ - Error: Width or height is too large, the maximum width and height is %1! - - - -- -+ - Stopping input thread ... - - - -- -+ - Error: Can't open X display! - Don't translate 'display' - - - -- -+ - Using X11 shared memory. - - - -- -+ - Not using X11 shared memory. - - - -- -+ - Warning: XFixes is not supported by X server, the cursor has been hidden. - Don't translate 'XFixes' - - - -- -+ - Error: Can't create shared image! - - - -- -+ - Error: Can't get shared memory! - - - -- -+ - Error: Can't attach to shared memory! - - - -- -+ - Error: Can't attach server to shared memory! - - - -- -+ - Warning: Xinerama is not supported by X server, multi-monitor support may not work properly. - Don't translate 'Xinerama' - - - -- -+ - Warning: No monitors detected, multi-monitor support may not work properly. - - - -- -+ - Error: Invalid screen bounding box! - - - -- -+ - Error: Can't get image (using shared memory)! - Usually this means the recording area is not completely inside the screen. Or did you change the screen resolution? - - - -- -+ - Error: Can't get image (not using shared memory)! - Usually this means the recording area is not completely inside the screen. Or did you change the screen resolution? - - - -- -+ - Error: Channel count is zero. - - - -- -+ - Error: Sample rate is zero. - - - -- -+ - Using sample format %1. - - - -- -+ - Error: Encoder requires an unsupported sample format! - - - -- -+ - Error: Sending of audio frame failed! - - - -- -+ - Error: Receiving of audio packet failed! - - - -- -- -+ -+ - Error: Encoding of audio frame failed! - - - -- -- -+ -+ - Error: Option '%1' could not be parsed! - - - -- -+ - Stopping encoder thread ... - - - -- -+ - Error: Can't open codec! - - - -- -+ - Warning: Codec option '%1' was not recognised! - - - -- -+ - Encoder thread started. - - - -- -+ - Flushing encoder ... - - - -- -+ - Encoder thread stopped. - - - -- -+ - Exception '%1' in encoder thread. - - - -- -+ - Unknown exception in encoder thread. - - - -- -+ - Stopping encoders ... - - - -- -+ - Waiting for muxer thread to stop ... - - - -- -- -+ -+ - Error: Can't copy parameters to stream! - - - -- -+ - Error: Can't write header! - Don't translate 'header' - - - -- -+ - Finishing encoders ... - - - -- -+ - Error: Can't find chosen output format! - - - -- -+ - Using format %1 (%2). - - - -- -+ - Error: Can't allocate format context! - - - -- -+ - Error: Can't open output file! - - - -- -+ - Error: Can't write trailer, continuing anyway. - Don't translate 'trailer' - - - -- -+ - Error: Can't find codec! - - - -- -+ - Using codec %1 (%2). - - - -- -+ - Error: Can't create new stream! - - - -- -+ - Error: Can't create new codec context! - - - -- -+ - Error: Can't get codec context defaults! - - - -- -+ - Warning: This codec is considered experimental by libav/ffmpeg. - - - -- -+ - Muxer thread started. - - - -- -+ - Error: Can't write frame to muxer! - - - -- -+ - Muxer thread stopped. - - - -- -+ - Exception '%1' in muxer thread. - - - -- -+ - Unknown exception in muxer thread. - - - -- -+ - Stopping fragment thread ... - - - -- -+ - Fragment thread started. - - - -- -+ - Next fragment ... - - - -- -+ - Finishing ... - - - -- -+ - Fragment thread stopped. - - - -- -+ - Exception '%1' in fragment thread. - - - -- -+ - Unknown exception in fragment thread. - - - -- -+ - Stopping synchronizer thread ... - - - -- -+ - Warning: Received video frame with non-monotonic timestamp. - - - -- -+ - Warning: Video buffer overflow, some frames will be lost. The audio input seems to be too slow. - - - -- -+ - Warning: Received audio samples with non-monotonic timestamp. - - - -- -+ - Warning: Too many audio samples, dropping samples to keep the audio in sync with the video. - - - -- -+ - Warning: Not enough audio samples, inserting silence to keep the audio in sync with the video. - - - -- -+ - Warning: Audio input is more than 2% too slow! - - - -- -+ - Warning: Audio input is more than 2% too fast! - - - -- -+ - Warning: Audio buffer overflow, starting new segment to keep the audio in sync with the video (some video and/or audio may be lost). The video input seems to be too slow. - - - -- -+ - Warning: Received hole in audio stream, inserting silence to keep the audio in sync with the video. - - - -- -+ - Synchronizer thread started. - - - -- -+ - Synchronizer thread stopped. - - - -- -+ - Exception '%1' in synchronizer thread. - - - -- -+ - Unknown exception in synchronizer thread. - - - -- -+ - Error: Width or height is not an even number! - - - -- -+ - Error: Frame rate is zero! - - - -- -+ - Using pixel format %1. - - - -- -+ - Error: The pixel format is not supported by the codec! - - - -- -+ - Error: Sending of video frame failed! - - - -- -+ - Error: Receiving of video packet failed! - - - -- -- -+ -+ - Error: Encoding of video frame failed! - - - -- -+ - CPU features - - -@@ -1276,12 +1358,12 @@ It is possible that your system doesn't use PulseAudio. - - LuPing - -- -+ - LuPing - - - -- -+ - luping - - -@@ -1289,12 +1371,12 @@ It is possible that your system doesn't use PulseAudio. - - MarkerTool - -- -+ - Marker - Markeerstift - - -- -+ - Set the Marker as the paint tool - Markeerstift instellen als verfgereedschap - -@@ -1302,25 +1384,38 @@ It is possible that your system doesn't use PulseAudio. - - MoveTool - -- -+ - Move - Verplaatsen - - -- -+ - Move the selection area - Selectiegebied verplaatsen - - -+ -+ OptionRecordTool -+ -+ -+ OptionRecord -+ -+ -+ -+ -+ options record tool -+ -+ -+ - - Options - -- -+ - Options - - - -- -+ - options tool - - -@@ -1328,12 +1423,12 @@ It is possible that your system doesn't use PulseAudio. - - PencilTool - -- -+ - Pencil - Potlood - - -- -+ - Set the Pencil as the paint tool - Potlood instellen als verfgereedschap - -@@ -1341,12 +1436,12 @@ It is possible that your system doesn't use PulseAudio. - - PinTool - -- -+ - Pin Tool - Vastmaken - - -- -+ - Pin image on the desktop - Afbeelding vastmaken op bureaublad - -@@ -1354,45 +1449,58 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -+ -+ - Save Error - Fout tijdens opslaan - - -- -- -- -+ -+ -+ -+ - Capture saved as - Schermafdruk opgeslagen als - - -- -+ - Capture saved to clipboard - Schermafdruk vastgelegd op klembord - - -- -- -- -+ -+ -+ -+ - Error trying to save as - Fout tijdens opslaan als - - -- -- -- -- -- -+ -+ kylin-screenshot -+ -+ -+ -+ -+ -+ -+ -+ - Unable to connect via DBus - Kan niet verbinden via DBus - - -- -+ -+ Kylin-Screenshot -+ -+ -+ -+ - Error - Fout - - -- -+ - Unable to write in - Kan niet wegschrijven naar - -@@ -1405,12 +1513,12 @@ It is possible that your system doesn't use PulseAudio. - - RectangleTool - -- -+ - Rectangle - Rechthoek - - -- -+ - Set the Rectangle as the paint tool - Rechthoek instellen als verfgereedschap - -@@ -1418,92 +1526,70 @@ It is possible that your system doesn't use PulseAudio. - - RedoTool - -- -+ - Redo - Opnieuw - - -- -+ - Redo the next modification - Volgende wijziging opnieuw toepassen - - - -- SaveTool -- -- -- Save -- Сачувај -- Opslaan -- -+ SaveAsTool - -- -- Save the capture -- Schermafdruk opslaan -- -- -- -- ScreenCap -- -- -- Options -+ -+ saveas - - - -- -- options tool -+ -+ Save the capture..... - - - - -- ScreenCapExit -- -- -- Options -- -- -+ SaveTool - -- -- options tool -- -+ Save -+ Сачувај -+ Opslaan - -- -- -- ScreenCapOption - -- -- Options -+ -+ save - - - -- -- options tool -- -+ -+ Save the capture -+ Schermafdruk opslaan - - - -- ScreenCapStart -+ Save_Location - -- -- Options -+ -+ save location - - - -- -- options tool -+ -+ save type - - - - -- ScreenCut -+ Save_Location2 - -- -- Options -+ -+ save location - - - -- -- options tool -+ -+ save type - - - -@@ -1515,251 +1601,15 @@ It is possible that your system doesn't use PulseAudio. - Kan scherm niet vastleggen - - -- -- ScreenMouse -- -- -- Options -- -- -- -- -- options tool -- -- -- -- -- ScreenMouseCursor -- -- -- Options -- -- -- -- -- options tool -- -- -- -- -- ScreenRecorder -- -- -- Frame rate: -- -- -- -- -- The number of frames per second in the final video. Higher frame rates use more CPU time. -- -- -- -- -- Container: -- -- -- -- -- Save as: -- -- -- -- -- Record cursor -- -- -- -- -- Record audio -- -- -- -- -- Cancel recording -- -- -- -- -- Save recording -- -- -- -- -- (not installed) -- -- -- -- -- The container (file format) that will be used to save the recording. --Note that not all codecs are supported by all containers, and that not all media players can read all file formats. --- Matroska (MKV) supports all the codecs, but is less well-known. --- MP4 is the most well-known format and will play on almost any modern media player, but supports only H.264 video -- (and many media players only support AAC audio). --- WebM is intended for embedding video into websites (with the HTML5 <video> tag). The format was created by Google. -- WebM is supported by default in Firefox, Chrome and Opera, and plugins are available for Internet Explorer and Safari. -- It supports only VP8 and Vorbis. --- OGG supports only Theora and Vorbis. -- -- -- -- -- Save recording as -- -- -- -- -- -- -- -- -- %1 files -- This appears in the file dialog, e.g. 'MP4 files' -- -- -- -- -- -- -- Other... -- -- -- -- -- Uncompressed -- -- -- -- -- Error: Could not find any suitable container in libavformat! -- -- -- -- -- Error: Could not find any suitable video codec in libavcodec! -- -- -- -- -- Error: Could not find any suitable audio codec in libavcodec! -- -- -- -- -- Starting page ... -- -- -- -- -- Started page. -- -- -- -- -- -- not installed -- -- -- -- -- -- not supported by container -- -- -- -- -- Starting input ... -- -- -- -- -- Started input. -- -- -- -- -- -- Error: Something went wrong during initialization. -- -- -- -- -- Stopping input ... -- -- -- -- -- Stopped input. -- -- -- -- -- Starting output ... -- -- -- -- -- -- Pause recording -- -- -- -- -- Started output. -- -- -- -- -- Stopping page ... -- -- -- -- -- Stopped page. -- -- -- -- -- Stopping output ... -- -- -- -- -- Stopped output. -- -- -- -- -- Start recording -- -- -- -- -- Encoding remaining data ... -- -- -- -- -- ScreenVoice -- -- -- Options -- -- -- -- -- options tool -- -- -- - - SelectionTool - -- -+ - Rectangular Selection - Rechthoekige selectie - - -- -+ - Set Selection as the paint tool - Selectie instellen als verfgereedschap - -@@ -1790,16 +1640,25 @@ Note that not all codecs are supported by all containers, and that not all media - - SizeIndicatorTool - -- -+ - Selection Size Indicator - Grootteindicatie van selectie - - -- -+ - Show the dimensions of the selection (X Y) - Toon de afmetingen van de selectie (X Y) - - -+ -+ StartRecordTool -+ -+ -+ -+ StartRecord -+ -+ -+ - - StrftimeChooserWidget - -@@ -1911,22 +1770,22 @@ Note that not all codecs are supported by all containers, and that not all media - - SyncDiagram - -- -+ - Video in - - - -- -+ - Audio in - - - -- -+ - Video out - - - -- -+ - Audio out - - -@@ -1935,29 +1794,29 @@ Note that not all codecs are supported by all containers, and that not all media - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - - - TextConfig - -- -+ - StrikeOut - Doorhalen - - -- -+ - Underline - Onderstrepen - - -- -+ - Bold - Vetgedrukt - - -- -+ - Italic - Cursief - -@@ -1969,12 +1828,12 @@ Note that not all codecs are supported by all containers, and that not all media - Tekst - - -- -+ - text - - - -- -+ - Add text to your capture - Voeg tekst toe aan je schermafdruk - -@@ -2024,12 +1883,12 @@ Note that not all codecs are supported by all containers, and that not all media - Ongedaan mken - - -- -+ - undo - - - -- -+ - Undo the last modification - Laatste wijziging ongedaan maken - -@@ -2037,17 +1896,17 @@ Note that not all codecs are supported by all containers, and that not all media - - VisualsEditor - -- -+ - Opacity of area outside selection: - Doorzichtigheid van gebied buiten selectie: - - -- -+ - Button Selection - Knopselectie - - -- -+ - Select All - Alles selecteren - -@@ -2055,34 +1914,348 @@ Note that not all codecs are supported by all containers, and that not all media - - mypopup - -- -+ -+ -+ -+ -+ -+ %1 files -+ This appears in the file dialog, e.g. 'MP4 files' -+ -+ -+ -+ -+ -+ -+ Other... -+ -+ -+ -+ -+ Uncompressed -+ -+ -+ -+ -+ Error: Could not find any suitable container in libavformat! -+ -+ -+ -+ -+ Error: Could not find any suitable video codec in libavcodec! -+ -+ -+ -+ -+ Error: Could not find any suitable audio codec in libavcodec! -+ -+ -+ -+ - All screens: %1x%2 - This appears in the screen selection combobox - - - -- -+ - Screen %1: %2x%3 at %4,%5 - This appears in the screen selection combobox - - - -- -- -+ -+ - not installed - - - -- -- -+ -+ - not supported by container - - - -- -+ - Screen %1 - This appears in the screen labels - - -+ -+ -+ Save recording as -+ -+ -+ -+ -+ Form -+ -+ -+ -+ -+ store location -+ -+ -+ -+ -+ ... -+ -+ -+ -+ -+ container -+ -+ -+ -+ -+ audio byte rate -+ -+ -+ -+ -+ video frate -+ -+ -+ -+ -+ video res -+ -+ -+ -+ -+ video codec -+ -+ -+ -+ -+ audio codec -+ -+ -+ -+ -+ ssrtools -+ -+ -+ Form -+ -+ -+ -+ -+ VideoFrate -+ -+ -+ -+ -+ Width -+ -+ -+ -+ -+ Left -+ -+ -+ -+ -+ Top -+ -+ -+ -+ -+ Height -+ -+ -+ -+ -+ select rectangle -+ -+ -+ -+ -+ select window -+ -+ -+ -+ -+ Information -+ -+ -+ -+ -+ Total time: -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ TextLabel -+ -+ -+ -+ -+ FPS in: -+ -+ -+ -+ -+ FPS out: -+ -+ -+ -+ -+ Size in: -+ -+ -+ -+ -+ Size out: -+ -+ -+ -+ -+ File name: -+ -+ -+ -+ -+ File size: -+ -+ -+ -+ -+ Bit rate: -+ -+ -+ -+ -+ fullscreen -+ -+ -+ -+ -+ fixed -+ -+ -+ -+ -+ cursor -+ -+ -+ -+ -+ record cursor -+ -+ -+ -+ -+ enable audio -+ -+ -+ -+ -+ option -+ -+ -+ -+ -+ start -+ -+ -+ -+ -+ cancel -+ -+ -+ -+ -+ save -+ -+ -+ -+ -+ Starting page ... -+ -+ -+ -+ -+ Started page. -+ -+ -+ -+ -+ Stopping page ... -+ -+ -+ -+ -+ Stopped page. -+ -+ -+ -+ -+ Starting output ... -+ -+ -+ -+ -+ Started output. -+ -+ -+ -+ -+ -+ Error: Something went wrong during initialization. -+ -+ -+ -+ -+ Stopping output ... -+ -+ -+ -+ -+ Stopped output. -+ -+ -+ -+ -+ Starting input ... -+ -+ -+ -+ -+ Started input. -+ -+ -+ -+ -+ Stopping input ... -+ -+ -+ -+ -+ Stopped input. -+ -+ -+ -+ -+ Encoding remaining data ... -+ -+ -+ -+ -+ Pause recording -+ -+ -+ -+ -+ Start recording -+ -+ - - -diff --git a/translations/Internationalization_pl.ts b/translations/Internationalization_pl.ts -index c398256..56e521b 100755 ---- a/translations/Internationalization_pl.ts -+++ b/translations/Internationalization_pl.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -243,7 +248,7 @@ Spacja, aby pokazać panel boczny. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -642,13 +647,13 @@ Spacja, aby pokazać panel boczny. - Zmień grubość narzędzia - - -- -+ - Available shortcuts in the screen capture mode. - Dostępne skróty w trybie przechwytywania obrazu. - - -- -- -+ -+ - Key - Klawisz - -@@ -678,8 +683,8 @@ Spacja, aby pokazać panel boczny. - - - -- -- -+ -+ - Description - Działanie - -@@ -695,7 +700,7 @@ Spacja, aby pokazać panel boczny. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1439,16 +1444,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - Błąd zapisu - - - - -- -- -+ -+ - Capture saved as - Zaznaczenie zapisano jako - -@@ -1460,27 +1465,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - Błąd przy próbie zapisu jako - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - Nie udało się połączyć za pomocą DBus - - -- -+ - Kylin-Screenshot - - -@@ -1783,7 +1788,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_pt_br.ts b/translations/Internationalization_pt_br.ts -index 951eceb..0ed9a60 100755 ---- a/translations/Internationalization_pt_br.ts -+++ b/translations/Internationalization_pt_br.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -244,7 +249,7 @@ Pressione espaço abrir o painel lateral. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -643,13 +648,13 @@ Pressione espaço abrir o painel lateral. - Muda a grossura do pincel - - -- -+ - Available shortcuts in the screen capture mode. - Atalhos disponívels na tela de captura. - - -- -- -+ -+ - Key - Tecla - -@@ -679,8 +684,8 @@ Pressione espaço abrir o painel lateral. - - - -- -- -+ -+ - Description - Descrição - -@@ -696,7 +701,7 @@ Pressione espaço abrir o painel lateral. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1440,16 +1445,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - Salvar erro - - - - -- -- -+ -+ - Capture saved as - Captura salva como - -@@ -1461,27 +1466,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - Erro tentando salvar como - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - Não foi possível conectar via DBus - - -- -+ - Kylin-Screenshot - - -@@ -1784,7 +1789,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_ru.ts b/translations/Internationalization_ru.ts -index f1bddca..a93787b 100755 ---- a/translations/Internationalization_ru.ts -+++ b/translations/Internationalization_ru.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -244,7 +249,7 @@ Press Space to open the side panel. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -647,13 +652,13 @@ Press Space to open the side panel. - Изменить толщину инструмента - - -- -+ - Available shortcuts in the screen capture mode. - Доступные горячие клавиши в режиме захвата экрана. - - -- -- -+ -+ - Key - Клавиша - -@@ -683,8 +688,8 @@ Press Space to open the side panel. - - - -- -- -+ -+ - Description - Описание - -@@ -700,7 +705,7 @@ Press Space to open the side panel. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1444,16 +1449,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - Ошибка сохранения - - - - -- -- -+ -+ - Capture saved as - Снимок сохранён как - -@@ -1465,27 +1470,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - Ошибка при попытке сохранить как - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - Не удалось подключиться через DBus - - -- -+ - Kylin-Screenshot - - -@@ -1788,7 +1793,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_sk.ts b/translations/Internationalization_sk.ts -index 304afae..a00c36f 100755 ---- a/translations/Internationalization_sk.ts -+++ b/translations/Internationalization_sk.ts -@@ -103,17 +103,17 @@ - - CaptureLauncher - -- -+ - <b>Capture Mode</b> - <b>Režim zachytávania</b> - - -- -+ - Rectangular Region - Pravouhlá oblasť - - -- -+ - Full Screen (All Monitors) - Celá obrazovka (všetky monitory) - -@@ -122,27 +122,32 @@ - Bez oneskorenia - - -- -+ -+ Screenshot -+ -+ -+ -+ - second - sekunda - - -- -+ - seconds - sekundy - - -- -+ - Take new screenshot - Urobiť novú snímku - - -- -+ - Area: - Oblasť: - - -- -+ - Delay: - Oneskorenie: - -@@ -248,7 +253,7 @@ Stlačte medzerník pre otvorenie postranného panelu. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -655,13 +660,13 @@ Stlačte medzerník pre otvorenie postranného panelu. - Zmena hrúbky nástroja - - -- -+ - Available shortcuts in the screen capture mode. - Dostupné klávesové skratky v režime zachytávania obrazovky. - - -- -- -+ -+ - Key - Kláves - -@@ -691,8 +696,8 @@ Stlačte medzerník pre otvorenie postranného panelu. - - - -- -- -+ -+ - Description - Popis - -@@ -708,7 +713,7 @@ Stlačte medzerník pre otvorenie postranného panelu. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1452,21 +1457,21 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - Nie je možné pripojiť sa prostredníctvom DBus - - -- -+ - Kylin-Screenshot - - -@@ -1488,22 +1493,22 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Capture saved as - Snímka uložená ako - - - - -- -- -+ -+ - Error trying to save as - Chyba pri ukladaní do - - -- -- -+ -+ - Save Error - Chyba pri ukladaní - -@@ -1796,7 +1801,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_sr.ts b/translations/Internationalization_sr.ts -index 7da500f..b2d4909 100755 ---- a/translations/Internationalization_sr.ts -+++ b/translations/Internationalization_sr.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -244,7 +249,7 @@ Press Space to open the side panel. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -643,13 +648,13 @@ Press Space to open the side panel. - Измени дебљину линије алата - - -- -+ - Available shortcuts in the screen capture mode. - Доступне пречице у моду снимка екрана. - - -- -- -+ -+ - Key - Тастер - -@@ -679,8 +684,8 @@ Press Space to open the side panel. - - - -- -- -+ -+ - Description - Опис - -@@ -696,7 +701,7 @@ Press Space to open the side panel. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1440,16 +1445,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - Грешка приликом упусивања - - - - -- -- -+ -+ - Capture saved as - Сачувај снимак као - -@@ -1461,27 +1466,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - Грешка приликом уписивања као - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - Нисам успео да се повежем кроз DBus - - -- -+ - Kylin-Screenshot - - -@@ -1785,7 +1790,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_tr.ts b/translations/Internationalization_tr.ts -index 59c3016..d7f3f3b 100755 ---- a/translations/Internationalization_tr.ts -+++ b/translations/Internationalization_tr.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -244,7 +249,7 @@ Yan paneli açmak için Boşluk tuşuna basın. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -643,13 +648,13 @@ Yan paneli açmak için Boşluk tuşuna basın. - Araç kalınlığını değiştirin - - -- -+ - Available shortcuts in the screen capture mode. - Ekran yakalama modunda kullanılabilir kısayollar. - - -- -- -+ -+ - Key - Anahtar - -@@ -679,8 +684,8 @@ Yan paneli açmak için Boşluk tuşuna basın. - - - -- -- -+ -+ - Description - Tanım - -@@ -696,7 +701,7 @@ Yan paneli açmak için Boşluk tuşuna basın. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1440,16 +1445,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - Kaydetme Hatası - - - - -- -- -+ -+ - Capture saved as - Yakalama farklı kaydedildi - -@@ -1461,27 +1466,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - Farklı kaydetmeye çalışılırken hata oluştu - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - DBus ile bağlanılamadı - - -- -+ - Kylin-Screenshot - - -@@ -1784,7 +1789,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_uk.ts b/translations/Internationalization_uk.ts -index d943809..fdefaa1 100755 ---- a/translations/Internationalization_uk.ts -+++ b/translations/Internationalization_uk.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -244,7 +249,7 @@ Press Space to open the side panel. - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -647,13 +652,13 @@ Press Space to open the side panel. - Змінити товщину інструменту - - -- -+ - Available shortcuts in the screen capture mode. - Доступні комбінації клавіш у режимі захоплення екрану. - - -- -- -+ -+ - Key - Клавіша - -@@ -683,8 +688,8 @@ Press Space to open the side panel. - - - -- -- -+ -+ - Description - Опис - -@@ -700,7 +705,7 @@ Press Space to open the side panel. - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -1444,16 +1449,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - Помилка збереження - - - - -- -- -+ -+ - Capture saved as - Знімок збережено як - -@@ -1465,27 +1470,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - Помилка під час збереження як - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - Не вдалось підключитись через DBus - - -- -+ - Kylin-Screenshot - - -@@ -1788,7 +1793,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - -diff --git a/translations/Internationalization_zh_CN.ts b/translations/Internationalization_zh_CN.ts -index 2902ee3..227e573 100755 ---- a/translations/Internationalization_zh_CN.ts -+++ b/translations/Internationalization_zh_CN.ts -@@ -109,7 +109,7 @@ - - CaptureLauncher - -- -+ - <b>Capture Mode</b> - <b>捕获模式</b> - -@@ -128,7 +128,12 @@ - 无延迟 - - -- -+ -+ Screenshot -+ -+ -+ -+ - second - 秒 - -@@ -265,8 +270,12 @@ Press Space to open the side panel. - - - -+ Screenshot -+ -+ -+ - Kylin-Screenshot -- 麒麟截图 -+ 麒麟截图 - - - -@@ -713,7 +722,7 @@ Press Space to open the side panel. - 可截图的系统快捷键 - - -- -+ - - Key - 键 -@@ -725,7 +734,7 @@ Press Space to open the side panel. - 描述 - - -- -+ - <u><b>License</b></u> - <u><b>许可证</b></u> - -@@ -736,9 +745,13 @@ Press Space to open the side panel. - - - -+ ScreenShot -+ -+ -+ - Kylin-ScreenShot - 麒麟截图 -- 麒麟截图 -+ 麒麟截图 - - - -@@ -752,7 +765,7 @@ Press Space to open the side panel. - <u><b>快捷键</b></u> - - -- -+ - Available shortcuts in the screen capture mode. - 屏幕捕捉模式中的可用快捷键。 - -@@ -1487,34 +1500,34 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - 保存错误 - - -- -+ - -- -+ - - Capture saved as - 捕获已保存为 - - -- -+ - Capture saved to clipboard - 捕获已保存至剪贴板 - - - - -- -+ - - Error trying to save as - 尝试另存为时出错 - - -- -+ - kylin-screenshot - 麒麟截图 - 麒麟截图 -@@ -1901,9 +1914,13 @@ It is possible that your system doesn't use PulseAudio. - - SystemNotification - -- - Kylin-ScreenShot Info -- 麒麟截图 消息 -+ 麒麟截图 消息 -+ -+ -+ -+ ScreenShot Info -+ - - - -diff --git a/translations/Internationalization_zh_TW.ts b/translations/Internationalization_zh_TW.ts -index f5e220e..1e702a5 100755 ---- a/translations/Internationalization_zh_TW.ts -+++ b/translations/Internationalization_zh_TW.ts -@@ -103,42 +103,47 @@ - - CaptureLauncher - -- -+ -+ Screenshot -+ -+ -+ -+ - <b>Capture Mode</b> - - - -- -+ - Rectangular Region - - - -- -+ - Full Screen (All Monitors) - - - -- -+ - second - - - -- -+ - seconds - - - -- -+ - Take new screenshot - - - -- -+ - Area: - - - -- -+ - Delay: - - -@@ -232,7 +237,7 @@ - - - -- Kylin-Screenshot -+ Screenshot - - - -@@ -656,14 +661,14 @@ - - - -- -- -+ -+ - Key - 鍵 - - -- -- -+ -+ - Description - 描述 - -@@ -679,7 +684,7 @@ - - - -- Kylin-ScreenShot -+ ScreenShot - - - -@@ -693,7 +698,7 @@ - <u><b>快速鍵</b></u> - - -- -+ - Available shortcuts in the screen capture mode. - 螢幕擷取模式中的可用快速鍵 - -@@ -1428,16 +1433,16 @@ It is possible that your system doesn't use PulseAudio. - - QObject - -- -- -+ -+ - Save Error - 存檔錯誤 - - - - -- -- -+ -+ - Capture saved as - 截圖已另存為 - -@@ -1449,27 +1454,27 @@ It is possible that your system doesn't use PulseAudio. - - - -- -- -+ -+ - Error trying to save as - 嘗試另存新檔時發生錯誤 - - -- -+ - kylin-screenshot - - - -- -- -- -- -- -+ -+ -+ -+ -+ - Unable to connect via DBus - 無法透過 DBus 進行連接 - - -- -+ - Kylin-Screenshot - - -@@ -1772,7 +1777,7 @@ It is possible that your system doesn't use PulseAudio. - SystemNotification - - -- Kylin-ScreenShot Info -+ ScreenShot Info - - - --- -2.33.0 - diff --git a/0009-add-changelog-for-1.0.1.patch b/0009-add-changelog-for-1.0.1.patch deleted file mode 100644 index 6ace721..0000000 --- a/0009-add-changelog-for-1.0.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 358f633f51ae1264d56752475cb29921a5613013 Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Mon, 11 Jul 2022 15:28:12 +0800 -Subject: [PATCH] add changelog for 1.0.1 - ---- - debian/changelog | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/debian/changelog b/debian/changelog -index 8a949fb..cd74632 100755 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,9 @@ -+kylin-screenshot (1.0.1-1) focal; urgency=medium -+ -+ * New upstream release. -+ -+ -- handsome_feng Thu, 17 Jun 2021 20:05:52 +0800 -+ - kylin-screenshot (1.0.0-1) unstable; urgency=medium - - * Initial release. (Closes: #969417) --- -2.33.0 - diff --git a/0010-pin-windget-windowIcon-follow-theme.patch b/0010-pin-windget-windowIcon-follow-theme.patch deleted file mode 100644 index 6edef4c..0000000 --- a/0010-pin-windget-windowIcon-follow-theme.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8dcf3640346818e4540559f7e921d90fe9a0f00d Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Wed, 13 Jul 2022 10:08:57 +0800 -Subject: [PATCH] pin windget windowIcon follow theme - ---- - src/tools/pin/pinwidget.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/tools/pin/pinwidget.cpp b/src/tools/pin/pinwidget.cpp -index 4c10ecd..0eef443 100755 ---- a/src/tools/pin/pinwidget.cpp -+++ b/src/tools/pin/pinwidget.cpp -@@ -26,12 +26,11 @@ - PinWidget::PinWidget(const QPixmap &pixmap, QWidget *parent) : - QWidget(parent), m_pixmap(pixmap) - { -- setWindowIcon(QIcon("/usr/share/icons/ukui-icon-theme-default/128x128/apps/kylin-screenshot.png")); - setWindowFlags(Qt::WindowStaysOnTopHint - | Qt::FramelessWindowHint); - //set the bottom widget background transparent - setAttribute(Qt::WA_TranslucentBackground); -- setMinimumWidth(300); -+ //setMinimumWidth(300); - ConfigHandler conf; - m_baseColor = conf.uiMainColorValue(); - m_hoverColor = conf.uiContrastColorValue(); --- -2.33.0 - diff --git a/0011-change-coloeFontWidget-some-ui-options.patch b/0011-change-coloeFontWidget-some-ui-options.patch deleted file mode 100644 index 676677e..0000000 --- a/0011-change-coloeFontWidget-some-ui-options.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 15e9127686ece049524c8ca2ac8e16629769174f Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Wed, 13 Jul 2022 14:14:10 +0800 -Subject: [PATCH] change coloeFontWidget some ui options - ---- - src/widgets/capture/fontsize_color_chose.cpp | 26 ++++++++++++++----- - src/widgets/capture/fontsize_color_chose2.cpp | 21 ++++++++++++--- - 2 files changed, 36 insertions(+), 11 deletions(-) - -diff --git a/src/widgets/capture/fontsize_color_chose.cpp b/src/widgets/capture/fontsize_color_chose.cpp -index a5d5ba0..7a26c7f 100755 ---- a/src/widgets/capture/fontsize_color_chose.cpp -+++ b/src/widgets/capture/fontsize_color_chose.cpp -@@ -121,18 +121,30 @@ void FontSize_Color_Chose::paintEvent(QPaintEvent *event) - if (color_rect == rect){ - Rect_h = rect.height()+4; - Rect_w = rect.width() +4; -- painter.setBrush(QColor(255,255,255)); -- painter.drawEllipse(QRect(rect.x()-2,rect.y()-2,Rect_h,Rect_w)); -- painter.setBrush(QColor(0,0,0)); -- painter.drawEllipse(rect); -+ painter.setBrush(QColor(255,255,255)); -+ painter.drawEllipse(QRect(rect.x()-2,rect.y()-2,Rect_h,Rect_w)); -+ if ((context.style_name.compare("ukui-dark") == 0) -+ || (context.style_name.compare("ukui-black") == 0)) { -+ painter.setBrush(QColor(Qt::gray)); -+ } else -+ painter.setBrush(QColor(0, 0, 0)); -+ painter.drawEllipse(rect); - } - else{ -- painter.setBrush(QColor(78,78,78)); -+ if ((context.style_name.compare("ukui-dark") == 0) -+ || (context.style_name.compare("ukui-black") == 0)) { -+ painter.setBrush(QColor(Qt::gray)); -+ } else -+ painter.setBrush(QColor(78, 78, 78)); - painter.drawEllipse(rect); - } - } -- painter.setBrush(QColor(25,25,25)); -- painter.drawRect(80,31,1,17); -+ if ((context.style_name.compare("ukui-dark") == 0) -+ || (context.style_name.compare("ukui-black") == 0)) { -+ painter.setBrush(QColor(Qt::gray)); -+ } else -+ painter.setBrush(QColor(25, 25, 25, 153)); -+ painter.drawRect(85,33,1.52,16); - for (int i =4;i<12;i++) - { - QRect rect = m_colorAreaList.at(i); -diff --git a/src/widgets/capture/fontsize_color_chose2.cpp b/src/widgets/capture/fontsize_color_chose2.cpp -index cd2b89c..859c2ab 100755 ---- a/src/widgets/capture/fontsize_color_chose2.cpp -+++ b/src/widgets/capture/fontsize_color_chose2.cpp -@@ -121,16 +121,29 @@ void FontSize_Color_Chose2::paintEvent(QPaintEvent *event) - Rect_w = rect.width() +4; - painter.setBrush(QColor(255,255,255)); - painter.drawEllipse(QRect(rect.x()-2,rect.y()-2,Rect_h,Rect_w)); -- painter.setBrush(QColor(0,0,0)); -+ if ((context.style_name.compare("ukui-dark") == 0) -+ || (context.style_name.compare("ukui-black") == 0)) { -+ painter.setBrush(QColor(Qt::gray)); -+ } else -+ painter.setBrush(QColor(0, 0, 0)); -+ painter.drawEllipse(rect); - painter.drawEllipse(rect); - } - else{ -- painter.setBrush(QColor(78,78,78)); -+ if ((context.style_name.compare("ukui-dark") == 0) -+ || (context.style_name.compare("ukui-black") == 0)) { -+ painter.setBrush(QColor(Qt::gray)); -+ } else -+ painter.setBrush(QColor(78, 78, 78)); - painter.drawEllipse(rect); - } - } -- painter.setBrush(QColor(25,25,25)); -- painter.drawRect(80,17,1,14); -+ if ((context.style_name.compare("ukui-dark") == 0) -+ || (context.style_name.compare("ukui-black") == 0)) { -+ painter.setBrush(QColor(Qt::gray)); -+ } else -+ painter.setBrush(QColor(25, 25, 25, 153)); -+ painter.drawRect(80,17,1.52,16); - for (int i =4;i<12;i++) - { - QRect rect = m_colorAreaList.at(i); --- -2.33.0 - diff --git a/kylin-screenshot-1.0.0.tar.gz b/kylin-screenshot-1.0.0.tar.gz deleted file mode 100644 index c278a95..0000000 Binary files a/kylin-screenshot-1.0.0.tar.gz and /dev/null differ diff --git a/kylin-screenshot-1.0.5.tar.gz b/kylin-screenshot-1.0.5.tar.gz new file mode 100644 index 0000000..d4b511e Binary files /dev/null and b/kylin-screenshot-1.0.5.tar.gz differ diff --git a/kylin-screenshot.spec b/kylin-screenshot.spec index 4f0c7e0..9b61ec2 100644 --- a/kylin-screenshot.spec +++ b/kylin-screenshot.spec @@ -1,9 +1,9 @@ %define debug_package %{nil} Name: kylin-screenshot -Version: 1.0.0 -Release: 15 +Version: 1.0.5 +Release: 1 Summary: a powerful screenshot and screen recording tool -License: GPL-3.0-or-later and LGPL-3.0-or-later and MIT and Apache-2.0 +License: GPL-3+ URL: https://github.com/ubuntukylin Source0: %{name}-%{version}.tar.gz @@ -23,22 +23,10 @@ BuildRequires: ffmpeg-devel BuildRequires: kf5-kwindowsystem-devel BuildRequires: kf5-kwindowsystem BuildRequires: gsettings-qt-devel -BuildRequires: ukui-interface + # Requires: NetworkManager -patch0: 0001-fix-screenshot-service.patch -patch1: 0001-add-save-dialog.patch -patch2: optimize-the-undo-button-function.patch -patch3: 0003-change-kylin-screenshot-to-screenshot.patch -patch4: 0004-add-log.patch -patch5: 0005-fixed-wayland-cannot-screenshot-top-widget.patch -patch6: 0006-change-markertool-opacity.patch -patch7: 0007-change-text-property-in-time.patch -patch8: 0008-change-notify-information-about-application-name.patch -patch9: 0009-add-changelog-for-1.0.1.patch -patch10: 0010-pin-windget-windowIcon-follow-theme.patch -patch11: 0011-change-coloeFontWidget-some-ui-options.patch %description Powerful yet simple-to-use screenshot software @@ -50,18 +38,6 @@ patch11: 0011-change-coloeFontWidget-some-ui-options.patch %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-screenshot.pro @@ -75,43 +51,46 @@ make INSTALL_ROOT=%{buildroot} install rm -rf $RPM_BUILD_ROOT %files -%{_bindir}/kylin-screenshot -%{_datadir}/applications/kylin-screenshot.desktop -%{_datadir}/dbus-1/interfaces/org.dharkael.kylinscreenshot.xml -%{_datadir}/dbus-1/services/org.dharkael.kylinscreenshot.service -%{_datadir}/glib-2.0/schemas/org.ukui.screenshot.gschema.xml -%{_datadir}/icons/hicolor/128x128/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/128x128@2x/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/16x16/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/16x16@2x/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/24x24/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/256x256/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/256x256@2x/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/32x32/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/32x32@2x/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/48x48/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/48x48@2x/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/64x64@2x/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/96x96/apps/kylin-screenshot.png -%{_datadir}/icons/hicolor/96x96@2x/apps/kylin-screenshot.png -%{_datadir}/kylin-screenshot/translations/Internationalization_ca.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_de_DE.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_es.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_fr.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_ja.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_ka.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_pl.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_pt_br.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_ru.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_sk.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_sr.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_tr.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_uk.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_zh_CN.qm -%{_datadir}/kylin-screenshot/translations/Internationalization_zh_TW.qm -%{_datadir}/metainfo/kylinscreenshot.appdata.xml +/usr/local/bin/kylin-screenshot +/usr/local/share/applications/kylin-screenshot.desktop +/usr/local/share/dbus-1/interfaces/org.dharkael.kylinscreenshot.xml +/usr/local/share/dbus-1/services/org.dharkael.kylinscreenshot.service +/usr/local/share/glib-2.0/schemas/org.ukui.screenshot.gschema.xml +/usr/local/share/icons/hicolor/128x128/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/128x128@2x/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/16x16/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/16x16@2x/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/24x24/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/256x256/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/256x256@2x/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/32x32/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/32x32@2x/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/48x48/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/48x48@2x/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/64x64@2x/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/96x96/apps/kylin-screenshot.png +/usr/local/share/icons/hicolor/96x96@2x/apps/kylin-screenshot.png +/usr/local/share/kylin-screenshot/translations/Internationalization_ca.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_de_DE.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_es.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_fr.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_ja.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_ka.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_pl.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_pt_br.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_ru.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_sk.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_sr.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_tr.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_uk.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_zh_CN.qm +/usr/local/share/kylin-screenshot/translations/Internationalization_zh_TW.qm +/usr/local/share/metainfo/kylinscreenshot.appdata.xml %changelog +* Mon Oct 24 2022 tanyulong - 1.0.5-1 +- update upstream version 1.0.5 + * Wed Jul 13 2022 peijiankang - 1.0.0-15 - change coloeFontWidget some ui options diff --git a/optimize-the-undo-button-function.patch b/optimize-the-undo-button-function.patch deleted file mode 100644 index 271c63d..0000000 --- a/optimize-the-undo-button-function.patch +++ /dev/null @@ -1,690 +0,0 @@ -diff -Naur kylin-screenshot-1.0.0/debian/copyright kylin-screenshot-1.0.0~/debian/copyright ---- kylin-screenshot-1.0.0/debian/copyright 2021-01-08 14:21:24.000000000 +0800 -+++ kylin-screenshot-1.0.0~/debian/copyright 2021-12-08 17:17:40.318668024 +0800 -@@ -42,7 +42,8 @@ - Copyright:2012-2020 Maarten Baert - License: LGPL-3+ - --Files: src/tools/cut/* -+Files: src/tools/AbstractActionToolWithWidget* -+ src/tools/cut/* - src/tools/luping/* - src/tools/options/* - src/tools/screencap/* -diff -Naur kylin-screenshot-1.0.0/kylin-screenshot.pro kylin-screenshot-1.0.0~/kylin-screenshot.pro ---- kylin-screenshot-1.0.0/kylin-screenshot.pro 2021-12-08 17:29:46.815135871 +0800 -+++ kylin-screenshot-1.0.0~/kylin-screenshot.pro 2021-12-08 17:32:17.786319602 +0800 -@@ -6,8 +6,7 @@ - - win32:LIBS += -luser32 -lshell32 - --#LIBS += -lavutil -lavformat -lavcodec -lswscale -lX11 -lXext -lXtst -lXfixes -lXinerama -lpulse --LIBS += -lX11 -lXext -lXtst -lXfixes -lXinerama -lpulse -+LIBS += -lavutil -lavformat -lavcodec -lswscale -lX11 -lXext -lXtst -lXfixes -lXinerama -lpulse - - TAG_VERSION = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags) - isEmpty(TAG_VERSION){ -@@ -28,6 +27,7 @@ - CONFIG += c++11 link_pkgconfig - PKGCONFIG += gsettings-qt - QMAKE_CXXFLAGS += -std=c++0x -+PKGCONFIG += libavutil libavformat libavcodec libswscale x11 xext xfixes xinerama libpulse - - #CONFIG += packaging # Enables "make install" for packaging paths - -@@ -88,6 +88,7 @@ - SOURCES += src/main.cpp \ - src/common/CommandLineOptions.cpp \ - src/common/Logger.cpp \ -+ src/tools/AbstractActionToolWithWidget.cpp \ - src/utils/mysavedialog.cpp \ - src/widgets/capture/buttonhandler.cpp \ - src/widgets/capture/font_options.cpp \ -@@ -171,14 +172,11 @@ - src/widgets/screentype.cpp \ - # src/widgets/widget.cpp - --HEADERS += src/common/Global.h \ -- src/common/my_qt.h \ -- src/common/my_x.h \ -- src/common/my_av.h \ -- src/widgets/capture/buttonhandler.h \ -+HEADERS += src/common/Global.h src/common/my_qt.h src/common/my_x.h src/common/my_av.h src/widgets/capture/buttonhandler.h \ - src/common/CommandLineOptions.h \ - src/common/Enum.h \ - src/common/Logger.h \ -+ src/tools/AbstractActionToolWithWidget.h \ - src/utils/mysavedialog.h \ - src/widgets/capture/font_options.h \ - src/widgets/capture/font_options2.h \ -@@ -317,12 +315,11 @@ - - servicedbus.path = $${PREFIX}/share/dbus-1/services/ - --# packaging { --# servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service --# } else { --# servicedbus.files = dbus/make/org.dharkael.kylinscreenshot.service --# } -- servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service -+ packaging { -+ servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service -+ } else { -+ servicedbus.files = dbus/make/org.dharkael.kylinscreenshot.service -+ } - - INSTALLS += target \ - icon \ -diff -Naur kylin-screenshot-1.0.0/src/common/CommandLineOptions.cpp kylin-screenshot-1.0.0~/src/common/CommandLineOptions.cpp ---- kylin-screenshot-1.0.0/src/common/CommandLineOptions.cpp 2021-01-08 14:21:24.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/common/CommandLineOptions.cpp 2021-12-08 17:17:42.139694256 +0800 -@@ -204,11 +204,11 @@ - #else - "Compiled with GCC " + QString::number(__GNUC__) + "." + QString::number(__GNUC_MINOR__) + "." + QString::number(__GNUC_PATCHLEVEL__) + "\n" - #endif -- "Qt: header " + QT_VERSION_STR + ", lib " + qVersion() + "\n"; --// "libavformat: header " + av_version(LIBAVFORMAT_VERSION_INT) + ", lib " + av_version(avformat_version()) + "\n" --// "libavcodec: header " + av_version(LIBAVCODEC_VERSION_INT) + ", lib " + av_version(avcodec_version()) + "\n" --// "libavutil: header " + av_version(LIBAVUTIL_VERSION_INT) + ", lib " + av_version(avutil_version()) + "\n" --// "libswscale: header " + av_version(LIBSWSCALE_VERSION_INT) + ", lib " + av_version(swscale_version()); -+ "Qt: header " + QT_VERSION_STR + ", lib " + qVersion() + "\n" -+ "libavformat: header " + av_version(LIBAVFORMAT_VERSION_INT) + ", lib " + av_version(avformat_version()) + "\n" -+ "libavcodec: header " + av_version(LIBAVCODEC_VERSION_INT) + ", lib " + av_version(avcodec_version()) + "\n" -+ "libavutil: header " + av_version(LIBAVUTIL_VERSION_INT) + ", lib " + av_version(avutil_version()) + "\n" -+ "libswscale: header " + av_version(LIBSWSCALE_VERSION_INT) + ", lib " + av_version(swscale_version()); - } - - QString GetApplicationSystemDir(const QString& subdir) { -diff -Naur kylin-screenshot-1.0.0/src/common/my_av.h kylin-screenshot-1.0.0~/src/common/my_av.h ---- kylin-screenshot-1.0.0/src/common/my_av.h 2021-01-08 14:21:24.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/common/my_av.h 2021-12-08 17:17:42.128694098 +0800 -@@ -1,21 +1,21 @@ - #pragma once - - extern "C" { --// #include --// #include --// #include --// #include --// #include --// #include --// #include --// #include -+#include -+#include -+#include -+#include -+//#include -+#include -+#include -+#include - } - #include - - // convert weird types from libav/ffmpeg to doubles --// inline double ToDouble(const AVRational& r) { --// return (double) r.num / (double) r.den; --// } -+inline double ToDouble(const AVRational& r) { -+ return (double) r.num / (double) r.den; -+} - - class LibavException : public std::exception { - public: -diff -Naur kylin-screenshot-1.0.0/src/tools/abstractactiontool.cpp kylin-screenshot-1.0.0~/src/tools/abstractactiontool.cpp ---- kylin-screenshot-1.0.0/src/tools/abstractactiontool.cpp 2021-01-08 14:21:24.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/tools/abstractactiontool.cpp 2021-12-08 17:17:41.448684302 +0800 -@@ -26,7 +26,7 @@ - } - - bool AbstractActionTool::isSelectable() const { -- return true; -+ return false; - } - - bool AbstractActionTool::showMousePreview() const { -diff -Naur kylin-screenshot-1.0.0/src/tools/AbstractActionToolWithWidget.cpp kylin-screenshot-1.0.0~/src/tools/AbstractActionToolWithWidget.cpp ---- kylin-screenshot-1.0.0/src/tools/AbstractActionToolWithWidget.cpp 1970-01-01 08:00:00.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/tools/AbstractActionToolWithWidget.cpp 2021-12-08 17:17:41.463684518 +0800 -@@ -0,0 +1,88 @@ -+/* -+ * -+ * Copyright: 2020 KylinSoft Co., Ltd. -+ * Authors: -+ * huanhuan zhang -+ * -+ * 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 -+ * (at your option) 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 . -+ */ -+#include "AbstractActionToolWithWidget.h".h" -+ -+AbstractActionToolWithWidget::AbstractActionToolWithWidget(QObject *parent) : CaptureTool(parent) { -+ -+} -+ -+bool AbstractActionToolWithWidget::isValid() const { -+ return true; -+} -+ -+bool AbstractActionToolWithWidget::isSelectable() const { -+ return true; -+} -+ -+bool AbstractActionToolWithWidget::showMousePreview() const { -+ return false; -+} -+ -+QIcon AbstractActionToolWithWidget::icon(const QColor &background, bool inEditor) const -+{ -+ Q_UNUSED(background); -+ Q_UNUSED(inEditor); -+ return QIcon(); -+} -+#ifdef SUPPORT_UKUI -+QIcon AbstractActionToolWithWidget::icon(const QColor &background, bool inEditor, const CaptureContext &context) const -+{ -+ Q_UNUSED(background); -+ Q_UNUSED(inEditor); -+ Q_UNUSED(context); -+ return QIcon(); -+} -+#endif -+void AbstractActionToolWithWidget::undo(QPixmap &pixmap) { -+ Q_UNUSED(pixmap); -+} -+ -+void AbstractActionToolWithWidget::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) { -+ Q_UNUSED(painter); -+ Q_UNUSED(pixmap); -+ Q_UNUSED(recordUndo); -+} -+ -+void AbstractActionToolWithWidget::paintMousePreview( -+ QPainter &painter, const CaptureContext &context) -+{ -+ Q_UNUSED(painter); -+ Q_UNUSED(context); -+} -+ -+void AbstractActionToolWithWidget::drawEnd(const QPoint &p) { -+ Q_UNUSED(p); -+} -+ -+void AbstractActionToolWithWidget::drawMove(const QPoint &p) { -+ Q_UNUSED(p); -+} -+ -+void AbstractActionToolWithWidget::drawStart(const CaptureContext &context) { -+ Q_UNUSED(context); -+} -+ -+void AbstractActionToolWithWidget::colorChanged(const QColor &c) { -+ Q_UNUSED(c); -+} -+ -+void AbstractActionToolWithWidget::thicknessChanged(const int th) { -+ Q_UNUSED(th); -+} -diff -Naur kylin-screenshot-1.0.0/src/tools/AbstractActionToolWithWidget.h kylin-screenshot-1.0.0~/src/tools/AbstractActionToolWithWidget.h ---- kylin-screenshot-1.0.0/src/tools/AbstractActionToolWithWidget.h 1970-01-01 08:00:00.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/tools/AbstractActionToolWithWidget.h 2021-12-08 17:17:41.437684144 +0800 -@@ -0,0 +1,47 @@ -+/* -+ * -+ * Copyright: 2020 KylinSoft Co., Ltd. -+ * Authors: -+ * huanhuan zhang -+ * -+ * 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 -+ * (at your option) 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 . -+ */ -+#pragma once -+ -+#include "capturetool.h" -+ -+class AbstractActionToolWithWidget : public CaptureTool { -+ Q_OBJECT -+public: -+ explicit AbstractActionToolWithWidget(QObject *parent = nullptr); -+ -+ bool isValid() const override; -+ bool isSelectable() const override; -+ bool showMousePreview() const override; -+ -+ QIcon icon(const QColor &background, bool inEditor) const override; -+#ifdef SUPPORT_UKUI -+ QIcon icon(const QColor &background, bool inEditor,const CaptureContext &context) const override; -+#endif -+ void undo(QPixmap &pixmap) override; -+ void process(QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override; -+ void paintMousePreview(QPainter &painter, const CaptureContext &context) override; -+ -+public slots: -+ void drawEnd(const QPoint &p) override; -+ void drawMove(const QPoint &p) override; -+ void drawStart(const CaptureContext &context) override; -+ void colorChanged(const QColor &c) override; -+ void thicknessChanged(const int th) override; -+}; -diff -Naur kylin-screenshot-1.0.0/src/tools/options/options.cpp kylin-screenshot-1.0.0~/src/tools/options/options.cpp ---- kylin-screenshot-1.0.0/src/tools/options/options.cpp 2021-01-08 14:21:24.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/tools/options/options.cpp 2021-12-08 17:17:41.485684835 +0800 -@@ -19,7 +19,7 @@ - */ - #include "options.h" - --Options::Options(QObject *parent) : AbstractActionTool(parent) -+Options::Options(QObject *parent) : AbstractActionToolWithWidget(parent) - { - } - bool Options::closeOnButtonPressed() const -diff -Naur kylin-screenshot-1.0.0/src/tools/options/options.h kylin-screenshot-1.0.0~/src/tools/options/options.h ---- kylin-screenshot-1.0.0/src/tools/options/options.h 2021-01-08 14:21:24.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/tools/options/options.h 2021-12-08 17:17:41.489684893 +0800 -@@ -22,8 +22,8 @@ - - #include - #include --#include "src/tools/abstractactiontool.h" --class Options : public AbstractActionTool { -+#include "src/tools/AbstractActionToolWithWidget.h" -+class Options : public AbstractActionToolWithWidget { - Q_OBJECT - public: - explicit Options(QObject *parent = nullptr); -diff -Naur kylin-screenshot-1.0.0/src/tools/save/saveastool.cpp kylin-screenshot-1.0.0~/src/tools/save/saveastool.cpp ---- kylin-screenshot-1.0.0/src/tools/save/saveastool.cpp 2021-01-08 14:21:24.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/tools/save/saveastool.cpp 2021-12-08 17:17:41.718688191 +0800 -@@ -21,7 +21,7 @@ - #include "src/utils/screenshotsaver.h" - #include - #include --SaveAsTool::SaveAsTool(QObject *parent) : AbstractActionTool(parent) { -+SaveAsTool::SaveAsTool(QObject *parent) : AbstractActionToolWithWidget(parent) { - - } - -diff -Naur kylin-screenshot-1.0.0/src/tools/save/saveastool.h kylin-screenshot-1.0.0~/src/tools/save/saveastool.h ---- kylin-screenshot-1.0.0/src/tools/save/saveastool.h 2021-01-08 14:21:24.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/tools/save/saveastool.h 2021-12-08 17:17:41.721688235 +0800 -@@ -19,8 +19,8 @@ - */ - #ifndef SAVEASTOOL_H - #define SAVEASTOOL_H --#include "src/tools/abstractactiontool.h" --class SaveAsTool : public AbstractActionTool -+#include "src/tools/AbstractActionToolWithWidget.h" -+class SaveAsTool : public AbstractActionToolWithWidget - { - Q_OBJECT - public: -diff -Naur kylin-screenshot-1.0.0/src/widgets/capture/buttonhandler.cpp kylin-screenshot-1.0.0~/src/widgets/capture/buttonhandler.cpp ---- kylin-screenshot-1.0.0/src/widgets/capture/buttonhandler.cpp 2021-01-08 14:21:25.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/widgets/capture/buttonhandler.cpp 2021-12-08 17:17:42.289696417 +0800 -@@ -384,6 +384,7 @@ - button->move(p.x()+29,p.y()); - break; - case CaptureButton::TYPE_OPTION: -+ Save_Location_Window_Pos = move_Save_Location_Window(p.x()+19,p.y()); - button->move(p.x()+19,p.y()); - break; - case CaptureButton::TYPE_SAVEAS: -@@ -405,6 +406,13 @@ - case CaptureButton::TYPE_SAVE: - button->move(p.x()+46,p.y()); - break; -+ case CaptureButton::TYPE_TEXT: -+ Font_Options_Window_Pos = move_Font_Options_Window(p.x(),p.y()); -+ button->move(p); -+ break; -+ case CaptureButton::TYPE_BLUR: -+ button->move(p); -+ break; - #endif - - case CaptureButton::TYPE_PIN: -@@ -424,6 +432,7 @@ - } - break; - default: -+ FontSize_Color_Chose_Window_Y = move_FontSize_Color_Chose_Window(p.y()); - button->move(p); - break; - } -@@ -479,3 +488,64 @@ - m_vectorButtons.clear(); - } - -+int ButtonHandler::move_FontSize_Color_Chose_Window(int y) -+{ -+ int FontSize_Color_Chose_Window_y; -+ if (y>m_selection.y()) -+ { -+ if (y+150 <= QGuiApplication::primaryScreen()->geometry().height()) -+ FontSize_Color_Chose_Window_y = y+50; -+ else -+ FontSize_Color_Chose_Window_y = y-80; -+ } -+ else -+ { -+ if (y-80 >= 0) -+ FontSize_Color_Chose_Window_y = y-80; -+ else -+ FontSize_Color_Chose_Window_y = y+50; -+ } -+ return FontSize_Color_Chose_Window_y; -+} -+QPoint ButtonHandler::move_Save_Location_Window(int x,int y) -+{ -+ QPoint p(x,y); -+ p.setX(x-50); -+ if (y>m_selection.y()) -+ { -+ if (y+170 <= QGuiApplication::primaryScreen()->geometry().height()) -+ p.setY(y+50); -+ else -+ p.setY(y-155); -+ } -+ else -+ { -+ if (y-155>= 0) -+ p.setY(y-155); -+ else -+ p.setY(y+50); -+ } -+ return p; -+} -+QPoint ButtonHandler::move_Font_Options_Window(int x,int y) -+{ -+ QPoint p(x,y); -+ p.setX(x-120); -+ if(y>m_selection.y()) -+ { -+ if (y+125 <= QGuiApplication::primaryScreen()->geometry().height()) -+ p.setY(y+50); -+ else -+ p.setY(y-95); -+ } -+ else -+ { -+ if (y-95 >= 0) -+ p.setY(y-95); -+ else -+ p.setY(y+50); -+ } -+ return p; -+} -+ -+ -diff -Naur kylin-screenshot-1.0.0/src/widgets/capture/buttonhandler.h kylin-screenshot-1.0.0~/src/widgets/capture/buttonhandler.h ---- kylin-screenshot-1.0.0/src/widgets/capture/buttonhandler.h 2021-01-08 14:21:25.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/widgets/capture/buttonhandler.h 2021-12-08 17:17:42.303696619 +0800 -@@ -44,6 +44,13 @@ - - void clearButtons(); - -+ int move_FontSize_Color_Chose_Window(int y); -+ QPoint move_Save_Location_Window(int x,int y); -+ QPoint move_Font_Options_Window(int x,int y); -+ -+ int FontSize_Color_Chose_Window_Y; -+ QPoint Save_Location_Window_Pos; -+ QPoint Font_Options_Window_Pos; - public slots: - void updatePosition(const QRect &selection); - void hide(); -diff -Naur kylin-screenshot-1.0.0/src/widgets/capture/capturewidget.cpp kylin-screenshot-1.0.0~/src/widgets/capture/capturewidget.cpp ---- kylin-screenshot-1.0.0/src/widgets/capture/capturewidget.cpp 2021-01-08 14:21:25.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/widgets/capture/capturewidget.cpp 2021-12-08 17:17:42.326696950 +0800 -@@ -513,8 +513,66 @@ - painter.drawPixmap(r,QPixmap(QStringLiteral(":/img/material/control_point.png"))); - } - } -+ updateChildWindow(); - } - -+void CaptureWidget::updateChildWindow() -+{ -+ if (font_color->isVisible()) -+ { -+ if (m_buttonHandler->FontSize_Color_Chose_Window_Y < vectorButtons.first()->pos().y()) -+ { -+ font_color->hide(); -+ font_color2->show(); -+ } -+ } -+ if (font_color2->isVisible()) -+ { -+ if (m_buttonHandler->FontSize_Color_Chose_Window_Y > vectorButtons.first()->pos().y()) -+ { -+ font_color2->hide(); -+ font_color->show(); -+ } -+ } -+ if (save_location->isVisible()) -+ { -+ if (m_buttonHandler->Save_Location_Window_Pos.y() < vectorButtons.first()->pos().y()) -+ { -+ save_location->hide(); -+ save_location2->show(); -+ } -+ } -+ if (save_location2->isVisible()) -+ { -+ if (m_buttonHandler->Save_Location_Window_Pos.y() > vectorButtons.first()->pos().y()) -+ { -+ save_location2->hide(); -+ save_location->show(); -+ } -+ } -+ if (font_options->isVisible()) -+ { -+ if (m_buttonHandler->Font_Options_Window_Pos.y() < vectorButtons.first()->pos().y()) -+ { -+ font_options->hide(); -+ font_options2->show(); -+ } -+ } -+ if (font_options2->isVisible()) -+ { -+ if (m_buttonHandler->Font_Options_Window_Pos.y()> vectorButtons.first()->pos().y()) -+ { -+ font_options->hide(); -+ font_options2->show(); -+ } -+ } -+ font_color ->move(vectorButtons.first()->pos().x()+length,m_buttonHandler->FontSize_Color_Chose_Window_Y); -+ font_color2 ->move(vectorButtons.first()->pos().x()+length,m_buttonHandler->FontSize_Color_Chose_Window_Y); -+ save_location ->move(m_buttonHandler->Font_Options_Window_Pos); -+ save_location2 ->move(m_buttonHandler->Font_Options_Window_Pos); -+ font_options ->move(m_buttonHandler->Font_Options_Window_Pos); -+ font_options2 ->move(m_buttonHandler->Font_Options_Window_Pos); -+} - void CaptureWidget::updateMagnifier(CaptureContext m_context){ - int x = m_context.mousePos.x(); - int y = m_context.mousePos.y(); -@@ -1473,6 +1531,7 @@ - - void CaptureWidget::font_options_defult() - { -+ font_options->move(m_buttonHandler->Font_Options_Window_Pos); - font_options->Font_size->setValue(m_context.thickness); - font_options->color = m_context.color; - font_options->Underline = m_context.underline; -@@ -1482,6 +1541,7 @@ - } - void CaptureWidget::font_options2_defult() - { -+ font_options2->move(m_buttonHandler->Font_Options_Window_Pos); - font_options2->Font_size->setValue(m_context.thickness); - font_options2->color = m_context.color; - font_options2->Underline = m_context.underline; -@@ -1542,6 +1602,7 @@ - } - void CaptureWidget::savetype_chose_default() - { -+ save_location->move(m_buttonHandler->Save_Location_Window_Pos); - if(m_context.saveType == ".jpg") - save_location->type_rect = save_location->m_TypeList.at(0); - else if(m_context.saveType == ".bmp") -@@ -1552,6 +1613,7 @@ - } - void CaptureWidget::savetype_chose2_default() - { -+ save_location->move(m_buttonHandler->Save_Location_Window_Pos); - if(m_context.saveType == ".jpg") - save_location2->type_rect = save_location2->m_TypeList.at(0); - else if(m_context.saveType == ".bmp") -@@ -1647,6 +1709,7 @@ - font_color_point->setY(b->y()+50); - font_color->move(font_color_point->x(),font_color_point->y()); - font_color->show(); -+ length = font_color->x() - vectorButtons.first()->pos().x(); - } - else - { -@@ -1654,6 +1717,7 @@ - font_color_point->setY(b->y()-80); - font_color2->move(font_color_point->x(),font_color_point->y()); - font_color2->show(); -+ length = font_color2->x() - vectorButtons.first()->pos().x(); - } - } - else -@@ -1664,6 +1728,7 @@ - font_color_point->setY(b->y()-80); - font_color2->move(font_color_point->x(),font_color_point->y()); - font_color2->show(); -+ length = font_color2->x() - vectorButtons.first()->pos().x(); - } - else - { -@@ -1671,8 +1736,10 @@ - font_color_point->setY(b->y()+50); - font_color->move(font_color_point->x(),font_color_point->y()); - font_color->show(); -+ length = font_color->x() - vectorButtons.first()->pos().x(); - } - } -+ - } - //options - void CaptureWidget::show_Save_Location_Window(CaptureButton *b) -@@ -1686,36 +1753,16 @@ - if(b->y()>m_selection->y()) - { - if (b->y()+170 <= QGuiApplication::primaryScreen()->geometry().height()) -- { -- font_color_point->setX(b->x()-67); -- font_color_point->setY(b->y()+50); -- save_location->move(font_color_point->x(),font_color_point->y()); - save_location->show(); -- } - else -- { -- font_color_point->setX(b->x()-67); -- font_color_point->setY(b->y()-155); -- save_location2->move(font_color_point->x(),font_color_point->y()); - save_location2->show(); -- } - } - else - { -- if (b->y()-155>= 0) -- { -- font_color_point->setX(b->x()-67); -- font_color_point->setY(b->y()-155); -- save_location2->move(font_color_point->x(),font_color_point->y()); -- save_location2->show(); -- } -+ if (b->y()-155>= 0) -+ save_location2->show(); - else -- { -- font_color_point->setX(b->x()-67); -- font_color_point->setY(b->y()+50); -- save_location->move(font_color_point->x(),font_color_point->y()); -- save_location->show(); -- } -+ save_location->show(); - } - } - //text -@@ -1728,37 +1775,16 @@ - if(b->y()>m_selection->y()) - { - if (b->y()+125 <= QGuiApplication::primaryScreen()->geometry().height()) -- { -- font_color_point->setX(b->x()-125); -- font_color_point->setY(b->y()+50); -- font_options->move(font_color_point->x(),font_color_point->y()); - font_options->show(); -- } - else -- { -- font_color_point->setX(b->x()-125); -- font_color_point->setY(b->y()-95); -- font_options2->move(font_color_point->x(),font_color_point->y()); - font_options2->show(); -- } - } - else - { - if (b->y()-95 >= 0) -- { -- font_color_point->setX(b->x()-125); -- font_color_point->setY(b->y()-95); -- font_options2->move(font_color_point->x(),font_color_point->y()); - font_options2->show(); -- -- } - else -- { -- font_color_point->setX(b->x()-125); -- font_color_point->setY(b->y()+50); -- font_options->move(font_color_point->x(),font_color_point->y()); - font_options->show(); -- } - } - } - void CaptureWidget::deal_with_SaveAs(CaptureButton *b) -diff -Naur kylin-screenshot-1.0.0/src/widgets/capture/capturewidget.h kylin-screenshot-1.0.0~/src/widgets/capture/capturewidget.h ---- kylin-screenshot-1.0.0/src/widgets/capture/capturewidget.h 2021-01-08 14:21:25.000000000 +0800 -+++ kylin-screenshot-1.0.0~/src/widgets/capture/capturewidget.h 2021-12-08 17:17:42.253695898 +0800 -@@ -174,6 +174,7 @@ - void pushToolToStack(); - void makeChild(QWidget *w); - -+ void updateChildWindow(); - //format code - void show_childwindow(CaptureButton *b); - void hide_ChildWindow(); -@@ -209,6 +210,8 @@ - uint m_id; - int magnifier_x; - int magnifier_y; -+ //signed width between FontSize_Color_Chose_Window and fistbutton -+ int length; - #ifdef ENABLE_RECORD - Recorder *recorder; - QMap m_isolatedButtons;