Added config options for call and sms ringtones

diff --git a/README b/README
index 3256c08f840dbb3a62bda574420c143c88fc31aa..b725eb86ab0007fbf20291f8af243e569c6e370d 100644 (file)
--- a/README
+++ b/README
@@ -195,9 +195,11 @@ using vala-dbus-binding-tool:
    "SYNC" button that will sync it if pressed
  + stacked notifier, with stacked modal dialogs
    (notify sms received during phone ringing during alarm)
    "SYNC" button that will sync it if pressed
  + stacked notifier, with stacked modal dialogs
    (notify sms received during phone ringing during alarm)

-    - aux acks the topmost dialog
+    + aux acks the topmost dialog

     + custom ringtone per every notifier (stops ringtone of modifier below,
       saving the time offset of playing so it can be reloaded and resumed)
     + custom ringtone per every notifier (stops ringtone of modifier below,
       saving the time offset of playing so it can be reloaded and resumed)

+    - notify sms
+    - notify incoming call

  - log
     - flash aux when there are unacknowledged log entries
     - write data to disk as log happens (to have at least partial logs if power
  - log
     - flash aux when there are unacknowledged log entries
     - write data to disk as log happens (to have at least partial logs if power

diff --git a/src/config.vala b/src/config.vala
index c2a0e56e4a15913d7aac4b62dd6acd7162337eb8..92f8f93cb919da40afe45b291979a1ee8b15134f 100644 (file)
--- a/src/config.vala
+++ b/src/config.vala
@@ -152,6 +152,20 @@ public class Config
         set { _ringtone_alarm = set_string("ringtone_alarm", value); }
     }
 
         set { _ringtone_alarm = set_string("ringtone_alarm", value); }
     }
 

+    private string _ringtone_call;
+    public string ringtone_call
+    {
+        get { return _ringtone_call; }
+        set { _ringtone_call = set_string("ringtone_call", value); }
+    }
+
+    private string _ringtone_sms;
+    public string ringtone_sms
+    {
+        get { return _ringtone_sms; }
+        set { _ringtone_sms = set_string("ringtone_sms", value); }
+    }
+

     public int backlight_max
     {
         get;
     public int backlight_max
     {
         get;


@@ -194,6 +208,8 @@ public class Config
         _power_button_keycode = get_int("power_button_keycode");
         _aux_button_keycode = get_int("aux_button_keycode");
         _ringtone_alarm = get_string("ringtone_alarm");
         _power_button_keycode = get_int("power_button_keycode");
         _aux_button_keycode = get_int("aux_button_keycode");
         _ringtone_alarm = get_string("ringtone_alarm");

+        _ringtone_call = get_string("ringtone_call");
+        _ringtone_sms = get_string("ringtone_sms");

     }
 
     public Config()
     }
 
     public Config()


@@ -219,6 +235,8 @@ public class Config
         power_button_keycode = 124;
         aux_button_keycode = 177;
         ringtone_alarm = "file:///usr/share/sounds/yue-fso/lec1.ogg";
         power_button_keycode = 124;
         aux_button_keycode = 177;
         ringtone_alarm = "file:///usr/share/sounds/yue-fso/lec1.ogg";

+        ringtone_call = "file:///usr/share/sounds/yue-fso/jmf1.ogg";
+        ringtone_sms = "file:///usr/share/sounds/yue-fso/nothing4.ogg";

 
         // Read config
         if (lua.do_file(homedir + "/config"))
 
         // Read config
         if (lua.do_file(homedir + "/config"))