mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-22 21:31:07 -05:00
this commit changed the QFileDialog::getOpenFileName to misc::getOpenFileName
This commit is contained in:
parent
f06fa656b8
commit
5fae434f03
@ -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_use_native_dialogs"
|
||||
call "%~dp0build\build.bat" 64 release autologin "CONFIG+=rs_efs" "CONFIG+=gxsthewire" "CONFIG+=no_retroshare_plugins" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_libsam3"
|
||||
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_use_native_dialogs"
|
||||
call "%~dp0build\pack.bat" 64 release autologin "CONFIG+=rs_efs" "CONFIG+=gxsthewire" "CONFIG+=no_retroshare_plugins" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_libsam3"
|
||||
if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL%
|
||||
|
||||
exit /B 0
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
|
||||
Subproject commit 7a50d7a81d60c4bf76ea4bd81f45a0f028419e89
|
@ -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,7 +540,8 @@ void PulseAddDialog::toggle()
|
||||
// Function to get the file dialog for the browse button
|
||||
void PulseAddDialog::onBrowseButtonClicked()
|
||||
{
|
||||
QString filePath = QFileDialog::getOpenFileName(this, tr("Select image file"), QString(), tr("Image files (*.png *.jpg *.jpeg *.bmp *.gif)"));
|
||||
QString filePath;
|
||||
misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load Picture File"), "Pictures (*.png *.xpm *.jpg *.jpeg *.gif *.webp )", filePath);
|
||||
if (!filePath.isEmpty()) {
|
||||
ui.lineEdit_FilePath->setText(filePath);
|
||||
addImage(filePath);
|
||||
|
Loading…
Reference in New Issue
Block a user