file path in map editor file dialog is kept for next file access
This commit is contained in:
parent
6b0bc35e3c
commit
40a67b569b
|
@ -334,7 +334,7 @@ MainWindow::MainWindow()
|
||||||
#endif
|
#endif
|
||||||
//std::cout << "C" << std::endl;
|
//std::cout << "C" << std::endl;
|
||||||
SetIcon(icon);
|
SetIcon(icon);
|
||||||
|
fileDialog = new wxFileDialog(this);
|
||||||
lastPaintEvent.start();
|
lastPaintEvent.start();
|
||||||
|
|
||||||
glCanvas->SetFocus();
|
glCanvas->SetFocus();
|
||||||
|
@ -354,6 +354,7 @@ void MainWindow::init(string fname) {
|
||||||
program->loadMap(fname);
|
program->loadMap(fname);
|
||||||
currentFile = fname;
|
currentFile = fname;
|
||||||
fileName = cutLastExt(extractFileFromDirectoryPath(fname.c_str()));
|
fileName = cutLastExt(extractFileFromDirectoryPath(fname.c_str()));
|
||||||
|
fileDialog->SetPath(ToUnicode(fname));
|
||||||
}
|
}
|
||||||
SetTitle(ToUnicode(currentFile + " - " + winHeader));
|
SetTitle(ToUnicode(currentFile + " - " + winHeader));
|
||||||
setDirty(false);
|
setDirty(false);
|
||||||
|
@ -489,10 +490,10 @@ void MainWindow::onPaint(wxPaintEvent &event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::onMenuFileLoad(wxCommandEvent &event) {
|
void MainWindow::onMenuFileLoad(wxCommandEvent &event) {
|
||||||
wxFileDialog fileDialog(this);
|
fileDialog->SetMessage(wxT("Select Glestmap to load"));
|
||||||
fileDialog.SetWildcard(wxT("Glest&Mega Map (*.gbm *.mgm)|*.gbm;*.mgm|Glest Map (*.gbm)|*.gbm|Mega Map (*.mgm)|*.mgm"));
|
fileDialog->SetWildcard(wxT("Glest&Mega Map (*.gbm *.mgm)|*.gbm;*.mgm|Glest Map (*.gbm)|*.gbm|Mega Map (*.mgm)|*.mgm"));
|
||||||
if (fileDialog.ShowModal() == wxID_OK) {
|
if (fileDialog->ShowModal() == wxID_OK) {
|
||||||
currentFile = fileDialog.GetPath().ToAscii();
|
currentFile = fileDialog->GetPath().ToAscii();
|
||||||
program->loadMap(currentFile);
|
program->loadMap(currentFile);
|
||||||
fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str()));
|
fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str()));
|
||||||
setDirty(false);
|
setDirty(false);
|
||||||
|
@ -513,10 +514,13 @@ void MainWindow::onMenuFileSave(wxCommandEvent &event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::onMenuFileSaveAs(wxCommandEvent &event) {
|
void MainWindow::onMenuFileSaveAs(wxCommandEvent &event) {
|
||||||
wxFileDialog fileDialog(this, wxT("Select file"), wxT(""), wxT(""), wxT("*.gbm|*.mgm"), wxSAVE);
|
wxFileDialog fd(this, wxT("Select file"), wxT(""), wxT(""), wxT("*.gbm|*.mgm"), wxSAVE);
|
||||||
fileDialog.SetWildcard(wxT("Glest Map (*.gbm)|*.gbm|MegaGlest Map (*.mgm)|*.mgm"));
|
|
||||||
if (fileDialog.ShowModal() == wxID_OK) {
|
fd.SetPath(fileDialog->GetPath());
|
||||||
currentFile = fileDialog.GetPath().ToAscii();
|
fd.SetWildcard(wxT("Glest Map (*.gbm)|*.gbm|MegaGlest Map (*.mgm)|*.mgm"));
|
||||||
|
if (fd.ShowModal() == wxID_OK) {
|
||||||
|
currentFile = fd.GetPath().ToAscii();
|
||||||
|
fileDialog->SetPath(fd.GetPath());
|
||||||
setExtension();
|
setExtension();
|
||||||
program->saveMap(currentFile);
|
program->saveMap(currentFile);
|
||||||
fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str()));
|
fileName = cutLastExt(extractFileFromDirectoryPath(currentFile.c_str()));
|
||||||
|
|
|
@ -161,6 +161,8 @@ private:
|
||||||
wxMenu *menuBrushStartLocation;
|
wxMenu *menuBrushStartLocation;
|
||||||
wxMenu *menuRadius;
|
wxMenu *menuRadius;
|
||||||
|
|
||||||
|
wxFileDialog *fileDialog;
|
||||||
|
|
||||||
string currentFile;
|
string currentFile;
|
||||||
|
|
||||||
BrushType currentBrush;
|
BrushType currentBrush;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user