fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 09:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'flameshot-org-master' into merge-from-upstream

Browse Source 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	appveyor.yml
#	data/graphics.qrc
#	src/tools/imgur/imguruploader.cpp
This commit is contained in:
Yuriy Puchkov
2020-10-15 15:44:49 +03:00
parent b8617df258 376a6f2a9c
commit 654455e9ac
37 changed files with 225 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/ISSUE_TEMPLATE/Bug_report.md vendored
View File

@@ -4,11 +4,16 @@ about: Create a report to help us improve
---
<!--
If you don't know how to get some of the following information from your computer, visit:
https://flameshot.js.org/#/data/issue-reporting
-->
**Flameshot version**
<!-- Version or commit. -->
**Describe the bug**
<!-- A clear and concise description of what the bug is. -->
<!-- A clear and concise description of what the bug is. Add screenshots if it helps explaining the issue. -->
**To Reproduce**
<!-- Steps to reproduce the behaviour. -->

7
.github/ISSUE_TEMPLATE/Feature_request.md vendored
View File

@@ -5,5 +5,10 @@ about: Suggest an idea for this project
---
**Is your feature request related to a problem?**
<!--
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
Please, a single feature per issue.
Please make sure:
- a single feature per issue
- explain in detail what you have in mind
- if it helps, add sketches/pictures
-->

31
.github/workflows/Linux-pack.yml vendored
View File

@@ -2,15 +2,15 @@ name: Packaging(Linux)
on:
push:
branches:
- master*
branches:
- master
paths-ignore:
- 'README.md'
- 'LICENSE'
pull_request:
branches:
- master*
- master
paths-ignore:
- 'README.md'
- 'LICENSE'
@@ -50,7 +50,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
# ref: master
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
@@ -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:
@@ -115,7 +115,7 @@ jobs:
uses: actions/checkout@v1
with:
fetch-depth: 0
# ref: master
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v1
@@ -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
@@ -217,7 +217,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
# ref: master
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
@@ -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 }}
@@ -310,7 +310,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
# ref: master
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
@@ -410,7 +410,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
# ref: master
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
@@ -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"
@@ -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
@@ -476,7 +476,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
# ref: master
ref: master
- name: Checkout Source code
if: github.event_name == 'pull_request'
uses: actions/checkout@v2
@@ -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: |

8
CMakeLists.txt
View File

@@ -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.1
VERSION 0.8.5.1
LANGUAGES CXX)
set(PROJECT_NAME_CAPITALIZED "Flameshot")
@@ -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

18
README.md
View File

