fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-01-07 17:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from namecheap/feature/RND-452-move-s3-configuration-to-etc-on-linux

Browse Source 
Move S3 configuration to /etc for linux version
This commit is contained in:
Yurii Puchkov
2020-07-06 04:37:46 -07:00
committed by GitHub
parent cb6d05f420 f5aa36f1a5
commit b955a2a551
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tools/imgs3/imgs3uploadertool.cpp
View File

@@ -21,10 +21,18 @@
#include <QDir>
#include <QPainter>
#include <QSettings>
#include <QFileInfo>
ImgS3UploaderTool::ImgS3UploaderTool(QObject *parent) : AbstractActionTool(parent) {
QSettings *pSettings = new QSettings(QDir::currentPath() + "/config.ini", QSettings::IniFormat);
QSettings *pSettings = nullptr;
QString configIniPath = QDir::currentPath() + "/config.ini";
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
if(!(QFileInfo::exists(configIniPath) && QFileInfo(configIniPath).isFile())) {
configIniPath = "/etc/flameshot/config.ini";
}
#endif
pSettings = new QSettings(configIniPath, QSettings::IniFormat);
pSettings->beginGroup("S3");
m_s3CredsUrl = pSettings->value("S3_CREDS_URL").toString();
m_s3XApiKey = pSettings->value("S3_X_API_KEY").toString();
@@ -38,6 +46,7 @@ QIcon ImgS3UploaderTool::icon(const QColor &background, bool inEditor) const {
Q_UNUSED(inEditor);
return QIcon(iconPath(background) + "cloud-upload.svg");
}
QString ImgS3UploaderTool::name() const {
return tr("Image Uploader");
}
@@ -50,7 +59,7 @@ QString ImgS3UploaderTool::description() const {
return tr("Upload the selection to S3 bucket");
}
QWidget* ImgS3UploaderTool::widget() {
QWidget *ImgS3UploaderTool::widget() {
return new ImgS3Uploader(capture, m_s3CredsUrl, m_s3XApiKey);
}
@@ -58,7 +67,7 @@ void ImgS3UploaderTool::setCapture(const QPixmap &pixmap) {
capture = pixmap;
}
CaptureTool* ImgS3UploaderTool::copy(QObject *parent) {
CaptureTool *ImgS3UploaderTool::copy(QObject *parent) {
return new ImgS3UploaderTool(parent);
}