Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-19 22:33:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

RS_ prefix

Browse Source
This commit is contained in:
hunbernd 2018-12-31 18:34:48 +01:00
parent 584b9039c9
commit 50ee33b229
6 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroshare-gui/src/gui/ShareManager.cpp
View File

@ -37,6 +37,7 @@
#include "gui/common/GroupDefs.h" #include "gui/common/GroupDefs.h"
#include "gui/notifyqt.h" #include "gui/notifyqt.h"
#include "util/QtVersion.h" #include "util/QtVersion.h"
#include "util/misc.h"
/* Images for context menu icons */ /* Images for context menu icons */
#define IMAGE_CANCEL ":/images/delete.png" #define IMAGE_CANCEL ":/images/delete.png"
@ -123,11 +124,7 @@ void ShareManager::doubleClickedCell(int row,int column)
{ {
if(column == COLUMN_PATH) if(column == COLUMN_PATH)
{ {
#ifdef NATIVEDIALOGS QString dirname = misc::getExistingDirectory(nullptr,tr("Choose directory"),QString());
QString dirname = QFileDialog::getExistingDirectory(NULL,tr("Choose directory"),QString(), QFileDialog::ShowDirsOnly);
#else
QString dirname = QFileDialog::getExistingDirectory(NULL,tr("Choose directory"),QString(),QFileDialog::DontUseNativeDialog | QFileDialog::ShowDirsOnly);
#endif
if(!dirname.isNull()) if(!dirname.isNull())
{ {
@ -361,11 +358,7 @@ void ShareManager::showEvent(QShowEvent *event)
void ShareManager::addShare() void ShareManager::addShare()
{ {
#ifdef NATIVEDIALOGS QString fname = misc::getExistingDirectory(nullptr,tr("Choose a directory to share"),QString());
QString fname = QFileDialog::getExistingDirectory(NULL,tr("Choose a directory to share"),QString(), QFileDialog::ShowDirsOnly);
#else
QString fname = QFileDialog::getExistingDirectory(NULL,tr("Choose a directory to share"),QString(),QFileDialog::DontUseNativeDialog | QFileDialog::ShowDirsOnly);
#endif
if(fname.isNull()) if(fname.isNull())
return; return;

8
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -22,7 +22,6 @@
#include <QApplication> #include <QApplication>
#include <QBuffer> #include <QBuffer>
#include <QColorDialog> #include <QColorDialog>
#include <QFontDialog>
#include <QKeyEvent> #include <QKeyEvent>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
@ -1487,11 +1486,8 @@ void ChatWidget::chooseFont()
{ {
bool ok; bool ok;
//Use NULL as parent as with this QFontDialog don't take care of title nether options. //Use NULL as parent as with this QFontDialog don't take care of title nether options.
#ifdef NATIVEDIALOGS QFont font = misc::getFont(&ok, currentFont, nullptr, tr("Choose your font."));
QFont font = QFontDialog::getFont(&ok, currentFont, NULL, tr("Choose your font.") );
#else
QFont font = QFontDialog::getFont(&ok, currentFont, NULL, tr("Choose your font."),QFontDialog::DontUseNativeDialog);
#endif
if (ok) { if (ok) {
currentFont = font; currentFont = font;
setFont(); setFont();

8
retroshare-gui/src/gui/settings/ChatPage.cpp
View File

@ -19,7 +19,6 @@
*******************************************************************************/ *******************************************************************************/
#include <QColorDialog> #include <QColorDialog>
#include <QFontDialog>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <time.h> #include <time.h>
@ -415,11 +414,8 @@ ChatPage::load()
void ChatPage::on_pushButtonChangeChatFont_clicked() void ChatPage::on_pushButtonChangeChatFont_clicked()
{ {
bool ok; bool ok;
#ifdef NATIVEDIALOGS QFont font = misc::getFont(&ok, fontTempChat, this, tr("Choose your default font for Chat."));
QFont font = QFontDialog::getFont(&ok, fontTempChat, this, tr("Choose your default font for Chat.") );
#else
QFont font = QFontDialog::getFont(&ok, fontTempChat, this, tr("Choose your default font for Chat."),QFontDialog::DontUseNativeDialog);
#endif
if (ok) { if (ok) {
fontTempChat = font; fontTempChat = font;
// using fontTempChat.rawname() does not always work! // using fontTempChat.rawname() does not always work!

27
retroshare-gui/src/util/misc.cpp
View File

@ -25,6 +25,7 @@
#include <QByteArray> #include <QByteArray>
#include <QBuffer> #include <QBuffer>
#include <time.h> #include <time.h>
#include <QFontDialog>
#include "misc.h" #include "misc.h"
@ -315,7 +316,7 @@ bool misc::getOpenFileName(QWidget *parent, RshareSettings::enumLastDir type
{ {
QString lastDir = Settings->getLastDir(type); QString lastDir = Settings->getLastDir(type);
#ifdef NATIVEDIALOGS #ifdef RS_NATIVEDIALOGS
file = QFileDialog::getOpenFileName(parent, caption, lastDir, filter, NULL, QFileDialog::DontResolveSymlinks | options); file = QFileDialog::getOpenFileName(parent, caption, lastDir, filter, NULL, QFileDialog::DontResolveSymlinks | options);
#else #else
file = QFileDialog::getOpenFileName(parent, caption, lastDir, filter, NULL, QFileDialog::DontResolveSymlinks | QFileDialog::DontUseNativeDialog | options); file = QFileDialog::getOpenFileName(parent, caption, lastDir, filter, NULL, QFileDialog::DontResolveSymlinks | QFileDialog::DontUseNativeDialog | options);
@ -342,7 +343,7 @@ bool misc::getOpenFileNames(QWidget *parent, RshareSettings::enumLastDir type
{ {
QString lastDir = Settings->getLastDir(type); QString lastDir = Settings->getLastDir(type);
#ifdef NATIVEDIALOGS #ifdef RS_NATIVEDIALOGS
files = QFileDialog::getOpenFileNames(parent, caption, lastDir, filter, NULL, QFileDialog::DontResolveSymlinks | options); files = QFileDialog::getOpenFileNames(parent, caption, lastDir, filter, NULL, QFileDialog::DontResolveSymlinks | options);
#else #else
files = QFileDialog::getOpenFileNames(parent, caption, lastDir, filter, NULL, QFileDialog::DontResolveSymlinks | QFileDialog::DontUseNativeDialog | options); files = QFileDialog::getOpenFileNames(parent, caption, lastDir, filter, NULL, QFileDialog::DontResolveSymlinks | QFileDialog::DontUseNativeDialog | options);
@ -372,7 +373,7 @@ bool misc::getSaveFileName(QWidget *parent, RshareSettings::enumLastDir type
{ {
QString lastDir = Settings->getLastDir(type) + "/" + file; QString lastDir = Settings->getLastDir(type) + "/" + file;
#ifdef NATIVEDIALOGS #ifdef RS_NATIVEDIALOGS
file = QFileDialog::getSaveFileName(parent, caption, lastDir, filter, selectedFilter, options); file = QFileDialog::getSaveFileName(parent, caption, lastDir, filter, selectedFilter, options);
#else #else
file = QFileDialog::getSaveFileName(parent, caption, lastDir, filter, selectedFilter, QFileDialog::DontUseNativeDialog | options); file = QFileDialog::getSaveFileName(parent, caption, lastDir, filter, selectedFilter, QFileDialog::DontUseNativeDialog | options);
@ -384,5 +385,23 @@ bool misc::getSaveFileName(QWidget *parent, RshareSettings::enumLastDir type
lastDir = QFileInfo(file).absoluteDir().absolutePath(); lastDir = QFileInfo(file).absoluteDir().absolutePath();
Settings->setLastDir(type, lastDir); Settings->setLastDir(type, lastDir);
return true; return true;
}
QFont misc::getFont(bool *ok, const QFont &initial, QWidget *parent, const QString &title)
{
#ifdef RS_NATIVEDIALOGS
return QFontDialog::getFont(ok, initial, parent, title);
#else
return QFontDialog::getFont(ok, initial, parent, title, QFontDialog::DontUseNativeDialog);
#endif
}
QString misc::getExistingDirectory(QWidget *parent, const QString &caption, const QString &dir)
{
#ifdef RS_NATIVEDIALOGS
return QFileDialog::getExistingDirectory(parent, caption, dir, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
#else
return QFileDialog::getExistingDirectory(parent, caption, dir, QFileDialog::DontUseNativeDialog | QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
#endif
} }

11
retroshare-gui/src/util/misc.h
View File

@ -171,8 +171,17 @@ class misc : public QObject
static bool getSaveFileName(QWidget *parent, RshareSettings::enumLastDir type static bool getSaveFileName(QWidget *parent, RshareSettings::enumLastDir type
, const QString &caption , const QString &filter , const QString &caption , const QString &filter
, QString &file, QString *selectedFilter = NULL , QString &file, QString *selectedFilter = NULL
, QFileDialog::Options options = 0); , QFileDialog::Options options = 0);
static QFont getFont(bool *ok
, const QFont &initial
, QWidget *parent = nullptr
, const QString &title = QString());
static QString getExistingDirectory(QWidget *parent = nullptr
, const QString &caption = QString()
, const QString &dir = QString());
}; };
// Trick to get a portable sleep() function // Trick to get a portable sleep() function

5
retroshare.pri
View File

@ -186,10 +186,9 @@ rs_deep_search:CONFIG -= no_rs_deep_search
# assignation to qmake command line 'RS_EXTRA_VERSION=""' # assignation to qmake command line 'RS_EXTRA_VERSION=""'
#RS_EXTRA_VERSION=git #RS_EXTRA_VERSION=git
# To enable native dialogs append the following assignation to qmake command line # To enable native dialogs append the following assignation to qmake command line
# "CONFIG+=use_native_dialogs" # "CONFIG+=rs_use_native_dialogs"
use_native_dialogs:DEFINES *= NATIVEDIALOGS rs_use_native_dialogs:DEFINES *= RS_NATIVEDIALOGS
########################################################################################################################################################### ###########################################################################################################################################################
# #