From 33c1874fbb17ed83c6d24103eff09c83297e0c4d Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Tue, 18 Feb 2014 16:23:48 +0100
Subject: Allow to have multiple panel layouts

---
 data/Makefile.am                      |  6 ++--
 data/default.layout                   | 53 +++++++++++++++++++++++++++++++++++
 data/org.mate.panel.gschema.xml.in.in |  5 ++++
 data/panel-default-layout.mate        | 53 -----------------------------------
 4 files changed, 61 insertions(+), 56 deletions(-)
 create mode 100644 data/default.layout
 delete mode 100644 data/panel-default-layout.mate

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 7b7d3721..cca1600c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
-default_layoutdir   = $(datadir)/mate-panel
-default_layout_DATA = panel-default-layout.mate
+layoutdir   = $(datadir)/mate-panel/layouts
+layout_DATA = default.layout
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
@@ -26,7 +26,7 @@ convert_DATA = mate-panel.convert
 EXTRA_DIST = \
 	$(convert_DATA) \
 	$(panel_gschemas_in_in) \
-	panel-default-layout.mate
+	$(layout_DATA)
 
 CLEANFILES = \
 	$(panel_gschemas_in) \
diff --git a/data/default.layout b/data/default.layout
new file mode 100644
index 00000000..77923b42
--- /dev/null
+++ b/data/default.layout
@@ -0,0 +1,53 @@
+[Toplevel top]
+expand=true
+orientation=top
+size=24
+
+[Toplevel bottom]
+expand=true
+orientation=bottom
+size=24
+
+[Object menu-bar]
+object-type=menu-bar
+toplevel-id=top
+position=0
+locked=true
+
+[Object notification-area]
+object-type=applet
+applet-iid=NotificationAreaAppletFactory::NotificationArea
+toplevel-id=top
+position=10
+panel-right-stick=true
+locked=true
+
+[Object clock]
+object-type=applet
+applet-iid=ClockAppletFactory::ClockApplet
+toplevel-id=top
+position=0
+panel-right-stick=true
+locked=true
+
+[Object show-desktop]
+object-type=applet
+applet-iid=WnckletFactory::ShowDesktopApplet
+toplevel-id=bottom
+position=0
+locked=true
+
+[Object window-list]
+object-type=applet
+applet-iid=WnckletFactory::WindowListApplet
+toplevel-id=bottom
+position=20
+locked=true
+
+[Object workspace-switcher]
+object-type=applet
+applet-iid=WnckletFactory::WorkspaceSwitcherApplet
+toplevel-id=bottom
+position=0
+panel-right-stick=true
+locked=true
diff --git a/data/org.mate.panel.gschema.xml.in.in b/data/org.mate.panel.gschema.xml.in.in
index 53c32b86..ec613941 100644
--- a/data/org.mate.panel.gschema.xml.in.in
+++ b/data/org.mate.panel.gschema.xml.in.in
@@ -1,5 +1,10 @@
 <schemalist gettext-domain="@GETTEXT_PACKAGE@">
   <schema id="org.mate.panel" path="/org/mate/panel/general/">
+    <key name="default-layout" type="s">
+      <default>'default'</default>
+      <_summary>Default panel layout</_summary>
+      <_description>The default panels layout to use when panels are created or resetted.</_description>
+    </key>
     <key name="enable-program-list" type="b">
       <default>true</default>
       <_summary>Enable program list in "Run Application" dialog</_summary>
diff --git a/data/panel-default-layout.mate b/data/panel-default-layout.mate
deleted file mode 100644
index 77923b42..00000000
--- a/data/panel-default-layout.mate
+++ /dev/null
@@ -1,53 +0,0 @@
-[Toplevel top]
-expand=true
-orientation=top
-size=24
-
-[Toplevel bottom]
-expand=true
-orientation=bottom
-size=24
-
-[Object menu-bar]
-object-type=menu-bar
-toplevel-id=top
-position=0
-locked=true
-
-[Object notification-area]
-object-type=applet
-applet-iid=NotificationAreaAppletFactory::NotificationArea
-toplevel-id=top
-position=10
-panel-right-stick=true
-locked=true
-
-[Object clock]
-object-type=applet
-applet-iid=ClockAppletFactory::ClockApplet
-toplevel-id=top
-position=0
-panel-right-stick=true
-locked=true
-
-[Object show-desktop]
-object-type=applet
-applet-iid=WnckletFactory::ShowDesktopApplet
-toplevel-id=bottom
-position=0
-locked=true
-
-[Object window-list]
-object-type=applet
-applet-iid=WnckletFactory::WindowListApplet
-toplevel-id=bottom
-position=20
-locked=true
-
-[Object workspace-switcher]
-object-type=applet
-applet-iid=WnckletFactory::WorkspaceSwitcherApplet
-toplevel-id=bottom
-position=0
-panel-right-stick=true
-locked=true
-- 
cgit v1.2.1