Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 02:03:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2575 from brotchie/master

Browse source 
Remember most recently opened script location.
This commit is contained in:
Philip Rosedale 2014-03-31 07:21:19 -07:00
commit d4b3113692
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/interface_en.ts
View file

@ -4,22 +4,22 @@
<context>
<name>Application</name>
<message>
<location filename="src/Application.cpp" line="1380"/>
<location filename="src/Application.cpp" line="1381"/>
<source>Export Voxels</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="1381"/>
<location filename="src/Application.cpp" line="1382"/>
<source>Sparse Voxel Octree Files (*.svo)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3617"/>
<location filename="src/Application.cpp" line="3623"/>
<source>Open Script</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3618"/>
<location filename="src/Application.cpp" line="3624"/>
<source>JavaScript Files (*.js)</source>
<translation type="unfinished"></translation>
</message>

15
interface/src/Application.cpp
View file

@ -169,6 +169,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
_bytesPerSecond(0),
_recentMaxPackets(0),
_resetRecentMaxPacketsSoon(true),
_previousScriptLocation(),
_logger(new FileLogger(this))
{
// read the ApplicationInfo.ini file for Name/Version/Domain information
@ -3610,12 +3611,20 @@ void Application::loadScript(const QString& scriptName) {
}
void Application::loadDialog() {
// shut down and stop any existing script
QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
QString suggestedName = desktopLocation.append("/script.js");
QString suggestedName;
if (_previousScriptLocation.isEmpty()) {
QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
suggestedName = desktopLocation.append("/script.js");
} else {
suggestedName = _previousScriptLocation;
}
QString fileNameString = QFileDialog::getOpenFileName(_glWidget, tr("Open Script"), suggestedName,
tr("JavaScript Files (*.js)"));
if (!fileNameString.isEmpty()) {
_previousScriptLocation = fileNameString;
}
loadScript(fileNameString);
}

2
interface/src/Application.h
View file

@ -483,6 +483,8 @@ private:
ControllerScriptingInterface _controllerScriptingInterface;
QPointer<LogDialog> _logDialog;
QString _previousScriptLocation;
FileLogger* _logger;
void checkVersion();