Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Set filename on successful open. Changed filename to fileName.

Browse Source
This commit is contained in:
Jim Evins
2015-09-05 19:47:59 -04:00
parent 69e7184a51
commit a34a3c93fd
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/File.cpp
+11 -9
View File
@@ -80,6 +80,8 @@ namespace glabels
LabelModel *label = XmlLabelParser::readFile( fileName ); LabelModel *label = XmlLabelParser::readFile( fileName );
if ( label ) if ( label )
{ {
label->setFileName( fileName );
if ( window->isEmpty() ) if ( window->isEmpty() )
{ {
window->setModel( label ); window->setModel( label );
@@ -108,7 +110,7 @@ namespace glabels
/// ///
bool File::save( MainWindow *window ) bool File::save( MainWindow *window )
{ {
if ( window->model()->filename().isEmpty() ) if ( window->model()->fileName().isEmpty() )
{ {
return saveAs( window ); return saveAs( window );
} }
@@ -118,7 +120,7 @@ namespace glabels
return true; return true;
} }
XmlLabelCreator::writeFile( window->model(), window->model()->filename() ); XmlLabelCreator::writeFile( window->model(), window->model()->fileName() );
return true; return true;
} }
@@ -128,7 +130,7 @@ namespace glabels
/// ///
bool File::saveAs( MainWindow *window ) bool File::saveAs( MainWindow *window )
{ {
QString rawFilename = QString rawFileName =
QFileDialog::getSaveFileName( window, QFileDialog::getSaveFileName( window,
tr("Save Label As"), tr("Save Label As"),
".", ".",
@@ -136,17 +138,17 @@ namespace glabels
0, 0,
QFileDialog::DontConfirmOverwrite QFileDialog::DontConfirmOverwrite
); );
if ( !rawFilename.isEmpty() ) if ( !rawFileName.isEmpty() )
{ {
QString filename = FileUtil::addExtension( rawFilename, ".glabels" ); QString fileName = FileUtil::addExtension( rawFileName, ".glabels" );
if ( QFileInfo(filename).exists() ) if ( QFileInfo(fileName).exists() )
{ {
QMessageBox msgBox( window ); QMessageBox msgBox( window );
msgBox.setWindowTitle( tr("Save Label As") ); msgBox.setWindowTitle( tr("Save Label As") );
msgBox.setIcon( QMessageBox::Warning ); msgBox.setIcon( QMessageBox::Warning );
msgBox.setText( tr("%1 already exists.").arg(filename) ); msgBox.setText( tr("%1 already exists.").arg(fileName) );
msgBox.setInformativeText( tr("Do you want to replace it?") ); msgBox.setInformativeText( tr("Do you want to replace it?") );
msgBox.setStandardButtons( QMessageBox::Yes | QMessageBox::No ); msgBox.setStandardButtons( QMessageBox::Yes | QMessageBox::No );
msgBox.setDefaultButton( QMessageBox::No ); msgBox.setDefaultButton( QMessageBox::No );
@@ -157,8 +159,8 @@ namespace glabels
} }
} }
XmlLabelCreator::writeFile( window->model(), filename ); XmlLabelCreator::writeFile( window->model(), fileName );
window->model()->setFilename( filename ); window->model()->setFileName( fileName );
return true; return true;
} }
glabels/LabelModel.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ namespace glabels
{ {
static int untitledCount = 0; static int untitledCount = 0;
if ( mFilename.isEmpty() ) if ( mFileName.isEmpty() )
{ {
if ( mUntitledInstance == 0 ) if ( mUntitledInstance == 0 )
{ {
@@ -60,7 +60,7 @@ namespace glabels
} }
else else
{ {
QFileInfo fileInfo( mFilename ); QFileInfo fileInfo( mFileName );
return fileInfo.baseName(); return fileInfo.baseName();
} }
} }
glabels/LabelModel.h
+8 -8
View File
@@ -75,8 +75,8 @@ namespace glabels
void clearModified(); void clearModified();
QString shortName(); QString shortName();
inline const QString& filename() const; inline const QString& fileName() const;
inline void setFilename( const QString &filename ); inline void setFileName( const QString &fileName );
inline int compressionLevel() const; inline int compressionLevel() const;
inline void setCompressionLevel( int compressionLevel ); inline void setCompressionLevel( int compressionLevel );
@@ -191,7 +191,7 @@ namespace glabels
private: private:
int mUntitledInstance; int mUntitledInstance;
bool mModified; bool mModified;
QString mFilename; QString mFileName;
int mCompressionLevel; int mCompressionLevel;
const libglabels::Template* mTmplate; const libglabels::Template* mTmplate;
const libglabels::Frame* mFrame; const libglabels::Frame* mFrame;
@@ -213,17 +213,17 @@ namespace glabels
} }
inline const QString& LabelModel::filename() const inline const QString& LabelModel::fileName() const
{ {
return mFilename; return mFileName;
} }
inline void LabelModel::setFilename( const QString &filename ) inline void LabelModel::setFileName( const QString &fileName )
{ {
if ( mFilename != filename ) if ( mFileName != fileName )
{ {
mFilename = filename; mFileName = fileName;
emit nameChanged(); emit nameChanged();
} }
} }