Merge branch 'feature/upstream' into develop

1 files changed, 62 insertions, 0 deletions

diff --git a/src/config/ConfigurationInterfaces.vala b/src/config/ConfigurationInterfaces.vala
index a9636ef..c785144 100644
--- a/src/config/ConfigurationInterfaces.vala
+++ b/src/config/ConfigurationInterfaces.vala
@@ -22,6 +22,8 @@ public enum FuzzyPropertyState {
 public enum ConfigurableProperty {   
     AUTO_IMPORT_FROM_LIBRARY = 0,
     BG_COLOR_NAME,
+    TRANSPARENT_BACKGROUND_TYPE,
+    TRANSPARENT_BACKGROUND_COLOR,
     COMMIT_METADATA_TO_MASTERS,
     DESKTOP_BACKGROUND_FILE,
     DESKTOP_BACKGROUND_MODE,
@@ -100,6 +102,12 @@ public enum ConfigurableProperty {
                 
             case BG_COLOR_NAME:
                 return "BG_COLOR_NAME";
+
+            case TRANSPARENT_BACKGROUND_TYPE:
+                return "TRANSPARENT_BACKGROUND_TYPE";
+
+            case TRANSPARENT_BACKGROUND_COLOR:
+                return "TRANSPARENT_BACKGROUND_COLOR";
                 
             case COMMIT_METADATA_TO_MASTERS:
                 return "COMMIT_METADATA_TO_MASTERS";
@@ -347,6 +355,8 @@ public abstract class ConfigurationFacade : Object {
 
     public signal void auto_import_from_library_changed();
     public signal void bg_color_name_changed();
+    public signal void transparent_background_type_changed();
+    public signal void transparent_background_color_changed();
     public signal void commit_metadata_to_masters_changed();
     public signal void events_sort_ascending_changed();
     public signal void external_app_changed();
@@ -369,6 +379,14 @@ public abstract class ConfigurationFacade : Object {
             case ConfigurableProperty.BG_COLOR_NAME:
                 bg_color_name_changed();
             break;
+
+            case ConfigurableProperty.TRANSPARENT_BACKGROUND_TYPE:
+                transparent_background_type_changed();
+            break;
+
+            case ConfigurableProperty.TRANSPARENT_BACKGROUND_COLOR:
+                transparent_background_color_changed();
+            break;
             
             case ConfigurableProperty.COMMIT_METADATA_TO_MASTERS:
                 commit_metadata_to_masters_changed();
@@ -453,6 +471,50 @@ public abstract class ConfigurationFacade : Object {
     }
 
     //
+    // transparent background type
+    //
+    public virtual string get_transparent_background_type() {
+        try {
+            return get_engine().get_string_property(ConfigurableProperty.TRANSPARENT_BACKGROUND_TYPE);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return "checkered";
+        }
+    }
+
+    public virtual void set_transparent_background_type(string type) {
+        try {
+            get_engine().set_string_property(ConfigurableProperty.TRANSPARENT_BACKGROUND_TYPE, type);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    //
+    // transparent background color
+    //
+    public virtual string get_transparent_background_color() {
+        try {
+            return get_engine().get_string_property(ConfigurableProperty.TRANSPARENT_BACKGROUND_COLOR);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return "#444";
+        }
+    }
+
+    public virtual void set_transparent_background_color(string color_name) {
+        try {
+            get_engine().set_string_property(ConfigurableProperty.TRANSPARENT_BACKGROUND_COLOR, color_name);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    //
     // commit metadata to masters
     //
     public virtual bool get_commit_metadata_to_masters() {