Merge branch 'v0.4' into testing

kozec · Nov 26, 2017 · 1a004c3 · 1a004c3
2 parents 0ae0333 + 70f82f0
commit 1a004c3
Show file tree

Hide file tree

Showing 65 changed files with 3,291 additions and 1,848 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,10 @@
 *.so
 *.patch
 !scc/*tester*
-*test*
+test*.py
 build/
 .atomignore
 commit*
 profiles
+.idea/
+out.svg
diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ Based on [Standalone Steam Controller Driver](https://github.com/ynsta/steamcont
 ##### Packages
 - Ubuntu (deb-based distros): in [OpenSUSE Build Service](http://software.opensuse.org/download.html?project=home%3Akozec&package=sc-controller).
 - Fedora, SUSE (rpm-based distros): in [OpenSUSE Build Service](http://software.opensuse.org/download.html?project=home%3Akozec&package=sc-controller).
+- Arch, Manjaro: in [AUR](https://aur.archlinux.org/packages/sc-controller-git/)
 - Solus: search for `sc-controller` in Software Center
 - Exherbo: in [hardware](https://git.exherbo.org/summer/packages/input/sc-controller)
 - Voidlinux: [template available](https://github.com/Vintodrimmer/void-packages/blob/sc-controller-branch/srcpkgs/sc-controller/template)

diff --git a/default_menus/.games.menu b/default_menus/.games.menu
@@ -1,3 +1,6 @@
 [{
+    "separator": true,
+    "name": "Games"
+}, {
     "generator" : "games"
 }]
diff --git a/default_menus/.windowlist.menu b/default_menus/.windowlist.menu
@@ -1,3 +1,6 @@
 [{
+    "separator": true,
+    "name": "Switch to"
+}, {
     "generator" : "windowlist"
 }]
diff --git a/default_menus/Profiles.menu b/default_menus/Profiles.menu
@@ -1,3 +1,6 @@
 [{
+    "separator": true,
+    "name": "All profiles"
+}, {
     "generator" : "profiles"
 }]
diff --git a/glade/app.glade b/glade/app.glade
@@ -246,15 +246,6 @@
         <signal name="toggled" handler="on_mnuEmulationEnabled_toggled" swapped="no"/>
       </object>
     </child>
-    <child>
-      <object class="GtkMenuItem" id="mnuRegisterController">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Register New Controller</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="on_mnuRegisterController_activate" swapped="no"/>
-      </object>
-    </child>
     <child>
       <object class="GtkMenuItem" id="mnuGlobalSettings">
         <property name="visible">True</property>
@@ -609,50 +600,50 @@
                   <object class="GtkFixed" id="mainArea">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <signal name="size-allocate" handler="on_c_size_allocate" swapped="no"/>
                     <child>
                       <object class="GtkBox" id="vbC">
+                        <property name="width_request">100</property>
+                        <property name="height_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkLabel" id="label9">
+                          <object class="GtkButton" id="btC">
+                            <property name="width_request">150</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="margin_left">20</property>
+                            <property name="margin_right">20</property>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="expand">False</property>
                             <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="btC">
-                            <property name="width_request">170</property>
+                          <object class="GtkButton" id="btCPAD">
+                            <property name="height_request">40</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
+                            <property name="margin_top">5</property>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkLabel" id="label10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
                       </object>
-                      <packing>
-                        <property name="x">10</property>
-                        <property name="y">150</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>