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
1=== modified file 'libwidgets/CMakeLists.txt'
2--- libwidgets/CMakeLists.txt 2016-12-23 20:19:18 +0000
3+++ libwidgets/CMakeLists.txt 2016-12-27 18:22:00 +0000
4@@ -29,7 +29,6 @@
5 link_directories(${LIB_PATHS})
6
7 vala_precompile(VALA_C ${PKGNAME}
8- Dialogs/ChooseAppDialog.vala
9 Interfaces/LocatableInterface.vala
10 Interfaces/NavigatableInterface.vala
11 Chrome/BasicLocationBar.vala
12@@ -38,15 +37,11 @@
13 Chrome/BreadcrumbIconList.vala
14 Chrome/ButtonWithMenu.vala
15 Chrome/ImgEventBox.vala
16- View/LocationBar.vala
17- View/BreadcrumbsEntry.vala
18 View/SearchResults.vala
19 Interfaces/SearchableInterface.vala
20- Chrome/TopMenu.vala
21 Chrome/ViewSwitcher.vala
22 Animations/Animations.vala
23 Resources.vala
24- MimeActions.vala
25 Welcome.vala
26 PACKAGES
27 gtk+-3.0
28
29=== removed directory 'libwidgets/Dialogs'
30=== modified file 'src/CMakeLists.txt'
31--- src/CMakeLists.txt 2016-12-27 16:46:32 +0000
32+++ src/CMakeLists.txt 2016-12-27 18:22:00 +0000
33@@ -80,8 +80,10 @@
34 QuicklistHandler.vala
35 ClipboardManager.vala
36 Dialogs/AbstractPropertiesDialog.vala
37+ Dialogs/ChooseAppDialog.vala
38 Dialogs/PropertiesWindow.vala
39 Dialogs/VolumePropertiesWindow.vala
40+ Utils/MimeActions.vala
41 Utils/Permissions.vala
42 View/ColumnView.vala
43 View/AbstractTreeView.vala
44@@ -97,13 +99,16 @@
45 View/Slot.vala
46 View/Miller.vala
47 View/Widgets/AbstractEditableLabel.vala
48+ View/Widgets/BreadcrumbsEntry.vala
49 View/Widgets/DiskRenderer.vala
50 View/Widgets/Label.vala
51+ View/Widgets/LocationBar.vala
52 View/Widgets/MultiLineEditableLabel.vala
53 View/Widgets/OverlayBar.vala
54 View/Widgets/PermissionButton.vala
55 View/Widgets/ProgressInfoWidget.vala
56 View/Widgets/SingleLineEditableLabel.vala
57+ View/Widgets/TopMenu.vala
58
59 PACKAGES
60 gtk+-3.0
61@@ -139,8 +144,10 @@
62 TextRenderer.vala
63 ClipboardManager.vala
64 Dialogs/AbstractPropertiesDialog.vala
65+ Dialogs/ChooseAppDialog.vala
66 Dialogs/PropertiesWindow.vala
67 Dialogs/VolumePropertiesWindow.vala
68+ Utils/MimeActions.vala
69 Utils/Permissions.vala
70 View/ColumnView.vala
71 View/AbstractTreeView.vala
72@@ -156,13 +163,16 @@
73 View/Slot.vala
74 View/Miller.vala
75 View/Widgets/AbstractEditableLabel.vala
76+ View/Widgets/BreadcrumbsEntry.vala
77 View/Widgets/DiskRenderer.vala
78 View/Widgets/Label.vala
79+ View/Widgets/LocationBar.vala
80 View/Widgets/MultiLineEditableLabel.vala
81 View/Widgets/OverlayBar.vala
82 View/Widgets/PermissionButton.vala
83 View/Widgets/ProgressInfoWidget.vala
84 View/Widgets/SingleLineEditableLabel.vala
85+ View/Widgets/TopMenu.vala
86
87 PACKAGES
88 gtk+-3.0
89
90=== renamed file 'libwidgets/Dialogs/ChooseAppDialog.vala' => 'src/Dialogs/ChooseAppDialog.vala'
91=== renamed file 'libwidgets/MimeActions.vala' => 'src/Utils/MimeActions.vala'
92=== renamed file 'libwidgets/View/BreadcrumbsEntry.vala' => 'src/View/Widgets/BreadcrumbsEntry.vala'
93=== renamed file 'libwidgets/View/LocationBar.vala' => 'src/View/Widgets/LocationBar.vala'
94=== renamed file 'libwidgets/Chrome/TopMenu.vala' => 'src/View/Widgets/TopMenu.vala'

Subscribers

People subscribed via source and target branches