benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'flameshot-org-master' into bugfix/memory-leak

Browse Source 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
This commit is contained in:
Yuriy Puchkov
2020-10-11 20:49:15 +03:00
parent a472648263 ac7142c4df
commit c92f8e3014
26 changed files with 153 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/configwindow.cpp
View File

@@ -37,9 +37,9 @@ ConfigWindow::ConfigWindow(QWidget* parent)
: QTabWidget(parent)
{
setAttribute(Qt::WA_DeleteOnClose);
setMinimumSize(GlobalValues::buttonBaseSize() * 14,
GlobalValues::buttonBaseSize() * 12);
setWindowIcon(QIcon(":img/app/flameshot.svg"));
const int size = GlobalValues::buttonBaseSize() * 12;
setMinimumSize(size, size);
setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg"));
setWindowTitle(tr("Configuration"));
auto changedSlot = [this](QString s) {