Merge lp://staging/~jeremywootten/pantheon-files/cross-distro-fixes into lp://staging/~elementary-apps/pantheon-files/trunk
Proposed by
Jeremy Wootten
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~jeremywootten/pantheon-files/cross-distro-fixes |
| Merge into: | lp://staging/~elementary-apps/pantheon-files/trunk |
| Diff against target: |
5615 lines (+5396/-5) 25 files modified
data/icons/128x128/system-file-manager.svg (+289/-0) data/icons/16x16/system-file-manager.svg (+163/-0) data/icons/24x24/system-file-manager.svg (+415/-0) data/icons/32x32/system-file-manager.svg (+331/-0) data/icons/48x48/system-file-manager.svg (+285/-0) data/icons/64x64/system-file-manager.svg (+273/-0) data/icons/CMakeLists.txt (+6/-0) data/icons/CMakeLists.txt.~1~ (+6/-0) data/icons/CMakeLists.txt.~2~ (+2/-0) libcore/CMakeLists.txt (+42/-1) libcore/Resources/Icons/24/selection-add.svg (+95/-0) libcore/Resources/Icons/24/selection-checked.svg (+2738/-0) libcore/Resources/Icons/24/selection-remove.svg (+162/-0) libcore/Resources/Icons/process-completed-symbolic.svg (+33/-0) libcore/Resources/Icons/process-error-symbolic.svg (+33/-0) libcore/Resources/Icons/selection-add.svg (+76/-0) libcore/Resources/Icons/selection-checked.svg (+96/-0) libcore/Resources/Icons/selection-remove.svg (+210/-0) libcore/Resources/Icons/view-column-symbolic.svg (+78/-0) libcore/Resources/pantheon-files.gresource.xml (+11/-0) libcore/marlin-icon-info.c (+44/-0) libwidgets/Chrome/ViewSwitcher.vala (+1/-1) src/Application.vala (+1/-2) src/View/Window.vala (+5/-0) src/marlin-icon-renderer.c (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~jeremywootten/pantheon-files/cross-distro-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| elementary Apps team | Pending | ||
|
Review via email:
|
|||
Description of the change
Package various icons which are missing in non-elementary themes. As well as the application icon referred to in the linked bug, the selection-helper icons, the icon used for the Column View, and icons needed for the dropbox plugin are included.
Modify marlin-icon-info so that the the hicolor theme is searched as fallback to find the selection-helper icons.
To post a comment you must log in.
Revision history for this message
| Danielle Foré (danrabbit) wrote | # |
Unmerged revisions
- 2457. By Jeremy Wootten
-
Remove unused code
- 2456. By Jeremy Wootten
-
Include various icons
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
You should use GResource for this and not install these files to the file system