aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arctica-greeter.vala16
-rw-r--r--src/background.vala2
-rw-r--r--src/main-window.vala8
-rw-r--r--src/menubar.vala18
-rw-r--r--src/settings-daemon.vala2
-rw-r--r--src/settings.vala2
-rw-r--r--src/user-list.vala6
7 files changed, 27 insertions, 27 deletions
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index eb827b8..09b3f74 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -237,7 +237,7 @@ public class ArcticaGreeter
/* Launch canberra */
Canberra.Context.create (out canberra_context);
- if (UGSettings.get_boolean (UGSettings.KEY_PLAY_READY_SOUND))
+ if (AGSettings.get_boolean (AGSettings.KEY_PLAY_READY_SOUND))
canberra_context.play (0,
Canberra.PROP_CANBERRA_XDG_THEME_NAME,
"ubuntu",
@@ -540,24 +540,24 @@ public class ArcticaGreeter
/* Set GTK+ settings */
debug ("Setting GTK+ settings");
var settings = Gtk.Settings.get_default ();
- var value = UGSettings.get_string (UGSettings.KEY_THEME_NAME);
+ var value = AGSettings.get_string (AGSettings.KEY_THEME_NAME);
if (value != "")
settings.set ("gtk-theme-name", value, null);
- value = UGSettings.get_string (UGSettings.KEY_ICON_THEME_NAME);
+ value = AGSettings.get_string (AGSettings.KEY_ICON_THEME_NAME);
if (value != "")
settings.set ("gtk-icon-theme-name", value, null);
- value = UGSettings.get_string (UGSettings.KEY_FONT_NAME);
+ value = AGSettings.get_string (AGSettings.KEY_FONT_NAME);
if (value != "")
settings.set ("gtk-font-name", value, null);
- var double_value = UGSettings.get_double (UGSettings.KEY_XFT_DPI);
+ var double_value = AGSettings.get_double (AGSettings.KEY_XFT_DPI);
if (double_value != 0.0)
settings.set ("gtk-xft-dpi", (int) (1024 * double_value), null);
- var boolean_value = UGSettings.get_boolean (UGSettings.KEY_XFT_ANTIALIAS);
+ var boolean_value = AGSettings.get_boolean (AGSettings.KEY_XFT_ANTIALIAS);
settings.set ("gtk-xft-antialias", boolean_value, null);
- value = UGSettings.get_string (UGSettings.KEY_XFT_HINTSTYLE);
+ value = AGSettings.get_string (AGSettings.KEY_XFT_HINTSTYLE);
if (value != "")
settings.set ("gtk-xft-hintstyle", value, null);
- value = UGSettings.get_string (UGSettings.KEY_XFT_RGBA);
+ value = AGSettings.get_string (AGSettings.KEY_XFT_RGBA);
if (value != "")
settings.set ("gtk-xft-rgba", value, null);
diff --git a/src/background.vala b/src/background.vala
index 2d60074..a0ad308 100644
--- a/src/background.vala
+++ b/src/background.vala
@@ -394,7 +394,7 @@ public class Background : Gtk.Fixed
GRID,
}
- public string default_background { get; set; default = UGSettings.get_string (UGSettings.KEY_BACKGROUND_COLOR); }
+ public string default_background { get; set; default = AGSettings.get_string (AGSettings.KEY_BACKGROUND_COLOR); }
public string? current_background { get; set; default = null; }
public bool draw_grid { get; set; default = true; }
public double alpha { get; private set; default = 1.0; }
diff --git a/src/main-window.vala b/src/main-window.vala
index 4026cff..74e2c5b 100644
--- a/src/main-window.vala
+++ b/src/main-window.vala
@@ -44,7 +44,7 @@ public class MainWindow : Gtk.Window
add_accel_group (accel_group);
var bg_color = Gdk.RGBA ();
- bg_color.parse (UGSettings.get_string (UGSettings.KEY_BACKGROUND_COLOR));
+ bg_color.parse (AGSettings.get_string (AGSettings.KEY_BACKGROUND_COLOR));
override_background_color (Gtk.StateFlags.NORMAL, bg_color);
get_accessible ().set_name (_("Login Screen"));
has_resize_grip = false;
@@ -52,9 +52,9 @@ public class MainWindow : Gtk.Window
realize ();
background = new Background (Gdk.cairo_create (get_window ()).get_target ());
- background.draw_grid = UGSettings.get_boolean (UGSettings.KEY_DRAW_GRID);
- background.default_background = UGSettings.get_string (UGSettings.KEY_BACKGROUND);
- background.set_logo (UGSettings.get_string (UGSettings.KEY_LOGO), UGSettings.get_string (UGSettings.KEY_BACKGROUND_LOGO));
+ background.draw_grid = AGSettings.get_boolean (AGSettings.KEY_DRAW_GRID);
+ background.default_background = AGSettings.get_string (AGSettings.KEY_BACKGROUND);
+ background.set_logo (AGSettings.get_string (AGSettings.KEY_LOGO), AGSettings.get_string (AGSettings.KEY_BACKGROUND_LOGO));
background.show ();
add (background);
ArcticaGreeter.add_style_class (background);
diff --git a/src/menubar.vala b/src/menubar.vala
index 8a507a4..303c3d9 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -106,7 +106,7 @@ public class MenuBar : Gtk.MenuBar
*/
public void set_keyboard_state ()
{
- onscreen_keyboard_item.set_active (UGSettings.get_boolean (UGSettings.KEY_ONSCREEN_KEYBOARD));
+ onscreen_keyboard_item.set_active (AGSettings.get_boolean (AGSettings.KEY_ONSCREEN_KEYBOARD));
}
private string default_theme_name;
@@ -122,7 +122,7 @@ public class MenuBar : Gtk.MenuBar
pack_direction = Gtk.PackDirection.RTL;
- if (UGSettings.get_boolean (UGSettings.KEY_SHOW_HOSTNAME))
+ if (AGSettings.get_boolean (AGSettings.KEY_SHOW_HOSTNAME))
{
var label = new Gtk.Label (Posix.utsname ().nodename);
label.show ();
@@ -227,13 +227,13 @@ public class MenuBar : Gtk.MenuBar
high_contrast_item.add_accelerator ("activate", accel_group, Gdk.Key.h, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE);
high_contrast_item.show ();
submenu.append (high_contrast_item);
- high_contrast_item.set_active (UGSettings.get_boolean (UGSettings.KEY_HIGH_CONTRAST));
+ high_contrast_item.set_active (AGSettings.get_boolean (AGSettings.KEY_HIGH_CONTRAST));
var item = new Gtk.CheckMenuItem.with_label (_("Screen Reader"));
item.toggled.connect (screen_reader_toggled_cb);
item.add_accelerator ("activate", accel_group, Gdk.Key.s, Gdk.ModifierType.SUPER_MASK | Gdk.ModifierType.MOD1_MASK, Gtk.AccelFlags.VISIBLE);
item.show ();
submenu.append (item);
- item.set_active (UGSettings.get_boolean (UGSettings.KEY_SCREEN_READER));
+ item.set_active (AGSettings.get_boolean (AGSettings.KEY_SCREEN_READER));
return a11y_item;
}
@@ -338,7 +338,7 @@ public class MenuBar : Gtk.MenuBar
debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
- var indicator_list = UGSettings.get_strv(UGSettings.KEY_INDICATORS);
+ var indicator_list = AGSettings.get_strv(AGSettings.KEY_INDICATORS);
var update_indicator_list = false;
for (var i = 0; i < indicator_list.length; i++)
@@ -351,7 +351,7 @@ public class MenuBar : Gtk.MenuBar
}
if (update_indicator_list)
- UGSettings.set_strv(UGSettings.KEY_INDICATORS, indicator_list);
+ AGSettings.set_strv(AGSettings.KEY_INDICATORS, indicator_list);
foreach (var indicator in indicator_list)
load_indicator(indicator);
@@ -379,7 +379,7 @@ public class MenuBar : Gtk.MenuBar
/* var settings = new Settings ("org.gnome.desktop.a11y.applications");*/
/*settings.set_boolean ("screen-keyboard-enabled", item.active);*/
- UGSettings.set_boolean (UGSettings.KEY_ONSCREEN_KEYBOARD, item.active);
+ AGSettings.set_boolean (AGSettings.KEY_ONSCREEN_KEYBOARD, item.active);
if (keyboard_window == null)
{
@@ -440,7 +440,7 @@ public class MenuBar : Gtk.MenuBar
else
settings.set ("gtk-theme-name", default_theme_name);
high_contrast = item.active;
- UGSettings.set_boolean (UGSettings.KEY_HIGH_CONTRAST, high_contrast);
+ AGSettings.set_boolean (AGSettings.KEY_HIGH_CONTRAST, high_contrast);
}
private void screen_reader_toggled_cb (Gtk.CheckMenuItem item)
@@ -451,7 +451,7 @@ public class MenuBar : Gtk.MenuBar
/*var settings = new Settings ("org.gnome.desktop.a11y.applications");*/
/*settings.set_boolean ("screen-reader-enabled", item.active);*/
- UGSettings.set_boolean (UGSettings.KEY_SCREEN_READER, item.active);
+ AGSettings.set_boolean (AGSettings.KEY_SCREEN_READER, item.active);
/* Hardcoded orca: */
if (item.active)
diff --git a/src/settings-daemon.vala b/src/settings-daemon.vala
index 56d4fae..162a032 100644
--- a/src/settings-daemon.vala
+++ b/src/settings-daemon.vala
@@ -194,7 +194,7 @@ public class ScreenSaverInterface : Object
idle_monitor.add_user_active_watch (() => set_active (false));
else
{
- var timeout = UGSettings.get_integer (UGSettings.KEY_IDLE_TIMEOUT);
+ var timeout = AGSettings.get_integer (AGSettings.KEY_IDLE_TIMEOUT);
if (timeout > 0)
idle_watch = idle_monitor.add_idle_watch (timeout * 1000, () => set_active (true));
}
diff --git a/src/settings.vala b/src/settings.vala
index 12722c5..29d4136 100644
--- a/src/settings.vala
+++ b/src/settings.vala
@@ -18,7 +18,7 @@
* Michael Terry <michael.terry@canonical.com>
*/
-public class UGSettings
+public class AGSettings
{
public static const string KEY_BACKGROUND = "background";
public static const string KEY_BACKGROUND_COLOR = "background-color";
diff --git a/src/user-list.vala b/src/user-list.vala
index 4b3bcc2..13b4bf9 100644
--- a/src/user-list.vala
+++ b/src/user-list.vala
@@ -80,7 +80,7 @@ public class UserList : GreeterList
return;
}
- var hidden_users = UGSettings.get_strv (UGSettings.KEY_HIDDEN_USERS);
+ var hidden_users = AGSettings.get_strv (AGSettings.KEY_HIDDEN_USERS);
if (!value)
{
foreach (var username in hidden_users)
@@ -582,7 +582,7 @@ public class UserList : GreeterList
private bool change_background_timeout_cb ()
{
string? new_background_file = null;
- if (menubar.high_contrast || !UGSettings.get_boolean (UGSettings.KEY_DRAW_USER_BACKGROUNDS))
+ if (menubar.high_contrast || !AGSettings.get_boolean (AGSettings.KEY_DRAW_USER_BACKGROUNDS))
new_background_file = null;
else if (selected_entry is UserPromptBox)
new_background_file = (selected_entry as UserPromptBox).background;
@@ -1038,7 +1038,7 @@ public class UserList : GreeterList
if (!show_hidden_users)
{
- var hidden_users = UGSettings.get_strv (UGSettings.KEY_HIDDEN_USERS);
+ var hidden_users = AGSettings.get_strv (AGSettings.KEY_HIDDEN_USERS);
foreach (var username in hidden_users)
if (username == user.name)
return;