Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-24 06:59:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #34 from defnax/fixmacos

Browse Source 
Fix for macos
This commit is contained in:
csoler 2024-03-04 09:34:27 +01:00 committed by GitHub
commit 398db7dfe8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/main.cpp
View File

@ -705,7 +705,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
* only on the first run - as the user might want to change it ;)
*/
QString osx_style("cleanlooks");
Rshare::setStyle(osx_style);
RsApplication::setStyle(osx_style);
Settings->setInterfaceStyle(osx_style);
#endif

6
retroshare-gui/src/rshare.cpp
View File

@ -99,6 +99,12 @@ QStringList RsApplication::_files; /**< List of files passed by argume
bool RsApplication::useConfigDir;
QString RsApplication::configDir;
#endif
#ifdef __APPLE__
QStringList RsApplication::_links; /**< List of links passed by arguments. */
QStringList RsApplication::_files; /**< List of files passed by arguments. */
#endif
Log RsApplication::log_output; /**< Logs debugging messages to file or stdout. */
RsGUIConfigOptions RsApplication::options;
QDateTime RsApplication::mStartupTime;

7
retroshare-gui/src/rshare.h
View File

@ -138,7 +138,7 @@ public:
static void setOpMode(const QString& op ) { options.opModeStr = op.toStdString(); }
static QString opmode() { return QString::fromStdString(options.opModeStr); }
#ifdef TO_REMOVE
#ifdef __APPLE__
/** Returns links passed by arguments. */
static QStringList* links() { return &_links; }
/** Returns files passed by arguments. */
@ -209,7 +209,10 @@ private:
static bool argNeedsValue(const QString &argName);
#endif
#ifdef __APPLE__
static QStringList _links; /**< List of links passed by arguments. */
static QStringList _files; /**< List of files passed by arguments. */
#endif
static QDateTime mStartupTime; // startup time
bool mBlink;
static QLocalServer* localServer;