livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-5782: Threaded file pickers for export floaters

master
Ansariel 2018-06-22 23:20:16 +02:00
parent 762a0eb0a3
commit dcab2e1025
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/daeexport.cpp
View File

@ -81,6 +81,7 @@
#include "lltrans.h"
#include "llversioninfo.h"
#include "llviewercontrol.h"
#include "llviewermenufile.h"
#include "llviewernetwork.h"
#include "llviewerregion.h"
#include "llviewertexturelist.h"
@ -196,14 +197,14 @@ void ColladaExportFloater::updateUI()
void ColladaExportFloater::onClickExport()
{
LLFilePicker& file_picker = LLFilePicker::instance();
if (!file_picker.getSaveFile(LLFilePicker::FFSAVE_COLLADA, LLDir::getScrubbedFileName(mObjectName + ".dae")))
{
LL_INFOS() << "User closed the filepicker, aborting export!" << LL_ENDL;
return;
}
mFilename = file_picker.getFirstFile();
(new LLFilePickerReplyThread(boost::bind(&ColladaExportFloater::onExportFileSelected, this, _1),
LLFilePicker::FFSAVE_COLLADA, LLDir::getScrubbedFileName(mObjectName + ".dae")))->getFile();
}
void ColladaExportFloater::onExportFileSelected(const std::vector<std::string>& filenames)
{
mFilename = filenames[0];
if (gSavedSettings.getBOOL("DAEExportTextures"))
{
saveTextures();

1
indra/newview/daeexport.h
View File

@ -131,6 +131,7 @@ private:
void refresh();
void dirty();
void onClickExport();
void onExportFileSelected(const std::vector<std::string>& filenames);
void onTextureExportCheck();
void onCommitTextureType();
void saveTextures();

19
indra/newview/fsfloaterexport.cpp
View File

@ -55,8 +55,9 @@
#include "llvfile.h"
#include "llviewercontrol.h"
#include "llviewerinventory.h"
#include "llviewerpartsource.h"
#include "llviewermenufile.h"
#include "llviewernetwork.h"
#include "llviewerpartsource.h"
#include "llviewerregion.h"
#include "llviewertexturelist.h"
#include "llvovolume.h"
@ -1082,14 +1083,14 @@ void FSFloaterObjectExport::updateUI()
void FSFloaterObjectExport::onClickExport()
{
LLFilePicker& file_picker = LLFilePicker::instance();
if(!file_picker.getSaveFile(LLFilePicker::FFSAVE_EXPORT, LLDir::getScrubbedFileName(mObjectName + ".oxp")))
{
LL_INFOS() << "User closed the filepicker, aborting export!" << LL_ENDL;
return;
}
mFilename = file_picker.getFirstFile();
(new LLFilePickerReplyThread(boost::bind(&FSFloaterObjectExport::onExportFileSelected, this, _1),
LLFilePicker::FFSAVE_EXPORT, LLDir::getScrubbedFileName(mObjectName + ".oxp")))->getFile();
}
void FSFloaterObjectExport::onExportFileSelected(const std::vector<std::string>& filenames)
{
mFilename = filenames[0];
LLUIString title = getString("title_working");
title.setArg("[OBJECT]", mObjectName);
setTitle(title);

1
indra/newview/fsfloaterexport.h
View File

@ -86,6 +86,7 @@ private:
void addSelectedObjects();
void populateObjectList();
void onClickExport();
void onExportFileSelected(const std::vector<std::string>& filenames);
void addTexturePreview();
S32 getNumExportableTextures();
void addObject(const LLViewerObject* prim, const std::string name);