benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions 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

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