Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

When hitting 'save as' ask for a filename even if one is set.

Browse source 
--HG--
branch : gsoc2014-dfighter
This commit is contained in:
dfighter1985 2014-07-30 15:55:09 +02:00
parent 0cef115a74
commit a994f23948
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp
View file

@ -200,23 +200,28 @@ TileEditorMainWindow::~TileEditorMainWindow()
void TileEditorMainWindow::save() void TileEditorMainWindow::save()
{ {
if( m_fileName.isEmpty() )
saveAs(); saveAs();
else
saveAs( m_fileName );
} }
void TileEditorMainWindow::saveAs() void TileEditorMainWindow::saveAs()
{ {
if( m_fileName.isEmpty() ) QString fn = QFileDialog::getSaveFileName( this,
{
m_fileName = QFileDialog::getSaveFileName( this,
tr( "Save TileBank as..." ), tr( "Save TileBank as..." ),
"", "",
tr( "TileBank files (*.tilebank)" ) ); tr( "TileBank files (*.tilebank)" ) );
if( m_fileName.isEmpty() ) if( fn.isEmpty() )
return; return;
} saveAs( fn );
}
void TileEditorMainWindow::saveAs( const QString &fn )
{
QList< QString > landNames; QList< QString > landNames;
int c = m_ui->landLW->count(); int c = m_ui->landLW->count();
@ -227,7 +232,7 @@ void TileEditorMainWindow::saveAs()
} }
TileBankSaver saver; TileBankSaver saver;
bool ok = saver.save( m_fileName.toUtf8().constData(), m_tileModel, m_lands ); bool ok = saver.save( fn.toUtf8().constData(), m_tileModel, m_lands );
if( !ok ) if( !ok )
{ {

1
code/studio/src/plugins/tile_editor/tile_editor_main_window.h
View file

@ -47,6 +47,7 @@ public:
public Q_SLOTS: public Q_SLOTS:
void save(); void save();
void saveAs(); void saveAs();
void saveAs( const QString &fn );
void open(); void open();
private Q_SLOTS: private Q_SLOTS: