Merge branch 'master' of github.com:mate-desktop/mate-utils

4 files changed, 55 insertions, 96 deletions

diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am
index 66bbd2b9..3ae71bd6 100644
--- a/baobab/data/Makefile.am
+++ b/baobab/data/Makefile.am
@@ -11,29 +11,23 @@ $(baobabapp_in_files): $(baobabapp_in_files:.desktop.in=.desktop.in.in)
 
 @INTLTOOL_DESKTOP_RULE@
 
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_in_files = baobab.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+gsettingsschema_in_files = org.mate.disk-usage-analyzer.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+.PRECIOUS: $(gsettings_SCHEMAS)
 
-man_MANS = mate-disk-usage-analyzer.1
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
 
-if MATECONF_SCHEMAS_INSTALL
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-		MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schemas_DATA) ; \
-	fi
-else
-install-data-local:
-endif
+man_MANS = mate-disk-usage-analyzer.1
 
 EXTRA_DIST = \
 	$(ui_DATA) \
-	mate-disk-usage-analyzer.desktop.desktop.in.in \
-	$(schemas_in_files) \
+	mate-disk-usage-analyzer.desktop.in.in \
+	$(gsettingsschema_in_files) \
 	$(man_MANS)
 
 CLEANFILES = \
 	$(baobabapp_in_files) \
 	$(baobabapp_DATA) \
-	$(schemas_DATA)
+	$(gsettings_SCHEMAS)
diff --git a/baobab/data/baobab-main-window.ui b/baobab/data/baobab-main-window.ui
index 55f6215c..e544c430 100644
--- a/baobab/data/baobab-main-window.ui
+++ b/baobab/data/baobab-main-window.ui
@@ -62,10 +62,10 @@
           <accelerator key="R" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
-          <object class="GtkAction" id="esci1">
+          <object class="GtkAction" id="menuquit">
             <property name="stock_id">gtk-quit</property>
-            <property name="name">esci1</property>
-            <signal handler="on_esci1_activate" last_modification_time="Tue, 05 Jul 2005 08:47:26 GMT" name="activate"/>
+            <property name="name">menuquit</property>
+            <signal handler="on_quit_activate" last_modification_time="Tue, 05 Jul 2005 08:47:26 GMT" name="activate"/>
           </object>
         </child>
         <child>
@@ -106,7 +106,6 @@
             <property name="active">True</property>
             <property name="name">view_tb</property>
             <property name="label" translatable="yes">_Toolbar</property>
-            <signal handler="on_view_tb_activate" last_modification_time="Wed, 19 Apr 2006 12:10:25 GMT" name="activate"/>
           </object>
         </child>
         <child>
@@ -114,7 +113,6 @@
             <property name="active">True</property>
             <property name="name">view_sb</property>
             <property name="label" translatable="yes">St_atusbar</property>
-            <signal handler="on_view_sb_activate" last_modification_time="Wed, 19 Apr 2006 12:45:08 GMT" name="activate"/>
           </object>
         </child>
         <child>
@@ -160,7 +158,7 @@
           <menuitem action="menustop"/>
           <menuitem action="menurescan"/>
           <separator/>
-          <menuitem action="esci1"/>
+          <menuitem action="menuquit"/>
         </menu>
         <menu action="edit1">
           <menuitem action="expand_all"/>
@@ -197,7 +195,6 @@
     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
     <property name="focus_on_map">True</property>
     <property name="urgency_hint">False</property>
-    <signal handler="on_esci1_activate" last_modification_time="Sun, 31 Jul 2005 16:47:41 GMT" name="destroy"/>
     <signal handler="on_delete_activate" last_modification_time="Sun, 31 Jul 2005 16:53:49 GMT" name="delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox1">
@@ -220,7 +217,6 @@
           <object class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
             <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-            <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
             <property name="tooltips">True</property>
             <property name="show_arrow">False</property>
             <child>
@@ -234,8 +230,7 @@
                 <property name="visible_vertical">True</property>
                 <property name="is_important">True</property>
                 <accessibility>
