Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use AIFilePicker everywhere.

Browse Source 
Also upgrade the file picker filters with the new extensions found
in the orginal file picker code of Singularity.

Also improve AIFilePicker a bit: added hasFilename() and now
deleting the statemachine automatically by default: it's no longer
needed to call deleteMe from the callback.
This commit is contained in:
Aleric Inglewood
2011-05-10 04:27:57 +02:00
parent 81550aa6de
commit e0b0fa4f58
49 changed files with 1097 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/llpanelpick.cpp
View File

@@ -66,7 +66,7 @@
//For pick import and export - RK
#include "llfilepicker.h"
#include "statemachine/aifilepicker.h"
#include "llviewernetwork.h"
#include "llsdserialize.h"
#include "hippogridmanager.h"
@@ -201,14 +201,19 @@ void LLPanelPick::initNewPick()
}
//Imports a new pick from an xml - RK
bool LLPanelPick::importNewPick()
void LLPanelPick::importNewPick(void (*callback)(void*, bool), void* data)
{
LLFilePicker& file_picker = LLFilePicker::instance();
AIFilePicker* filepicker = new AIFilePicker;
filepicker->open(FFLOAD_XML, "", "export");
filepicker->run(boost::bind(&LLPanelPick::importNewPick_continued, this, callback, data, filepicker));
}
if(!file_picker.getOpenFile(LLFilePicker::FFLOAD_XML)) return false;// User canceled load.
else
void LLPanelPick::importNewPick_continued(void (*callback)(void*, bool), void* data, AIFilePicker* filepicker)
{
bool result = false;
if (filepicker->hasFilename())
{
std::string file = file_picker.getFirstFile();
std::string file = filepicker->getFilename();
llifstream importer(file);
LLSD data;
@@ -231,19 +236,25 @@ bool LLPanelPick::importNewPick()
mImporting = true;
sendPickInfoUpdate();
return true;
result = true;
}
(*callback)(data, result);
}
//Exports a pick to an XML - RK
void LLPanelPick::exportPick()
{
LLFilePicker& file_picker = LLFilePicker::instance();
if(!file_picker.getSaveFile(LLFilePicker::FFSAVE_XML))
return;// User canceled save.
AIFilePicker* filepicker = new AIFilePicker;
filepicker->open("", FFSAVE_XML, "", "export");
filepicker->run(boost::bind(&LLPanelPick::exportPick_continued, this, filepicker));
}
std::string destination = file_picker.getFirstFile();
void LLPanelPick::exportPick_continued(AIFilePicker* filepicker)
{
if (!filepicker->hasFilename())
return;
std::string destination = filepicker->getFilename();
LLSD datas;