eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-17 13:09:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into mike-style-integration

Browse Source 
Conflicts:
	main.cpp
This commit is contained in:
Tats
2014-05-04 17:50:49 -04:00
parent 62ed1d290d 011f5b205f
commit bca6e7651d
41 changed files with 1172 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MainWindow.cpp
View File

@@ -203,8 +203,11 @@ void MainWindow::open()
if (okToContinue())
{
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open project"), ".", tr("MapMap files (*." MAPMAP_EXTENSION ")"));
if (!fileName.isEmpty())
tr("Open project"),
".", // TODO : change this to previous used one, if any
//tr("MapMap files (*.%1)", MAPMAP_EXTENSION));
tr("All files (*)"));
if (! fileName.isEmpty())
loadFile(fileName);
}
@@ -231,14 +234,25 @@ bool MainWindow::saveAs()
videoTimer->stop();
// Popul file dialog to choose filename.
QString fileName = QFileDialog::getSaveFileName(this, tr("Save project"),
".", tr("MapMap files (*." MAPMAP_EXTENSION ")"));
QString fileName = QFileDialog::getSaveFileName(this,
tr("Save project"),
".",
tr("MapMap files (*.%1)", MAPMAP_EXTENSION)
);
// Restart video playback. XXX Hack
videoTimer->start();
if (fileName.isEmpty())
return false;
if (! fileName.endsWith(MAPMAP_EXTENSION))
{
std::cout << "filename doesn't end with expected extension: " <<
fileName.toStdString() << std::endl;
fileName.append(".");
fileName.append(MAPMAP_EXTENSION);
}
// Save to filename.
return saveFile(fileName);