Files

Merge lp:~elementary-apps/pantheon-files/file-location-shuffling into lp:~elementary-apps/pantheon-files/trunk

  1. file-location-shuffling
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Cody Garver
Approved revision: 2427
Merged at revision: 2429
Proposed branch: lp:~elementary-apps/pantheon-files/file-location-shuffling
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 94 lines (+10/-5)
2 files modified
libwidgets/CMakeLists.txt (+0/-5)
src/CMakeLists.txt (+10/-0)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-files/file-location-shuffling
Reviewer Review Type Date Requested Status
Jeremy Wootten code Approve
Review via email: mp+313887@code.launchpad.net

Commit message

* Move ChooseAppDialog.vala to src/Dialogs
* Move MimeActions.vala to src/Utils
* Move BreadcrumbsEntry.vala, LocationBar.vala, TopMenu.vala to src/View/Widgets

Description of the change

This does what we have to do in order to get the last dialog into src/Dialogs

Turns out a bunch of stuff depends on MimeActions.vala which makes sense as a Util anyways :)

To post a comment you must log in.
Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

This is probably a good idea - except care must be taken that libwidgets (or libcore) contains all the code that is (or will be) required by filechooser module, bearing in mind that it may be desired to replace more widgets in the filechooser.

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

No regressions found

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libwidgets/CMakeLists.txt'
--- libwidgets/CMakeLists.txt 2016-12-23 20:19:18 +0000
+++ libwidgets/CMakeLists.txt 2016-12-27 18:22:00 +0000
@@ -29,7 +29,6 @@
29link_directories(${LIB_PATHS})29link_directories(${LIB_PATHS})
3030
31vala_precompile(VALA_C ${PKGNAME}31vala_precompile(VALA_C ${PKGNAME}
32 Dialogs/ChooseAppDialog.vala
33 Interfaces/LocatableInterface.vala32 Interfaces/LocatableInterface.vala
34 Interfaces/NavigatableInterface.vala33 Interfaces/NavigatableInterface.vala
35 Chrome/BasicLocationBar.vala34 Chrome/BasicLocationBar.vala
@@ -38,15 +37,11 @@
38 Chrome/BreadcrumbIconList.vala37 Chrome/BreadcrumbIconList.vala
39 Chrome/ButtonWithMenu.vala38 Chrome/ButtonWithMenu.vala
40 Chrome/ImgEventBox.vala39 Chrome/ImgEventBox.vala
41 View/LocationBar.vala
42 View/BreadcrumbsEntry.vala
43 View/SearchResults.vala40 View/SearchResults.vala
44 Interfaces/SearchableInterface.vala41 Interfaces/SearchableInterface.vala
45 Chrome/TopMenu.vala
46 Chrome/ViewSwitcher.vala42 Chrome/ViewSwitcher.vala
47 Animations/Animations.vala43 Animations/Animations.vala
48 Resources.vala44 Resources.vala
49 MimeActions.vala
50 Welcome.vala45 Welcome.vala
51PACKAGES46PACKAGES
52 gtk+-3.047 gtk+-3.0
5348
=== removed directory 'libwidgets/Dialogs'
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2016-12-27 16:46:32 +0000
+++ src/CMakeLists.txt 2016-12-27 18:22:00 +0000
@@ -80,8 +80,10 @@
80 QuicklistHandler.vala80 QuicklistHandler.vala
81 ClipboardManager.vala81 ClipboardManager.vala
82 Dialogs/AbstractPropertiesDialog.vala82 Dialogs/AbstractPropertiesDialog.vala
83 Dialogs/ChooseAppDialog.vala
83 Dialogs/PropertiesWindow.vala84 Dialogs/PropertiesWindow.vala
84 Dialogs/VolumePropertiesWindow.vala85 Dialogs/VolumePropertiesWindow.vala
86 Utils/MimeActions.vala
85 Utils/Permissions.vala87 Utils/Permissions.vala
86 View/ColumnView.vala88 View/ColumnView.vala
87 View/AbstractTreeView.vala89 View/AbstractTreeView.vala
@@ -97,13 +99,16 @@
97 View/Slot.vala99 View/Slot.vala
98 View/Miller.vala100 View/Miller.vala
99 View/Widgets/AbstractEditableLabel.vala101 View/Widgets/AbstractEditableLabel.vala
102 View/Widgets/BreadcrumbsEntry.vala
100 View/Widgets/DiskRenderer.vala103 View/Widgets/DiskRenderer.vala
101 View/Widgets/Label.vala104 View/Widgets/Label.vala
105 View/Widgets/LocationBar.vala
102 View/Widgets/MultiLineEditableLabel.vala106 View/Widgets/MultiLineEditableLabel.vala
103 View/Widgets/OverlayBar.vala107 View/Widgets/OverlayBar.vala
104 View/Widgets/PermissionButton.vala108 View/Widgets/PermissionButton.vala
105 View/Widgets/ProgressInfoWidget.vala109 View/Widgets/ProgressInfoWidget.vala
106 View/Widgets/SingleLineEditableLabel.vala110 View/Widgets/SingleLineEditableLabel.vala
111 View/Widgets/TopMenu.vala
107112
108 PACKAGES113 PACKAGES
109 gtk+-3.0114 gtk+-3.0
@@ -139,8 +144,10 @@
139 TextRenderer.vala144 TextRenderer.vala
140 ClipboardManager.vala145 ClipboardManager.vala
141 Dialogs/AbstractPropertiesDialog.vala146 Dialogs/AbstractPropertiesDialog.vala
147 Dialogs/ChooseAppDialog.vala
142 Dialogs/PropertiesWindow.vala148 Dialogs/PropertiesWindow.vala
143 Dialogs/VolumePropertiesWindow.vala149 Dialogs/VolumePropertiesWindow.vala
150 Utils/MimeActions.vala
144 Utils/Permissions.vala151 Utils/Permissions.vala
145 View/ColumnView.vala152 View/ColumnView.vala
146 View/AbstractTreeView.vala153 View/AbstractTreeView.vala
@@ -156,13 +163,16 @@
156 View/Slot.vala163 View/Slot.vala
157 View/Miller.vala164 View/Miller.vala
158 View/Widgets/AbstractEditableLabel.vala165 View/Widgets/AbstractEditableLabel.vala
166 View/Widgets/BreadcrumbsEntry.vala
159 View/Widgets/DiskRenderer.vala167 View/Widgets/DiskRenderer.vala
160 View/Widgets/Label.vala168 View/Widgets/Label.vala
169 View/Widgets/LocationBar.vala
161 View/Widgets/MultiLineEditableLabel.vala170 View/Widgets/MultiLineEditableLabel.vala
162 View/Widgets/OverlayBar.vala171 View/Widgets/OverlayBar.vala
163 View/Widgets/PermissionButton.vala172 View/Widgets/PermissionButton.vala
164 View/Widgets/ProgressInfoWidget.vala173 View/Widgets/ProgressInfoWidget.vala
165 View/Widgets/SingleLineEditableLabel.vala174 View/Widgets/SingleLineEditableLabel.vala
175 View/Widgets/TopMenu.vala
166176
167 PACKAGES177 PACKAGES
168 gtk+-3.0178 gtk+-3.0
169179
=== renamed file 'libwidgets/Dialogs/ChooseAppDialog.vala' => 'src/Dialogs/ChooseAppDialog.vala'
=== renamed file 'libwidgets/MimeActions.vala' => 'src/Utils/MimeActions.vala'
=== renamed file 'libwidgets/View/BreadcrumbsEntry.vala' => 'src/View/Widgets/BreadcrumbsEntry.vala'
=== renamed file 'libwidgets/View/LocationBar.vala' => 'src/View/Widgets/LocationBar.vala'
=== renamed file 'libwidgets/Chrome/TopMenu.vala' => 'src/View/Widgets/TopMenu.vala'

Subscribers

People subscribed via source and target branches