From 40629915f74eb23118c3079ab80df9fdf42fa894 Mon Sep 17 00:00:00 2001 From: Boyuan Yang Date: Fri, 25 Sep 2020 22:03:35 -0400 Subject: [PATCH 01/41] Explicitly hide tray icon before exit on Windows Currently flameshot tray icon will not disappear after program terminates on Windows. This is a known issue and need to be explicitly handled. This commit connects the aboutToQuit signal to QSystemTrayIcon::hide slot to ensure that the tray icon is removed before program terminates. --- src/core/controller.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/controller.cpp b/src/core/controller.cpp index 3d2343f9..b0cf0b3d 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -234,6 +234,13 @@ void Controller::enableTrayIcon() } }; connect(m_trayIcon, &QSystemTrayIcon::activated, this, trayIconActivated); + +#ifdef Q_OS_WIN + // Ensure proper removal of tray icon when program quits on Windows. + connect( + qApp, &QCoreApplication::aboutToQuit, m_trayIcon, &QSystemTrayIcon::hide); +#endif + m_trayIcon->show(); } From 9ecad946672f0afa7b74c9c254786a99df60412e Mon Sep 17 00:00:00 2001 From: RieL Date: Thu, 8 Oct 2020 00:17:06 +0900 Subject: [PATCH 02/41] Update Internationalization_ko.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Improved Korean translation. 1.도움 메세지를 보여줍니다 -> 도움 메세지 보기 2.캡처 모드 시작에 도움 메세지를 보여줍니다 -> 캡처 모드 시작에 도움 메세지 보기 3.데스크톱 알림을 사용합니다 -> 데스크톱 알림 사용 4.트레이 아이콘을 보임 -> 트레이 아이콘 보기 5.시작할때 실행 -> 컴퓨터를 시작할 때 실행 6.Toggle visibility of sidebar with options of the selected tool -> 사이드바를 열어 선택한 도구의 옵션보기 7.도구의 두께를 바꿉니다 -> 도구 두께 변경 8.직사각형 선택->직사각형 Selection (need more proper word to translate) 9.변경할 버튼을 선택하세요 -> 변경 할 버튼 선택 10.콘트래스트 색상 -> 대비 색상 11.선택 영역 외의 불투명도: -> 선택 영역 외 불투명도 12. 버튼 셀렉션 -> 버튼 선택 --- data/translations/Internationalization_ko.ts | 35 ++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/data/translations/Internationalization_ko.ts b/data/translations/Internationalization_ko.ts index 9bb5a6a8..df06abe5 100644 --- a/data/translations/Internationalization_ko.ts +++ b/data/translations/Internationalization_ko.ts @@ -305,28 +305,28 @@ Space로 사이드 패널을 엽니다. Show help message - 도움 메세지를 보여줍니다 + 도움 메세지 보기 Show the help message at the beginning in the capture mode. - 캡처 모드 시작에 도움 메세지를 보여줍니다. + 캡처 모드 시작에 도움 메세지 보기. Show desktop notifications - 데스크톱 알림을 사용합니다 + 데스크톱 알림 사용 Show tray icon - 트레이 아이콘을 보임 + 트레이 아이콘 보기 Show the systemtray icon - 시스템 트레이 아이콘을 보여줍니다 + 시스템 트레이 아이콘 보기 @@ -386,7 +386,7 @@ Space로 사이드 패널을 엽니다. Launch at startup startup의 적절한 번역이 필요합니다. - 시작할때 실행 + 컴퓨터를 시작할 때 실행 @@ -396,22 +396,22 @@ Space로 사이드 패널을 엽니다. Close after capture - 캡처 후 닫기 + 캡처 후 닫기 Close after taking a screenshot - 스크린샷을 찍은 이후 닫기 + 스크린샷을 찍은 후 닫기 Copy URL after upload - 업로드 이후 URL을 복사 + 업로드 이후 URL 복사 Copy URL and close window after upload - 업로드 이후 URL을 복사하고 창을 닫음 + 업로드 이후 URL을 복사하고 창 닫기 @@ -531,7 +531,7 @@ Space로 사이드 패널을 엽니다. Toggle visibility of sidebar with options of the selected tool - + 사이드바를 열어 선택한 도구의 옵션보기 @@ -541,7 +541,7 @@ Space로 사이드 패널을 엽니다. Change the tool's thickness - 도구의 두께를 바꿉니다 + 도구 두께 변경 @@ -753,7 +753,8 @@ Space로 사이드 패널을 엽니다. Rectangular Selection - 직사각형 선택 + selection에 대한 적절한 번역이 필요합니다. + 직사각형 Selection @@ -964,7 +965,7 @@ Space로 사이드 패널을 엽니다. Select a Button to modify it - 변경할 버튼을 선택하세요 + 변경 할 버튼 선택 @@ -979,7 +980,7 @@ Space로 사이드 패널을 엽니다. Contrast Color - 콘트래스트 색상 + 대비 색상 @@ -1005,12 +1006,12 @@ Space로 사이드 패널을 엽니다. Opacity of area outside selection: - 선택 영역 외의 불투명도: + 선택 영역 외 불투명도: Button Selection - 버튼 셀렉션 + 버튼 선택 From 22ae116f29da41a1d393a8e3e11a8a3b1e34dcd1 Mon Sep 17 00:00:00 2001 From: Jeremy Borgman Date: Wed, 7 Oct 2020 11:17:00 -0500 Subject: [PATCH 03/41] testing app image fix --- .github/workflows/Linux-pack.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index 0a356514..5b7869f9 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -349,6 +349,8 @@ jobs: $GITHUB_WORKSPACE/data/img/app/flameshot.png \ ${APPIMAGE_DST_PATH}/ + rm ${APPIMAGE_DST_PATH}/lib/x86_64-linux-gnu/libxcb-glx.so.0 + VERSION=${VERSION} $GITHUB_WORKSPACE/appimagetool ${APPIMAGE_DST_PATH} mv $GITHUB_WORKSPACE/Flameshot-${VERSION}-${ARCH}.AppImage $GITHUB_WORKSPACE/Flameshot-${VERSION}.${ARCH}.AppImage - name: SHA256Sum of appimage package(daily build) From a2f845415c55254db2df0dc0f8dee4ab4aa6da7c Mon Sep 17 00:00:00 2001 From: Ash Holland Date: Sat, 10 Oct 2020 02:13:34 +0100 Subject: [PATCH 04/41] Improve pixelation of small areas Previously the level of pixelation would decrease if the selected area was too thin to hold 10 pixelated blocks. Now the level of pixelation only decreases when the selected area is too thin to hold even one pixelated block. This doesn't completely solve the issue of pixelation decreasing when the area is thin, but it significantly improves the situation. --- src/tools/pixelate/pixelatetool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/pixelate/pixelatetool.cpp b/src/tools/pixelate/pixelatetool.cpp index 6f742279..47831d20 100644 --- a/src/tools/pixelate/pixelatetool.cpp +++ b/src/tools/pixelate/pixelatetool.cpp @@ -89,7 +89,7 @@ void PixelateTool::process(QPainter& painter, int width = selection.width() * (0.5 / qMax(1, m_thickness)); QPixmap t = pixmap.copy(selection); - t = t.scaledToWidth(qMax(width, 10), Qt::SmoothTransformation); + t = t.scaledToWidth(qMax(width, 1), Qt::SmoothTransformation); t = t.scaledToWidth(selection.width()); painter.drawImage(selection, t.toImage()); } From eae9c97b232ce04da62d45cc8c600d85bf7d1a62 Mon Sep 17 00:00:00 2001 From: Ahmed Zetao Yang Date: Sat, 10 Oct 2020 11:01:09 +0800 Subject: [PATCH 05/41] chore(CI): checkout the head commit instead of using the default merge ref --- .github/workflows/Linux-pack.yml | 42 ++++++++++++++++++++++++++++++ .github/workflows/Windows-pack.yml | 8 ++++++ .github/workflows/build_cmake.yml | 10 ++++++- .github/workflows/clang-format.yml | 9 ++++++- 4 files changed, 67 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index 5b7869f9..b38b9473 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -46,10 +46,17 @@ jobs: } steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | @@ -102,12 +109,19 @@ jobs: image: vitzy/flameshot:ubuntu-bionic steps: - name: Checkout Source code + if: github.event_name == 'push' # Because git version < 2.18(ubuntu 18.04), so only actions/checkout@v1 can be used. # If you use actions/checkout@v2, you will have no .git folder. uses: actions/checkout@v1 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v1 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.ref }} - name: Set env & Print flameshot version shell: bash run: | @@ -199,10 +213,17 @@ jobs: } steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | @@ -285,10 +306,17 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | @@ -378,10 +406,17 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | @@ -437,10 +472,17 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index e56d0126..6ca6952a 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -52,11 +52,19 @@ jobs: steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} + - name: Set env & Print flameshot version shell: bash run: | diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index ca731941..155b2b82 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -25,7 +25,15 @@ jobs: os: [ubuntu-20.04] steps: - - uses: actions/checkout@v2 + - name: Checkout Source code + if: github.event_name == 'push' + uses: actions/checkout@v2 + + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Install Dependencies run: | diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 24382ae9..1921caeb 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -7,7 +7,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout Source code + if: github.event_name == 'push' + uses: actions/checkout@v2 + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.sha }} - uses: DoozyX/clang-format-lint-action@v0.9 with: source: './src' From c5b6fe39573d66ba4f98f8944e36879d5bd4add4 Mon Sep 17 00:00:00 2001 From: Ahmed Zetao Yang Date: Sat, 10 Oct 2020 22:15:19 +0800 Subject: [PATCH 06/41] fix: checkout of head commit during PR creation * according to https://github.com/actions/checkout/issues/61#issuecomment-561363340 --- .github/workflows/Linux-pack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index b38b9473..5155df7d 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -121,7 +121,7 @@ jobs: uses: actions/checkout@v1 with: fetch-depth: 0 - ref: ${{ github.event.pull_request.head.ref }} + ref: refs/pull/${{ github.event.number }}/head - name: Set env & Print flameshot version shell: bash run: | From c8767e7a1b491da8ce2ee9a60adbc943b5651f7d Mon Sep 17 00:00:00 2001 From: Ash Holland Date: Sat, 10 Oct 2020 14:24:33 +0100 Subject: [PATCH 07/41] Fix pixelation of small areas --- src/tools/pixelate/pixelatetool.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tools/pixelate/pixelatetool.cpp b/src/tools/pixelate/pixelatetool.cpp index 47831d20..e9ce8a82 100644 --- a/src/tools/pixelate/pixelatetool.cpp +++ b/src/tools/pixelate/pixelatetool.cpp @@ -87,10 +87,12 @@ void PixelateTool::process(QPainter& painter, scene.render(&painter, selection, QRectF()); } else { int width = selection.width() * (0.5 / qMax(1, m_thickness)); + int height = selection.height() * (0.5 / qMax(1, m_thickness)); + QSize size = QSize(qMax(width, 1), qMax(height, 1)); QPixmap t = pixmap.copy(selection); - t = t.scaledToWidth(qMax(width, 1), Qt::SmoothTransformation); - t = t.scaledToWidth(selection.width()); + t = t.scaled(size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + t = t.scaled(selection.width(), selection.height()); painter.drawImage(selection, t.toImage()); } } From 8ff94a95a8b59f3e23327b7e9b3fe91f23b885b6 Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Sat, 10 Oct 2020 13:04:19 -0500 Subject: [PATCH 08/41] Cleaned up flatpak build for flathub submission (#1040) * Cleaned up flatpak build for flathub submission. Fixed app-id and other assets to match dbus naming. * fixed missing updates * fixing build issues --- .github/workflows/Linux-pack.yml | 22 +++++++++--------- ...meshot.yml => org.flameshot.Flameshot.yml} | 7 +++--- data/graphics.qrc | 4 ++-- ...meshot.png => org.flameshot.Flameshot.png} | Bin ...meshot.svg => org.flameshot.Flameshot.svg} | 0 ...meshot.png => org.flameshot.Flameshot.png} | Bin ...meshot.png => org.flameshot.Flameshot.png} | Bin ...meshot.svg => org.flameshot.Flameshot.svg} | 0 data/rpm/flameshot.spec | 6 ++--- data/snap/snapcraft.yaml | 8 +++---- ...l => org.flameshot.Flameshot.metainfo.xml} | 4 ++-- ...esktop => org.flameshot.Flameshot.desktop} | 2 +- src/CMakeLists.txt | 20 ++++++++-------- src/core/controller.cpp | 6 ++--- 14 files changed, 40 insertions(+), 39 deletions(-) rename data/flatpak/{org.flameshot.flameshot.yml => org.flameshot.Flameshot.yml} (86%) rename data/img/app/{flameshot.png => org.flameshot.Flameshot.png} (100%) rename data/img/app/{flameshot.svg => org.flameshot.Flameshot.svg} (100%) rename data/img/hicolor/128x128/apps/{flameshot.png => org.flameshot.Flameshot.png} (100%) rename data/img/hicolor/48x48/apps/{flameshot.png => org.flameshot.Flameshot.png} (100%) rename data/img/hicolor/scalable/apps/{flameshot.svg => org.flameshot.Flameshot.svg} (100%) rename docs/appdata/{flameshot.metainfo.xml => org.flameshot.Flameshot.metainfo.xml} (91%) rename docs/desktopEntry/package/{flameshot.desktop => org.flameshot.Flameshot.desktop} (99%) diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index 5155df7d..48e03595 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -366,7 +366,7 @@ jobs: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr make -j$(nproc) DESTDIR=${APPIMAGE_DST_PATH} install - $GITHUB_WORKSPACE/appimagetool -s deploy ${APPIMAGE_DST_PATH}/usr/share/applications/flameshot.desktop + $GITHUB_WORKSPACE/appimagetool -s deploy ${APPIMAGE_DST_PATH}/usr/share/applications/org.flameshot.Flameshot.desktop mkdir -p ${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts cp \ @@ -374,7 +374,7 @@ jobs: ${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts/ cp \ - $GITHUB_WORKSPACE/data/img/app/flameshot.png \ + $GITHUB_WORKSPACE/data/img/app/org.flameshot.Flameshot.png \ ${APPIMAGE_DST_PATH}/ rm ${APPIMAGE_DST_PATH}/lib/x86_64-linux-gnu/libxcb-glx.so.0 @@ -438,21 +438,21 @@ jobs: flatpak install -y --noninteractive flathub org.kde.Sdk//5.15 org.kde.Platform//5.15 - name: Packaging flatpak run: | - BUNDLE="org.flameshot.flameshot_${VERSION}_${ARCH}.flatpak" - MANIFEST_PATH=$GITHUB_WORKSPACE/data/flatpak/org.flameshot.flameshot.yml + BUNDLE="org.flameshot.Flameshot_${VERSION}_${ARCH}.flatpak" + MANIFEST_PATH=$GITHUB_WORKSPACE/data/flatpak/org.flameshot.Flameshot.yml RUNTIME_REPO="https://flathub.org/repo/flathub.flatpakrepo" - APP_ID="org.flameshot.flameshot" + APP_ID="org.flameshot.Flameshot" BRANCH="master" flatpak-builder --user --disable-rofiles-fuse --repo=repo --force-clean flatpak_app ${MANIFEST_PATH} --install-deps-from=flathub flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID} ${BRANCH} - mv $GITHUB_WORKSPACE/org.flameshot.flameshot_${VERSION}_${ARCH}.flatpak $GITHUB_WORKSPACE/org.flameshot.flameshot-${VERSION}.${ARCH}.flatpak + mv $GITHUB_WORKSPACE/org.flameshot.Flameshot_${VERSION}_${ARCH}.flatpak $GITHUB_WORKSPACE/org.flameshot.Flameshot-${VERSION}.${ARCH}.flatpak - name: SHA256Sum of flatpak package(daily build) run: | - sha256sum $GITHUB_WORKSPACE/org.flameshot.flameshot-${VERSION}.${ARCH}.flatpak - sha256sum $GITHUB_WORKSPACE/org.flameshot.flameshot-${VERSION}.${ARCH}.flatpak > $GITHUB_WORKSPACE/org.flameshot.flameshot-${VERSION}.${ARCH}.flatpak.sha256sum + sha256sum $GITHUB_WORKSPACE/org.flameshot.Flameshot-${VERSION}.${ARCH}.flatpak + sha256sum $GITHUB_WORKSPACE/org.flameshot.Flameshot-${VERSION}.${ARCH}.flatpak > $GITHUB_WORKSPACE/org.flameshot.Flameshot-${VERSION}.${ARCH}.flatpak.sha256sum echo "================flatpak sha256sum download link====================" - echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh $GITHUB_WORKSPACE/org.flameshot.flameshot-${VERSION}.${ARCH}.flatpak.sha256sum) + echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh $GITHUB_WORKSPACE/org.flameshot.Flameshot-${VERSION}.${ARCH}.flatpak.sha256sum) echo "========no operation for you can see link in the log console=======" - name: Upload flatpak package(daily build) run: | @@ -464,8 +464,8 @@ jobs: with: name: Linux-distribution-artifact path: | - ${{ github.workspace }}/org.flameshot.flameshot-*.${{ env.ARCH }}.flatpak - ${{ github.workspace }}/org.flameshot.flameshot-*.${{ env.ARCH }}.flatpak.sha256sum + ${{ github.workspace }}/org.flameshot.Flameshot-*.${{ env.ARCH }}.flatpak + ${{ github.workspace }}/org.flameshot.Flameshot-*.${{ env.ARCH }}.flatpak.sha256sum snap-pack: name: snap diff --git a/data/flatpak/org.flameshot.flameshot.yml b/data/flatpak/org.flameshot.Flameshot.yml similarity index 86% rename from data/flatpak/org.flameshot.flameshot.yml rename to data/flatpak/org.flameshot.Flameshot.yml index e5d9c57b..cf246772 100644 --- a/data/flatpak/org.flameshot.flameshot.yml +++ b/data/flatpak/org.flameshot.Flameshot.yml @@ -1,4 +1,4 @@ -app-id: org.flameshot.flameshot +app-id: org.flameshot.Flameshot runtime: org.kde.Platform runtime-version: '5.15' sdk: org.kde.Sdk @@ -20,7 +20,8 @@ finish-args: - --talk-name=org.freedesktop.Notifications # System Tray Icon - --talk-name=org.kde.StatusNotifierWatcher - - --own-name=org.kde.StatusNotifierItem-2-1 + - --own-name=org.kde.* + - --own-name=org.flameshot.Flameshot modules: - name: flameshot buildsystem: cmake-ninja @@ -29,4 +30,4 @@ modules: sources: - type: git url: https://github.com/flameshot-org/flameshot.git - branch: master + branch: master diff --git a/data/graphics.qrc b/data/graphics.qrc index eb4b2cb8..971b9fd5 100644 --- a/data/graphics.qrc +++ b/data/graphics.qrc @@ -1,7 +1,7 @@ - img/app/flameshot.svg - img/app/flameshot.png + img/app/org.flameshot.Flameshot.svg + img/app/org.flameshot.Flameshot.png img/material/black/undo-variant.svg img/material/black/text.svg img/material/black/square.svg diff --git a/data/img/app/flameshot.png b/data/img/app/org.flameshot.Flameshot.png similarity index 100% rename from data/img/app/flameshot.png rename to data/img/app/org.flameshot.Flameshot.png diff --git a/data/img/app/flameshot.svg b/data/img/app/org.flameshot.Flameshot.svg similarity index 100% rename from data/img/app/flameshot.svg rename to data/img/app/org.flameshot.Flameshot.svg diff --git a/data/img/hicolor/128x128/apps/flameshot.png b/data/img/hicolor/128x128/apps/org.flameshot.Flameshot.png similarity index 100% rename from data/img/hicolor/128x128/apps/flameshot.png rename to data/img/hicolor/128x128/apps/org.flameshot.Flameshot.png diff --git a/data/img/hicolor/48x48/apps/flameshot.png b/data/img/hicolor/48x48/apps/org.flameshot.Flameshot.png similarity index 100% rename from data/img/hicolor/48x48/apps/flameshot.png rename to data/img/hicolor/48x48/apps/org.flameshot.Flameshot.png diff --git a/data/img/hicolor/scalable/apps/flameshot.svg b/data/img/hicolor/scalable/apps/org.flameshot.Flameshot.svg similarity index 100% rename from data/img/hicolor/scalable/apps/flameshot.svg rename to data/img/hicolor/scalable/apps/org.flameshot.Flameshot.svg diff --git a/data/rpm/flameshot.spec b/data/rpm/flameshot.spec index 7fa9439d..8acab0b3 100644 --- a/data/rpm/flameshot.spec +++ b/data/rpm/flameshot.spec @@ -71,7 +71,7 @@ make %{?_smp_mflags} %if 0%{?is_opensuse} %if 0%{?suse_version} >= 1500 -%suse_update_desktop_file %{name} Graphics +%suse_update_desktop_file org.flameshot.Flameshot Graphics %endif %endif @@ -87,9 +87,9 @@ make %{?_smp_mflags} %{_datadir}/%{name} %{_datadir}/dbus-1/interfaces/org.flameshot.Flameshot.xml %{_datadir}/dbus-1/services/org.flameshot.Flameshot.service -%{_datadir}/metainfo/flameshot.metainfo.xml +%{_datadir}/metainfo/org.flameshot.Flameshot.metainfo.xml %{_datadir}/flameshot/translations -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/org.flameshot.Flameshot.desktop %{_datadir}/bash-completion/completions/%{name} %{_datadir}/zsh/site-functions/_%{name} %{_datadir}/icons/hicolor diff --git a/data/snap/snapcraft.yaml b/data/snap/snapcraft.yaml index 9c372cb1..a737fc9b 100644 --- a/data/snap/snapcraft.yaml +++ b/data/snap/snapcraft.yaml @@ -21,7 +21,7 @@ architectures: apps: flameshot: command: flameshot - desktop: usr/share/applications/flameshot.desktop + desktop: usr/share/applications/org.flameshot.Flameshot.desktop extensions: - kde-neon environment: @@ -62,9 +62,9 @@ parts: override-build: | snapcraftctl build # Correct the Icon path - sed -i 's|^Exec=flameshot|Exec=/snap/bin/flameshot.flameshot|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/flameshot.desktop - sed -i 's|^Icon=.*|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/flameshot.svg|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/flameshot.desktop - sed -i 's/^\(Name\(\[.\+\]\)\?=.*\)$/\1 (Snappy Edition)/g' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/flameshot.desktop + sed -i 's|^Exec=flameshot|Exec=/snap/bin/org.flameshot.Flameshot|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/org.flameshot.Flameshot.desktop + sed -i 's|^Icon=.*|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/org.flameshot.Flameshot.svg|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/org.flameshot.Flameshot.desktop + sed -i 's/^\(Name\(\[.\+\]\)\?=.*\)$/\1 (Snappy Edition)/g' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/org.flameshot.Flameshot.desktop build-packages: - g++ - make diff --git a/docs/appdata/flameshot.metainfo.xml b/docs/appdata/org.flameshot.Flameshot.metainfo.xml similarity index 91% rename from docs/appdata/flameshot.metainfo.xml rename to docs/appdata/org.flameshot.Flameshot.metainfo.xml index 3f413f17..973680f5 100644 --- a/docs/appdata/flameshot.metainfo.xml +++ b/docs/appdata/org.flameshot.Flameshot.metainfo.xml @@ -1,6 +1,6 @@ - org.flameshot.flameshot + org.flameshot.Flameshot CC0-1.0 GPL-3.0-or-later Flameshot @@ -28,6 +28,6 @@ https://github.com/flameshot-org/flameshot https://github.com/flameshot-org/flameshot/issues/new - flameshot.desktop + org.flameshot.Flameshot.desktop diff --git a/docs/desktopEntry/package/flameshot.desktop b/docs/desktopEntry/package/org.flameshot.Flameshot.desktop similarity index 99% rename from docs/desktopEntry/package/flameshot.desktop rename to docs/desktopEntry/package/org.flameshot.Flameshot.desktop index d6cc9c84..94b78fb5 100644 --- a/docs/desktopEntry/package/flameshot.desktop +++ b/docs/desktopEntry/package/org.flameshot.Flameshot.desktop @@ -29,7 +29,7 @@ Keywords[ja]=flameshot;screenshot;capture;shutter;スクリーンショット; Keywords[es]=flameshot;screenshot;capture;shutter;captura; Keywords[de]=flameshot;screenshot;Bildschirmfoto;Aufnahme; Exec=flameshot -Icon=flameshot +Icon=org.flameshot.Flameshot Terminal=false Type=Application Categories=Graphics; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 71a925a4..8ca41c96 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -143,11 +143,11 @@ install( RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # Install desktop files, completion and dbus files -configure_file(${CMAKE_SOURCE_DIR}/docs/desktopEntry/package/flameshot.desktop - ${CMAKE_CURRENT_BINARY_DIR}/share/applications/flameshot.desktop COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/docs/desktopEntry/package/org.flameshot.Flameshot.desktop + ${CMAKE_CURRENT_BINARY_DIR}/share/applications/org.flameshot.Flameshot.desktop COPYONLY) -configure_file(${CMAKE_SOURCE_DIR}/docs/appdata/flameshot.metainfo.xml - ${CMAKE_CURRENT_BINARY_DIR}/share/metainfo/flameshot.metainfo.xml COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/docs/appdata/org.flameshot.Flameshot.metainfo.xml + ${CMAKE_CURRENT_BINARY_DIR}/share/metainfo/org.flameshot.Flameshot.metainfo.xml COPYONLY) configure_file(${CMAKE_SOURCE_DIR}/docs/shell-completion/flameshot ${CMAKE_CURRENT_BINARY_DIR}/share/bash-completion/completions/flameshot COPYONLY) @@ -162,14 +162,14 @@ configure_file(${CMAKE_SOURCE_DIR}/data/dbus/org.flameshot.Flameshot.service.in ${CMAKE_CURRENT_BINARY_DIR}/share/dbus-1/services/org.flameshot.Flameshot.service) # Install Icons -configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/48x48/apps/flameshot.png - ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/48x48/apps/flameshot.png COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/48x48/apps/org.flameshot.Flameshot.png + ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/48x48/apps/org.flameshot.Flameshot.png COPYONLY) -configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/128x128/apps/flameshot.png - ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/128x128/apps/flameshot.png COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/128x128/apps/org.flameshot.Flameshot.png + ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/128x128/apps/org.flameshot.Flameshot.png COPYONLY) -configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/scalable/apps/flameshot.svg - ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/scalable/apps/flameshot.svg COPYONLY) +configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/scalable/apps/org.flameshot.Flameshot.svg + ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/scalable/apps/org.flameshot.Flameshot.svg COPYONLY) # Install assets install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) diff --git a/src/core/controller.cpp b/src/core/controller.cpp index b0cf0b3d..2f341694 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -224,8 +224,8 @@ void Controller::enableTrayIcon() m_trayIcon = new QSystemTrayIcon(); m_trayIcon->setToolTip(QStringLiteral("Flameshot")); m_trayIcon->setContextMenu(trayIconMenu); - QIcon trayicon = - QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png")); + QIcon trayicon = QIcon::fromTheme( + "flameshot-tray", QIcon(":img/app/org.flameshot.Flameshot.png")); m_trayIcon->setIcon(trayicon); auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r) { @@ -260,7 +260,7 @@ void Controller::sendTrayNotification(const QString& text, { if (m_trayIcon) { m_trayIcon->showMessage( - title, text, QIcon(":img/app/flameshot.svg"), timeout); + title, text, QIcon(":img/app/org.flameshot.Flameshot.svg"), timeout); } } From 81c68c06d6c7ef3520fd2d59f81b6e56f1a79329 Mon Sep 17 00:00:00 2001 From: Jeremy Borgman Date: Sat, 10 Oct 2020 19:43:35 -0500 Subject: [PATCH 09/41] staging for 0.8.4 release --- CMakeLists.txt | 2 +- data/debian/changelog | 2 +- data/rpm/flameshot.spec | 4 +++- docs/appdata/org.flameshot.Flameshot.metainfo.xml | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74860fa2..2d20245c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13) # This can be read from ${PROJECT_NAME} after project() is called project( flameshot - VERSION 0.8.3 + VERSION 0.8.4 LANGUAGES CXX) set(PROJECT_NAME_CAPITALIZED "Flameshot") diff --git a/data/debian/changelog b/data/debian/changelog index be7f9bd4..bee8f48f 100644 --- a/data/debian/changelog +++ b/data/debian/changelog @@ -1,4 +1,4 @@ -flameshot (0.8.3-1) unstable; urgency=medium +flameshot (0.8.4-1) unstable; urgency=medium * New stable release. diff --git a/data/rpm/flameshot.spec b/data/rpm/flameshot.spec index 8acab0b3..585ad194 100644 --- a/data/rpm/flameshot.spec +++ b/data/rpm/flameshot.spec @@ -1,5 +1,5 @@ Name: flameshot -Version: 0.8.3 +Version: 0.8.4 Release: 1%{?dist} Summary: Powerful yet simple to use screenshot software Summary(eu-ES): Potente pero simple de usar software de capturas @@ -95,6 +95,8 @@ make %{?_smp_mflags} %{_datadir}/icons/hicolor %changelog +* Sat Oct 10 2020 Jeremy Borgman - 0.8.4-1 +- Updated for flameshot 0.8.4 * Mon Sep 19 2020 Jeremy Borgman - 0.8.3-1 - Updated for flameshot 0.8.3 * Mon Sep 07 2020 Zetao Yang - 0.8.0-1 diff --git a/docs/appdata/org.flameshot.Flameshot.metainfo.xml b/docs/appdata/org.flameshot.Flameshot.metainfo.xml index 973680f5..7f7517bd 100644 --- a/docs/appdata/org.flameshot.Flameshot.metainfo.xml +++ b/docs/appdata/org.flameshot.Flameshot.metainfo.xml @@ -5,6 +5,7 @@ GPL-3.0-or-later Flameshot + From 36fdb3b2f44851fb825f9392321409994c4ce764 Mon Sep 17 00:00:00 2001 From: Ahmed Zetao Yang Date: Sun, 11 Oct 2020 09:39:18 +0800 Subject: [PATCH 10/41] docs: correcting svg file name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a4342f69..053f6cae 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- Flameshot + Flameshot
Flameshot From ac7142c4df5cf218ddf5b032d80ac340639f99d0 Mon Sep 17 00:00:00 2001 From: Ahmed Zetao Yang Date: Sun, 11 Oct 2020 17:22:19 +0800 Subject: [PATCH 11/41] fix: correcting images name --- CMakeLists.txt | 2 +- src/config/configwindow.cpp | 2 +- src/tools/imgur/imguruploader.cpp | 2 +- src/tools/launcher/applauncherwidget.cpp | 2 +- src/utils/screenshotsaver.cpp | 3 ++- src/widgets/infowindow.cpp | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d20245c..0a3bfc17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Powerful yet simple to use screenshot sof set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_PACKAGE_HOMEPAGE_URL "https://flameshot.org") set(CPACK_PACKAGE_CONTACT "flameshot-org developers ") -set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/img/app/flameshot.svg") # TODO: Can any generator make use of this? +set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/img/app/org.flameshot.Flameshot.svg") # TODO: Can any generator make use of this? set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") # TODO: Where is this used? Do we need a better source? if(WIN32) diff --git a/src/config/configwindow.cpp b/src/config/configwindow.cpp index 737c6573..ccd10714 100644 --- a/src/config/configwindow.cpp +++ b/src/config/configwindow.cpp @@ -39,7 +39,7 @@ ConfigWindow::ConfigWindow(QWidget* parent) setAttribute(Qt::WA_DeleteOnClose); const int size = GlobalValues::buttonBaseSize() * 12; setMinimumSize(size, size); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); setWindowTitle(tr("Configuration")); auto changedSlot = [this](QString s) { diff --git a/src/tools/imgur/imguruploader.cpp b/src/tools/imgur/imguruploader.cpp index 26e3f149..a457c1c3 100644 --- a/src/tools/imgur/imguruploader.cpp +++ b/src/tools/imgur/imguruploader.cpp @@ -50,7 +50,7 @@ ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent) , m_pixmap(capture) { setWindowTitle(tr("Upload to Imgur")); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) QRect position = frameGeometry(); diff --git a/src/tools/launcher/applauncherwidget.cpp b/src/tools/launcher/applauncherwidget.cpp index 4ae24175..1ca1dc50 100644 --- a/src/tools/launcher/applauncherwidget.cpp +++ b/src/tools/launcher/applauncherwidget.cpp @@ -52,7 +52,7 @@ AppLauncherWidget::AppLauncherWidget(const QPixmap& p, QWidget* parent) , m_pixmap(p) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); setWindowTitle(tr("Open With")); m_keepOpen = ConfigHandler().keepOpenAppLauncherValue(); diff --git a/src/utils/screenshotsaver.cpp b/src/utils/screenshotsaver.cpp index fd5c433d..40363042 100644 --- a/src/utils/screenshotsaver.cpp +++ b/src/utils/screenshotsaver.cpp @@ -108,7 +108,8 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture) QString msg = QObject::tr("Error trying to save as ") + savePath; QMessageBox saveErrBox( QMessageBox::Warning, QObject::tr("Save Error"), msg); - saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg")); + saveErrBox.setWindowIcon( + QIcon(":img/app/org.flameshot.Flameshot.svg")); saveErrBox.exec(); } } diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index b624adfa..23bc8c8d 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -36,7 +36,7 @@ InfoWindow::InfoWindow(QWidget* parent) : QWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); setWindowTitle(tr("About")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) From a472648263a0c4a2f30b0ae553b873236818d4b8 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Sun, 11 Oct 2020 20:41:25 +0300 Subject: [PATCH 12/41] Fix - memory leaks --- src/config/shortcutswidget.cpp | 1 + src/utils/configshortcuts.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/shortcutswidget.cpp b/src/config/shortcutswidget.cpp index 84c9d292..afd1aabc 100644 --- a/src/config/shortcutswidget.cpp +++ b/src/config/shortcutswidget.cpp @@ -147,5 +147,6 @@ void ShortcutsWidget::slotShortcutCellClicked(int row, int col) m_table->setItem(row, col, item); } } + delete setShortcutDialog; } } diff --git a/src/utils/configshortcuts.cpp b/src/utils/configshortcuts.cpp index 69e438b6..7f957e36 100644 --- a/src/utils/configshortcuts.cpp +++ b/src/utils/configshortcuts.cpp @@ -17,7 +17,7 @@ const QVector& ConfigShortcuts::captureShortcutsDefault( m_shortcuts << (QStringList() << shortcutName << b->tool()->description() << ks.toString()); - b->close(); + delete b; } m_shortcuts << (QStringList() From 0c4bb3716cd06719b706b051dffca3a18a477c2c Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Sun, 11 Oct 2020 20:59:10 +0300 Subject: [PATCH 13/41] Fix - add keyboar icon in the SetShortcutDialog --- data/graphics.qrc | 1 + 1 file changed, 1 insertion(+) diff --git a/data/graphics.qrc b/data/graphics.qrc index a267ebf9..b0270ea5 100644 --- a/data/graphics.qrc +++ b/data/graphics.qrc @@ -2,6 +2,7 @@ img/app/org.flameshot.Flameshot.svg img/app/org.flameshot.Flameshot.png + img/app/keyboard.svg img/material/black/delete.svg img/material/black/undo-variant.svg img/material/black/text.svg From f894b44f250d9a2197e23f51a5e76021752c20da Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Mon, 12 Oct 2020 12:48:05 +0300 Subject: [PATCH 14/41] Get cache path for linux according to XDG standard --- src/utils/history.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/utils/history.cpp b/src/utils/history.cpp index f5ce6ae6..d90487bd 100644 --- a/src/utils/history.cpp +++ b/src/utils/history.cpp @@ -1,7 +1,9 @@ #include "history.h" #include "src/utils/confighandler.h" +#include #include #include +#include #include History::History() @@ -11,7 +13,9 @@ History::History() #ifdef Q_OS_WIN m_historyPath = QDir::homePath() + "/AppData/Roaming/flameshot/history/"; #else - m_historyPath = QDir::homePath() + "/.cache/flameshot/history/"; + QString path = QProcessEnvironment::systemEnvironment().value( + "XDG_CACHE_HOME", QDir::homePath() + "/.cache"); + m_historyPath = path + "/flameshot/history/"; #endif // Check if directory for history exists and create if doesn't From 5d9f8f002a5a07902747ef54ba28205c367808fb Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Mon, 12 Oct 2020 13:38:41 +0300 Subject: [PATCH 15/41] Fix resource path for images --- src/config/setshortcutwidget.cpp | 2 +- src/config/shortcutswidget.cpp | 2 +- src/tools/storage/imguploader.cpp | 2 +- src/tools/storage/s3/imgs3uploader.cpp | 2 +- src/widgets/infowindow.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/setshortcutwidget.cpp b/src/config/setshortcutwidget.cpp index 7b570da4..cd5ab130 100644 --- a/src/config/setshortcutwidget.cpp +++ b/src/config/setshortcutwidget.cpp @@ -26,7 +26,7 @@ SetShortcutDialog::SetShortcutDialog(QDialog* parent) : QDialog(parent) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); setWindowTitle(tr("Set Shortcut")); m_ks = QKeySequence(); diff --git a/src/config/shortcutswidget.cpp b/src/config/shortcutswidget.cpp index afd1aabc..83af66fc 100644 --- a/src/config/shortcutswidget.cpp +++ b/src/config/shortcutswidget.cpp @@ -39,7 +39,7 @@ ShortcutsWidget::ShortcutsWidget(QWidget* parent) : QWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); setWindowTitle(tr("Hot Keys")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) diff --git a/src/tools/storage/imguploader.cpp b/src/tools/storage/imguploader.cpp index 92597dbd..7106ed61 100644 --- a/src/tools/storage/imguploader.cpp +++ b/src/tools/storage/imguploader.cpp @@ -59,7 +59,7 @@ void ImgUploader::init(const QString& title, const QString& label) resultStatus = false; setWindowTitle(title); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) QRect position = frameGeometry(); diff --git a/src/tools/storage/s3/imgs3uploader.cpp b/src/tools/storage/s3/imgs3uploader.cpp index fc57e850..c16f7860 100644 --- a/src/tools/storage/s3/imgs3uploader.cpp +++ b/src/tools/storage/s3/imgs3uploader.cpp @@ -65,7 +65,7 @@ void ImgS3Uploader::init(const QString& title, const QString& label) resultStatus = false; setWindowTitle(title); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); } QNetworkProxy* ImgS3Uploader::proxy() diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index f5520d07..c0c12aec 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -55,7 +55,7 @@ InfoWindow::InfoWindow(QWidget* parent) void InfoWindow::initLabels() { QLabel* icon = new QLabel(); - icon->setPixmap(QPixmap(":img/app/flameshot.svg")); + icon->setPixmap(QPixmap(":img/app/org.flameshot.Flameshot.svg")); icon->setAlignment(Qt::AlignHCenter); m_layout->addWidget(icon); From f273a06d9831e293544ef11f53282e7419e1d6d8 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Mon, 12 Oct 2020 13:48:32 +0300 Subject: [PATCH 16/41] Remove unrequired includes --- src/utils/history.cpp | 1 - src/widgets/infowindow.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/utils/history.cpp b/src/utils/history.cpp index d90487bd..35b48567 100644 --- a/src/utils/history.cpp +++ b/src/utils/history.cpp @@ -1,6 +1,5 @@ #include "history.h" #include "src/utils/confighandler.h" -#include #include #include #include diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index c0c12aec..bb2e2e22 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) From f11073bc00f1f656a590daa940e7497400f273cb Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Mon, 12 Oct 2020 08:40:35 -0500 Subject: [PATCH 17/41] fixing icon regression (#1051) * fixing icon regression * fixed symlink --- data/graphics.qrc | 2 ++ data/img/app/flameshot.png | 1 + data/img/app/flameshot.svg | 1 + data/img/hicolor/128x128/apps/flameshot.png | 1 + data/img/hicolor/48x48/apps/flameshot.png | 1 + data/img/hicolor/scalable/apps/flameshot.svg | 1 + src/CMakeLists.txt | 11 +++++++++++ src/config/configwindow.cpp | 2 +- src/core/controller.cpp | 6 +++--- src/tools/imgur/imguruploader.cpp | 2 +- src/tools/launcher/applauncherwidget.cpp | 2 +- src/utils/screenshotsaver.cpp | 3 +-- src/widgets/infowindow.cpp | 2 +- 13 files changed, 26 insertions(+), 9 deletions(-) create mode 120000 data/img/app/flameshot.png create mode 120000 data/img/app/flameshot.svg create mode 120000 data/img/hicolor/128x128/apps/flameshot.png create mode 120000 data/img/hicolor/48x48/apps/flameshot.png create mode 120000 data/img/hicolor/scalable/apps/flameshot.svg diff --git a/data/graphics.qrc b/data/graphics.qrc index 971b9fd5..76adcd3a 100644 --- a/data/graphics.qrc +++ b/data/graphics.qrc @@ -1,7 +1,9 @@ img/app/org.flameshot.Flameshot.svg + img/app/flameshot.svg img/app/org.flameshot.Flameshot.png + img/app/flameshot.png img/material/black/undo-variant.svg img/material/black/text.svg img/material/black/square.svg diff --git a/data/img/app/flameshot.png b/data/img/app/flameshot.png new file mode 120000 index 00000000..9639efdd --- /dev/null +++ b/data/img/app/flameshot.png @@ -0,0 +1 @@ +org.flameshot.Flameshot.png \ No newline at end of file diff --git a/data/img/app/flameshot.svg b/data/img/app/flameshot.svg new file mode 120000 index 00000000..44f59631 --- /dev/null +++ b/data/img/app/flameshot.svg @@ -0,0 +1 @@ +org.flameshot.Flameshot.svg \ No newline at end of file diff --git a/data/img/hicolor/128x128/apps/flameshot.png b/data/img/hicolor/128x128/apps/flameshot.png new file mode 120000 index 00000000..9639efdd --- /dev/null +++ b/data/img/hicolor/128x128/apps/flameshot.png @@ -0,0 +1 @@ +org.flameshot.Flameshot.png \ No newline at end of file diff --git a/data/img/hicolor/48x48/apps/flameshot.png b/data/img/hicolor/48x48/apps/flameshot.png new file mode 120000 index 00000000..9639efdd --- /dev/null +++ b/data/img/hicolor/48x48/apps/flameshot.png @@ -0,0 +1 @@ +org.flameshot.Flameshot.png \ No newline at end of file diff --git a/data/img/hicolor/scalable/apps/flameshot.svg b/data/img/hicolor/scalable/apps/flameshot.svg new file mode 120000 index 00000000..44f59631 --- /dev/null +++ b/data/img/hicolor/scalable/apps/flameshot.svg @@ -0,0 +1 @@ +org.flameshot.Flameshot.svg \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8ca41c96..ba9c917a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -171,6 +171,17 @@ configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/128x128/apps/org.flameshot.F configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/scalable/apps/org.flameshot.Flameshot.svg ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/scalable/apps/org.flameshot.Flameshot.svg COPYONLY) +## Install icon with both names +configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/48x48/apps/flameshot.png + ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/48x48/apps/flameshot.png COPYONLY) + +configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/128x128/apps/flameshot.png + ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/128x128/apps/flameshot.png COPYONLY) + +configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/scalable/apps/flameshot.svg + ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/scalable/apps/flameshot.svg COPYONLY) + + # Install assets install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) diff --git a/src/config/configwindow.cpp b/src/config/configwindow.cpp index ccd10714..737c6573 100644 --- a/src/config/configwindow.cpp +++ b/src/config/configwindow.cpp @@ -39,7 +39,7 @@ ConfigWindow::ConfigWindow(QWidget* parent) setAttribute(Qt::WA_DeleteOnClose); const int size = GlobalValues::buttonBaseSize() * 12; setMinimumSize(size, size); - setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); setWindowTitle(tr("Configuration")); auto changedSlot = [this](QString s) { diff --git a/src/core/controller.cpp b/src/core/controller.cpp index 2f341694..b0cf0b3d 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -224,8 +224,8 @@ void Controller::enableTrayIcon() m_trayIcon = new QSystemTrayIcon(); m_trayIcon->setToolTip(QStringLiteral("Flameshot")); m_trayIcon->setContextMenu(trayIconMenu); - QIcon trayicon = QIcon::fromTheme( - "flameshot-tray", QIcon(":img/app/org.flameshot.Flameshot.png")); + QIcon trayicon = + QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png")); m_trayIcon->setIcon(trayicon); auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r) { @@ -260,7 +260,7 @@ void Controller::sendTrayNotification(const QString& text, { if (m_trayIcon) { m_trayIcon->showMessage( - title, text, QIcon(":img/app/org.flameshot.Flameshot.svg"), timeout); + title, text, QIcon(":img/app/flameshot.svg"), timeout); } } diff --git a/src/tools/imgur/imguruploader.cpp b/src/tools/imgur/imguruploader.cpp index a457c1c3..26e3f149 100644 --- a/src/tools/imgur/imguruploader.cpp +++ b/src/tools/imgur/imguruploader.cpp @@ -50,7 +50,7 @@ ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent) , m_pixmap(capture) { setWindowTitle(tr("Upload to Imgur")); - setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) QRect position = frameGeometry(); diff --git a/src/tools/launcher/applauncherwidget.cpp b/src/tools/launcher/applauncherwidget.cpp index 1ca1dc50..4ae24175 100644 --- a/src/tools/launcher/applauncherwidget.cpp +++ b/src/tools/launcher/applauncherwidget.cpp @@ -52,7 +52,7 @@ AppLauncherWidget::AppLauncherWidget(const QPixmap& p, QWidget* parent) , m_pixmap(p) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); setWindowTitle(tr("Open With")); m_keepOpen = ConfigHandler().keepOpenAppLauncherValue(); diff --git a/src/utils/screenshotsaver.cpp b/src/utils/screenshotsaver.cpp index 40363042..fd5c433d 100644 --- a/src/utils/screenshotsaver.cpp +++ b/src/utils/screenshotsaver.cpp @@ -108,8 +108,7 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture) QString msg = QObject::tr("Error trying to save as ") + savePath; QMessageBox saveErrBox( QMessageBox::Warning, QObject::tr("Save Error"), msg); - saveErrBox.setWindowIcon( - QIcon(":img/app/org.flameshot.Flameshot.svg")); + saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg")); saveErrBox.exec(); } } diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index 23bc8c8d..b624adfa 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -36,7 +36,7 @@ InfoWindow::InfoWindow(QWidget* parent) : QWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); setWindowTitle(tr("About")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) From 7df5a1332697bfc1d65d38aa7271477bf7620d4d Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Tue, 13 Oct 2020 19:49:05 -0500 Subject: [PATCH 18/41] Testing appveyor (#1058) --- appveyor.yml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 960e86f2..3be2328f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,7 @@ clone_folder: c:\projects\source environment: Qt5_INSTALL_DIR: 'C:\Qt\5.15.0\msvc2019_64' PATH: '%Qt5_INSTALL_DIR%\bin;%PATH%' + build_script: - cmd: >- @@ -16,5 +17,30 @@ build_script: cmake c:\projects\source -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE:STRING=Release - cmake --build . --config "Release" + cmake --build . --parallel 2 --config "Release" + + cpack -G WIX -B package + mkdir artifact + + dir + + cp package/*.msi artifact/. + + cp src/Release/*.exe artifact/. + + 7z a -tzip artifact.zip artifact/ + +artifacts: +- path: build\package\*.msi + name: installer +- path: build\src\Release\*.exe + name: executable +- path: build\artifact.zip + name: archive + +deploy: +- provider: Webhook + url: https://app.signpath.io/API/v1/042f605f-b378-45d8-ad16-b7695b071036/Integrations/AppVeyor?ProjectSlug=flameshot&SigningPolicySlug=test-signing + authorization: + secure: G5nNnkfRSJ+EEx+7LlUSSoEyoL+pHYItvjrNxbWITE7RB+cm9qzuHRdwmrZdEDjdVCLZ2TkNawynMxYcGMZAQA== From cc34ede2c7570cece76561104aa7e439ea6c4a41 Mon Sep 17 00:00:00 2001 From: Jeremy Borgman Date: Tue, 13 Oct 2020 20:20:13 -0500 Subject: [PATCH 19/41] matching flatpak files to flathub repo --- .github/workflows/Linux-pack.yml | 2 +- data/flatpak/org.flameshot.Flameshot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index 48e03595..b37b6382 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -457,7 +457,7 @@ jobs: - name: Upload flatpak package(daily build) run: | echo "=====================flatpak download link=====================" - echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh $GITHUB_WORKSPACE/org.flameshot.flameshot-${VERSION}.${ARCH}.flatpak) + echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh $GITHUB_WORKSPACE/org.flameshot.Flameshot-${VERSION}.${ARCH}.flatpak) echo "======no operation for you can see link in the log console=====" - name: Artifact Upload uses: actions/upload-artifact@v2 diff --git a/data/flatpak/org.flameshot.Flameshot.yml b/data/flatpak/org.flameshot.Flameshot.yml index cf246772..183a241b 100644 --- a/data/flatpak/org.flameshot.Flameshot.yml +++ b/data/flatpak/org.flameshot.Flameshot.yml @@ -30,4 +30,4 @@ modules: sources: - type: git url: https://github.com/flameshot-org/flameshot.git - branch: master + branch: master \ No newline at end of file From 3ceaf66cd82da204e465ccf153dfc539b4970855 Mon Sep 17 00:00:00 2001 From: James LaChance Date: Wed, 14 Oct 2020 01:44:55 -0400 Subject: [PATCH 20/41] Add instructions for how to format code This took @jfly and me far too long to figure out how to actually get the code formatted. --- docs/CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 21b1a2b1..5935a019 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -19,6 +19,7 @@ For small fixes or incremental improvements simply fork the repo and follow the 2. Start coding! - Implement your feature. - Check your code works as expected. + - Run the code formatter: `clang-format -i $(git ls-files "*.cpp" "*.h")` 3. Commit your changes to a new branch (not `master`, one change per branch) and push it: - Commit messages should: From 4eaad7b9884aaf406403babc0f60288874b0b919 Mon Sep 17 00:00:00 2001 From: Mehrad Mahmoudian Date: Wed, 14 Oct 2020 17:43:07 +0300 Subject: [PATCH 21/41] Revamped GitHub Issue templates --- .github/ISSUE_TEMPLATE/Bug_report.md | 7 ++++++- .github/ISSUE_TEMPLATE/Feature_request.md | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index d253e120..f7f774cd 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -4,11 +4,16 @@ about: Create a report to help us improve --- + + **Flameshot version** **Describe the bug** - + **To Reproduce** diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md index 8b511242..7b62f674 100644 --- a/.github/ISSUE_TEMPLATE/Feature_request.md +++ b/.github/ISSUE_TEMPLATE/Feature_request.md @@ -5,5 +5,10 @@ about: Suggest an idea for this project --- **Is your feature request related to a problem?** + \ No newline at end of file From ce331924a4a1695a142cfb021bf5c8a13b8d4382 Mon Sep 17 00:00:00 2001 From: Jeremy Borgman Date: Wed, 14 Oct 2020 09:07:01 -0500 Subject: [PATCH 22/41] organizing files --- .github/workflows/Linux-pack.yml | 11 +- CMakeLists.txt | 6 +- .../org.flameshot.Flameshot.metainfo.xml | 0 .../package/org.flameshot.Flameshot.desktop | 0 {docs => data}/shell-completion/flameshot | 0 {data => packaging}/debian/changelog | 0 {data => packaging}/debian/compat | 0 {data => packaging}/debian/control | 0 {data => packaging}/debian/copyright | 0 {data => packaging}/debian/docs | 0 {data => packaging}/debian/rules | 0 {data => packaging}/debian/source/format | 0 .../flatpak/org.flameshot.Flameshot.yml | 0 {data => packaging}/rpm/flameshot.spec | 0 .../Bitmaps/CPACK_WIX_UI_BANNER.BMP | Bin .../Bitmaps/CPACK_WIX_UI_DIALOG.BMP | Bin .../win-installer/LICENSE/GPL-3.0.txt | 0 scripts/upload_services/transfer.sh.sh | 19 ---- snapcraft.yaml | 107 ++++++++++++++++++ src/CMakeLists.txt | 9 +- 20 files changed, 120 insertions(+), 32 deletions(-) rename {docs => data}/appdata/org.flameshot.Flameshot.metainfo.xml (100%) rename {docs => data}/desktopEntry/package/org.flameshot.Flameshot.desktop (100%) rename {docs => data}/shell-completion/flameshot (100%) rename {data => packaging}/debian/changelog (100%) rename {data => packaging}/debian/compat (100%) rename {data => packaging}/debian/control (100%) rename {data => packaging}/debian/copyright (100%) rename {data => packaging}/debian/docs (100%) rename {data => packaging}/debian/rules (100%) rename {data => packaging}/debian/source/format (100%) rename {data => packaging}/flatpak/org.flameshot.Flameshot.yml (100%) rename {data => packaging}/rpm/flameshot.spec (100%) rename {data => packaging}/win-installer/Bitmaps/CPACK_WIX_UI_BANNER.BMP (100%) rename {data => packaging}/win-installer/Bitmaps/CPACK_WIX_UI_DIALOG.BMP (100%) rename {data => packaging}/win-installer/LICENSE/GPL-3.0.txt (100%) delete mode 100644 scripts/upload_services/transfer.sh.sh create mode 100644 snapcraft.yaml diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index b37b6382..eb367711 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -76,7 +76,7 @@ jobs: path: tools - name: Packaging on ${{ matrix.dist.name }} run: | - cp -r $GITHUB_WORKSPACE/data/debian $GITHUB_WORKSPACE + cp -r $GITHUB_WORKSPACE/packaging/debian $GITHUB_WORKSPACE bash $GITHUB_WORKSPACE/tools/packpack mv $GITHUB_WORKSPACE/build/${PRODUCT}_${VERSION}-${RELEASE}_amd64.deb $GITHUB_WORKSPACE/build/${PRODUCT}-${VERSION}-${RELEASE}.${{ matrix.dist.name }}.amd64.deb env: @@ -165,7 +165,7 @@ jobs: echo "=========================" - name: Packaging on ubuntu-18.04 run: | - cp -r $GITHUB_WORKSPACE/data/debian $GITHUB_WORKSPACE + cp -r $GITHUB_WORKSPACE/packaging/debian $GITHUB_WORKSPACE mkdir -p $GITHUB_WORKSPACE/build sed -e "/cmake (>= 3.13~),/d" -i $GITHUB_WORKSPACE/debian/control dpkg-buildpackage -b @@ -243,7 +243,7 @@ jobs: path: tools - name: Packaging on ${{ matrix.dist.name }} run: | - cp -r $GITHUB_WORKSPACE/data/rpm $GITHUB_WORKSPACE + cp -r $GITHUB_WORKSPACE/packaging/rpm $GITHUB_WORKSPACE bash $GITHUB_WORKSPACE/tools/packpack env: OS: ${{ matrix.dist.os }} @@ -439,7 +439,7 @@ jobs: - name: Packaging flatpak run: | BUNDLE="org.flameshot.Flameshot_${VERSION}_${ARCH}.flatpak" - MANIFEST_PATH=$GITHUB_WORKSPACE/data/flatpak/org.flameshot.Flameshot.yml + MANIFEST_PATH=$GITHUB_WORKSPACE/packaging/flatpak/org.flameshot.Flameshot.yml RUNTIME_REPO="https://flathub.org/repo/flathub.flatpakrepo" APP_ID="org.flameshot.Flameshot" BRANCH="master" @@ -494,11 +494,10 @@ jobs: echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}" echo "================================" echo ::set-env name=VERSION::$(echo ${last_committed_tag:1}) + - name: Packaging snap uses: snapcore/action-build@v1 id: snapcraft - with: - path: data - name: Rename snap name shell: bash run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a3bfc17..bf6f2fa2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,15 +82,15 @@ if(WIN32) # Supported languages can be found at # http://wixtoolset.org/documentation/manual/v3/wixui/wixui_localization.html #set(CPACK_WIX_CULTURES "ar-SA,bg-BG,ca-ES,hr-HR,cs-CZ,da-DK,nl-NL,en-US,et-EE,fi-FI,fr-FR,de-DE") - set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/data/win-installer/Bitmaps/CPACK_WIX_UI_BANNER.BMP") - set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/data/win-installer/Bitmaps/CPACK_WIX_UI_DIALOG.BMP") + set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/packaging/win-installer/Bitmaps/CPACK_WIX_UI_BANNER.BMP") + set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/packaging/win-installer/Bitmaps/CPACK_WIX_UI_DIALOG.BMP") set(CPACK_WIX_PROPERTY_ARPHELPLINK "${CPACK_PACKAGE_HOMEPAGE_URL}") set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${CPACK_PACKAGE_HOMEPAGE_URL}") set(CPACK_WIX_ROOT_FEATURE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}") set(CPACK_WIX_LIGHT_EXTRA_FLAGS "-dcl:high") # set high compression - set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/data/win-installer/LICENSE/GPL-3.0.txt") + set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/packaging/win-installer/LICENSE/GPL-3.0.txt") set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md") # The correct way would be to include both x32 and x64 into one installer diff --git a/docs/appdata/org.flameshot.Flameshot.metainfo.xml b/data/appdata/org.flameshot.Flameshot.metainfo.xml similarity index 100% rename from docs/appdata/org.flameshot.Flameshot.metainfo.xml rename to data/appdata/org.flameshot.Flameshot.metainfo.xml diff --git a/docs/desktopEntry/package/org.flameshot.Flameshot.desktop b/data/desktopEntry/package/org.flameshot.Flameshot.desktop similarity index 100% rename from docs/desktopEntry/package/org.flameshot.Flameshot.desktop rename to data/desktopEntry/package/org.flameshot.Flameshot.desktop diff --git a/docs/shell-completion/flameshot b/data/shell-completion/flameshot similarity index 100% rename from docs/shell-completion/flameshot rename to data/shell-completion/flameshot diff --git a/data/debian/changelog b/packaging/debian/changelog similarity index 100% rename from data/debian/changelog rename to packaging/debian/changelog diff --git a/data/debian/compat b/packaging/debian/compat similarity index 100% rename from data/debian/compat rename to packaging/debian/compat diff --git a/data/debian/control b/packaging/debian/control similarity index 100% rename from data/debian/control rename to packaging/debian/control diff --git a/data/debian/copyright b/packaging/debian/copyright similarity index 100% rename from data/debian/copyright rename to packaging/debian/copyright diff --git a/data/debian/docs b/packaging/debian/docs similarity index 100% rename from data/debian/docs rename to packaging/debian/docs diff --git a/data/debian/rules b/packaging/debian/rules similarity index 100% rename from data/debian/rules rename to packaging/debian/rules diff --git a/data/debian/source/format b/packaging/debian/source/format similarity index 100% rename from data/debian/source/format rename to packaging/debian/source/format diff --git a/data/flatpak/org.flameshot.Flameshot.yml b/packaging/flatpak/org.flameshot.Flameshot.yml similarity index 100% rename from data/flatpak/org.flameshot.Flameshot.yml rename to packaging/flatpak/org.flameshot.Flameshot.yml diff --git a/data/rpm/flameshot.spec b/packaging/rpm/flameshot.spec similarity index 100% rename from data/rpm/flameshot.spec rename to packaging/rpm/flameshot.spec diff --git a/data/win-installer/Bitmaps/CPACK_WIX_UI_BANNER.BMP b/packaging/win-installer/Bitmaps/CPACK_WIX_UI_BANNER.BMP similarity index 100% rename from data/win-installer/Bitmaps/CPACK_WIX_UI_BANNER.BMP rename to packaging/win-installer/Bitmaps/CPACK_WIX_UI_BANNER.BMP diff --git a/data/win-installer/Bitmaps/CPACK_WIX_UI_DIALOG.BMP b/packaging/win-installer/Bitmaps/CPACK_WIX_UI_DIALOG.BMP similarity index 100% rename from data/win-installer/Bitmaps/CPACK_WIX_UI_DIALOG.BMP rename to packaging/win-installer/Bitmaps/CPACK_WIX_UI_DIALOG.BMP diff --git a/data/win-installer/LICENSE/GPL-3.0.txt b/packaging/win-installer/LICENSE/GPL-3.0.txt similarity index 100% rename from data/win-installer/LICENSE/GPL-3.0.txt rename to packaging/win-installer/LICENSE/GPL-3.0.txt diff --git a/scripts/upload_services/transfer.sh.sh b/scripts/upload_services/transfer.sh.sh deleted file mode 100644 index 082ac8c4..00000000 --- a/scripts/upload_services/transfer.sh.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -URL="https://transfer.sh" - -if [ $# -eq 0 ]; then - echo "Usage: transfer.sh FILE\n" - exit 1 -fi - -FILE=$1 - -if [ ! -f "$FILE" ]; then - echo "File ${FILE} not found" - exit 1 -fi - -RESPONSE=$(curl -# -F "file=@${FILE}" "${URL}") - -echo "${RESPONSE}" # to terminal \ No newline at end of file diff --git a/snapcraft.yaml b/snapcraft.yaml new file mode 100644 index 00000000..a737fc9b --- /dev/null +++ b/snapcraft.yaml @@ -0,0 +1,107 @@ +--- + +name: flameshot +adopt-info: flameshot +base: core18 +summary: Powerful yet simple to use screenshot software +description: | + A powerful open source screenshot and annotation tool for Linux, Flameshot + has a varied set of markup tools available, which include Freehand drawing, + Lines, Arrows, Boxes, Circles, Highlighting, Blur. Additionally, you can + customise the color, size and/or thickness of many of these image annotation + tools. +grade: stable # must be 'stable' to release into candidate/stable channels +confinement: strict # use 'strict' once you have the right plugs and slots +#confinement: devmode # use 'strict' once you have the right plugs and slots +architectures: + - build-on: amd64 + - build-on: i386 + + +apps: + flameshot: + command: flameshot + desktop: usr/share/applications/org.flameshot.Flameshot.desktop + extensions: + - kde-neon + environment: + DISABLE_WAYLAND: 1 + XDG_DATA_DIRS: $SNAP/share:$XDG_DATA_DIRS + QT_QPA_PLATFORMTHEME: gtk3 + slots: [dbus-flameshot] + plugs: + - kde-frameworks-5-plug + - home + - removable-media + - network + - network-bind + - opengl + - pulseaudio + - wayland + - unity7 + - x11 + +parts: + flameshot: + build-snaps: + - kde-frameworks-5-core18-sdk + - kde-frameworks-5-core18 + - cmake #core18 does not have new enough cmake so install from snap + plugin: cmake + configflags: + - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' + - '-DCMAKE_INSTALL_PREFIX=/usr' + source: https://github.com/flameshot-org/flameshot.git + source-type: git + override-pull: | + snapcraftctl pull + last_committed_tag="$(git tag -l --sort=-v:refname | head -1)" + git_revno="$(git rev-list $(git describe --tags --abbrev=0)..HEAD --count)" + git_hash="$(git rev-parse --short HEAD)" + snapcraftctl set-version "${last_committed_tag}+git${git_revno}.${git_hash}" + override-build: | + snapcraftctl build + # Correct the Icon path + sed -i 's|^Exec=flameshot|Exec=/snap/bin/org.flameshot.Flameshot|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/org.flameshot.Flameshot.desktop + sed -i 's|^Icon=.*|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/org.flameshot.Flameshot.svg|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/org.flameshot.Flameshot.desktop + sed -i 's/^\(Name\(\[.\+\]\)\?=.*\)$/\1 (Snappy Edition)/g' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/org.flameshot.Flameshot.desktop + build-packages: + - g++ + - make + - qt5-default + - qttools5-dev-tools + - libqt5svg5-dev + stage-packages: + - dbus-x11 + - libgtk2.0-0 + - openssl + - ca-certificates + - qtwayland5 + - libqt5dbus5 + - libqt5network5 + - libqt5core5a + - libqt5widgets5 + - libqt5gui5 + - libqt5svg5 + - libxkbcommon0 + - ttf-ubuntu-font-family + - dmz-cursor-theme + - light-themes + - adwaita-icon-theme + - gnome-themes-standard + - shared-mime-info + - libgdk-pixbuf2.0-0 + prime: + # libquazip5-1 pulls in Qt5 from bionic as a dependency. We don't + # want it in our snap, however, because we get a newer Qt5 from the + # kde-kf5 platform snap. + - "-usr/lib/x86_64-linux-gnu/libQt5*" + - "-usr/lib/x86_64-linux-gnu/libqt5*" +slots: + # Depending on in which environment we're running we either need + # to use the system or session DBus so we also need to have one + # slot for each. + dbus-flameshot: + interface: dbus + bus: session + name: org.flameshot.Flameshot diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ba9c917a..bde4e49b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -130,6 +130,7 @@ foreach(FILE ${QM_FILES}) COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${F_NAME} ${CMAKE_CURRENT_BINARY_DIR}/translations/${F_NAME}) endforeach() + # ###################################################################################################################### # Installation instructions @@ -143,16 +144,16 @@ install( RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # Install desktop files, completion and dbus files -configure_file(${CMAKE_SOURCE_DIR}/docs/desktopEntry/package/org.flameshot.Flameshot.desktop +configure_file(${CMAKE_SOURCE_DIR}/data/desktopEntry/package/org.flameshot.Flameshot.desktop ${CMAKE_CURRENT_BINARY_DIR}/share/applications/org.flameshot.Flameshot.desktop COPYONLY) -configure_file(${CMAKE_SOURCE_DIR}/docs/appdata/org.flameshot.Flameshot.metainfo.xml +configure_file(${CMAKE_SOURCE_DIR}/data/appdata/org.flameshot.Flameshot.metainfo.xml ${CMAKE_CURRENT_BINARY_DIR}/share/metainfo/org.flameshot.Flameshot.metainfo.xml COPYONLY) -configure_file(${CMAKE_SOURCE_DIR}/docs/shell-completion/flameshot +configure_file(${CMAKE_SOURCE_DIR}/data/shell-completion/flameshot ${CMAKE_CURRENT_BINARY_DIR}/share/bash-completion/completions/flameshot COPYONLY) -configure_file(${CMAKE_SOURCE_DIR}/docs/shell-completion/flameshot +configure_file(${CMAKE_SOURCE_DIR}/data/shell-completion/flameshot ${CMAKE_CURRENT_BINARY_DIR}/share/zsh/site-functions/_flameshot COPYONLY) configure_file(${CMAKE_SOURCE_DIR}/data/dbus/org.flameshot.Flameshot.xml From 80dd24f675187e52515e2351024d2b645766492e Mon Sep 17 00:00:00 2001 From: Jeremy Borgman Date: Wed, 14 Oct 2020 10:07:47 -0500 Subject: [PATCH 23/41] Added code signing information --- README.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 053f6cae..9451ab32 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,8 @@ - [Build](#build) - [Install](#install) - [License](#license) +- [Privacy Policy](#privacy-policy) +- [Code Signing Policy](#code-signing-policy) - [Contribute](#contribute) - [Acknowledgment](#acknowledgment) @@ -367,12 +369,18 @@ Note: If you install from source, there is no uninstaller, you will need to manu Info: If I take code from your project and that implies a relicense to GPLv3, you can reuse my changes with the original previous license of your project applied. +## Privacy Policy +This program will not transfer any information to other networked systems unless specifically requested by the user or the person installing or operating it. + + +## Code Signing Policy +Free code signing provided by [SignPath.io](https://signpath.io/), certificate by [SignPath Foundation](https://signpath.org/). + +Code signing is currently a manual process so not every patch release will be signed. + ## Contribute - If you want to contribute check the [CONTRIBUTING.md](docs/CONTRIBUTING.md) - - ## Acknowledgment Thanks to those who have shown interest in the early development process: - [lupoDharkael](https://github.com/lupoDharkael) @@ -380,3 +388,7 @@ Thanks to those who have shown interest in the early development process: - [XerTheSquirrel](https://github.com/XerTheSquirrel) - [The members of Sugus GNU/Linux](https://github.com/SUGUS-GNULinux) - ismatori + +Thanks to sponsors: +- JetBrains +- SignPath From 376a6f2a9c17449d00f93ff8fcfb8e5ab6c17339 Mon Sep 17 00:00:00 2001 From: Jeremy Borgman Date: Wed, 14 Oct 2020 18:27:04 -0500 Subject: [PATCH 24/41] Added releasing info for v0.8.5 --- CMakeLists.txt | 2 +- data/appdata/org.flameshot.Flameshot.metainfo.xml | 1 + packaging/debian/changelog | 4 ++-- packaging/rpm/flameshot.spec | 4 +++- snapcraft.yaml | 2 -- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf6f2fa2..2d9810aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13) # This can be read from ${PROJECT_NAME} after project() is called project( flameshot - VERSION 0.8.4 + VERSION 0.8.5 LANGUAGES CXX) set(PROJECT_NAME_CAPITALIZED "Flameshot") diff --git a/data/appdata/org.flameshot.Flameshot.metainfo.xml b/data/appdata/org.flameshot.Flameshot.metainfo.xml index 7f7517bd..bcfdae7d 100644 --- a/data/appdata/org.flameshot.Flameshot.metainfo.xml +++ b/data/appdata/org.flameshot.Flameshot.metainfo.xml @@ -5,6 +5,7 @@ GPL-3.0-or-later Flameshot + diff --git a/packaging/debian/changelog b/packaging/debian/changelog index bee8f48f..60948a3b 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,5 +1,5 @@ -flameshot (0.8.4-1) unstable; urgency=medium +flameshot (0.8.5-1) unstable; urgency=medium * New stable release. - -- Jeremy Borgman Mon, 30 Sep 2020 09:18:29 -0600 + -- Jeremy Borgman Wed, 14 Oct 2020 18:24:29 -0600 diff --git a/packaging/rpm/flameshot.spec b/packaging/rpm/flameshot.spec index 585ad194..e64afcdd 100644 --- a/packaging/rpm/flameshot.spec +++ b/packaging/rpm/flameshot.spec @@ -1,5 +1,5 @@ Name: flameshot -Version: 0.8.4 +Version: 0.8.5 Release: 1%{?dist} Summary: Powerful yet simple to use screenshot software Summary(eu-ES): Potente pero simple de usar software de capturas @@ -95,6 +95,8 @@ make %{?_smp_mflags} %{_datadir}/icons/hicolor %changelog +* Sat Oct 14 2020 Jeremy Borgman - 0.8.5-1 +- Updated for flameshot 0.8.5 * Sat Oct 10 2020 Jeremy Borgman - 0.8.4-1 - Updated for flameshot 0.8.4 * Mon Sep 19 2020 Jeremy Borgman - 0.8.3-1 diff --git a/snapcraft.yaml b/snapcraft.yaml index a737fc9b..3444f26c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -15,8 +15,6 @@ confinement: strict # use 'strict' once you have the right plugs and slots #confinement: devmode # use 'strict' once you have the right plugs and slots architectures: - build-on: amd64 - - build-on: i386 - apps: flameshot: From 9eb1a7cb187ecdcb0af70b28cd346aa73885e6a3 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Thu, 15 Oct 2020 13:06:38 +0300 Subject: [PATCH 25/41] Fix - memory leaks --- src/core/globalshortcutfilter.cpp | 13 +++++++++++-- src/core/globalshortcutfilter.h | 4 ++++ src/tools/storage/s3/imgs3uploader.cpp | 6 +++++- src/tools/storage/s3/imgs3uploader.h | 1 + src/widgets/historywidget.cpp | 15 +++++++++------ src/widgets/historywidget.h | 4 ++-- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/core/globalshortcutfilter.cpp b/src/core/globalshortcutfilter.cpp index 56534973..57f198ba 100644 --- a/src/core/globalshortcutfilter.cpp +++ b/src/core/globalshortcutfilter.cpp @@ -23,6 +23,8 @@ GlobalShortcutFilter::GlobalShortcutFilter(QObject* parent) : QObject(parent) { + m_history = nullptr; + // Forced Print Screen if (RegisterHotKey(NULL, 1, 0, VK_SNAPSHOT)) { // ok - capture screen @@ -33,6 +35,11 @@ GlobalShortcutFilter::GlobalShortcutFilter(QObject* parent) } } +GlobalShortcutFilter::~GlobalShortcutFilter() +{ + delete m_history; +} + bool GlobalShortcutFilter::nativeEventFilter(const QByteArray& eventType, void* message, long* result) @@ -49,8 +56,10 @@ bool GlobalShortcutFilter::nativeEventFilter(const QByteArray& eventType, // Show screenshots history if (VK_SNAPSHOT == keycode && MOD_SHIFT == modifiers) { - HistoryWidget* pHistory = new HistoryWidget(); - pHistory->show(); + if (m_history == nullptr) { + m_history = new HistoryWidget(); + } + m_history->show(); } // Capture screen diff --git a/src/core/globalshortcutfilter.h b/src/core/globalshortcutfilter.h index 3ed8f10d..83137c84 100644 --- a/src/core/globalshortcutfilter.h +++ b/src/core/globalshortcutfilter.h @@ -20,6 +20,8 @@ #include #include +class HistoryWidget; + class GlobalShortcutFilter : public QObject , public QAbstractNativeEventFilter @@ -27,6 +29,7 @@ class GlobalShortcutFilter Q_OBJECT public: explicit GlobalShortcutFilter(QObject* parent = nullptr); + ~GlobalShortcutFilter(); bool nativeEventFilter(const QByteArray& eventType, void* message, @@ -40,4 +43,5 @@ private: quint32 nativeKeycode(Qt::Key key); bool registerShortcut(quint32 nativeKey, quint32 nativeMods); bool unregisterShortcut(quint32 nativeKey, quint32 nativeMods); + HistoryWidget* m_history; }; diff --git a/src/tools/storage/s3/imgs3uploader.cpp b/src/tools/storage/s3/imgs3uploader.cpp index c16f7860..554ce917 100644 --- a/src/tools/storage/s3/imgs3uploader.cpp +++ b/src/tools/storage/s3/imgs3uploader.cpp @@ -56,6 +56,11 @@ ImgS3Uploader::ImgS3Uploader(QWidget* parent) init(tr("Delete image from S3"), tr("Deleting image...")); } +ImgS3Uploader::~ImgS3Uploader() +{ + clearProxy(); +} + void ImgS3Uploader::init(const QString& title, const QString& label) { m_proxy = nullptr; @@ -87,7 +92,6 @@ QNetworkProxy* ImgS3Uploader::initProxy() if (httpProxyHost.length() > 0) { m_proxy = new QNetworkProxy(); - if (settings->contains("HTTP_PROXY_TYPE")) { switch (settings->value("HTTP_PROXY_TYPE").toInt()) { case 0: diff --git a/src/tools/storage/s3/imgs3uploader.h b/src/tools/storage/s3/imgs3uploader.h index a5938895..8a9ec7aa 100644 --- a/src/tools/storage/s3/imgs3uploader.h +++ b/src/tools/storage/s3/imgs3uploader.h @@ -41,6 +41,7 @@ class ImgS3Uploader : public ImgUploader public: explicit ImgS3Uploader(const QPixmap& capture, QWidget* parent = nullptr); explicit ImgS3Uploader(QWidget* parent = nullptr); + ~ImgS3Uploader(); void upload(); void deleteResource(const QString&, const QString&); diff --git a/src/widgets/historywidget.cpp b/src/widgets/historywidget.cpp index 93afc738..25df2ccd 100644 --- a/src/widgets/historywidget.cpp +++ b/src/widgets/historywidget.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -46,6 +45,11 @@ HistoryWidget::HistoryWidget(QWidget* parent) loadHistory(); } +HistoryWidget::~HistoryWidget() +{ + delete m_notification; +} + void HistoryWidget::loadHistory() { // read history files @@ -140,9 +144,7 @@ void HistoryWidget::addLine(const QString& path, const QString& fileName) // TODO - remove dependency injection (s3 & imgur) if (unpackFileName.type.compare(SCREENSHOT_STORAGE_TYPE_S3) == 0) { if (unpackFileName.token.length() > 0) { - ImgS3Uploader* uploader = new ImgS3Uploader(); - removeItem( - uploader, phbl, unpackFileName.file, unpackFileName.token); + removeItem(phbl, unpackFileName.file, unpackFileName.token); } else { // for compatibility with previous versions and to be able to // remove previous screenshots @@ -176,18 +178,19 @@ void HistoryWidget::addLine(const QString& path, const QString& fileName) m_pVBox->addLayout(phbl); } -void HistoryWidget::removeItem(ImgUploader* imgUploader, - QLayout* pl, +void HistoryWidget::removeItem(QLayout* pl, const QString& fileName, const QString& deleteToken) { hide(); + ImgS3Uploader* imgUploader = new ImgS3Uploader(); imgUploader->show(); imgUploader->deleteResource(fileName, deleteToken); connect(imgUploader, &QWidget::destroyed, this, [=]() { if (imgUploader->resultStatus) { removeLayoutItem(pl); } + imgUploader->deleteLater(); show(); }); } diff --git a/src/widgets/historywidget.h b/src/widgets/historywidget.h index 0d88098a..abd4e0b9 100644 --- a/src/widgets/historywidget.h +++ b/src/widgets/historywidget.h @@ -19,6 +19,7 @@ class HistoryWidget : public QDialog Q_OBJECT public: explicit HistoryWidget(QWidget* parent = nullptr); + ~HistoryWidget(); signals: @@ -26,8 +27,7 @@ private: void loadHistory(); void addLine(const QString&, const QString&); void setEmptyMessage(); - void removeItem(ImgUploader* imgUploader, - QLayout* pl, + void removeItem(QLayout* pl, const QString& s3FileName, const QString& deleteToken); void removeLayoutItem(QLayout* pl); From 14387902110112ba02117b6eb62a88fe31a61952 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Thu, 15 Oct 2020 15:54:24 +0300 Subject: [PATCH 26/41] Fix - delete.svg in the graphics.qrc file --- data/graphics.qrc | 1 + 1 file changed, 1 insertion(+) diff --git a/data/graphics.qrc b/data/graphics.qrc index 96225b9f..6d86a9da 100644 --- a/data/graphics.qrc +++ b/data/graphics.qrc @@ -5,6 +5,7 @@ img/app/org.flameshot.Flameshot.png img/app/flameshot.png img/app/keyboard.svg + img/material/black/delete.svg img/material/black/undo-variant.svg img/material/black/text.svg img/material/black/square.svg From 2f133cab32b1fe073893dd04b2491b96bba8f834 Mon Sep 17 00:00:00 2001 From: Ahmed Zetao Yang Date: Thu, 15 Oct 2020 21:02:27 +0800 Subject: [PATCH 27/41] chore(CI): using environment files to manage environment (#1073) * chore(CI): using environment files to manage environment * using Environment Files, due to the `set-env` command is deprecated and will be disabled soon * https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/ * https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files * docs: add flathub store badge --- .github/workflows/Linux-pack.yml | 15 +++++++-------- .github/workflows/Windows-pack.yml | 2 +- README.md | 7 +++++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index eb367711..89a62655 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -23,7 +23,7 @@ env: # docker images, see https://hub.docker.com/r/vitzy/flameshot # vitzy/flameshot or packpack/packpack DOCKER_REPO: vitzy/flameshot - # upload services: 0x0.st, file.io, transfer.sh, wetransfer.com + # upload services: wetransfer.com, file.io, 0x0.st UPLOAD_SERVICE: wetransfer.com jobs: @@ -67,7 +67,7 @@ jobs: echo ${last_committed_tag:1} echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}" echo "================================" - echo ::set-env name=VERSION::$(echo ${last_committed_tag:1}) + echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV - name: Get packpack tool uses: actions/checkout@v2 with: @@ -132,7 +132,7 @@ jobs: echo ${last_committed_tag:1} echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}" echo "================================" - echo ::set-env name=VERSION::$(echo ${last_committed_tag:1}) + echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV - name: Install dependencies run: | apt-get -y -qq update @@ -234,7 +234,7 @@ jobs: echo ${last_committed_tag:1} echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}" echo "================================" - echo ::set-env name=VERSION::$(echo ${last_committed_tag:1}) + echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV - name: Get packpack tool uses: actions/checkout@v2 with: @@ -327,7 +327,7 @@ jobs: echo ${last_committed_tag:1} echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}" echo "================================" - echo ::set-env name=VERSION::$(echo ${last_committed_tag:1}) + echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV - name: Install Dependencies run: | sudo apt-get -y -qq update @@ -427,7 +427,7 @@ jobs: echo ${last_committed_tag:1} echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}" echo "================================" - echo ::set-env name=VERSION::$(echo ${last_committed_tag:1}) + echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV - name: Setup flatpak run: | sudo apt-get -y -qq update @@ -493,8 +493,7 @@ jobs: echo ${last_committed_tag:1} echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}" echo "================================" - echo ::set-env name=VERSION::$(echo ${last_committed_tag:1}) - + echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV - name: Packaging snap uses: snapcore/action-build@v1 id: snapcraft diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index 6ca6952a..40404624 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -75,7 +75,7 @@ jobs: echo ${last_committed_tag:1} echo "Details: ${last_committed_tag}+git${git_revno}.${git_hash}" echo "================================" - echo ::set-env name=VERSION::$(echo ${last_committed_tag:1}) + echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV - name: Cache Qt id: cache-qt diff --git a/README.md b/README.md index 9451ab32..81deb5c8 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,11 @@
- Get it from the Snap Store - + Get it from the Snap Store + + + Download on Flathub +