-		
-	      </accessibility>
+                </accessibility>
                 <signal handler="on_tbscanhome_clicked" last_modification_time="Wed, 23 Aug 2006 12:30:03 GMT" name="clicked"/>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="a11y-tbscanhome1">
diff --git a/baobab/data/baobab.schemas.in b/baobab/data/baobab.schemas.in
deleted file mode 100644
index 10196119..00000000
--- a/baobab/data/baobab.schemas.in
+++ /dev/null
@@ -1,70 +0,0 @@
-<mateconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/baobab/ui/toolbar_visible</key>
-      <applyto>/apps/baobab/ui/toolbar_visible</applyto>
-      <owner>baobab</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-	<short>Toolbar is Visible</short>
-	<long>Whether the toolbar should be visible in main window.</long>
-      </locale>
-    </schema>
-    
-    <schema>
-      <key>/schemas/apps/baobab/ui/statusbar_visible</key>
-      <applyto>/apps/baobab/ui/statusbar_visible</applyto>
-      <owner>baobab</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-	<short>Status Bar is Visible</short>
-	<long>Whether the status bar at the bottom of main window
-	should be visible.</long>
-      </locale>
-    </schema>
-    
-    <schema>
-      <key>/schemas/apps/baobab/properties/enable_home_monitor</key>
-      <applyto>/apps/baobab/properties/enable_home_monitor</applyto>
-      <owner>baobab</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-	<short>Enable monitoring of home directory</short>
-	<long>Whether any change to the home directory should
-	be monitored.</long>
-      </locale>
-    </schema>
-    
-    
-    <schema>
-      <key>/schemas/apps/baobab/properties/skip_scan_uri_list</key>
-      <applyto>/apps/baobab/properties/skip_scan_uri_list</applyto>
-      <owner>baobab</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-	<short>Excluded partitions URIs</short>
-	<long>A list of URIs for partitions to be excluded from scanning.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/baobab/ui/baobab_subfoldertips_visible</key>
-      <applyto>/apps/baobab/ui/baobab_subfoldertips_visible</applyto>
-      <owner>baobab</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-	<short>Subfolders tooltips visible</short>
-	<long>Whether the subfolder tooltips of the selected folder
-	are drawn.</long>
-      </locale>
-    </schema>
-    
-  </schemalist>
-</mateconfschemafile>
-    
diff --git a/baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in b/baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
new file mode 100644
index 00000000..26801491
--- /dev/null
+++ b/baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
@@ -0,0 +1,40 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.disk-usage-analyzer" path="/org/mate/disk-usage-analyzer/">
+    <child name="preferences" schema="org.mate.disk-usage-analyzer.preferences"/>
+    <child name="ui" schema="org.mate.disk-usage-analyzer.ui"/>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.disk-usage-analyzer.preferences" path="/org/mate/disk-usage-analyzer/preferences/">
+    <key name="monitor-home" type="b">
+      <default>false</default>
+      <_summary>Monitor Home</_summary>
+      <_description>Whether any change to the home directory should be monitored.</_description>
+    </key>
+    <key name="excluded-uris" type="as">
+      <default>[]</default>
+      <_summary>Excluded partitions URIs</_summary>
+      <_description>A list of URIs for partitions to be excluded from scanning.</_description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.disk-usage-analyzer.ui" path="/org/mate/disk-usage-analyzer/ui/">
+    <key name="toolbar-visible" type="b">
+      <default>true</default>
+      <_summary>Toolbar is Visible</_summary>
+      <_description>Whether the toolbar should be visible in main window.</_description>
+    </key>
+    <key name="statusbar-visible" type="b">
+      <default>false</default>
+      <_summary>Statusbar is Visible</_summary>
+      <_description>Whether the status bar at the bottom of main window	should be visible.</_description>
+    </key>
+    <key name="subfoldertips-visible" type="b">
+      <default>true</default>
+      <_summary>Subfolder tips visible</_summary>
+      <_description>Whether the subfolder tooltips of the selected folder are drawn.</_description>
+    </key>
+    <key name="active-chart" type="s">
+      <default>'rings'</default>
+      <_summary>Active Chart</_summary>
+      <_description>Which type of chart should be displayed.</_description>
+    </key>
+  </schema>
+</schemalist>