Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-04-16 21:43:04 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "this commit changed the QFileDialog::getOpenFileName to misc::getOpenFileName"

Browse Source 
This reverts commit 5fae434f03d5e4eccb0abbf0573e40006cac9a00.
This commit is contained in:
PYRET1C 2023-04-14 17:21:45 +05:30
parent 5fae434f03
commit df8e6b9f96
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_scripts/Windows-msys2/build.bat
View File

@ -9,11 +9,11 @@ call "%EnvPath%\env.bat"
if errorlevel 1 goto error_env
%cecho% info "Build %SourceName%"
call "%~dp0build\build.bat" 64 release autologin "CONFIG+=rs_efs" "CONFIG+=gxsthewire" "CONFIG+=no_retroshare_plugins" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_libsam3"
call "%~dp0build\build.bat" 64 release autologin "CONFIG+=rs_use_native_dialogs"
if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
%cecho% info "Pack %SourceName%"
call "%~dp0build\pack.bat" 64 release autologin "CONFIG+=rs_efs" "CONFIG+=gxsthewire" "CONFIG+=no_retroshare_plugins" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_libsam3"
call "%~dp0build\pack.bat" 64 release autologin "CONFIG+=rs_use_native_dialogs"
if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL%
exit /B 0

2
libretroshare

@ -1 +1 @@
Subproject commit 7a50d7a81d60c4bf76ea4bd81f45a0f028419e89
Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476

5
retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
View File

@ -20,11 +20,11 @@
#include <iostream>
#include <QtGui>
#include <QFileDialog>
#include "PulseReply.h"
#include "gui/gxs/GxsIdDetails.h"
#include "gui/common/FilesDefs.h"
#include "util/misc.h"
#include "PulseAddDialog.h"
@ -540,8 +540,7 @@ void PulseAddDialog::toggle()
// Function to get the file dialog for the browse button
void PulseAddDialog::onBrowseButtonClicked()
{
QString filePath;
misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load Picture File"), "Pictures (*.png *.xpm *.jpg *.jpeg *.gif *.webp )", filePath);
QString filePath = QFileDialog::getOpenFileName(this, tr("Select image file"), QString(), tr("Image files (*.png *.jpg *.jpeg *.bmp *.gif)"));
if (!filePath.isEmpty()) {
ui.lineEdit_FilePath->setText(filePath);
addImage(filePath);