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

Merge pull request #55 from namecheap/bugfix/RND-660-flameshot-get-cache-path-for-linux-according-to-xdg-standard

Browse Source 
Bugfix/rnd 660 flameshot get cache path for linux according to xdg standard
This commit is contained in:
Yurii Puchkov
2020-10-12 04:39:08 -07:00
committed by GitHub
parent bde4457b4b f273a06d98
commit 2245c4709a
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/setshortcutwidget.cpp
View File

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

2
src/config/shortcutswidget.cpp
View File

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

2
src/tools/storage/imguploader.cpp
View File

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

2
src/tools/storage/s3/imgs3uploader.cpp
View File

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

5
src/utils/history.cpp
View File

@@ -2,6 +2,7 @@
#include "src/utils/confighandler.h"
#include <QDir>
#include <QFile>
#include <QProcessEnvironment>
#include <QStringList>
History::History()
@@ -11,7 +12,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

3
src/widgets/infowindow.cpp
View File

@@ -20,7 +20,6 @@
#include <QIcon>
#include <QKeyEvent>
#include <QLabel>
#include <QTableWidget>
#include <QVBoxLayout>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
@@ -55,7 +54,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);