Some fixes to recent files #3621

zonkmachine · 2017-06-09T05:06:15Z

The recent file system feels a bit glitchy. If you work with a saved file and then start a new project, or a new project from template that you decide to scratch, the next time you launch LMMS you will get back the previous saved work again. I find this a bit unintuitive as you've done other work in between.

Fixes

If the last project was a template we create a new project.
If there is a recovery file present and you discard it we create a new project. The project launched could be defective or, if .lmmsrc.xml wasn't written, an earlier project.
Add a factory default data/projects/templates/default.mpt. Fixes New Project opens with old parameters #528

zonkmachine · 2017-06-09T17:54:58Z

if the last project was a template we create a new project. ( This PR )

Works fine. Clears the action up good. Some more testing and I'll merge this later.

zonkmachine · 2017-06-09T22:38:26Z

if the last project was a template we create a new project. ( This PR )

Seem to be fixed for when you create project from a template but not when the project is the default.mpt .

zonkmachine · 2017-06-10T02:33:50Z

if the last project was a template we create a new project. ( This PR )

Seem to be fixed for when you create project from a template but not when the project is the default.mpt .

No. It works if you save a project as default project. Song::createNewProject() first tries to find default.mpt in your templates directory. Next it looks in factoryProjectsDir() and this it cant find because there seem to be no default.mpt among the factory templates, so it proceeds to generate a hard coded project and this isn't really a file so it doesn't get registered in the recent files list.

@tresf Should there be a default.mpt in the factory templates?

tresf · 2017-06-10T03:54:48Z

@tresf Should there be a default.mpt in the factory templates?

It certainly sounds more logical than a hard-coded project.

zonkmachine · 2017-06-10T05:17:49Z

Works like a charm!

zonkmachine · 2017-06-10T07:20:40Z

Add a factory default data/projects/templates/default.mpt

I believe this also takes care of issue #528

Umcaruje

I tested this, works like a charm, can confirm it fixes #528 too

Umcaruje · 2017-06-10T08:10:40Z

src/core/ConfigManager.cpp

@@ -282,7 +282,8 @@ void ConfigManager::addRecentlyOpenedProject( const QString & file )
 {
 	QFileInfo recentFile( file );
 	if( recentFile.suffix().toLower() == "mmp" ||
-			recentFile.suffix().toLower() == "mmpz" )
+			recentFile.suffix().toLower() == "mmpz" ||
+				recentFile.suffix().toLower() == "mpt" )


You could remove the one tab of indentation here so these two lines are at the same level

Umcaruje · 2017-06-10T08:11:20Z

src/core/main.cpp

@@ -846,13 +846,15 @@ int main( int argc, char * * argv )
 		else if( ConfigManager::inst()->
 				value( "app", "openlastproject" ).toInt() &&
 			!ConfigManager::inst()->
-				recentlyOpenedProjects().isEmpty() )
+				recentlyOpenedProjects().isEmpty() &&
+			!recoveryFilePresent )


And here you could add another tab

I added even more for a casual look. Bohemic chic.

Haha, it'll maybe look weird in some editors that don't have the same spaces for tabs like github does, don't you think?

Umcaruje · 2017-06-10T08:14:18Z

data/projects/templates/default.mpt

@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!DOCTYPE lmms-project>
+<lmms-project version="1.0" creator="LMMS" creatorversion="1.2.0-rc3.15" type="song">


I wonder what we should do with the creator version, this way we'd need to update it for every version, otherwise the users would keep getting the 'Project version mismatch' tool tip on each new project, right?

I updated the creatorversion manually. It could be automated with the --upgrade command. For another release though...

tresf · 2017-06-10T10:57:31Z

Interesting point about creator version. A cmake configured default.mpt.in could address this problem, or we could suppress project version warnings for template files.

zonkmachine · 2017-06-10T16:01:47Z

I thought about suppressing warnings too but we should really keep our own made stuff up to date, making such a sing a bit superfluous. Update the projects for a new release makes most sense to me.
We should have a release protocol to follow with things like this defined.

* Add a factory default data/projects/templates/default.mpt. Fixes LMMS#528 * On launch, if the last project was a template we create a new project (default.mpt) instead. * If there is a recovery file present and you discard it we create a new project as the project launched could be defective or, if .lmmsrc.xml wasn't written, an earlier project.

tresf · 2017-06-12T17:35:17Z

Cherry-picked and ready for master via 9edaa59.

* Add a factory default data/projects/templates/default.mpt. Fixes LMMS#528 * On launch, if the last project was a template we create a new project (default.mpt) instead. * If there is a recovery file present and you discard it we create a new project as the project launched could be defective or, if .lmmsrc.xml wasn't written, an earlier project.

zonkmachine added 2 commits June 9, 2017 06:43

Save template as recent file

ac9f4a2

On template as recent file: create new project

62ec0a3

zonkmachine added this to the 1.2.0 milestone Jun 9, 2017

Only open recent file if no recovery file is present

6973671

Factory default.mpt

3dae75f

Umcaruje reviewed Jun 10, 2017

View reviewed changes

zonkmachine added 2 commits June 10, 2017 11:33

creatorversion

1a630ba

fixup

1d68a41

fixup - remove post-modern code formatting

75ec937

Umcaruje approved these changes Jun 10, 2017

View reviewed changes

zonkmachine merged commit a371ff0 into LMMS:stable-1.2 Jun 10, 2017

zonkmachine deleted the fixopenrecent branch June 12, 2017 19:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Some fixes to recent files #3621

Some fixes to recent files #3621

zonkmachine commented Jun 9, 2017 •

edited

Loading

zonkmachine commented Jun 9, 2017

zonkmachine commented Jun 9, 2017

zonkmachine commented Jun 10, 2017

tresf commented Jun 10, 2017

zonkmachine commented Jun 10, 2017

zonkmachine commented Jun 10, 2017

Umcaruje left a comment

Umcaruje Jun 10, 2017

zonkmachine Jun 10, 2017

Umcaruje Jun 10, 2017

zonkmachine Jun 10, 2017

Umcaruje Jun 10, 2017

Umcaruje Jun 10, 2017

zonkmachine Jun 10, 2017

tresf commented Jun 10, 2017 •

edited

Loading

zonkmachine commented Jun 10, 2017

tresf commented Jun 12, 2017

Some fixes to recent files #3621

Some fixes to recent files #3621

Conversation

zonkmachine commented Jun 9, 2017 • edited Loading

Fixes

zonkmachine commented Jun 9, 2017

zonkmachine commented Jun 9, 2017

zonkmachine commented Jun 10, 2017

tresf commented Jun 10, 2017

zonkmachine commented Jun 10, 2017

zonkmachine commented Jun 10, 2017

Umcaruje left a comment

Choose a reason for hiding this comment

Umcaruje Jun 10, 2017

Choose a reason for hiding this comment

zonkmachine Jun 10, 2017

Choose a reason for hiding this comment

Umcaruje Jun 10, 2017

Choose a reason for hiding this comment

zonkmachine Jun 10, 2017

Choose a reason for hiding this comment

Umcaruje Jun 10, 2017

Choose a reason for hiding this comment

Umcaruje Jun 10, 2017

Choose a reason for hiding this comment

zonkmachine Jun 10, 2017

Choose a reason for hiding this comment

tresf commented Jun 10, 2017 • edited Loading

zonkmachine commented Jun 10, 2017

tresf commented Jun 12, 2017

zonkmachine commented Jun 9, 2017 •

edited

Loading

tresf commented Jun 10, 2017 •

edited

Loading