Skip to content
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

FileBrowser icons to show git status #124

Open
dhirschfeld opened this issue Aug 17, 2017 · 12 comments · May be fixed by #885
Open

FileBrowser icons to show git status #124

dhirschfeld opened this issue Aug 17, 2017 · 12 comments · May be fixed by #885

Comments

@dhirschfeld
Copy link
Member

It would be nice if the FileBrowser were "git aware" and could display the git status with the icons.

Coming from Windows I'm thinking of something similar to the TortoiseGit overlay icons for Windows Explorer:

@zzhangjii
Copy link
Contributor

These are some nice icons! But I feel if applied to current file icons in FileBrowser, those git marks would be too small to see or distinguish.
The current Git-plugin design is to list files in different stages , and has a letter to mark its current status (A, M, D, R), we can borrow these git marks to replace letters

@dhirschfeld
Copy link
Member Author

If the icons are too small to show the git status themselves, perhaps we could do something similar to Visual Studio Code where you have a separate changes view which shows the status of all files and which are staged or not:
image

@ellisonbg
Copy link
Contributor

ellisonbg commented Aug 17, 2017 via email

@zzhangjii
Copy link
Contributor

We can do something similar, a floating label showing the total number of staged and unstaged files

@ghost
Copy link

ghost commented Aug 17, 2017

Here are two ideas I mocked up, with a label on the Git Tab. We could explicitly state the number of changed files, or we could just put an indicator that changes were made:

screen shot 2017-08-17 at 9 46 57 am

screen shot 2017-08-17 at 9 47 20 am

Let me know what you all think!

@ghost
Copy link

ghost commented Aug 17, 2017

The number of changes could also be rotated to match "Git"

screen shot 2017-08-17 at 9 50 58 am

@zzhangjii zzhangjii added this to the 0.2 milestone Aug 19, 2017
@dhirschfeld
Copy link
Member Author

Heh, after actually giving it a go I was going to open an issue to request some form of indication that a folder is a git repo and found that I'd already opened one! :P

image

@weihwang
Copy link

weihwang commented Oct 12, 2018

@dhirschfeld for the screen below, do you see any issues with merging the visual of "git tracking" into the folder icon, rather than a separate icon to the left (see below)?

(Sample add repo flow)
https://www.figma.com/proto/UyNpeQNuTj6Uv74MoEJDh3ji/Git-extension?node-id=513%3A3712&scaling=min-zoom

image

@dhirschfeld
Copy link
Member Author

@weihwang - I'd be happy with any indicator that its' a git repo. The icon on the side as above works perfectly well for that however it might be nicer to have the git icon merged with the folder icon as that would probably take up less space which is often a valuable commodity

@tgeorgeux
Copy link
Contributor

@weihwang I think another option is to add indicators to right column that (similar to vscode above), this will allow us to also reflect status of individual files in the file browser.

@tgeorgeux
Copy link
Contributor

Referenced in issues:
jupyterlab/jupyterlab#5499
jupyterlab/jupyterlab#5498

@weihwang
Copy link

weihwang commented Oct 15, 2018

Here's one more iteration. I don't think we need to remove "last modified" completely, unless we need the space for actions or other indicators in the future. We may need another icon for file status "tracked in a repo" such as "added, modified, deleted" as opposed to "repo indicator"

image

Proposal to deprecate 3-letter status and opt for simpler single letter icons. Checking color contrast with dark mode next.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

6 participants