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

[Danielle Foré]

* 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

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

[lp:~elementary-pantheon/switchboard-plug-keyboard/organize-source]

505. By Danielle Foré on 2017-02-12

re-organize source files

=== renamed directory 'src/Pages/Behaviour' => 'src/Behavior'
=== renamed file 'src/Pages/Behaviour/settings.vala' => 'src/Behavior/Settings.vala'
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-06-28 00:00:35 +0000
+++ src/CMakeLists.txt	2017-02-12 02:46:30 +0000
@@ -13,30 +13,34 @@
 include (ValaPrecompile)
 # Add all your vala files and required packages to the List below to include them in the build
 vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
-    keyboard.vala
-    page.vala
-
-    Pages/behaviour.vala
-    Pages/Behaviour/settings.vala
-
-    Pages/layout.vala   
-    Pages/Layout/display.vala
-    Pages/Layout/add_layout.vala
-    Pages/Layout/handler.vala
-    Pages/Layout/settings.vala
-    Pages/Layout/xkb_modifier.vala
-    
-    Pages/shortcuts.vala 
-    Pages/Shortcuts/settings.vala
-    Pages/Shortcuts/tree.vala
-    Pages/Shortcuts/display.vala
-    Pages/Shortcuts/shortcut.vala
-    Pages/Shortcuts/list.vala
-    Pages/Shortcuts/section_switcher.vala
-    Pages/Shortcuts/custom_tree.vala
-    Pages/Shortcuts/custom_shortcut_settings.vala
-    Pages/Shortcuts/conflict_dialog.vala
-    Pages/Shortcuts/display_tree.vala
+    Keyboard.vala
+
+    Behavior/Settings.vala
+
+    Dialogs/ConflictDialog.vala
+
+    Layout/Handler.vala
+    Layout/Settings.vala
+    Layout/XkbModifier.vala
+
+    Shortcuts/CustomShortcutSettings.vala
+    Shortcuts/List.vala
+    Shortcuts/Settings.vala
+    Shortcuts/Shortcut.vala
+
+    Views/AbstractPage.vala
+    Views/Behavior.vala
+    Views/Layout.vala
+    Views/Shortcuts.vala
+
+    Widgets/Layout/AddLayoutPopover.vala
+    Widgets/Layout/Display.vala
+
+    Widgets/Shortcuts/CustomTree.vala
+    Widgets/Shortcuts/Display.vala
+    Widgets/Shortcuts/DisplayTree.vala
+    Widgets/Shortcuts/SectionSwitcher.vala
+    Widgets/Shortcuts/Tree.vala
 
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES

=== added directory 'src/Dialogs'
=== renamed file 'src/Pages/Shortcuts/conflict_dialog.vala' => 'src/Dialogs/ConflictDialog.vala'
=== renamed file 'src/keyboard.vala' => 'src/Keyboard.vala'
=== renamed directory 'src/Pages/Layout' => 'src/Layout'
=== renamed file 'src/Pages/Layout/handler.vala' => 'src/Layout/Handler.vala'
=== renamed file 'src/Pages/Layout/settings.vala' => 'src/Layout/Settings.vala'
=== renamed file 'src/Pages/Layout/xkb_modifier.vala' => 'src/Layout/XkbModifier.vala'
=== renamed directory 'src/Pages/Shortcuts' => 'src/Shortcuts'
=== renamed file 'src/Pages/Shortcuts/custom_shortcut_settings.vala' => 'src/Shortcuts/CustomShortcutSettings.vala'
=== renamed file 'src/Pages/Shortcuts/list.vala' => 'src/Shortcuts/List.vala'
=== renamed file 'src/Pages/Shortcuts/settings.vala' => 'src/Shortcuts/Settings.vala'
=== renamed file 'src/Pages/Shortcuts/shortcut.vala' => 'src/Shortcuts/Shortcut.vala'
=== renamed directory 'src/Pages' => 'src/Views'
=== renamed file 'src/page.vala' => 'src/Views/AbstractPage.vala'
=== renamed file 'src/Pages/behaviour.vala' => 'src/Views/Behavior.vala'
=== renamed file 'src/Pages/layout.vala' => 'src/Views/Layout.vala'
=== renamed file 'src/Pages/shortcuts.vala' => 'src/Views/Shortcuts.vala'
=== added directory 'src/Widgets'
=== added directory 'src/Widgets/Layout'
=== renamed file 'src/Pages/Layout/add_layout.vala' => 'src/Widgets/Layout/AddLayoutPopover.vala'
=== renamed file 'src/Pages/Layout/display.vala' => 'src/Widgets/Layout/Display.vala'
=== added directory 'src/Widgets/Shortcuts'
=== renamed file 'src/Pages/Shortcuts/custom_tree.vala' => 'src/Widgets/Shortcuts/CustomTree.vala'
=== renamed file 'src/Pages/Shortcuts/display.vala' => 'src/Widgets/Shortcuts/Display.vala'
=== renamed file 'src/Pages/Shortcuts/display_tree.vala' => 'src/Widgets/Shortcuts/DisplayTree.vala'
=== renamed file 'src/Pages/Shortcuts/section_switcher.vala' => 'src/Widgets/Shortcuts/SectionSwitcher.vala'
=== renamed file 'src/Pages/Shortcuts/tree.vala' => 'src/Widgets/Shortcuts/Tree.vala'