@@ -65,6 +65,8 @@
- [Build](#build)
- [Install](#install)
- [License](#license)
- [Privacy Policy](#privacy-policy)
- [Code Signing Policy](#code-signing-policy)
- [Contribute](#contribute)
- [Acknowledgment](#acknowledgment)
@@ -398,12 +400,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)
@@ -411,3 +419,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

39
appveyor.yml
View File

@@ -5,15 +5,42 @@ 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: >-
- cmd: >-
mkdir build
mkdir build
cd build
cd build
echo %PATH%
echo %PATH%
cmake c:\projects\source -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE:STRING=Release
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==

1
docs/appdata/org.flameshot.Flameshot.metainfo.xml → data/appdata/org.flameshot.Flameshot.metainfo.xml
View File

@@ -5,6 +5,7 @@
<project_license>GPL-3.0-or-later</project_license>
<name>Flameshot</name>
<releases>
<release version="0.8.5" date="2020-10-14"/>
<release version="0.8.4" date="2020-10-10"/>
<release version="0.8.3" date="2020-09-28"/>
<release version="0.8.1" date="2020-09-23"/>

5
data/debian/changelog
View File

@@ -1,5 +0,0 @@
flameshot (0.8.4-1) unstable; urgency=medium
* New stable release.
-- Jeremy Borgman <borgman.jeremy@pm.me> Mon, 30 Sep 2020 09:18:29 -0600

0
docs/desktopEntry/package/org.flameshot.Flameshot.desktop → data/desktopEntry/package/org.flameshot.Flameshot.desktop
View File

3
data/graphics.qrc
View File

@@ -1,9 +1,10 @@
<RCC>
<qresource prefix="/">
<file>img/app/org.flameshot.Flameshot.svg</file>
<file>img/app/flameshot.svg</file>
<file>img/app/org.flameshot.Flameshot.png</file>
<file>img/app/flameshot.png</file>
<file>img/app/keyboard.svg</file>
<file>img/material/black/delete.svg</file>
<file>img/material/black/undo-variant.svg</file>
<file>img/material/black/text.svg</file>
<file>img/material/black/square.svg</file>

1
data/img/app/flameshot.png Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.png

1
data/img/app/flameshot.svg Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.svg

1
data/img/hicolor/128x128/apps/flameshot.png Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.png

1
data/img/hicolor/48x48/apps/flameshot.png Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.png

1
data/img/hicolor/scalable/apps/flameshot.svg Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.svg

0
docs/shell-completion/flameshot → data/shell-completion/flameshot
View File

1
docs/CONTRIBUTING.md
View File

@@ -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:

5
packaging/debian/changelog Normal file
View File

@@ -0,0 +1,5 @@
flameshot (0.8.5-1) unstable; urgency=medium
* New stable release.
-- Jeremy Borgman <borgman.jeremy@pm.me> Wed, 14 Oct 2020 18:24:29 -0600

0
data/debian/compat → packaging/debian/compat
View File

0
data/debian/control → packaging/debian/control
View File

0
data/debian/copyright → packaging/debian/copyright
View File

0
data/debian/docs → packaging/debian/docs
View File

0
data/debian/rules → packaging/debian/rules
View File

0
data/debian/source/format → packaging/debian/source/format
View File

2
data/flatpak/org.flameshot.Flameshot.yml → packaging/flatpak/org.flameshot.Flameshot.yml
View File

@@ -30,4 +30,4 @@ modules:
sources:
- type: git
url: https://github.com/flameshot-org/flameshot.git
branch: master
branch: master

4
data/rpm/flameshot.spec → packaging/rpm/flameshot.spec
View File

@@ -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 <borgman.jeremy@pm.me> - 0.8.5-1
- Updated for flameshot 0.8.5
* Sat Oct 10 2020 Jeremy Borgman <borgman.jeremy@pm.me> - 0.8.4-1
- Updated for flameshot 0.8.4
* Mon Sep 19 2020 Jeremy Borgman <borgman.jeremy@pm.me> - 0.8.3-1

0
data/win-installer/Bitmaps/CPACK_WIX_UI_BANNER.BMP → packaging/win-installer/Bitmaps/CPACK_WIX_UI_BANNER.BMP
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

0
data/win-installer/Bitmaps/CPACK_WIX_UI_DIALOG.BMP → packaging/win-installer/Bitmaps/CPACK_WIX_UI_DIALOG.BMP
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 224 KiB

After

Width:  |  Height:  |  Size: 224 KiB

0
data/win-installer/LICENSE/GPL-3.0.txt → packaging/win-installer/LICENSE/GPL-3.0.txt
View File

19
scripts/upload_services/transfer.sh.sh
View File

@@ -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

105
snapcraft.yaml Normal file
View File

@@ -0,0 +1,105 @@
---
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
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

20
src/CMakeLists.txt
View File

@@ -145,6 +145,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
@@ -158,16 +159,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
@@ -186,6 +187,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})

2
src/config/configwindow.cpp
View File

@@ -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) {

6
src/core/controller.cpp
View File

@@ -239,8 +239,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) {
@@ -284,7 +284,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);
}
}

2
src/tools/launcher/applauncherwidget.cpp
View File

@@ -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();

3
src/utils/screenshotsaver.cpp
View File

@@ -116,8 +116,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();
}
}

2
src/widgets/infowindow.cpp
View File

@@ -35,7 +35,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))