Merge branch 'dev' into dev-stable

Author: Hayao0819

channels/cinnamon/airootfs.any/etc/dconf/db/local.d/01-alter-cinnamon

@@ -19,7 +19,6 @@ desktop-effects-unmaximize-effect='scale'
 desktop-effects-unmaximize-time=100
 desktop-effects-unmaximize-transition='easeOutBounce'
 enabled-applets=['panel1:left:0:menu@cinnamon.org:0', 'panel1:left:1:grouped-window-list@cinnamon.org:2', 'panel1:right:0:systray@cinnamon.org:3', 'panel1:right:1:xapp-status@cinnamon.org:4', 'panel1:right:2:notifications@cinnamon.org:5', 'panel1:right:3:printers@cinnamon.org:6', 'panel1:right:4:removable-drives@cinnamon.org:7', 'panel1:right:5:keyboard@cinnamon.org:8', 'panel1:right:6:network@cinnamon.org:9', 'panel1:right:7:sound@cinnamon.org:10', 'panel1:right:8:power@cinnamon.org:11', 'panel1:right:9:calendar@cinnamon.org:12']
-favorite-apps=['chromium.desktop', 'nemo.desktop', 'org.gnome.Terminal.desktop', 'cinnamon-settings.desktop']
 hotcorner-layout=['expo:true:0', 'scale:false:0', ':true:0', 'desktop:true:0']
 next-applet-id=13
 panel-edit-mode=false

channels/cinnamon/airootfs.i686/etc/dconf/db/local.d/02-alter-cinnamon-favo-apps

@@ -0,0 +1,2 @@
+[org/cinnamon]
+favorite-apps=['firefox.desktop', 'nemo.desktop', 'org.gnome.Terminal.desktop', 'cinnamon-settings.desktop']

…/grouped-window-list@cinnamon.org/2.json …/grouped-window-list@cinnamon.org/2.jsonchannels/cinnamon/airootfs.any/etc/skel/.cinnamon/configs/grouped-window-list@cinnamon.org/2.json renamed to channels/cinnamon/airootfs.i686/etc/skel/.cinnamon/configs/grouped-window-list@cinnamon.org/2.json channels/cinnamon/airootfs.any/etc/skel/.cinnamon/configs/grouped-window-list@cinnamon.org/2.json renamed to channels/cinnamon/airootfs.i686/etc/skel/.cinnamon/configs/grouped-window-list@cinnamon.org/2.json

@@ -160,11 +160,14 @@
         "type": "generic",
         "default": [
             "firefox.desktop",
+            "nemo.desktop",
             "org.gnome.Terminal.desktop",
-            "nemo.desktop"
+            "thunderbird.desktop",
+            "gnome-system-monitor.desktop",
+            "cinnamon-settings.desktop"
         ],
         "value": [
-            "chromium.desktop",
+            "firefox.desktop",
             "nemo.desktop",
             "org.gnome.Terminal.desktop",
             "thunderbird.desktop",

channels/cinnamon/airootfs.x86_64/etc/dconf/db/local.d/02-alter-cinnamon-favo-apps

@@ -0,0 +1,2 @@
+[org/cinnamon]
+favorite-apps=['chromium.desktop', 'nemo.desktop', 'org.gnome.Terminal.desktop', 'cinnamon-settings.desktop']