Merge lp://qastaging/~tintou/scratch/filemanager into lp://qastaging/~elementary-apps/scratch/scratch
Proposed by
Corentin Noël
Status: | Rejected |
---|---|
Rejected by: | Zisu Andrei |
Proposed branch: | lp://qastaging/~tintou/scratch/filemanager |
Merge into: | lp://qastaging/~elementary-apps/scratch/scratch |
Diff against target: |
1566 lines (+330/-994) 19 files modified
plugins/CMakeLists.txt (+0/-1) plugins/filemanager/CMakeLists.txt (+2/-0) plugins/filemanager/File.vala (+3/-3) plugins/filemanager/FileItem.vala (+52/-0) plugins/filemanager/FileManagerPlugin.vala (+68/-46) plugins/filemanager/FileView.vala (+39/-210) plugins/filemanager/FolderItem.vala (+154/-0) plugins/filemanager/Settings.vala (+1/-1) plugins/folder-manager/CMakeLists.txt (+0/-29) plugins/folder-manager/File.vala (+0/-207) plugins/folder-manager/FileView.vala (+0/-312) plugins/folder-manager/FolderManagerPlugin.vala (+0/-122) plugins/folder-manager/Settings.vala (+0/-36) plugins/folder-manager/folder-manager.plugin (+0/-10) plugins/outline/OutlinePlugin.vala (+4/-1) plugins/source-tree/SourceTreePlugin.vala (+3/-1) schemas/CMakeLists.txt (+0/-1) schemas/org.pantheon.scratch.plugins.file-manager.gschema.xml (+4/-4) schemas/org.pantheon.scratch.plugins.folder-manager.gschema.xml (+0/-10) |
To merge this branch: | bzr merge lp://qastaging/~tintou/scratch/filemanager |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Danielle Foré | ux | Needs Fixing | |
Zisu Andrei (community) | Needs Fixing | ||
Review via email:
|
To post a comment you must log in.
Unmerged revisions
- 1749. By Corentin Noël
-
Unified the file manager and folder manager.
This branch works as advertised, but, as discussed, we need to change the root item into a folder item too so you can use the context menu to add files to it, instead of using the plus sign at the bottom.
Also maybe after creating a new file, the sidebar entry needs to be opened in rename mode so that the user can type in the desired name.