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

Use defined(Q_OS_LINUX) || defined(Q_OS_UNIX) where applicable to support BSD OSs. (#264)

Browse Source
This commit is contained in:
Danilo Egêa Gondolfo
2018-07-01 08:45:49 -03:00
committed by Dharkael
parent c75c9aa7f8
commit df3958e43a
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/geneneralconf.cpp
View File

@@ -48,7 +48,7 @@ void GeneneralConf::updateComponents() {
m_sysNotifications->setChecked(config.desktopNotificationValue());
m_autostart->setChecked(config.startupLaunchValue());
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
m_showTray->setChecked(!config.disabledTrayIconValue());
#endif
}
@@ -155,7 +155,7 @@ void GeneneralConf::initShowDesktopNotification() {
}
void GeneneralConf::initShowTrayIcon() {
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
m_showTray = new QCheckBox(tr("Show tray icon"), this);
ConfigHandler config;
bool checked = !config.disabledTrayIconValue();

4
src/core/controller.cpp
View File

@@ -41,7 +41,7 @@ Controller::Controller() : m_captureWindow(nullptr) {
qApp->setQuitOnLastWindowClosed(false);
// init tray icon
#if defined(Q_OS_LINUX)
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
if (!ConfigHandler().disabledTrayIconValue()) {
enableTrayIcon();
}
@@ -204,7 +204,7 @@ void Controller::enableTrayIcon() {
}
void Controller::disableTrayIcon() {
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
if (m_trayIcon) {
m_trayIcon->deleteLater();
}

4
src/main.cpp
View File

@@ -29,7 +29,7 @@
#include <QTimer>
#include <QDir>
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
#include "src/core/flameshotdbusadapter.h"
#include "src/utils/dbusutils.h"
#include <QDBusMessage>
@@ -64,7 +64,7 @@ int main(int argc, char *argv[]) {
app.setOrganizationName("Dharkael");
auto c = Controller::getInstance();
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
new FlameshotDBusAdapter(c);
QDBusConnection dbus = QDBusConnection::sessionBus();
if (!dbus.isConnected()) {

2
src/tools/pin/pintool.cpp
View File

@@ -45,7 +45,7 @@ QString PinTool::description() const {
QWidget* PinTool::widget() {
PinWidget *w = new PinWidget(m_pixmap);
const int &&m = w->margin();
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
QRect adjusted_pos = m_geometry + QMargins(m,-m,-m,-m);
#else
QRect adjusted_pos = m_geometry + QMargins(m, m, m, m);

4
src/utils/confighandler.cpp
View File

@@ -240,7 +240,7 @@ void ConfigHandler::setKeepOpenAppLauncher(const bool keepOpen) {
bool ConfigHandler::startupLaunchValue() {
bool res = false;
#if defined(Q_OS_LINUX)
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
QString path = QDir::homePath() + "/.config/autostart/Flameshot.desktop";
res = QFile(path).exists();
#elif defined(Q_OS_WIN)
@@ -254,7 +254,7 @@ bool ConfigHandler::startupLaunchValue() {
}
void ConfigHandler::setStartupLaunch(const bool start) {
#if defined(Q_OS_LINUX)
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
QString path = QDir::homePath() + "/.config/autostart/Flameshot.desktop";
QFile file(path);
if (start) {

2
src/utils/pathinfo.cpp
View File

@@ -41,7 +41,7 @@ QStringList PathInfo::translationsPaths() {
QString binaryPath = QFileInfo(qApp->applicationDirPath())
.absoluteFilePath();
QString trPath = QDir::toNativeSeparators(binaryPath + "/translations") ;
#if defined(Q_OS_LINUX)
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
return QStringList()
<< QString(APP_PREFIX) + "/share/flameshot/translations"
<< trPath

4
src/utils/screengrabber.cpp
View File

@@ -24,7 +24,7 @@
#include <QApplication>
#include <QDesktopWidget>
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
#include <QDBusInterface>
#include <QDBusReply>
#include <QDir>
@@ -36,7 +36,7 @@ ScreenGrabber::ScreenGrabber(QObject *parent) : QObject(parent) {
QPixmap ScreenGrabber::grabEntireDesktop(bool &ok) {
ok = true;
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
if(m_info.waylandDectected()) {
QPixmap res;
// handle screenshot based on DE

2
src/utils/systemnotification.cpp
View File

@@ -10,7 +10,7 @@
#endif
#include "src/core/controller.h"
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
SystemNotification::SystemNotification(QObject *parent) : QObject(parent) {
m_interface = new QDBusInterface(QStringLiteral("org.freedesktop.Notifications"),
QStringLiteral("/org/freedesktop/Notifications"),