-
Notifications
You must be signed in to change notification settings - Fork 551
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Missing files are now automatically deleted from the recent menu, with a notification in the status bar (rather than a dialog box) #2202
Conversation
will no longer fail silently
notification present in the status bar, rather than prompting the user through a QMessageBox. Also removed some unnecessary semicolons.
A notification will appear in the status bar, rather than in a dialog box. (Also removed some unnecessary semicolons.)
…and a missing project will be automatically deleted.
…h a notification in the status bar (rather than a dialog box)
Please ignore the absolute |
I've sometimes thought that they chose the name I'll try to give this a spin later on today, thanks! |
P.S> My GitHub branch-management process, first attempted with OpenShot but now the one I use on all projects, goes like this: $ # After creating my fork in their web interface
$ git clone <my fork SSH identifier>; cd $PROJECT
$ git remote add upstream <upstream HTTPS URL>
$ git fetch upstream
From https://github.com/...
$ git branch -u upstream/$DEFAULT $DEFAULT # 'master' or 'develop' or whatever
Branch '$DEFAULT' set up to track remote branch '$DEFAULT' from 'upstream'.
$ # So now, the default branch tracks the UPSTREAM. I never use that branch in my own fork.
$ # When I want to write code for a PR...
$ git pull # Sync with upstream/$DEFAULT
$ git checkout -b newtopic # Create a new topic branch based on latest upstream/$DEFAULT
$ git push -u origin newtopic # I do this immediately, before writing any code, to configure it
Total 0 (delta 0), reused 0 (delta 0)
remote:
remote: Create a pull request for 'newtopic' on GitHub by visiting:
remote: https://github.com/ferdnyc/$PROJECT/pull/new/newtopic
remote:
To github.com:ferdnyc/$PROJECT.git
* [new branch] newtopic -> newtopic
Branch 'newtopic' set up to track remote branch 'newtopic' from 'origin'.
$ # Then after committing any changes, I can just...
$ git push
remote: Resolving deltas: ...
To github.com:ferdnyc/$PROJECT.git
$GITREFA..$GITREFB newtopic -> newtopic
$ # After I finish development on newtopic...
$ git checkout $DEFAULT # Return to upstream/$DEFAULT as my base branch
$ git pull # Sync with upstream/$DEFAULT
$ # And if I need to return to newtopic...
$ git checkout newtopic
$ git merge develop # If there's already a PR, it's easier/cleaner to do this on the web. |
@ferdnyc - Looked at that cool documentation of your Git-workflow. Thought, I wish there was a gist. And there was. Thank you! |
(For the curious, that's this gist.) |
@ferdnyc - Any thoughts on this one? |
Ahh, crap. I'd said I was going to look at this, and promptly did... exactly nothing. Sorry about that. I'm checking it out as we speak, I'll get back to you within the hour. |
LGTM. Seems to work well. TimeoutI think the timeout on the message could maybe be longer, but that's something we can adjust after-the-fact based on feedback/testing, it doesn't need to hold up this merge. I'm actually thinking that the ideal situation might be to display the message with a very long lifetime, almost indefinitely — like, literally a full minute, maybe more — but then also have any subsequent file-loading actions clear it out again. Which would be as simple as just having Post-failure stateIt feels a bit weird that, if you already have a project loaded when you try to open a Recent file that's no longer there, nothing happens in OpenShot other than the entry being removed and the status-line message being shown. The project you previously had loaded remains open. But, that's both consistent with the previous behavior, and probably the best course of action to take under the circumstances. (I jut said it felt a bit weird, not that it's necessarily wrong.) Message formattingHmm. Possible future modifications aside, as far as the current PR's code goes my only concern is that the message might be a little verbose. With the default window size, it can get cut off if you have a long path. I used
(More of it fit in the window's statusline than actually fits here, but not _all _of it.) I guess the options for addressing that would be:
But as I said, none of this constitutes a reason to hold up the merge, it's all stuff that can be tweaked after the fact. Thanks @bnieuwveld, good stuff! (ETA: Looks like I missed my "within the hour" timeframe by around 8 minutes. #SHAAAAME) |
@ferdnyc - No problem about the delay. LGTM too! 👍 Great job @bnieuwveld ! |
Oh, and special shoutout to Github's $ cd /path/to/openshot-qt
$ hub pr checkout 2202
remote: Enumerating objects: 2, done.
remote: Counting objects: 100% (2/2), done.
remote: Total 3 (delta 2), reused 2 (delta 2), pack-reused 1
Unpacking objects: 100% (3/3), done.
From git://github.com/OpenShot/openshot-qt
* [new ref] refs/pull/2202/head -> bnieuwveld-develop
Switched to branch 'bnieuwveld-develop' |
@ferdnyc Pretty neat. Thanks! |
Supersedes PR #1605