Scratch

Merge lp://staging/~superscript18/scratch/bugfix-1390607 into lp://staging/~elementary-apps/scratch/scratch

bugfix-1390607
Merge into scratch

Proposed by SuperScript on 2015-02-23

Status:

Rejected

Rejected by:

Cody Garver on 2016-02-22

Proposed branch:

lp://staging/~superscript18/scratch/bugfix-1390607

Merge into:

lp://staging/~elementary-apps/scratch/scratch

Diff against target:

220 lines (+59/-81)

3 files modified

data/scratch-text-editor.desktop (+1/-1)
src/MainWindow.vala (+2/-46)
src/Scratch.vala (+56/-34)

To merge this branch:

bzr merge lp://staging/~superscript18/scratch/bugfix-1390607

Low

Confirmed

Link a bug report

Reviewer	Date Requested	Status
Jeremy Wootten		Needs Fixing on 2016-01-15
Danielle Foré	2015-02-23	Needs Fixing on 2015-03-12
Review via email: mp+250651@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-02-10.

Description of the change

I have reworked the logic in launching Scratch. This new method is quite a bit cleaner and fixes several problems:

1. Scratch opens temporary (unsaved) documents when you open a second window. This is a pain because they are opened twice and cannot be closed in either instance without losing data.

2. When you opened a new window in Scratch, the previous window would try to get your attention (`window.present ()`) resulting in an unneeded red icon in Plank.

3. Middle-clicking on the Scratch icon in Plank did nothing. Now it should open a blank new window ready for you to work.

I've included elementary-design to decide if all this functionality is correct.

This fixes bugs:
Bug #1420549: middle-click on Plank does nothing
Bug #1390607: don't open unsaved files in new windows

Revision history for this message

Danielle Foré (danrabbit) wrote on 2015-03-12:

* Segfault when closing a second new window with nothing open while having a file open in the first window

*Can confirm that unsaved files don't open in new windows.

review: Needs Fixing

Revision history for this message

SuperScript (superscript18) wrote on 2015-03-12:

@DanielFore: I can't reproduce that SEGFAULT. Can you post some more detail instructions?

Also, should we have Pantheon Files open a new window by default, too?

Revision history for this message

Jeremy Wootten (jeremywootten) wrote on 2016-01-15:

Conflicts with trunk r1618 and does not compile with vala-0.28.

After fixing conflicts compiles on valac 0.28. Note careful resolving of conflict in Scratch.vala required.

Using the merged branch:

Cannot reproduce bug 1390607 in latest trunk (or in this branch).

New window on middle click on Plank icon works.

Could not reproduce crash mentioned by Dan.

See inline comment regarding unhandled errors and spelling

Needs fixing but potentially mergeable.

review: Needs Fixing

Unmerged revisions

1451. By SuperScript on 2015-02-12: isn't needed anymore.
1450. By SuperScript on 2015-02-10: fixed tab/space to match elementary guidelines
1449. By SuperScript on 2015-02-10: Redid Scratch's startup procedure