sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7380 from slarosa/fix_18485

Browse Source 
Fixes #18485 - do not truncate project title if filename contains period
This commit is contained in:
Matthias Kuhn 2018-07-09 11:19:12 -05:00 committed by GitHub
commit c4b9106872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/qgsproject.cpp
View File

@ -508,7 +508,7 @@ QString QgsProject::baseName() const
}
else
{
return QFileInfo( mFile.fileName() ).baseName();
return QFileInfo( mFile.fileName() ).completeBaseName();
}
}

14
tests/src/python/test_qgsproject.py
View File

@ -1091,6 +1091,20 @@ class TestQgsProject(unittest.TestCase):
self.assertTrue(l.setSubsetString('class=\'a\''))
self.assertTrue(p.isDirty())
def testProjectTitleWithPeriod(self):
tmpDir = QTemporaryDir()
tmpFile = "{}/2.18.21.qgs".format(tmpDir.path())
tmpFile2 = "{}/qgis-3.2.0.qgs".format(tmpDir.path())
p0 = QgsProject()
p0.setFileName(tmpFile)
p1 = QgsProject()
p1.setFileName(tmpFile2)
self.assertEqual(p0.baseName(), '2.18.21')
self.assertEqual(p1.baseName(), 'qgis-3.2.0')
if __name__ == '__main__':
unittest.main()