Merge lp:~elementary-pantheon/switchboard-plug-keyboard/organize-source into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Corentin Noël
Approved revision: 505
Merged at revision: 505
Proposed branch: lp:~elementary-pantheon/switchboard-plug-keyboard/organize-source
Merge into: lp:~elementary-pantheon/switchboard-plug-keyboard/trunk
Diff against target: 92 lines (+28/-24)
1 file modified
src/CMakeLists.txt (+28/-24)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-keyboard/organize-source
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+317040@code.launchpad.net

Commit message

* Add Dialogs, Views, and Widgets folders
* Move relevant files to these new directories
* Rename page.vala to AbstractPage.vala
* Rename add_layout.vala to AddLayoutPopover.vala
* CamelCase file names
* Update CMake

Description of the change

Trying to re-organize these files in the way you would expect for elementary code. Mainly this adds folders for Views, Dialogs, Widgets and moves relevant source files into these categories.

Also renamed a couple of files to make it more clear what they are

To post a comment you must log in.
505. By Danielle Foré

re-organize source files

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed directory 'src/Pages/Behaviour' => 'src/Behavior'
2=== renamed file 'src/Pages/Behaviour/settings.vala' => 'src/Behavior/Settings.vala'
3=== modified file 'src/CMakeLists.txt'
4--- src/CMakeLists.txt 2016-06-28 00:00:35 +0000
5+++ src/CMakeLists.txt 2017-02-12 02:46:30 +0000
6@@ -13,30 +13,34 @@
7 include (ValaPrecompile)
8 # Add all your vala files and required packages to the List below to include them in the build
9 vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
10- keyboard.vala
11- page.vala
12-
13- Pages/behaviour.vala
14- Pages/Behaviour/settings.vala
15-
16- Pages/layout.vala
17- Pages/Layout/display.vala
18- Pages/Layout/add_layout.vala
19- Pages/Layout/handler.vala
20- Pages/Layout/settings.vala
21- Pages/Layout/xkb_modifier.vala
22-
23- Pages/shortcuts.vala
24- Pages/Shortcuts/settings.vala
25- Pages/Shortcuts/tree.vala
26- Pages/Shortcuts/display.vala
27- Pages/Shortcuts/shortcut.vala
28- Pages/Shortcuts/list.vala
29- Pages/Shortcuts/section_switcher.vala
30- Pages/Shortcuts/custom_tree.vala
31- Pages/Shortcuts/custom_shortcut_settings.vala
32- Pages/Shortcuts/conflict_dialog.vala
33- Pages/Shortcuts/display_tree.vala
34+ Keyboard.vala
35+
36+ Behavior/Settings.vala
37+
38+ Dialogs/ConflictDialog.vala
39+
40+ Layout/Handler.vala
41+ Layout/Settings.vala
42+ Layout/XkbModifier.vala
43+
44+ Shortcuts/CustomShortcutSettings.vala
45+ Shortcuts/List.vala
46+ Shortcuts/Settings.vala
47+ Shortcuts/Shortcut.vala
48+
49+ Views/AbstractPage.vala
50+ Views/Behavior.vala
51+ Views/Layout.vala
52+ Views/Shortcuts.vala
53+
54+ Widgets/Layout/AddLayoutPopover.vala
55+ Widgets/Layout/Display.vala
56+
57+ Widgets/Shortcuts/CustomTree.vala
58+ Widgets/Shortcuts/Display.vala
59+ Widgets/Shortcuts/DisplayTree.vala
60+ Widgets/Shortcuts/SectionSwitcher.vala
61+ Widgets/Shortcuts/Tree.vala
62
63 ${CMAKE_CURRENT_BINARY_DIR}/config.vala
64 PACKAGES
65
66=== added directory 'src/Dialogs'
67=== renamed file 'src/Pages/Shortcuts/conflict_dialog.vala' => 'src/Dialogs/ConflictDialog.vala'
68=== renamed file 'src/keyboard.vala' => 'src/Keyboard.vala'
69=== renamed directory 'src/Pages/Layout' => 'src/Layout'
70=== renamed file 'src/Pages/Layout/handler.vala' => 'src/Layout/Handler.vala'
71=== renamed file 'src/Pages/Layout/settings.vala' => 'src/Layout/Settings.vala'
72=== renamed file 'src/Pages/Layout/xkb_modifier.vala' => 'src/Layout/XkbModifier.vala'
73=== renamed directory 'src/Pages/Shortcuts' => 'src/Shortcuts'
74=== renamed file 'src/Pages/Shortcuts/custom_shortcut_settings.vala' => 'src/Shortcuts/CustomShortcutSettings.vala'
75=== renamed file 'src/Pages/Shortcuts/list.vala' => 'src/Shortcuts/List.vala'
76=== renamed file 'src/Pages/Shortcuts/settings.vala' => 'src/Shortcuts/Settings.vala'
77=== renamed file 'src/Pages/Shortcuts/shortcut.vala' => 'src/Shortcuts/Shortcut.vala'
78=== renamed directory 'src/Pages' => 'src/Views'
79=== renamed file 'src/page.vala' => 'src/Views/AbstractPage.vala'
80=== renamed file 'src/Pages/behaviour.vala' => 'src/Views/Behavior.vala'
81=== renamed file 'src/Pages/layout.vala' => 'src/Views/Layout.vala'
82=== renamed file 'src/Pages/shortcuts.vala' => 'src/Views/Shortcuts.vala'
83=== added directory 'src/Widgets'
84=== added directory 'src/Widgets/Layout'
85=== renamed file 'src/Pages/Layout/add_layout.vala' => 'src/Widgets/Layout/AddLayoutPopover.vala'
86=== renamed file 'src/Pages/Layout/display.vala' => 'src/Widgets/Layout/Display.vala'
87=== added directory 'src/Widgets/Shortcuts'
88=== renamed file 'src/Pages/Shortcuts/custom_tree.vala' => 'src/Widgets/Shortcuts/CustomTree.vala'
89=== renamed file 'src/Pages/Shortcuts/display.vala' => 'src/Widgets/Shortcuts/Display.vala'
90=== renamed file 'src/Pages/Shortcuts/display_tree.vala' => 'src/Widgets/Shortcuts/DisplayTree.vala'
91=== renamed file 'src/Pages/Shortcuts/section_switcher.vala' => 'src/Widgets/Shortcuts/SectionSwitcher.vala'
92=== renamed file 'src/Pages/Shortcuts/tree.vala' => 'src/Widgets/Shortcuts/Tree.vala'

Subscribers

People subscribed via source and target branches