From 233037a709c7843cc63e49b90da961da04bed545 Mon Sep 17 00:00:00 2001 From: Brent Hull Date: Sat, 17 Nov 2012 20:09:06 -0500 Subject: Don't set the toolbar type in the ui file so user's choice will be applied automatically (no need to load the preference from MateConf) --- baobab/data/baobab-main-window.ui | 1 - 1 file changed, 1 deletion(-) (limited to 'baobab/data') diff --git a/baobab/data/baobab-main-window.ui b/baobab/data/baobab-main-window.ui index 55f6215c..85298f4a 100644 --- a/baobab/data/baobab-main-window.ui +++ b/baobab/data/baobab-main-window.ui @@ -220,7 +220,6 @@ True GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_ICONS True False -- cgit v1.2.1 From 507090e64e66315d6dad960791489a477dced017 Mon Sep 17 00:00:00 2001 From: Brent Hull Date: Sat, 17 Nov 2012 22:13:08 -0500 Subject: Port disk-usage-analyzer to Gsettings (based on GNOME patch) --- baobab/data/Makefile.am | 19 ++---- baobab/data/baobab-main-window.ui | 14 ++--- baobab/data/baobab.schemas.in | 70 ---------------------- .../org.mate.disk-usage-analyzer.gschema.xml.in | 40 +++++++++++++ 4 files changed, 51 insertions(+), 92 deletions(-) delete mode 100644 baobab/data/baobab.schemas.in create mode 100644 baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in (limited to 'baobab/data') diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am index 66bbd2b9..02dda3b3 100644 --- a/baobab/data/Makefile.am +++ b/baobab/data/Makefile.am @@ -11,21 +11,14 @@ $(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) -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) \ diff --git a/baobab/data/baobab-main-window.ui b/baobab/data/baobab-main-window.ui index 85298f4a..e544c430 100644 --- a/baobab/data/baobab-main-window.ui +++ b/baobab/data/baobab-main-window.ui @@ -62,10 +62,10 @@ - + gtk-quit - esci1 - + menuquit + @@ -106,7 +106,6 @@ True view_tb _Toolbar - @@ -114,7 +113,6 @@ True view_sb St_atusbar - @@ -160,7 +158,7 @@ - + @@ -197,7 +195,6 @@ GDK_GRAVITY_NORTH_WEST True False - @@ -233,8 +230,7 @@ True True - - + 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 @@ - - - - /schemas/apps/baobab/ui/toolbar_visible - /apps/baobab/ui/toolbar_visible - baobab - bool - TRUE - - Toolbar is Visible - Whether the toolbar should be visible in main window. - - - - - /schemas/apps/baobab/ui/statusbar_visible - /apps/baobab/ui/statusbar_visible - baobab - bool - FALSE - - Status Bar is Visible - Whether the status bar at the bottom of main window - should be visible. - - - - - /schemas/apps/baobab/properties/enable_home_monitor - /apps/baobab/properties/enable_home_monitor - baobab - bool - FALSE - - Enable monitoring of home directory - Whether any change to the home directory should - be monitored. - - - - - - /schemas/apps/baobab/properties/skip_scan_uri_list - /apps/baobab/properties/skip_scan_uri_list - baobab - list - string - [] - - Excluded partitions URIs - A list of URIs for partitions to be excluded from scanning. - - - - - /schemas/apps/baobab/ui/baobab_subfoldertips_visible - /apps/baobab/ui/baobab_subfoldertips_visible - baobab - bool - TRUE - - Subfolders tooltips visible - Whether the subfolder tooltips of the selected folder - are drawn. - - - - - - 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 @@ + + + + + + + + false + <_summary>Monitor Home + <_description>Whether any change to the home directory should be monitored. + + + [] + <_summary>Excluded partitions URIs + <_description>A list of URIs for partitions to be excluded from scanning. + + + + + true + <_summary>Toolbar is Visible + <_description>Whether the toolbar should be visible in main window. + + + false + <_summary>Statusbar is Visible + <_description>Whether the status bar at the bottom of main window should be visible. + + + true + <_summary>Subfolder tips visible + <_description>Whether the subfolder tooltips of the selected folder are drawn. + + + 'rings' + <_summary>Active Chart + <_description>Which type of chart should be displayed. + + + -- cgit v1.2.1 From 6624ef6132129949a9c5b8da2c5762bb2b7ba14d Mon Sep 17 00:00:00 2001 From: Brent Hull Date: Sun, 18 Nov 2012 14:09:18 -0500 Subject: Fix some issues with Makefile.am after Gsettings conversion --- baobab/data/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'baobab/data') diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am index 02dda3b3..3ae71bd6 100644 --- a/baobab/data/Makefile.am +++ b/baobab/data/Makefile.am @@ -13,6 +13,7 @@ $(baobabapp_in_files): $(baobabapp_in_files:.desktop.in=.desktop.in.in) gsettingsschema_in_files = org.mate.disk-usage-analyzer.gschema.xml.in gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) +.PRECIOUS: $(gsettings_SCHEMAS) @INTLTOOL_XML_NOMERGE_RULE@ @@ -22,11 +23,11 @@ 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) -- cgit v1.2.1