From 428c058d50d5d85abdc456f2ae29b42398d13ed9 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Thu, 15 Oct 2020 16:03:26 +0300 Subject: [PATCH 28/41] Update *.ts files --- data/translations/Internationalization_ca.ts | 126 +++++++++--------- data/translations/Internationalization_cs.ts | 126 +++++++++--------- .../Internationalization_de_DE.ts | 126 +++++++++--------- data/translations/Internationalization_es.ts | 126 +++++++++--------- data/translations/Internationalization_eu.ts | 126 +++++++++--------- data/translations/Internationalization_fr.ts | 126 +++++++++--------- data/translations/Internationalization_hu.ts | 4 - .../Internationalization_it_IT.ts | 126 +++++++++--------- data/translations/Internationalization_ja.ts | 126 +++++++++--------- data/translations/Internationalization_ka.ts | 126 +++++++++--------- data/translations/Internationalization_nl.ts | 126 +++++++++--------- .../Internationalization_nl_NL.ts | 126 +++++++++--------- data/translations/Internationalization_pl.ts | 126 +++++++++--------- .../Internationalization_pt_BR.ts | 126 +++++++++--------- data/translations/Internationalization_ru.ts | 124 +++++++++-------- data/translations/Internationalization_sk.ts | 126 +++++++++--------- .../Internationalization_sr_SP.ts | 126 +++++++++--------- .../Internationalization_sv_SE.ts | 126 +++++++++--------- data/translations/Internationalization_tr.ts | 126 +++++++++--------- data/translations/Internationalization_uk.ts | 124 +++++++++-------- .../Internationalization_zh_CN.ts | 126 +++++++++--------- .../Internationalization_zh_TW.ts | 126 +++++++++--------- 22 files changed, 1262 insertions(+), 1384 deletions(-) diff --git a/data/translations/Internationalization_ca.ts b/data/translations/Internationalization_ca.ts index a45d49c6..ff56d241 100644 --- a/data/translations/Internationalization_ca.ts +++ b/data/translations/Internationalization_ca.ts @@ -324,176 +324,170 @@ Press Space to open the side panel. GeneneralConf - + Show help message Mostra el missatge d'ajuda - + Show the help message at the beginning in the capture mode. Mostra el missatge d'ajuda en iniciar el mode de captura. - - + + Show desktop notifications Mostra les notificacions d'escriptori - + Show tray icon Mostra la icona en la barra de tasques - + Show the systemtray icon Mostra la icona en la barra de tasques - - + + Import Importar - - - - + + + + Error Error - + Unable to read file. Impossible llegir el fitxer. - - + + Unable to write file. Impossible escriure al fitxer. - + Save File Guardar Arxiu - + Confirm Reset Confirmar Reset - + Are you sure you want to reset the configuration? Esteu segur que voleu reiniciar la configuració? - + Show the side panel button - + Show the side panel toggle button in the capture mode. - + Configuration File Fitxer de Configuració - + Export Exportar - + Reset Reset - + Launch at startup Llançament a l'inici - - + + Launch Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -501,27 +495,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Copia l'URL - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. - + Open in browser @@ -549,37 +543,37 @@ Press Space to open the side panel. - + URL copied to clipboard. L'URL s'ha copiat al porta-retalls. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -712,7 +706,7 @@ Press Space to open the side panel. InfoWindow - + About Quant a @@ -765,12 +759,12 @@ Press Space to open the side panel. Descripció - + <u><b>License</b></u> <u><b>Llicència</b></u> - + <u><b>Version</b></u> <u><b>Versió</b></u> @@ -874,24 +868,24 @@ Press Space to open the side panel. - + Capture is saved and copied to the clipboard as - + 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 @@ -1092,7 +1086,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_cs.ts b/data/translations/Internationalization_cs.ts index 6919832c..2a6fb76a 100644 --- a/data/translations/Internationalization_cs.ts +++ b/data/translations/Internationalization_cs.ts @@ -327,114 +327,114 @@ Stiskněte mezerník pro otevření postranního panelu. GeneneralConf - - + + Import Zavést - - - - + + + + Error Chyba - + Unable to read file. Nelze přečíst soubor. - - + + Unable to write file. Nelze zapsat soubor. - + Save File Uložit soubor - + Confirm Reset Potvrdit vrácení na výchozí - + Are you sure you want to reset the configuration? Opravdu chcete nastavení vrátit do výchozího stavu? - + Show help message Ukázat zprávu s nápovědou - + Show the help message at the beginning in the capture mode. Ukázat zprávu s nápovědou na začátku v režimu zachytávání. - + Show the side panel button Ukázat tlačítko na postranním panelu - + Show the side panel toggle button in the capture mode. V režimu zachytávání ukazovat tlačítko na postranním panelu. - - + + Show desktop notifications Ukázat oznámení - + Show tray icon Ukázat ikonu v oznamovací oblasti panelu - + Show the systemtray icon Ukázat ikonu v oznamovací oblasti panelu - + Configuration File Soubor s nastavením - + Export Vyvést - + Reset Nastavit znovu - + Launch at startup Spustit při spuštění - - + + Launch Flameshot Spustit Flameshot - + Show welcome message on launch - + Close application after capture @@ -443,64 +443,58 @@ Stiskněte mezerník pro otevření postranního panelu. Zavřít po vytvoření snímku - + Close after taking a screenshot Zavřít po vytvoření snímku obrazovky - + Copy URL after upload Kopírovat adresu (URL) po nahrání - + Copy URL and close window after upload Po nahrání zkopírovat URL a zavřít okno - + Save image after copy Uložit obrázek po kopírování - + Save image file after copying it Uložit obrázek se souborem po jeho zkopírování - + Save Path Cesta pro ukládání - - + Change... Změnit... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder Vyberte složku - + Unable to write to directory. Nelze zapsat do adresáře. @@ -508,27 +502,27 @@ Stiskněte mezerník pro otevření postranního panelu. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopírovat adresu (URL) - + URL copied to clipboard. Adresa (URL) zkopírována do schránky. - + Open in browser @@ -556,37 +550,37 @@ Stiskněte mezerník pro otevření postranního panelu. - + URL copied to clipboard. Adresa (URL) zkopírována do schránky. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -723,7 +717,7 @@ Stiskněte mezerník pro otevření postranního panelu. InfoWindow - + About O programu @@ -788,12 +782,12 @@ Stiskněte mezerník pro otevření postranního panelu. Popis - + <u><b>License</b></u> <u><b>Licence</b></u> - + <u><b>Version</b></u> <u><b>Verze</b></u> @@ -883,13 +877,13 @@ Stiskněte mezerník pro otevření postranního panelu. QObject - + Save Error Chyba při ukládání - + Capture saved as Zachycená obrazovka uložena jako @@ -905,7 +899,7 @@ Stiskněte mezerník pro otevření postranního panelu. - + Error trying to save as Chyba při ukládání jako @@ -915,7 +909,7 @@ Stiskněte mezerník pro otevření postranního panelu. - + Capture is saved and copied to the clipboard as @@ -1121,7 +1115,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_de_DE.ts b/data/translations/Internationalization_de_DE.ts index 8815a815..b7260abe 100644 --- a/data/translations/Internationalization_de_DE.ts +++ b/data/translations/Internationalization_de_DE.ts @@ -327,176 +327,170 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. GeneneralConf - - + + Import Importieren - - - - + + + + Error Fehler - + Unable to read file. Datei kann nicht gelesen werden. - - + + Unable to write file. Datei kann nicht geschrieben werden. - + Save File Datei speichern - + Confirm Reset Zurücksetzen bestätigen - + Are you sure you want to reset the configuration? Sind Sie sicher, dass sie die Konfiguration zurücksetzen wollen? - + Show help message Hilfetext anzeigen - + Show the help message at the beginning in the capture mode. Hilfetext am Start der Auswahl anzeigen. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Zeige Desktopbenachrichtigungen - + Show tray icon Zeige Taskleistensymbol - + Show the systemtray icon Zeigt das Taskleistensymbol - + Configuration File Konfigurationsdatei - + Export Exportieren - + Reset Zurücksetzen - + Launch at startup Automatisch starten - - + + Launch Flameshot Starte Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -504,27 +498,27 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL kopieren - + URL copied to clipboard. URL kopiert. - + Open in browser @@ -552,37 +546,37 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - + URL copied to clipboard. URL kopiert. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -719,7 +713,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. InfoWindow - + About Über @@ -784,12 +778,12 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. Beschreibung - + <u><b>License</b></u> <u><b>Lizenz</b></u> - + <u><b>Version</b></u> <u><b>Version</b></u> @@ -879,13 +873,13 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. QObject - + Save Error Speicherfehler - + Capture saved as Aufnahme gespeichert als @@ -901,7 +895,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - + Error trying to save as Fehler beim Speichern unter @@ -911,7 +905,7 @@ Drücke die Leertaste um das Seitenmenü zu öffnen. - + Capture is saved and copied to the clipboard as @@ -1107,7 +1101,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_es.ts b/data/translations/Internationalization_es.ts index 17b5ae95..0ac6ef0a 100644 --- a/data/translations/Internationalization_es.ts +++ b/data/translations/Internationalization_es.ts @@ -327,176 +327,170 @@ Presiona Espacio para abrir el panel lateral. GeneneralConf - - + + Import Importar - - - - + + + + Error Error - + Unable to read file. Imposible leer el archivo. - - + + Unable to write file. Imposible escribir el archivo. - + Save File Guardar Archivo - + Confirm Reset Confirmar Reset - + Are you sure you want to reset the configuration? ¿Estás seguro de que quieres reiniciar la configuración? - + Show help message Mostrar mensaje de ayuda - + Show the help message at the beginning in the capture mode. Muestra el mensaje de ayuda al iniciar el modo de captura. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Mostrar notificaciones del escritorio - + Show tray icon Mostrar icono en la barra de tareas - + Show the systemtray icon Mostrar el icono en la barra de tareas - + Configuration File Archivo de Configuración - + Export Exportar - + Reset Reset - + Launch at startup Lanzar en el arranque - - + + Launch Flameshot Lanzar Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -504,27 +498,27 @@ Presiona Espacio para abrir el panel lateral. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Copiar URL - + URL copied to clipboard. URL copiada al portapapeles. - + Open in browser @@ -552,37 +546,37 @@ Presiona Espacio para abrir el panel lateral. - + URL copied to clipboard. URL copiada al portapapeles. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -719,7 +713,7 @@ Presiona Espacio para abrir el panel lateral. InfoWindow - + About Información @@ -780,12 +774,12 @@ Presiona Espacio para abrir el panel lateral. Descripción - + <u><b>License</b></u> <u><b>Licencia</b></u> - + <u><b>Version</b></u> <u><b>Versión</b></u> @@ -875,13 +869,13 @@ Presiona Espacio para abrir el panel lateral. QObject - + Save Error Error al Guardar - + Capture saved as Captura guardada como @@ -897,7 +891,7 @@ Presiona Espacio para abrir el panel lateral. - + Error trying to save as Error intentando guardar como @@ -907,7 +901,7 @@ Presiona Espacio para abrir el panel lateral. - + Capture is saved and copied to the clipboard as @@ -1103,7 +1097,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_eu.ts b/data/translations/Internationalization_eu.ts index 58849ec8..71bd4c2c 100644 --- a/data/translations/Internationalization_eu.ts +++ b/data/translations/Internationalization_eu.ts @@ -327,114 +327,114 @@ Sakatu Zuriunea alboko panela irekitzeko. GeneneralConf - - + + Import Inportatu - - - - + + + + Error Errorea - + Unable to read file. Ezin da fitxategia irakurri. - - + + Unable to write file. Ezin da fitxategian idatzi. - + Save File Gorde fitxategia - + Confirm Reset Baieztatu berrezartzea - + Are you sure you want to reset the configuration? Ziur ezarpenak berrezarri nahi dituzula? - + Show help message Erakutsi laguntza-mezua - + Show the help message at the beginning in the capture mode. Erakutsi laguntza-mezua argazki-hartze modua irekitzean. - + Show the side panel button Erakutsi aldeko paneleko botoia - + Show the side panel toggle button in the capture mode. Erakutsi aldeko panela erakusteko botoia argazki-hartze moduan. - - + + Show desktop notifications Erakutsi mahaigaineko jakinarazpenak - + Show tray icon Erakutsi ikonoa erretiluan - + Show the systemtray icon Erakutsi ikonoa sistemako erretiluan - + Configuration File Konfigurazio-fitxategia - + Export Esportatu - + Reset Berrezarri - + Launch at startup Abiarazi saio-hasieran - - + + Launch Flameshot Abiarazi Flamsehot - + Show welcome message on launch - + Close application after capture @@ -443,64 +443,58 @@ Sakatu Zuriunea alboko panela irekitzeko. Itxi argazkia egin ostean - + Close after taking a screenshot Itxi pantaila-argazkia egin ostean - + Copy URL after upload Kopiatu URLa igo ostean - + Copy URL and close window after upload Kopiatu URLa eta itxi leihoa igo ostean - + Save image after copy Gorde irudia kopiatu ostean - + Save image file after copying it Gorde irudia fitxategian kopiatu ostean - + Save Path Gordetzeko bidea - - + Change... Aldatu... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder Aukeratu karpeta - + Unable to write to directory. Ezin da direktorioan idatzi. @@ -508,27 +502,27 @@ Sakatu Zuriunea alboko panela irekitzeko. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopiatu URLa - + URL copied to clipboard. Arbelean kopiatu da URLa. - + Open in browser @@ -556,37 +550,37 @@ Sakatu Zuriunea alboko panela irekitzeko. - + URL copied to clipboard. Arbelean kopiatu da URLa. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -723,7 +717,7 @@ Sakatu Zuriunea alboko panela irekitzeko. InfoWindow - + About Honi buruz @@ -788,12 +782,12 @@ Sakatu Zuriunea alboko panela irekitzeko. Deskribapena - + <u><b>License</b></u> <u><b>Lizentzia</b></u> - + <u><b>Version</b></u> <u><b>Bertsioa</b></u> @@ -883,13 +877,13 @@ Sakatu Zuriunea alboko panela irekitzeko. QObject - + Save Error Errorea gordetzean - + Capture saved as Argazkia honela gorde da: @@ -905,7 +899,7 @@ Sakatu Zuriunea alboko panela irekitzeko. - + Error trying to save as Errorea honela gordetzean: @@ -915,7 +909,7 @@ Sakatu Zuriunea alboko panela irekitzeko. - + Capture is saved and copied to the clipboard as @@ -1121,7 +1115,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_fr.ts b/data/translations/Internationalization_fr.ts index b8413358..9a91935d 100644 --- a/data/translations/Internationalization_fr.ts +++ b/data/translations/Internationalization_fr.ts @@ -327,114 +327,114 @@ Appuyer sur Espace pour ouvrir le panneau latéral. GeneneralConf - - + + Import Importer - - - - + + + + Error Erreur - + Unable to read file. Impossible de lire le fichier. - - + + Unable to write file. Impossible d'écrire le fichier. - + Save File Sauvegarder le fichier - + Confirm Reset Confirmer la Réinitialisation - + Are you sure you want to reset the configuration? Êtes-vous sûr de vouloir réinitialiser la configuration ? - + Show help message Montrer le message d'aide - + Show the help message at the beginning in the capture mode. Afficher ce message au lancement du mode capture. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Afficher les notifications du bureau - + Show tray icon Afficher les icones de la barre d'état - + Show the systemtray icon Afficher l'icône dans la barre de tâches - + Configuration File Fichier de Configuration - + Export Exporter - + Reset Réinitialiser - + Launch at startup Lancer au démarrage - - + + Launch Flameshot Démarrer Flameshot - + Show welcome message on launch - + Close application after capture @@ -443,64 +443,58 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Fermer après une capture - + Close after taking a screenshot Fermer l'application après une capture d'écran - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -508,27 +502,27 @@ Appuyer sur Espace pour ouvrir le panneau latéral. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Copier l'URL - + URL copied to clipboard. URL copiée dans le Presse-papier. - + Open in browser @@ -556,37 +550,37 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - + URL copied to clipboard. URL copiée dans le Presse-papier. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -719,7 +713,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. InfoWindow - + About À propos @@ -776,12 +770,12 @@ Appuyer sur Espace pour ouvrir le panneau latéral. Description - + <u><b>License</b></u> <u><b>Licences</b></u> - + <u><b>Version</b></u> <u><b>Version</b></u> @@ -871,13 +865,13 @@ Appuyer sur Espace pour ouvrir le panneau latéral. QObject - + Save Error Erreur lors de la sauvegarde - + Capture saved as Capture d'écran sauvegardée sous @@ -893,7 +887,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - + Error trying to save as Erreur lors de la sauvegarde sous @@ -903,7 +897,7 @@ Appuyer sur Espace pour ouvrir le panneau latéral. - + Capture is saved and copied to the clipboard as @@ -1099,7 +1093,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_hu.ts b/data/translations/Internationalization_hu.ts index 9f7483ad..2d08036b 100644 --- a/data/translations/Internationalization_hu.ts +++ b/data/translations/Internationalization_hu.ts @@ -421,10 +421,6 @@ Press Space to open the side panel. Copy file path after save - - Select default path for Screenshots - - Use fixed path for screenshots to save diff --git a/data/translations/Internationalization_it_IT.ts b/data/translations/Internationalization_it_IT.ts index 29698387..31409aa7 100644 --- a/data/translations/Internationalization_it_IT.ts +++ b/data/translations/Internationalization_it_IT.ts @@ -308,176 +308,170 @@ Press Space to open the side panel. GeneneralConf - - + + Import - - - - + + + + Error - + Unable to read file. - - + + Unable to write file. - + Save File - + Confirm Reset - + Are you sure you want to reset the configuration? - + Show help message - + Show the help message at the beginning in the capture mode. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications - + Show tray icon - + Show the systemtray icon - + Configuration File - + Export - + Reset - + Launch at startup - - + + Launch Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -485,27 +479,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL - + URL copied to clipboard. - + Open in browser @@ -533,37 +527,37 @@ Press Space to open the side panel. - + URL copied to clipboard. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -672,17 +666,17 @@ Press Space to open the side panel. InfoWindow - + About - + <u><b>License</b></u> - + <u><b>Version</b></u> @@ -964,13 +958,13 @@ You may need to escape the '#' sign as in '\#FFF' - + Capture saved as - + Error trying to save as @@ -980,12 +974,12 @@ You may need to escape the '#' sign as in '\#FFF' - + Capture is saved and copied to the clipboard as - + Save Error @@ -996,7 +990,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_ja.ts b/data/translations/Internationalization_ja.ts index 6fbd0f74..373c1fb0 100644 --- a/data/translations/Internationalization_ja.ts +++ b/data/translations/Internationalization_ja.ts @@ -327,176 +327,170 @@ Enter を押すと画面をキャプチャー。 GeneneralConf - + Show help message ヘルプメッセージを表示する - + Show the help message at the beginning in the capture mode. キャプチャーモード開始時にヘルプメッセージを表示する。 - - + + Show desktop notifications デスクトップの通知を表示する - + Show tray icon トレイアイコンを表示する - + Show the systemtray icon システムトレイアイコンを表示する - - + + Import インポート - - - - + + + + Error エラー - + Unable to read file. ファイルを読み込めません。 - - + + Unable to write file. ファイルに書き込めません。 - + Save File ファイルを保存 - + Confirm Reset リセットの確認 - + Are you sure you want to reset the configuration? 設定をリセットしてもよろしいですか? - + Show the side panel button - + Show the side panel toggle button in the capture mode. - + Configuration File 設定ファイル - + Export エクスポート - + Reset リセット - + Launch at startup スタートアップ時に起動する - - + + Launch Flameshot Flameshot を起動する - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -504,27 +498,27 @@ Enter を押すと画面をキャプチャー。 HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL をコピー - + URL copied to clipboard. URL をクリップボードにコピーしました。 - + Open in browser @@ -552,37 +546,37 @@ Enter を押すと画面をキャプチャー。 - + URL copied to clipboard. URL をクリップボードにコピーしました。 - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -719,7 +713,7 @@ Enter を押すと画面をキャプチャー。 InfoWindow - + About このアプリケーションについて @@ -772,12 +766,12 @@ Enter を押すと画面をキャプチャー。 説明 - + <u><b>License</b></u> <u><b>ライセンス</b></u> - + <u><b>Version</b></u> <u><b>バージョン</b></u> @@ -871,13 +865,13 @@ Enter を押すと画面をキャプチャー。 QObject - + Save Error 保存エラー - + Capture saved as キャプチャーを保存しました: @@ -893,7 +887,7 @@ Enter を押すと画面をキャプチャー。 - + Error trying to save as 保存時にエラーが発生しました: @@ -903,7 +897,7 @@ Enter を押すと画面をキャプチャー。 - + Capture is saved and copied to the clipboard as @@ -1099,7 +1093,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_ka.ts b/data/translations/Internationalization_ka.ts index 23358f34..e3931166 100644 --- a/data/translations/Internationalization_ka.ts +++ b/data/translations/Internationalization_ka.ts @@ -323,176 +323,170 @@ Press Space to open the side panel. GeneneralConf - - + + Import იმპორტირება - - - - + + + + Error შეცდომა - + Unable to read file. ფაილის წაკითხვა ვერ მოხერხდა. - - + + Unable to write file. ფაილის ჩაწერა ვერ მოხერხდა. - + Save File ფაილის შენახვა - + Confirm Reset განულების დადასტურება - + Are you sure you want to reset the configuration? დარწმუნებული ხართ, რომ გსურთ პარამეტრების განულება? - + Show help message დახმარების შეტყობინების ნახვა - + Show the help message at the beginning in the capture mode. დახმარების შეტყობინების ნახვა გადაღების რეჟიმის დაწყებისას. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications ცნობების ჩვენება სამუშაო მაგიდაზე - + Show tray icon ხატულის ჩვენება სისტემურ პანელზე - + Show the systemtray icon ხატულის ჩვენება სისტემურ პანელზე - + Configuration File პარამეტრების ფაილი - + Export ექსპორტირება - + Reset განულება - + Launch at startup გაშვება სისტემის ჩატვირთვისას - - + + Launch Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -500,27 +494,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL-ის კოპირება - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. - + Open in browser @@ -548,37 +542,37 @@ Press Space to open the side panel. - + URL copied to clipboard. URL დაკოპირდა გაცვლის ბუფერში. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -711,7 +705,7 @@ Press Space to open the side panel. InfoWindow - + About პროგრამის შესახებ @@ -768,12 +762,12 @@ Press Space to open the side panel. აღწერა - + <u><b>License</b></u> <u><b>ლიცენზია</b></u> - + <u><b>Version</b></u> <u><b>ვერსია</b></u> @@ -863,13 +857,13 @@ Press Space to open the side panel. QObject - + Save Error შეცდომა შენახვისას - + Capture saved as სურათი შენახულია როგორც: @@ -885,7 +879,7 @@ Press Space to open the side panel. - + Error trying to save as შეცდომა მცდელობისას შენახულიყო როგორც: @@ -895,7 +889,7 @@ Press Space to open the side panel. - + Capture is saved and copied to the clipboard as @@ -1091,7 +1085,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_nl.ts b/data/translations/Internationalization_nl.ts index 8ef28afa..a6ddaf86 100644 --- a/data/translations/Internationalization_nl.ts +++ b/data/translations/Internationalization_nl.ts @@ -327,176 +327,170 @@ 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 the side panel button - + Show the side panel toggle button in the capture mode. - - + + 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 Flameshot Flameshot openen - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -504,27 +498,27 @@ Druk op spatie om het zijpaneel te openen. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL kopiëren - + URL copied to clipboard. URL gekopieerd naar klembord. - + Open in browser @@ -552,37 +546,37 @@ Druk op spatie om het zijpaneel te openen. - + URL copied to clipboard. URL gekopieerd naar klembord. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -719,7 +713,7 @@ Druk op spatie om het zijpaneel te openen. InfoWindow - + About Over @@ -780,12 +774,12 @@ Druk op spatie om het zijpaneel te openen. Omschrijving - + <u><b>License</b></u> <u><b>Лиценца</b></u> - + <u><b>Version</b></u> <u><b>Верзија</b></u> @@ -875,13 +869,13 @@ Druk op spatie om het zijpaneel te openen. QObject - + Save Error Fout tijdens opslaan - + Capture saved as Schermafdruk opgeslagen als @@ -897,7 +891,7 @@ Druk op spatie om het zijpaneel te openen. - + Error trying to save as Fout tijdens opslaan als @@ -907,7 +901,7 @@ Druk op spatie om het zijpaneel te openen. - + Capture is saved and copied to the clipboard as @@ -1103,7 +1097,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_nl_NL.ts b/data/translations/Internationalization_nl_NL.ts index ddca4082..337d1e65 100644 --- a/data/translations/Internationalization_nl_NL.ts +++ b/data/translations/Internationalization_nl_NL.ts @@ -327,114 +327,114 @@ Druk op de spatiebalk om het zijpaneel te openen. GeneneralConf - - + + Import Importeren - - - - + + + + Error Fout - + Unable to read file. Bestand kan niet gelezen worden. - - + + 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 u zeker dat u de configuratie opnieuw wilt instellen? - + Show help message Toon helpbericht - + Show the help message at the beginning in the capture mode. Toon het helpbericht aan het begin in de vastlegmodus. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Bureaubladmeldingen weergeven - + Show tray icon Pictogram in het systeemvak weergeven - + Show the systemtray icon Toon het systeemvakpictogram - + Configuration File Configuratie bestand - + Export Exporteren - + Reset Standaardwaarden - + Launch at startup Automatisch opstarten - - + + Launch Flameshot Start Flameshot - + Show welcome message on launch - + Close application after capture @@ -443,64 +443,58 @@ Druk op de spatiebalk om het zijpaneel te openen. Sluit na schermopname - + Close after taking a screenshot Sluit na het maken van een schermopname - + Copy URL after upload Kopieer URL na upload - + Copy URL and close window after upload Kopieer URL en sluit venster na upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -508,27 +502,27 @@ Druk op de spatiebalk om het zijpaneel te openen. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL kopiëren - + URL copied to clipboard. URL gekopieerd naar klembord. - + Open in browser @@ -556,37 +550,37 @@ Druk op de spatiebalk om het zijpaneel te openen. - + URL copied to clipboard. URL gekopieerd naar klembord. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -723,7 +717,7 @@ Druk op de spatiebalk om het zijpaneel te openen. InfoWindow - + About Over @@ -788,12 +782,12 @@ Druk op de spatiebalk om het zijpaneel te openen. Omschrijving - + <u><b>License</b></u> <u><b>Licentie</b></u> - + <u><b>Version</b></u> <u><b>Versie</b></u> @@ -883,13 +877,13 @@ Druk op de spatiebalk om het zijpaneel te openen. QObject - + Save Error Fout tijdens opslaan - + Capture saved as Schermafdruk opgeslagen als @@ -905,7 +899,7 @@ Druk op de spatiebalk om het zijpaneel te openen. - + Error trying to save as Fout bij opslaan als @@ -915,7 +909,7 @@ Druk op de spatiebalk om het zijpaneel te openen. - + Capture is saved and copied to the clipboard as @@ -1111,7 +1105,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_pl.ts b/data/translations/Internationalization_pl.ts index 99d08a8b..3751eb9b 100644 --- a/data/translations/Internationalization_pl.ts +++ b/data/translations/Internationalization_pl.ts @@ -326,114 +326,114 @@ Spacja, aby pokazać panel boczny. GeneneralConf - - + + Import Import - - - - + + + + Error Błąd - + Unable to read file. Nie można odczytać pliku. - - + + Unable to write file. Nie można zapisać pliku. - + Save File Zapisz plik - + Confirm Reset Potwierdź Reset - + Are you sure you want to reset the configuration? Czy na pewno chcesz zresetować konfigurację? - + Show help message Pokaż podpowiedzi - + Show the help message at the beginning in the capture mode. Pokaż podpowiedzi na początku trybu przechwytywania. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Pokaż powiadomienia ekranowe - + Show tray icon Pokaż ikonę w trayu - + Show the systemtray icon Pokaż ikonę w zasobniku systemowym - + Configuration File Plik konfiguracyjny - + Export Export - + Reset Reset - + Launch at startup Uruchom podczas startu - - + + Launch Flameshot Uruchom Flameshot - + Show welcome message on launch - + Close application after capture @@ -442,64 +442,58 @@ Spacja, aby pokazać panel boczny. Zamknij po wykonaniu zrzutu - + Close after taking a screenshot Zamknij po wykonaniu zrzutu ekranu - + Copy URL after upload Kopiuj adres URL po wysłaniu - + Copy URL and close window after upload Kopiuj adres URL po wysłaniu i zamknij okno - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -507,27 +501,27 @@ Spacja, aby pokazać panel boczny. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopiuj URL - + URL copied to clipboard. URL skopiowany do schowka. - + Open in browser @@ -555,37 +549,37 @@ Spacja, aby pokazać panel boczny. - + URL copied to clipboard. URL skopiowany do schowka. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -722,7 +716,7 @@ Spacja, aby pokazać panel boczny. InfoWindow - + About O programie @@ -787,12 +781,12 @@ Spacja, aby pokazać panel boczny. Działanie - + <u><b>License</b></u> <u><b>Licencja</b></u> - + <u><b>Version</b></u> <u><b>Wersja</b></u> @@ -882,13 +876,13 @@ Spacja, aby pokazać panel boczny. QObject - + Save Error Błąd zapisu - + Capture saved as Zaznaczenie zapisano jako @@ -904,7 +898,7 @@ Spacja, aby pokazać panel boczny. - + Error trying to save as Błąd przy próbie zapisu jako @@ -914,7 +908,7 @@ Spacja, aby pokazać panel boczny. - + Capture is saved and copied to the clipboard as @@ -1114,7 +1108,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_pt_BR.ts b/data/translations/Internationalization_pt_BR.ts index 9ccfcd68..6120968e 100644 --- a/data/translations/Internationalization_pt_BR.ts +++ b/data/translations/Internationalization_pt_BR.ts @@ -327,114 +327,114 @@ Pressione espaço abrir o painel lateral. GeneneralConf - - + + Import Importar - - - - + + + + Error Erro - + Unable to read file. Não foi possível ler o arquivo. - - + + Unable to write file. Não foi possível escrever no arquivo. - + Save File Salvar Arquivo - + Confirm Reset Confirmar Reset - + Are you sure you want to reset the configuration? Tem certeza que deseja resetar a configuração? - + Show help message Mostrar mensagem de ajuda - + Show the help message at the beginning in the capture mode. Mostrar mensagem de ajuda no início do modo de captura. - + Show the side panel button Mostrar botão no painel lateral - + Show the side panel toggle button in the capture mode. Mostrar altenador do painel lateral. - - + + Show desktop notifications Mostrar notificações de Desktop - + Show tray icon Mostrar ícone de tray - + Show the systemtray icon Mosrar ícone na barra de aplicações - + Configuration File Arquivo de Configurações - + Export Exportar - + Reset Reset - + Launch at startup Iniciar junto com o sistema - - + + Launch Flameshot Iniciar Flameshot - + Show welcome message on launch - + Close application after capture @@ -443,64 +443,58 @@ Pressione espaço abrir o painel lateral. Fechar após captura - + Close after taking a screenshot Fechar após tirar uma screenshot - + Copy URL after upload Copiar URL após upload - + Copy URL and close window after upload Copiar URL e fechar janela após upload - + Save image after copy Salvar imagem após copiar - + Save image file after copying it Salvar imagem após copiar - + Save Path Salvar Caminho - - + Change... Alterar... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder Selecione uma pasta - + Unable to write to directory. Não foi possível escrever no diretório. @@ -508,27 +502,27 @@ Pressione espaço abrir o painel lateral. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Copiar URL - + URL copied to clipboard. URL copiada para a área de transferência. - + Open in browser @@ -556,37 +550,37 @@ Pressione espaço abrir o painel lateral. - + URL copied to clipboard. URL copiada para a área de transferência. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -723,7 +717,7 @@ Pressione espaço abrir o painel lateral. InfoWindow - + About Sobre @@ -788,12 +782,12 @@ Pressione espaço abrir o painel lateral. Descrição - + <u><b>License</b></u> <u><b>Licença</b></u> - + <u><b>Version</b></u> <u><b>Versão</b></u> @@ -883,13 +877,13 @@ Pressione espaço abrir o painel lateral. QObject - + Save Error Erro ao salvar - + Capture saved as Captura salva como @@ -905,7 +899,7 @@ Pressione espaço abrir o painel lateral. - + Error trying to save as Erro ao tentar salvar como @@ -915,7 +909,7 @@ Pressione espaço abrir o painel lateral. - + Capture is saved and copied to the clipboard as @@ -1121,7 +1115,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_ru.ts b/data/translations/Internationalization_ru.ts index 2ca55a0e..77b0a5c0 100644 --- a/data/translations/Internationalization_ru.ts +++ b/data/translations/Internationalization_ru.ts @@ -327,114 +327,114 @@ Press Space to open the side panel. GeneneralConf - - + + Import Импорт - - - - + + + + Error Ошибка - + Unable to read file. Не удалось прочитать файл. - - + + Unable to write file. Не удалось записать файл. - + Save File Сохранить файл - + Confirm Reset Подтвердить сброс - + Are you sure you want to reset the configuration? Вы действительно хотите сбросить настройки? - + Show help message Показывать справочное сообщение - + Show the help message at the beginning in the capture mode. Показывать справочное сообщение перед началом захвата экрана. - + Show the side panel button Показывать кнопку боковой панели - + Show the side panel toggle button in the capture mode. Показывать кнопку открытия боковой панели в режиме захвата. - - + + Show desktop notifications Показывать уведомления - + Show tray icon Показывать значок в трее - + Show the systemtray icon Показать значок в системном трее - + Configuration File Файл конфигурации - + Export Экспорт - + Reset Сброс - + Launch at startup Запускать при старте системы - - + + Launch Flameshot Запустить Flameshot - + Show welcome message on launch Показывать приветствие при запуске - + Close application after capture Закрывать приложение после захвата экрана @@ -443,64 +443,62 @@ Press Space to open the side panel. Закрыть после снимка - + Close after taking a screenshot Закрыть после снимка - + Copy URL after upload Копировать URL после загрузки - + Copy URL and close window after upload Копировать URL и закрыть окно после загрузки - + Save image after copy Сохранять изображение после копирования - + Save image file after copying it Сохранять файл изображения после копирования - + Save Path Путь сохранения - - + Change... Сменить... - - + + Copy file path after save Скопировать путь к файлу после сохранения - Select default path for Screenshots - Выберите путь по умолчанию для снимков экрана + Выберите путь по умолчанию для снимков экрана - + Use fixed path for screenshots to save Использовать фиксированный путь для сохранения снимков экрана - + Choose a Folder Выберите папку - + Unable to write to directory. Не удалось записать в папку. @@ -508,27 +506,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads Последние загрузки - + Screenshots history is empty История скриншотов пуста - + Copy URL Скопировать URL - + URL copied to clipboard. URL скопирован в буфер обмена. - + Open in browser Открыть в браузере @@ -556,37 +554,37 @@ Press Space to open the side panel. Удаление изображения... - + URL copied to clipboard. URL скопирован в буфер обмена. - + Unable to remove screenshot from the remote storage. Невозможно удалить снимок экрана из удаленного хранилища. - + Network error Ошибка сети - + Possibly it doesn't exist anymore Возможно, его больше не существует - + Do you want to remove screenshot from local history anyway? Вы все равно хотите удалить скриншот из локальной истории? - + Remove screenshot from history? Удалить скриншот из истории? - + S3 Creds URL is not found in your configuration file S3 Creds URL не найден в вашем файле конфигурации @@ -727,7 +725,7 @@ Press Space to open the side panel. InfoWindow - + About Информация @@ -792,12 +790,12 @@ Press Space to open the side panel. Описание - + <u><b>License</b></u> <u><b>Лицензия</b></u> - + <u><b>Version</b></u> <u><b>Версия</b></u> @@ -887,13 +885,13 @@ Press Space to open the side panel. QObject - + Save Error Ошибка сохранения - + Capture saved as Снимок сохранён как @@ -909,7 +907,7 @@ Press Space to open the side panel. - + Error trying to save as Ошибка при попытке сохранить как @@ -919,7 +917,7 @@ Press Space to open the side panel. Сохранить скриншот - + Capture is saved and copied to the clipboard as Скриншот сохранен на диск и скопирован в буфер обмена как @@ -1122,7 +1120,7 @@ You can find me in the system tray. Вы можете найти меня в системном трее. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. Привет я тут! Щелкните значок на панели задач, чтобы сделать снимок экрана, или щелкните правой кнопкой, чтобы увидеть дополнительные параметры. diff --git a/data/translations/Internationalization_sk.ts b/data/translations/Internationalization_sk.ts index a0ef1e07..c5917398 100644 --- a/data/translations/Internationalization_sk.ts +++ b/data/translations/Internationalization_sk.ts @@ -327,114 +327,114 @@ Stlačte medzerník pre otvorenie postranného panelu. GeneneralConf - - + + Import Importovať - - - - + + + + Error Chyba - + Unable to read file. Zlyhalo čítanie súboru. - - + + Unable to write file. Zlyhal zápis do súboru. - + Save File Uložiť súbor - + Confirm Reset Potvrdiť Reset - + Are you sure you want to reset the configuration? Naozaj si želáte resetovať aktuálnu konfiguráciu? - + Show help message Zobraziť nápovedu - + Show the help message at the beginning in the capture mode. Zobraziť nápovedu na začiatku počas režimu zachytávania obrazovky. - + Show the side panel button Zobraziť tlačidlo na postrannom paneli - + Show the side panel toggle button in the capture mode. V režime zachytávania zobrazovať tlačidlo na postrannom paneli. - - + + Show desktop notifications Zobraziť systémové upozornenia - + Show tray icon Zobraziť stavovú ikonu - + Show the systemtray icon Zobraziť ikonu v stavovej oblasti - + Configuration File Súbor s konfiguráciou - + Export Exportovať - + Reset Resetovať - + Launch at startup Spúšťať pri štarte - - + + Launch Flameshot Spustiť Flameshot - + Show welcome message on launch - + Close application after capture @@ -443,64 +443,58 @@ Stlačte medzerník pre otvorenie postranného panelu. Zavrieť po vytvorení snímky - + Close after taking a screenshot Zatvoriť po vytvorení snímky obrazovky - + Copy URL after upload Kopírovať URL po uploade - + Copy URL and close window after upload Po nahratí skopírovať URL a zavrieť okno - + Save image after copy Uložiť obrázok po kopírovaní - + Save image file after copying it Uložiť obrázok so súborom po jeho skopírovaní - + Save Path Cesta pre ukladanie - - + Change... Zmeniť... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder Vyberte priečinok - + Unable to write to directory. Zápis do adresára nie je možný. @@ -508,27 +502,27 @@ Stlačte medzerník pre otvorenie postranného panelu. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopírovať URL - + URL copied to clipboard. URL skopírovaná do schránky. - + Open in browser @@ -556,37 +550,37 @@ Stlačte medzerník pre otvorenie postranného panelu. - + URL copied to clipboard. URL skopírovaná do schránky. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -723,7 +717,7 @@ Stlačte medzerník pre otvorenie postranného panelu. InfoWindow - + About O programe @@ -788,12 +782,12 @@ Stlačte medzerník pre otvorenie postranného panelu. Popis - + <u><b>License</b></u> <u><b>Licencia</b></u> - + <u><b>Version</b></u> <u><b>Verzia</b></u> @@ -1050,13 +1044,13 @@ Možno budete musieť napísať pred '#' opačnú lomku, teda '\# - + Capture saved as Snímka uložená ako - + Error trying to save as Chyba pri ukladaní do @@ -1066,12 +1060,12 @@ Možno budete musieť napísať pred '#' opačnú lomku, teda '\# - + Capture is saved and copied to the clipboard as - + Save Error Chyba pri ukladaní @@ -1121,7 +1115,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_sr_SP.ts b/data/translations/Internationalization_sr_SP.ts index 61ea6102..707a544e 100644 --- a/data/translations/Internationalization_sr_SP.ts +++ b/data/translations/Internationalization_sr_SP.ts @@ -327,176 +327,170 @@ Press Space to open the side panel. GeneneralConf - - + + Import Увоз - - - - + + + + Error Грешка - + Unable to read file. Нисам успео да прочитам датотеку. - - + + Unable to write file. Нисам успео да сачувам датотеку. - + Save File Сачувај датотеку - + Confirm Reset Потврда поништавања - + Are you sure you want to reset the configuration? Да ли сте сигурни да желите да поништите сва прилагођена подешавања? - + Show help message Приказуј поруку са упутством - + Show the help message at the beginning in the capture mode. Приказуј поруку са кратким упутством на почетку снимања екрана. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Користи системска обавештења - + Show tray icon Иконица на системској полици - + Show the systemtray icon Приказуј иконицу на системској полици - + Configuration File Датотека са подешавањима - + Export Извоз - + Reset Поништи - + Launch at startup Покрени на почетку - - + + Launch Flameshot Покрени Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -504,27 +498,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Запамти интернет адресу - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. - + Open in browser @@ -552,37 +546,37 @@ Press Space to open the side panel. - + URL copied to clipboard. Интернет адреса је сачувана у привременој меморији. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -719,7 +713,7 @@ Press Space to open the side panel. InfoWindow - + About О програму @@ -776,12 +770,12 @@ Press Space to open the side panel. Опис - + <u><b>License</b></u> <u><b>Лиценца</b></u> - + <u><b>Version</b></u> <u><b>Верзија</b></u> @@ -871,13 +865,13 @@ Press Space to open the side panel. QObject - + Save Error Грешка приликом упусивања - + Capture saved as Сачувај снимак као @@ -893,7 +887,7 @@ Press Space to open the side panel. - + Error trying to save as Грешка приликом уписивања као @@ -903,7 +897,7 @@ Press Space to open the side panel. - + Capture is saved and copied to the clipboard as @@ -1099,7 +1093,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_sv_SE.ts b/data/translations/Internationalization_sv_SE.ts index 60c48463..8d0eff1e 100644 --- a/data/translations/Internationalization_sv_SE.ts +++ b/data/translations/Internationalization_sv_SE.ts @@ -327,176 +327,170 @@ Tryck Space för att öppna sidopanelen. GeneneralConf - - + + Import Importera - - - - + + + + Error Fel - + Unable to read file. Kunde inte läsa filen. - - + + Unable to write file. Kunde inte skriva till filen. - + Save File Spara fil - + Confirm Reset Bekräfta återställning - + Are you sure you want to reset the configuration? Är du säker på att du vill återställa konfigurationen? - + Show help message Visa hjälpmeddelande - + Show the help message at the beginning in the capture mode. Visa hjälpmeddelande vid början av skärmklippsläge. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Visa skrivbordsnotifieringar - + Show tray icon Visa ikon i systemfältet - + Show the systemtray icon Visa ikon i systemfältet - + Configuration File Konfigurationsfil - + Export Exportera - + Reset Återställ - + Launch at startup Starta vid uppstart - - + + Launch Flameshot Starta Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -504,27 +498,27 @@ Tryck Space för att öppna sidopanelen. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL Kopiera URL - + URL copied to clipboard. URL kopierad till klippbord. - + Open in browser @@ -552,37 +546,37 @@ Tryck Space för att öppna sidopanelen. - + URL copied to clipboard. URL kopierad till klippbord. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -719,7 +713,7 @@ Tryck Space för att öppna sidopanelen. InfoWindow - + About Om @@ -780,12 +774,12 @@ Tryck Space för att öppna sidopanelen. Beskrivning - + <u><b>License</b></u> <u><b>Licens</b></u> - + <u><b>Version</b></u> <u><b>Version</b></u> @@ -875,13 +869,13 @@ Tryck Space för att öppna sidopanelen. QObject - + Save Error Spara fel - + Capture saved as Urval sparad som @@ -897,7 +891,7 @@ Tryck Space för att öppna sidopanelen. - + Error trying to save as Fel vid spara som @@ -907,7 +901,7 @@ Tryck Space för att öppna sidopanelen. - + Capture is saved and copied to the clipboard as @@ -1103,7 +1097,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_tr.ts b/data/translations/Internationalization_tr.ts index 6d0954c6..3ca1ca6c 100644 --- a/data/translations/Internationalization_tr.ts +++ b/data/translations/Internationalization_tr.ts @@ -327,176 +327,170 @@ Yan paneli açmak için Boşluk tuşuna basın. GeneneralConf - - + + Import Dışa aktar - - - - + + + + Error Hata - + Unable to read file. Dosya okunamıyor. - - + + Unable to write file. Dosya yazılamıyor. - + Save File Dosyayı Kaydet - + Confirm Reset Sıfırlamayı Onayla - + Are you sure you want to reset the configuration? Ayarları sıfırlamak istediğinizden emin misiniz? - + Show help message Yardım mesajını göster - + Show the help message at the beginning in the capture mode. Yakalama modunda başında yardım mesajını gösterin. - + Show the side panel button - + Show the side panel toggle button in the capture mode. - - + + Show desktop notifications Masaüstü bildirimlerini göster - + Show tray icon Tepsi simgesini göster - + Show the systemtray icon Sistem tepsisi simgesini göster - + Configuration File Yapılandırma Dosyası - + Export Dışa aktar - + Reset Sıfırla - + Launch at startup Başlangıçta başlatın - - + + Launch Flameshot Flameshot'ı başlat - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -504,27 +498,27 @@ Yan paneli açmak için Boşluk tuşuna basın. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL URL Kopyala - + URL copied to clipboard. URL panoya kopyalandı. - + Open in browser @@ -552,37 +546,37 @@ Yan paneli açmak için Boşluk tuşuna basın. - + URL copied to clipboard. URL panoya kopyalandı. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -719,7 +713,7 @@ Yan paneli açmak için Boşluk tuşuna basın. InfoWindow - + About Hakkında @@ -776,12 +770,12 @@ Yan paneli açmak için Boşluk tuşuna basın. Tanım - + <u><b>License</b></u> <u><b>Lisans</b></u> - + <u><b>Version</b></u> <u><b>Sürüm</b></u> @@ -871,13 +865,13 @@ Yan paneli açmak için Boşluk tuşuna basın. QObject - + Save Error Kaydetme Hatası - + Capture saved as Yakalama farklı kaydedildi @@ -893,7 +887,7 @@ Yan paneli açmak için Boşluk tuşuna basın. - + Error trying to save as Farklı kaydetmeye çalışılırken hata oluştu @@ -903,7 +897,7 @@ Yan paneli açmak için Boşluk tuşuna basın. - + Capture is saved and copied to the clipboard as @@ -1099,7 +1093,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_uk.ts b/data/translations/Internationalization_uk.ts index 10c40c9a..992235ca 100644 --- a/data/translations/Internationalization_uk.ts +++ b/data/translations/Internationalization_uk.ts @@ -327,114 +327,114 @@ Press Space to open the side panel. GeneneralConf - - + + Import Імпорт - - - - + + + + Error Помилка - + Unable to read file. Не вдалось прочитати файл. - - + + Unable to write file. Не вдалось записати файл. - + Save File Зберегти файл - + Confirm Reset Підтвердити скидання - + Are you sure you want to reset the configuration? Ви дійсно хочете скинути налаштування? - + Show help message Показувати повідомлення довідки - + Show the help message at the beginning in the capture mode. Показувати повідомлення довідки на початку режиму захоплення. - + Show the side panel button Показувати кнопку бічній панелі - + Show the side panel toggle button in the capture mode. Показувати кнопку відкриття бічної панелі в режимі захоплення. - - + + Show desktop notifications Показувати повідомлення - + Show tray icon Показувати значок на панелі - + Show the systemtray icon Показувати значок на панелі повідомленнь - + Configuration File Файл налаштувань - + Export Експорт - + Reset Скинути - + Launch at startup Запускати при старті системи - - + + Launch Flameshot Запускати Flameshot - + Show welcome message on launch Показувати вітання під час запуску - + Close application after capture Закривати програму після захоплення екрану @@ -443,64 +443,62 @@ Press Space to open the side panel. Закрити після знімка - + Close after taking a screenshot Закрити після знімка - + Copy URL after upload Копіювати URL після завантаження - + Copy URL and close window after upload Копіювати URL і закрити вікно після завантаження - + Save image after copy Зберігати зображення після копіювання - + Save image file after copying it Зберігати файл зображення після копіювання - + Save Path Шлях збереження - - + Change... Змінити... - - + + Copy file path after save Скопіювати шлях до файлу після збереження - Select default path for Screenshots - Виберіть шлях за замовчуванням для скріншотів + Виберіть шлях за замовчуванням для скріншотів - + Use fixed path for screenshots to save Використовувати фіксований шлях для знімків екрана для збереження - + Choose a Folder Обрати папку - + Unable to write to directory. Не вдалося записати в папку. @@ -508,27 +506,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads Останні завантаження - + Screenshots history is empty Історія знімків екрана порожня - + Copy URL Скопіювати URL - + URL copied to clipboard. URL скопійовано до буферу обміну. - + Open in browser Відкрити в браузері @@ -556,37 +554,37 @@ Press Space to open the side panel. Видалення зображення... - + URL copied to clipboard. URL скопійовано до буферу обміну. - + Unable to remove screenshot from the remote storage. Не вдалося видалити знімок екрана з віддаленого сховища. - + Network error Помилка мережі - + Possibly it doesn't exist anymore Можливо, його вже не існує - + Do you want to remove screenshot from local history anyway? Ви все одно хочете видалити знімок екрана з місцевої історії? - + Remove screenshot from history? Видалити знімок екрана з історії? - + S3 Creds URL is not found in your configuration file S3 Creds URL не знайдено у вашому файлі конфігурації @@ -727,7 +725,7 @@ Press Space to open the side panel. InfoWindow - + About Про... @@ -792,12 +790,12 @@ Press Space to open the side panel. Опис - + <u><b>License</b></u> <u><b>Ліцензія</b></u> - + <u><b>Version</b></u> <u><b>Версія</b></u> @@ -887,13 +885,13 @@ Press Space to open the side panel. QObject - + Save Error Помилка збереження - + Capture saved as Знімок збережено як @@ -909,7 +907,7 @@ Press Space to open the side panel. - + Error trying to save as Помилка під час збереження як @@ -919,7 +917,7 @@ Press Space to open the side panel. Зберегти знімок екрана - + Capture is saved and copied to the clipboard as Скріншот збережен на диск та скопійован у буфер обміну як @@ -1122,7 +1120,7 @@ You can find me in the system tray. Ви можете знайти мене в системному треї. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. Привіт, я тут! Клацніть піктограму в треї, щоб зробити знімок екрана, або клацніть правою кнопкою, щоб побачити більше опцій. diff --git a/data/translations/Internationalization_zh_CN.ts b/data/translations/Internationalization_zh_CN.ts index df842b25..c67a276f 100644 --- a/data/translations/Internationalization_zh_CN.ts +++ b/data/translations/Internationalization_zh_CN.ts @@ -328,114 +328,114 @@ Press Space to open the side panel. GeneneralConf - + Show help message 显示帮助文档 - + Show the help message at the beginning in the capture mode. 在捕获之前显示帮助信息。 - - + + Show desktop notifications 显示桌面通知 - + Show tray icon 显示托盘图标 - + Show the systemtray icon 显示任务栏图标 - - + + Import 导入 - - - - + + + + Error 错误 - + Unable to read file. 无法读取文件。 - - + + Unable to write file. 无法写入文件。 - + Save File 保存到文件 - + Confirm Reset 确定重置 - + Are you sure you want to reset the configuration? 你确定你想要重置配置？ - + Show the side panel button 显示侧边栏按钮 - + Show the side panel toggle button in the capture mode. 在捕获模式下显示侧边栏切换按钮。 - + Configuration File 配置文件 - + Export 导出 - + Reset 重置 - + Launch at startup 开机时启动 - - + + Launch Flameshot 启动 Flameshot - + Show welcome message on launch - + Close application after capture @@ -444,64 +444,58 @@ Press Space to open the side panel. 捕获后关闭 - + Close after taking a screenshot 获取屏幕截图后关闭 - + Copy URL after upload 上传后复制 URL - + Copy URL and close window after upload 上传后复制 URL 并关闭窗口 - + Save image after copy 复制后保存图像 - + Save image file after copying it 复制到剪贴板后保存图像文件 - + Save Path 保存路径 - - + Change... 变更… - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder 选择文件夹 - + Unable to write to directory. 无法写入目录。 @@ -509,27 +503,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL 复制链接 - + URL copied to clipboard. - + Open in browser @@ -557,37 +551,37 @@ Press Space to open the side panel. - + URL copied to clipboard. - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -724,7 +718,7 @@ Press Space to open the side panel. InfoWindow - + About 关于 @@ -785,12 +779,12 @@ Press Space to open the side panel. 描述 - + <u><b>License</b></u> <u><b>许可证</b></u> - + <u><b>Version</b></u> <u><b>版本</b></u> @@ -884,13 +878,13 @@ Press Space to open the side panel. QObject - + Save Error 保存错误 - + Capture saved as 捕获已保存为 @@ -906,7 +900,7 @@ Press Space to open the side panel. - + Error trying to save as 尝试另存为时出错 @@ -916,7 +910,7 @@ Press Space to open the side panel. - + Capture is saved and copied to the clipboard as @@ -1122,7 +1116,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. diff --git a/data/translations/Internationalization_zh_TW.ts b/data/translations/Internationalization_zh_TW.ts index f1b17ca0..dcdca448 100644 --- a/data/translations/Internationalization_zh_TW.ts +++ b/data/translations/Internationalization_zh_TW.ts @@ -323,176 +323,170 @@ Press Space to open the side panel. GeneneralConf - + Show help message 顯示説明資訊 - + Show the help message at the beginning in the capture mode. 在擷取之前顯示説明資訊 - - + + Show desktop notifications 顯示桌面通知 - + Show tray icon 顯示託盤圖示 - + Show the systemtray icon 顯示工作列圖示 - - + + Import 匯入 - - - - + + + + Error 錯誤 - + Unable to read file. 無法讀取檔案 - - + + Unable to write file. 無法寫入檔案 - + Save File 存檔 - + Confirm Reset 確認重設 - + Are you sure you want to reset the configuration? 你確定你想要重設？ - + Show the side panel button - + Show the side panel toggle button in the capture mode. - + Configuration File 設定檔 - + Export 匯出 - + Reset 重設 - + Launch at startup 自動啟動 - - + + Launch Flameshot - + Show welcome message on launch - + Close application after capture - + Close after taking a screenshot - + Copy URL after upload - + Copy URL and close window after upload - + Save image after copy - + Save image file after copying it - + Save Path - - + Change... - - + + Copy file path after save - - Select default path for Screenshots - - - - + Use fixed path for screenshots to save - + Choose a Folder - + Unable to write to directory. @@ -500,27 +494,27 @@ Press Space to open the side panel. HistoryWidget - + Latest Uploads - + Screenshots history is empty - + Copy URL 複製連結 - + URL copied to clipboard. 連結已複製到剪貼簿 - + Open in browser @@ -548,37 +542,37 @@ Press Space to open the side panel. - + URL copied to clipboard. 連結已複製到剪貼簿 - + Unable to remove screenshot from the remote storage. - + Network error - + Possibly it doesn't exist anymore - + Do you want to remove screenshot from local history anyway? - + Remove screenshot from history? - + S3 Creds URL is not found in your configuration file @@ -711,7 +705,7 @@ Press Space to open the side panel. InfoWindow - + About 關於 @@ -764,12 +758,12 @@ Press Space to open the side panel. 描述 - + <u><b>License</b></u> <u><b>授權條款</b></u> - + <u><b>Version</b></u> <u><b>版本</b></u> @@ -863,13 +857,13 @@ Press Space to open the side panel. QObject - + Save Error 存檔錯誤 - + Capture saved as 截圖已另存為 @@ -885,7 +879,7 @@ Press Space to open the side panel. - + Error trying to save as 嘗試另存新檔時發生錯誤 @@ -895,7 +889,7 @@ Press Space to open the side panel. - + Capture is saved and copied to the clipboard as @@ -1091,7 +1085,7 @@ You can find me in the system tray. - + Hello, I'm here! Click icon in the tray to take a screenshot or click with a right button to see more options. From f68cbfba65b2700cc551d684109cde04a0e6b210 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Thu, 15 Oct 2020 16:22:00 +0300 Subject: [PATCH 29/41] Disable deploy in the appveyor.yml from the upstream --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3be2328f..55b0ccdd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,8 +39,8 @@ artifacts: - path: build\artifact.zip name: archive -deploy: -- provider: Webhook - url: https://app.signpath.io/API/v1/042f605f-b378-45d8-ad16-b7695b071036/Integrations/AppVeyor?ProjectSlug=flameshot&SigningPolicySlug=test-signing - authorization: - secure: G5nNnkfRSJ+EEx+7LlUSSoEyoL+pHYItvjrNxbWITE7RB+cm9qzuHRdwmrZdEDjdVCLZ2TkNawynMxYcGMZAQA== +#deploy: +#- provider: Webhook +# url: https://app.signpath.io/API/v1/042f605f-b378-45d8-ad16-b7695b071036/Integrations/AppVeyor?ProjectSlug=flameshot&SigningPolicySlug=test-signing +# authorization: +# secure: G5nNnkfRSJ+EEx+7LlUSSoEyoL+pHYItvjrNxbWITE7RB+cm9qzuHRdwmrZdEDjdVCLZ2TkNawynMxYcGMZAQA== From 2a138cf60f64a0d450fa67ebe65654f02bbbcdb2 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Thu, 15 Oct 2020 16:34:44 +0300 Subject: [PATCH 30/41] Update renames resouce for image flameshot.svg --- src/config/setshortcutwidget.cpp | 2 +- src/config/shortcutswidget.cpp | 2 +- src/tools/storage/imguploader.cpp | 2 +- src/tools/storage/s3/imgs3uploader.cpp | 2 +- src/widgets/infowindow.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/setshortcutwidget.cpp b/src/config/setshortcutwidget.cpp index cd5ab130..7b570da4 100644 --- a/src/config/setshortcutwidget.cpp +++ b/src/config/setshortcutwidget.cpp @@ -26,7 +26,7 @@ SetShortcutDialog::SetShortcutDialog(QDialog* parent) : QDialog(parent) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); setWindowTitle(tr("Set Shortcut")); m_ks = QKeySequence(); diff --git a/src/config/shortcutswidget.cpp b/src/config/shortcutswidget.cpp index 83af66fc..afd1aabc 100644 --- a/src/config/shortcutswidget.cpp +++ b/src/config/shortcutswidget.cpp @@ -39,7 +39,7 @@ ShortcutsWidget::ShortcutsWidget(QWidget* parent) : QWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); setWindowTitle(tr("Hot Keys")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) diff --git a/src/tools/storage/imguploader.cpp b/src/tools/storage/imguploader.cpp index 7106ed61..92597dbd 100644 --- a/src/tools/storage/imguploader.cpp +++ b/src/tools/storage/imguploader.cpp @@ -59,7 +59,7 @@ void ImgUploader::init(const QString& title, const QString& label) resultStatus = false; setWindowTitle(title); - setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) QRect position = frameGeometry(); diff --git a/src/tools/storage/s3/imgs3uploader.cpp b/src/tools/storage/s3/imgs3uploader.cpp index 554ce917..c713e6f3 100644 --- a/src/tools/storage/s3/imgs3uploader.cpp +++ b/src/tools/storage/s3/imgs3uploader.cpp @@ -70,7 +70,7 @@ void ImgS3Uploader::init(const QString& title, const QString& label) resultStatus = false; setWindowTitle(title); - setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); + setWindowIcon(QIcon(":img/app/flameshot.svg")); } QNetworkProxy* ImgS3Uploader::proxy() diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index 7ae2924b..6a7eaf71 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -54,7 +54,7 @@ InfoWindow::InfoWindow(QWidget* parent) void InfoWindow::initLabels() { QLabel* icon = new QLabel(); - icon->setPixmap(QPixmap(":img/app/org.flameshot.Flameshot.svg")); + icon->setPixmap(QPixmap(":img/app/flameshot.svg")); icon->setAlignment(Qt::AlignHCenter); m_layout->addWidget(icon); From 8e25f438f21a0deb9089cedf0fbaff8dab0177ee Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 16 Oct 2020 10:08:13 +0300 Subject: [PATCH 31/41] Code refactoring - HistoryWidget, add clearHistoryLayout and loadHistory methods --- src/core/controller.cpp | 1 + src/core/globalshortcutfilter.cpp | 1 + src/widgets/historywidget.cpp | 20 ++++++++++++++++++-- src/widgets/historywidget.h | 5 +++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/core/controller.cpp b/src/core/controller.cpp index f11c3f8f..fe0c713b 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -298,6 +298,7 @@ void Controller::updateConfigComponents() void Controller::showRecentScreenshots() { HistoryWidget* pHistory = new HistoryWidget(); + pHistory->loadHistory(); pHistory->exec(); } diff --git a/src/core/globalshortcutfilter.cpp b/src/core/globalshortcutfilter.cpp index 57f198ba..a956a1ae 100644 --- a/src/core/globalshortcutfilter.cpp +++ b/src/core/globalshortcutfilter.cpp @@ -58,6 +58,7 @@ bool GlobalShortcutFilter::nativeEventFilter(const QByteArray& eventType, if (VK_SNAPSHOT == keycode && MOD_SHIFT == modifiers) { if (m_history == nullptr) { m_history = new HistoryWidget(); + m_history->loadHistory(); } m_history->show(); } diff --git a/src/widgets/historywidget.cpp b/src/widgets/historywidget.cpp index 25df2ccd..f35c382a 100644 --- a/src/widgets/historywidget.cpp +++ b/src/widgets/historywidget.cpp @@ -41,8 +41,6 @@ HistoryWidget::HistoryWidget(QWidget* parent) QWidget* widget = new QWidget(); scrollArea->setWidget(widget); widget->setLayout(m_pVBox); - - loadHistory(); } HistoryWidget::~HistoryWidget() @@ -50,8 +48,26 @@ HistoryWidget::~HistoryWidget() delete m_notification; } +void HistoryWidget::clearHistoryLayout(QLayout* layout) +{ + QLayoutItem* child; + while (layout->count() != 0) { + child = layout->takeAt(0); + if (child->layout() != 0) { + clearHistoryLayout(child->layout()); + } else if (child->widget() != 0) { + delete child->widget(); + } + + delete child; + } +} + void HistoryWidget::loadHistory() { + // clear old history if exists + clearHistoryLayout(m_pVBox); + // read history files History history = History(); QList historyFiles = history.history(); diff --git a/src/widgets/historywidget.h b/src/widgets/historywidget.h index abd4e0b9..b713f666 100644 --- a/src/widgets/historywidget.h +++ b/src/widgets/historywidget.h @@ -21,10 +21,11 @@ public: explicit HistoryWidget(QWidget* parent = nullptr); ~HistoryWidget(); -signals: + void loadHistory(); private: - void loadHistory(); + void clearHistoryLayout(QLayout* layout); + void addLine(const QString&, const QString&); void setEmptyMessage(); void removeItem(QLayout* pl, From 161ecc3c04461435303878d79a5ba766f14b4c40 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 16 Oct 2020 10:17:29 +0300 Subject: [PATCH 32/41] Fix - HistoryWidget is not deleted in Controller --- src/core/controller.cpp | 15 ++++++++++++--- src/core/controller.h | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/core/controller.cpp b/src/core/controller.cpp index fe0c713b..2666d1e8 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -44,6 +44,8 @@ Controller::Controller() : m_captureWindow(nullptr) { + m_history = nullptr; + qApp->setQuitOnLastWindowClosed(false); // set default shortcusts if not set yet @@ -68,6 +70,11 @@ Controller::Controller() qApp->setStyleSheet(StyleSheet); } +Controller::~Controller() +{ + delete m_history; +} + Controller* Controller::getInstance() { static Controller c; @@ -297,9 +304,11 @@ void Controller::updateConfigComponents() void Controller::showRecentScreenshots() { - HistoryWidget* pHistory = new HistoryWidget(); - pHistory->loadHistory(); - pHistory->exec(); + if (nullptr == m_history) { + m_history = new HistoryWidget(); + } + m_history->loadHistory(); + m_history->show(); } void Controller::startFullscreenCapture(const uint id) diff --git a/src/core/controller.h b/src/core/controller.h index 2308abcc..0cb9ee24 100644 --- a/src/core/controller.h +++ b/src/core/controller.h @@ -30,6 +30,7 @@ class ConfigWindow; class InfoWindow; class QSystemTrayIcon; class CaptureLauncher; +class HistoryWidget; using lambda = std::function; class Controller : public QObject @@ -40,6 +41,7 @@ public: static Controller* getInstance(); Controller(const Controller&) = delete; + ~Controller(); void operator=(const Controller&) = delete; void enableExports(); @@ -87,4 +89,6 @@ private: QPointer m_launcherWindow; QPointer m_configWindow; QPointer m_trayIcon; + + HistoryWidget* m_history; }; From 3c5ff1d29c4e6e2449ea22073266c54ee8cbf218 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 16 Oct 2020 10:41:51 +0300 Subject: [PATCH 33/41] Code refactoring - Cleanup code --- src/config/shortcutswidget.cpp | 2 -- src/utils/configshortcuts.cpp | 4 +--- src/widgets/historywidget.cpp | 2 -- src/widgets/orientablepushbutton.cpp | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/config/shortcutswidget.cpp b/src/config/shortcutswidget.cpp index afd1aabc..b11e9afa 100644 --- a/src/config/shortcutswidget.cpp +++ b/src/config/shortcutswidget.cpp @@ -33,8 +33,6 @@ #include #endif -#include - ShortcutsWidget::ShortcutsWidget(QWidget* parent) : QWidget(parent) { diff --git a/src/utils/configshortcuts.cpp b/src/utils/configshortcuts.cpp index 7f957e36..8bc28d56 100644 --- a/src/utils/configshortcuts.cpp +++ b/src/utils/configshortcuts.cpp @@ -1,11 +1,9 @@ #include "configshortcuts.h" #include "src/tools/capturetool.h" -#include +#include ConfigShortcuts::ConfigShortcuts() {} -// QVector getButtons() - const QVector& ConfigShortcuts::captureShortcutsDefault( const QVector& buttons) { diff --git a/src/widgets/historywidget.cpp b/src/widgets/historywidget.cpp index f35c382a..4a80eddf 100644 --- a/src/widgets/historywidget.cpp +++ b/src/widgets/historywidget.cpp @@ -20,8 +20,6 @@ #include #include -#include - HistoryWidget::HistoryWidget(QWidget* parent) : QDialog(parent) { diff --git a/src/widgets/orientablepushbutton.cpp b/src/widgets/orientablepushbutton.cpp index f85b66d5..68cfdcc5 100644 --- a/src/widgets/orientablepushbutton.cpp +++ b/src/widgets/orientablepushbutton.cpp @@ -18,7 +18,6 @@ // Based on https://stackoverflow.com/a/53135675/964478 #include "orientablepushbutton.h" -#include #include #include #include From f9497ee2ea94c491c9412890a92c5aa52335fb3a Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 16 Oct 2020 13:22:32 +0300 Subject: [PATCH 34/41] Fix - HistoryWidget is not updated if called by Shortcut --- src/core/globalshortcutfilter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/globalshortcutfilter.cpp b/src/core/globalshortcutfilter.cpp index a956a1ae..0f311134 100644 --- a/src/core/globalshortcutfilter.cpp +++ b/src/core/globalshortcutfilter.cpp @@ -58,8 +58,8 @@ bool GlobalShortcutFilter::nativeEventFilter(const QByteArray& eventType, if (VK_SNAPSHOT == keycode && MOD_SHIFT == modifiers) { if (m_history == nullptr) { m_history = new HistoryWidget(); - m_history->loadHistory(); } + m_history->loadHistory(); m_history->show(); } From e98c974009e0142e53cabcf06c0bc94837c3b805 Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Fri, 16 Oct 2020 05:25:33 -0500 Subject: [PATCH 35/41] Updated releasing instructions (#1074) --- docs/Releasing.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/Releasing.md b/docs/Releasing.md index e46c4c7c..30787c62 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -12,6 +12,9 @@ These are the steps for actually making the release - [ ] Create sha256 for each binary and compare against sha256 shown in the CI to verify there was no corruption or inserted malware. - [ ] Create a new "New Release" in githhub and explain changes in release notes - [ ] Upload all binaries and sha's +- [ ] Update flatpak manifest for flathub: https://github.com/flathub/org.flameshot.Flameshot +- [ ] Push snapcraft edge release to stable +- [ ] If this is a major release coordinate with sign path on signed windows binaries - [ ] Update change log on [website](https://github.com/flameshot-org/flameshot-org.github.io/) data/changelog.md - [ ] Update version on [website](https://github.com/flameshot-org/flameshot-org.github.io/blob/master/_coverpage.md) From 49c87138a86136bf1a3e92e3d8ee1356fc260a43 Mon Sep 17 00:00:00 2001 From: Leekilalala <61931322+Leeklll@users.noreply.github.com> Date: Fri, 16 Oct 2020 18:27:07 +0800 Subject: [PATCH 36/41] Update Hong Kong, China translation. (#1075) * Add files via upload * Update China-hongkong translation. --- .../Internationalization_zh_HK.ts | 1244 +++++++++++++++++ 1 file changed, 1244 insertions(+) create mode 100644 data/translations/Internationalization_zh_HK.ts diff --git a/data/translations/Internationalization_zh_HK.ts b/data/translations/Internationalization_zh_HK.ts new file mode 100644 index 00000000..a1d38922 --- /dev/null +++ b/data/translations/Internationalization_zh_HK.ts @@ -0,0 +1,1244 @@ + + + + + AppLauncher + + + App Launcher + 應用程式啟動器 + + + + Choose an app to open the capture + 選擇一個程式打開此截圖 + + + + AppLauncherWidget + + + Open With + 打開方式 + + + + Launch in terminal + 從終端啟動 + + + + Keep open after selection + 選擇後保持開啟 + + + + + Error + 錯誤 + + + + Unable to launch in terminal. + 無法從終端啟動。 + + + + Unable to write in + 無法寫入 + + + + ArrowTool + + + Arrow + 指針 + + + + Set the Arrow as the paint tool + 選取指針作為繪製工具 + + + + BlurTool + + Blur + 模糊 + + + Set Blur as the paint tool + 選擇模糊作為繪製工具 + + + + CaptureLauncher + + + <b>Capture Mode</b> + + + + + Rectangular Region + 矩形區域 + + + + Full Screen (All Monitors) + 满屏（所有顯示器） + + + + No Delay + 無時延 + + + + second + + + + + seconds + + + + + Take new screenshot + 捕獲新截圖 + + + + Area: + + + + + Delay: + + + + + CaptureWidget + + + Unable to capture screen + 無法捕獲屏幕 + + + + 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. + 使用鼠標選擇一片區域，或按Esc退出。 +按Enter以捕獲屏幕。 +點擊右鍵顯示拾色器。 +使用鼠標滾輪以較工具寬度。 +按Space以打開側方面板。 + + + + Tool Settings + 工具選項 + + + + CircleCountTool + + + Circle Counter + 環狀計數器 + + + + Add an autoincrementing counter bubble + 添加自增計數器 + + + + CircleTool + + + Circle + 環形 + + + + Set the Circle as the paint tool + 選取環形作為繪畫工具 + + + + ConfigWindow + + + Configuration + 設定 + + + + Interface + 接口 + + + + Filename Editor + 文檔名稱編輯器 + + + + General + 一般 + + + + Controller + + + &Take Screenshot + &捕獲截圖 + + + + &Open Launcher + &開啓啓動器 + + + + &Configuration + &設定 + + + + &About + &關於 + + + &Information + &資訊 + + + + &Quit + &結束 + + + + CopyTool + + + Copy + 複製 + + + + Copy the selection into the clipboard + 複製選項到剪貼板 + + + + DBusUtils + + + Unable to connect via DBus + 無法通過 DBus 連接 + + + + ExitTool + + + Exit + 離開 + + + + Leave the capture screen + 離開螢幕擷取 + + + + FileNameEditor + + + Edit the name of your captures: + 編輯您的截圖名稱: + + + + Edit: + 編輯器: + + + + Preview: + 預覽: + + + + Save + 存檔 + + + + Saves the pattern + 儲存樣式 + + + + Reset + 重設 + + + + Restores the saved pattern + 恢復儲存的樣式 + + + + Clear + 清除 + + + + Deletes the name + 刪除這個名稱 + + + + GeneneralConf + + + Show help message + 顯示説明資訊 + + + + Show the help message at the beginning in the capture mode. + 在擷取之前顯示説明資訊。 + + + + + Show desktop notifications + 顯示桌面通知 + + + + Show tray icon + 顯示託盤圖標 + + + + Show the systemtray icon + 顯示工作列圖標 + + + + + Import + 導入 + + + + + + + Error + 錯誤 + + + + Unable to read file. + 無法讀取檔案。 + + + + + Unable to write file. + 無法寫入檔案。 + + + + Save File + 存檔 + + + + Confirm Reset + 確認重設 + + + + Are you sure you want to reset the configuration? + 你確定想要重設？ + + + + Show the side panel button + 顯示側邊欄按鈕 + + + + Show the side panel toggle button in the capture mode. + 在截圖模式下顯示側邊欄切換按鈕。 + + + + Configuration File + 設定文檔 + + + + Export + 導出 + + + + Reset + 重設 + + + + Launch at startup + 自動啟動 + + + + Launch Flameshot + 啓動Flameshot + + + + Close after capture + 捕獲截圖后關閉 + + + + Close after taking a screenshot + 進行截屏后關閉 + + + + Copy URL after upload + 上載后複製URL + + + + Copy URL and close window after upload + 上載后複製URL並關閉窗口 + + + + Save image after copy + 複製後保存圖像 + + + + Save image file after copying it + 複製圖像檔案后保存 + + + + Save Path + 保存路徑 + + + + Change... + 變更... + + + + Choose a Folder + 選取檔案集 + + + + Unable to write to directory. + 無法寫入目錄。 + + + + ImgurUploader + + + Upload to Imgur + 上傳到 Imgur + + + + Uploading Image + 正在上傳 + + + + Copy URL + 複製連結 + + + + Open URL + 打開連結 + + + + Delete image + 刪除圖像 + + + + Image to Clipboard. + 將檔案複製到剪貼簿。 + + + + + Unable to open the URL. + 無法打開該URL。 + + + + URL copied to clipboard. + URL已複製到剪貼板。 + + + + Screenshot copied to clipboard. + 截圖已複製到剪貼板。 + + + + ImgurUploaderTool + + + Image Uploader + 上傳圖片 + + + + Upload the selection to Imgur + 上載到 Imgur + + + + InfoWindow + + + About + 關於 + + + + SPACEBAR + + + + + Right Click + 右鍵 + + + + Mouse Wheel + 滑鼠滑輪 + + + + Move selection 1px + 移動 1px + + + + Resize selection 1px + 調整大小 1px + + + + Quit capture + 結束擷取 + + + + Copy to clipboard + 複製到剪貼簿 + + + + Save selection as a file + 將選擇範圍另存新檔 + + + + Undo the last modification + 復原上次修改 + + + + Toggle visibility of sidebar with options of the selected tool + 使用所選工具選項切換側邊欄可見性 + + + + Show color picker + 顯示顏色選擇器 + + + + Change the tool's thickness + 改變工具的寬度 + + + + Key + 鍵 + + + + Description + 描述 + + + + <u><b>License</b></u> + <u><b>授權條款</b></u> + + + + <u><b>Version</b></u> + <u><b>版本</b></u> + + + + <u><b>Shortcuts</b></u> + <u><b>快速鍵</b></u> + + + + Available shortcuts in the screen capture mode. + 螢幕捕獲模式中的可用快捷鍵。 + + + + LineTool + + + Line + 直綫 + + + + Set the Line as the paint tool + 將直綫設定為繪畫工具 + + + + MarkerTool + + + Marker + 標記 + + + + Set the Marker as the paint tool + 將標記設定為繪畫工具 + + + + MoveTool + + + Move + 移動 + + + + Move the selection area + 移動選擇區域 + + + + PencilTool + + + Pencil + 鉛筆 + + + + Set the Pencil as the paint tool + 將鉛筆設定為繪畫工具 + + + + PinTool + + + Pin Tool + 固定工具 + + + + Pin image on the desktop + 將圖像固定到桌面 + + + + PixelateTool + + + Pixelate + 馬賽克工具 + + + + Set Pixelate as the paint tool + 將馬賽克工具設定為繪畫工具 + + + + QObject + + + Save Error + 存檔錯誤 + + + + + Capture saved as + 截圖已另存為 + + + + Capture saved to clipboard. + 熒幕捕獲已存儲到剪貼板。 + + + + Capture saved to clipboard + 螢幕捕獲已存儲到剪貼板 + + + + + Error trying to save as + 嘗試另存新檔時發生錯誤 + + + + + + + + Unable to connect via DBus + 無法透過 DBus 進行連接 + + + + Powerful yet simple to use screenshot software. + + + + + See + + + + + Capture the entire desktop. + 捕獲整個桌面。 + + + + Open the capture launcher. + 開啓捕獲啓動器。 + + + + Start a manual capture in GUI mode. + 在GUi模式下開啓手動捕獲。 + + + + Configure + Configure + + + + Capture a single screen. + 捕獲單一熒幕。 + + + + Path where the capture will be saved + + + + + Save the capture to the clipboard + + + + + Delay time in milliseconds + + + + + Set the filename pattern + + + + + Enable or disable the trayicon + + + + + Enable or disable run at startup + + + + + Show the help message in the capture mode + + + + + Define the main UI color + + + + + Define the contrast UI color + + + + + Print raw PNG capture + + + + + Define the screen to capture + + + + + default: screen containing the cursor + + + + + Screen number + + + + + Invalid color, this flag supports the following formats: +- #RGB (each of R, G, and B is a single hex digit) +- #RRGGBB +- #RRRGGGBBB +- #RRRRGGGGBBBB +- Named colors like 'blue' or 'red' +You may need to escape the '#' sign as in '\#FFF' + + + + + Invalid delay, it must be higher than 0 + + + + + Invalid screen number, it must be non negative + + + + + Invalid path, it must be a real path in the system + + + + + Invalid value, it must be defined as 'true' or 'false' + + + + + Error + 錯誤 + + + + Unable to write in + 無法寫入 + + + + URL copied to clipboard. + 連結已複製到剪貼板。 + + + + Options + 選項 + + + + Arguments + + + + + arguments + + + + + Usage + 使用 + + + + options + 選項 + + + + Per default runs Flameshot in the background and adds a tray icon for configuration. + + + + + RectangleTool + + + Rectangle + 矩形 + + + + Set the Rectangle as the paint tool + 將矩形設定為繪畫工具 + + + + RedoTool + + + Redo + 重做 + + + + Redo the next modification + 重做下一次修改 + + + + SaveTool + + + Save + 儲存 + + + + Save the capture + 儲存螢幕捕獲 + + + + ScreenGrabber + + + Unable to capture screen + 無法捕獲螢幕 + + + + SelectionTool + + + Rectangular Selection + 矩形選擇 + + + + Set Selection as the paint tool + 將矩形選擇設定為繪畫工具 + + + + SidePanelWidget + + + Active thickness: + 動態寬度： + + + + Active color: + 動態顔色： + + + + Press ESC to cancel + 按ESC以取消 + + + + Grab Color + 選取顔色 + + + + SizeIndicatorTool + + + Selection Size Indicator + 選擇尺寸指示 + + + + Show the dimensions of the selection (X Y) + 顯示選擇的尺寸 (X Y) + + + + StrftimeChooserWidget + + + Century (00-99) + 世紀(00-99) + + + + Year (00-99) + 年(00-99) + + + + Year (2000) + 年(2000) + + + + Month Name (jan) + 月(jan) + + + + Month Name (january) + 月(january) + + + + Month (01-12) + 月(01-12) + + + + Week Day (1-7) + 工作日(1-7) + + + + Week (01-53) + 周(01-53) + + + + Day Name (mon) + 星期(mon) + + + + Day Name (monday) + 星期(diumenge) + + + + Day (01-31) + 日(01-31) + + + + Day of Month (1-31) + 一月中的某日(1-31) + + + + Day (001-366) + 日(001-366) + + + + Time (%H-%M-%S) + 時間(%H-%M-%S) + + + + Time (%H-%M) + 時間(%H-%M) + + + + Hour (00-23) + 小時(00-23) + + + + Hour (01-12) + 小時(01-12) + + + + Minute (00-59) + 分(00-59) + + + + Second (00-59) + 秒(00-59) + + + + Full Date (%m/%d/%y) + 日期(%m/%d/%y) + + + + Full Date (%Y-%m-%d) + 日期(%Y-%m-%d) + + + + SystemNotification + + + Flameshot Info + Flameshot相關資訊 + + + + TextConfig + + + StrikeOut + 劃去 + + + + Underline + 下劃綫 + + + + Bold + 加粗 + + + + Italic + 斜體 + + + + TextTool + + + Text + 文本工具 + + + + Add text to your capture + 往您捕獲的截圖中添加文本 + + + + UIcolorEditor + + + UI Color Editor + UI 顏色編輯器 + + + + Change the color moving the selectors and see the changes in the preview buttons. + 移動顏色選擇並在預覽按鈕檢視。 + + + + Select a Button to modify it + 選擇一個按鈕以修改 + + + + Main Color + 主色 + + + + Click on this button to set the edition mode of the main color. + 點選按鈕設定主色。 + + + + Contrast Color + 對比色 + + + + Click on this button to set the edition mode of the contrast color. + 點選按鈕設定對比色。 + + + + UndoTool + + + Undo + 撤銷 + + + + Undo the last modification + 撤銷上次修改 + + + + UtilityPanel + + + Close + 關閉 + + + + VisualsEditor + + + Opacity of area outside selection: + 選取區域以外的不透明度： + + + + Button Selection + 按鈕選取 + + + + Select All + 全選 + + + From 2d4cd76e85ba2dc4f03482dce21de5ca436d8c3b Mon Sep 17 00:00:00 2001 From: Jeremy Borgman Date: Fri, 16 Oct 2020 05:30:04 -0500 Subject: [PATCH 37/41] Updated CMAKE for new translation --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bde4e49b..a2a60808 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -52,6 +52,7 @@ set(FLAMESHOT_TS_FILES ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_tr.ts ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_uk.ts ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_CN.ts + ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_HK.ts ${CMAKE_SOURCE_DIR}/data/translations/Internationalization_zh_TW.ts) if(GENERATE_TS) From 0919d26145aefd70edcba0a3f8c802862cf06849 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 16 Oct 2020 13:43:50 +0300 Subject: [PATCH 38/41] Fix - call the same HistoryWidget object on Shortcut and from the Menu --- src/core/globalshortcutfilter.cpp | 14 +------------- src/core/globalshortcutfilter.h | 4 ---- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/core/globalshortcutfilter.cpp b/src/core/globalshortcutfilter.cpp index 0f311134..0a6c2ebe 100644 --- a/src/core/globalshortcutfilter.cpp +++ b/src/core/globalshortcutfilter.cpp @@ -17,14 +17,11 @@ #include "globalshortcutfilter.h" #include "src/core/controller.h" -#include "src/widgets/historywidget.h" #include GlobalShortcutFilter::GlobalShortcutFilter(QObject* parent) : QObject(parent) { - m_history = nullptr; - // Forced Print Screen if (RegisterHotKey(NULL, 1, 0, VK_SNAPSHOT)) { // ok - capture screen @@ -35,11 +32,6 @@ GlobalShortcutFilter::GlobalShortcutFilter(QObject* parent) } } -GlobalShortcutFilter::~GlobalShortcutFilter() -{ - delete m_history; -} - bool GlobalShortcutFilter::nativeEventFilter(const QByteArray& eventType, void* message, long* result) @@ -56,11 +48,7 @@ bool GlobalShortcutFilter::nativeEventFilter(const QByteArray& eventType, // Show screenshots history if (VK_SNAPSHOT == keycode && MOD_SHIFT == modifiers) { - if (m_history == nullptr) { - m_history = new HistoryWidget(); - } - m_history->loadHistory(); - m_history->show(); + Controller::getInstance()->showRecentScreenshots(); } // Capture screen diff --git a/src/core/globalshortcutfilter.h b/src/core/globalshortcutfilter.h index 83137c84..3ed8f10d 100644 --- a/src/core/globalshortcutfilter.h +++ b/src/core/globalshortcutfilter.h @@ -20,8 +20,6 @@ #include #include -class HistoryWidget; - class GlobalShortcutFilter : public QObject , public QAbstractNativeEventFilter @@ -29,7 +27,6 @@ class GlobalShortcutFilter Q_OBJECT public: explicit GlobalShortcutFilter(QObject* parent = nullptr); - ~GlobalShortcutFilter(); bool nativeEventFilter(const QByteArray& eventType, void* message, @@ -43,5 +40,4 @@ private: quint32 nativeKeycode(Qt::Key key); bool registerShortcut(quint32 nativeKey, quint32 nativeMods); bool unregisterShortcut(quint32 nativeKey, quint32 nativeMods); - HistoryWidget* m_history; }; From 5ea80b2ca239086eeeda6520b5510640ad759c4d Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 16 Oct 2020 15:03:42 +0300 Subject: [PATCH 39/41] Fix - update history widget on new capture --- src/core/controller.cpp | 9 +++++++++ src/core/controller.h | 1 + src/tools/storage/imgur/imguruploader.cpp | 2 ++ src/tools/storage/s3/imgs3uploader.cpp | 2 ++ src/widgets/capturelauncher.cpp | 3 --- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/core/controller.cpp b/src/core/controller.cpp index 2666d1e8..93fb4865 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -302,6 +302,15 @@ void Controller::updateConfigComponents() } } +void Controller::updateRecentScreenshots() +{ + if (nullptr != m_history) { + if (m_history->isVisible()) { + m_history->loadHistory(); + } + } +} + void Controller::showRecentScreenshots() { if (nullptr == m_history) { diff --git a/src/core/controller.h b/src/core/controller.h index 0cb9ee24..54cca5cc 100644 --- a/src/core/controller.h +++ b/src/core/controller.h @@ -45,6 +45,7 @@ public: void operator=(const Controller&) = delete; void enableExports(); + void updateRecentScreenshots(); signals: void captureTaken(uint id, QPixmap p); diff --git a/src/tools/storage/imgur/imguruploader.cpp b/src/tools/storage/imgur/imguruploader.cpp index 02bff6d8..710d5049 100644 --- a/src/tools/storage/imgur/imguruploader.cpp +++ b/src/tools/storage/imgur/imguruploader.cpp @@ -16,6 +16,7 @@ // along with Flameshot. If not, see . #include "imguruploader.h" +#include "src/core/controller.h" #include "src/utils/confighandler.h" #include "src/utils/filenamehandler.h" #include "src/utils/history.h" @@ -86,6 +87,7 @@ void ImgurUploader::handleReply(QNetworkReply* reply) QApplication::clipboard()->setText(imageUrl().toString()); SystemNotification().sendMessage( QObject::tr("URL copied to clipboard.")); + Controller::getInstance()->updateRecentScreenshots(); close(); } else { onUploadOk(); diff --git a/src/tools/storage/s3/imgs3uploader.cpp b/src/tools/storage/s3/imgs3uploader.cpp index c713e6f3..d7ff78e2 100644 --- a/src/tools/storage/s3/imgs3uploader.cpp +++ b/src/tools/storage/s3/imgs3uploader.cpp @@ -18,6 +18,7 @@ #include "imgs3uploader.h" #include "imgs3settings.h" +#include "src/core/controller.h" #include "src/utils/confighandler.h" #include "src/utils/history.h" #include "src/utils/systemnotification.h" @@ -200,6 +201,7 @@ void ImgS3Uploader::handleReplyUpload(QNetworkReply* reply) if (ConfigHandler().copyAndCloseAfterUploadEnabled()) { QApplication::clipboard()->setText(imageUrl().toString()); SystemNotification().sendMessage(tr("URL copied to clipboard.")); + Controller::getInstance()->updateRecentScreenshots(); close(); } else { onUploadOk(); diff --git a/src/widgets/capturelauncher.cpp b/src/widgets/capturelauncher.cpp index 1366b577..4c9edded 100644 --- a/src/widgets/capturelauncher.cpp +++ b/src/widgets/capturelauncher.cpp @@ -20,9 +20,6 @@ #include "src/utils/screengrabber.h" #include "src/utils/screenshotsaver.h" #include "src/widgets/imagelabel.h" - -#include "src/widgets/notificationwidget.h" -#include #include #include #include From 3e7b87ccfee1719e80e31332c0ac097497087a5b Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 16 Oct 2020 15:08:08 +0300 Subject: [PATCH 40/41] Code refactoring - remove not required headers and definitions --- src/tools/storage/imgur/imguruploader.cpp | 5 ----- src/tools/storage/s3/imgs3uploader.cpp | 1 - src/widgets/capture/capturewidget.h | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/tools/storage/imgur/imguruploader.cpp b/src/tools/storage/imgur/imguruploader.cpp index 710d5049..565f6372 100644 --- a/src/tools/storage/imgur/imguruploader.cpp +++ b/src/tools/storage/imgur/imguruploader.cpp @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include #include #include @@ -37,9 +35,7 @@ #include #include #include -#include #include -#include #include #include @@ -53,7 +49,6 @@ ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent) &QNetworkAccessManager::finished, this, &ImgurUploader::handleReply); - // QTimer::singleShot(2000, this, &ImgurUploader::onUploadOk); // testing } void ImgurUploader::handleReply(QNetworkReply* reply) diff --git a/src/tools/storage/s3/imgs3uploader.cpp b/src/tools/storage/s3/imgs3uploader.cpp index d7ff78e2..7a7c846f 100644 --- a/src/tools/storage/s3/imgs3uploader.cpp +++ b/src/tools/storage/s3/imgs3uploader.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #include #include diff --git a/src/widgets/capture/capturewidget.h b/src/widgets/capture/capturewidget.h index fe3ffdbf..6797fed6 100644 --- a/src/widgets/capture/capturewidget.h +++ b/src/widgets/capture/capturewidget.h @@ -39,11 +39,9 @@ class QPaintEvent; class QResizeEvent; class QMouseEvent; -class CaptureModification; class QNetworkAccessManager; class QNetworkReply; class ColorPicker; -class Screenshot; class NotifierBox; class HoverEventFilter; From d1274add472f11431b875495f89cda829781db25 Mon Sep 17 00:00:00 2001 From: Yuriy Puchkov Date: Fri, 16 Oct 2020 15:24:25 +0300 Subject: [PATCH 41/41] Release v0.8.5.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9edb83e8..0436273c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13) # This can be read from ${PROJECT_NAME} after project() is called project( flameshot - VERSION 0.8.5.1 + VERSION 0.8.5.2 LANGUAGES CXX) set(PROJECT_NAME_CAPITALIZED "Flameshot")