Audience

Merge lp:~philip.scott/audience/widget-ordering into lp:~audience-members/audience/trunk

  1. widget-ordering
  2. Merge into trunk
Proposed by Felipe Escoto
Status: Merged
Approved by: Danielle Foré
Approved revision: 691
Merged at revision: 691
Proposed branch: lp:~philip.scott/audience/widget-ordering
Merge into: lp:~audience-members/audience/trunk
Diff against target: 55 lines (+15/-10)
1 file modified
src/CMakeLists.txt (+15/-10)
To merge this branch: bzr merge lp:~philip.scott/audience/widget-ordering
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+309900@code.launchpad.net

Commit message

Re-order widget files

Description of the change

So many new files! This branch should sort them out before it gets too crazy :)

To post a comment you must log in.
lp:~philip.scott/audience/widget-ordering updated
691. By Felipe Escoto

Ordered widget files

Revision history for this message
Danielle Foré (danrabbit) wrote :

Builds fine, looks sane :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2016-09-26 20:52:11 +0000
3+++ src/CMakeLists.txt 2016-11-03 00:00:40 +0000
4@@ -49,23 +49,28 @@
5 Utils.vala
6 DiskManager.vala
7 Window.vala
8- Widgets/BottomBar.vala
9- Widgets/SettingsPopover.vala
10- Widgets/PreviewPopover.vala
11- Widgets/TimeWidget.vala
12- Widgets/Playlist.vala
13- Widgets/PlaylistPopover.vala
14+
15 Widgets/WelcomePage.vala
16- Widgets/PlayerPage.vala
17- Widgets/LibraryPage.vala
18- Widgets/LibraryItem.vala
19 Widgets/NavigationButton.vala
20- Widgets/EpisodesPage.vala
21 Widgets/Toast.vala
22+
23+ Widgets/Player/BottomBar.vala
24+ Widgets/Player/SettingsPopover.vala
25+ Widgets/Player/PreviewPopover.vala
26+ Widgets/Player/TimeWidget.vala
27+ Widgets/Player/Playlist.vala
28+ Widgets/Player/PlaylistPopover.vala
29+ Widgets/Player/PlayerPage.vala
30+
31+ Widgets/Library/LibraryPage.vala
32+ Widgets/Library/LibraryItem.vala
33+ Widgets/Library/EpisodesPage.vala
34+
35 Services/Inhibitor.vala
36 Services/DirictoryMonitoring.vala
37 Services/LibraryManager.vala
38 Services/Thubnailer.vala
39+
40 Objects/Video.vala
41 PACKAGES
42 ${VALA_DEPS}
43
44=== added directory 'src/Widgets/Library'
45=== renamed file 'src/Widgets/EpisodesPage.vala' => 'src/Widgets/Library/EpisodesPage.vala'
46=== renamed file 'src/Widgets/LibraryItem.vala' => 'src/Widgets/Library/LibraryItem.vala'
47=== renamed file 'src/Widgets/LibraryPage.vala' => 'src/Widgets/Library/LibraryPage.vala'
48=== added directory 'src/Widgets/Player'
49=== renamed file 'src/Widgets/BottomBar.vala' => 'src/Widgets/Player/BottomBar.vala'
50=== renamed file 'src/Widgets/PlayerPage.vala' => 'src/Widgets/Player/PlayerPage.vala'
51=== renamed file 'src/Widgets/Playlist.vala' => 'src/Widgets/Player/Playlist.vala'
52=== renamed file 'src/Widgets/PlaylistPopover.vala' => 'src/Widgets/Player/PlaylistPopover.vala'
53=== renamed file 'src/Widgets/PreviewPopover.vala' => 'src/Widgets/Player/PreviewPopover.vala'
54=== renamed file 'src/Widgets/SettingsPopover.vala' => 'src/Widgets/Player/SettingsPopover.vala'
55=== renamed file 'src/Widgets/TimeWidget.vala' => 'src/Widgets/Player/TimeWidget.vala'

Subscribers

People subscribed via source and target branches