diff options
| -rw-r--r-- | src/animate-timer.vala | 8 | ||||
| -rw-r--r-- | src/background.vala | 16 | ||||
| -rw-r--r-- | src/greeter-list.vala | 6 | ||||
| -rw-r--r-- | src/main-window.vala | 2 | ||||
| -rw-r--r-- | src/menubar.vala | 2 | ||||
| -rw-r--r-- | src/prompt-box.vala | 24 | ||||
| -rw-r--r-- | src/settings.vala | 52 | ||||
| -rw-r--r-- | tests/menubar.vala | 2 |
8 files changed, 56 insertions, 56 deletions
diff --git a/src/animate-timer.vala b/src/animate-timer.vala index d5aaf71..e4abab3 100644 --- a/src/animate-timer.vala +++ b/src/animate-timer.vala @@ -24,10 +24,10 @@ private class AnimateTimer : Object public delegate double EasingFunc (double x); /* The following are the same intervals that Unity uses */ - public static const int INSTANT = 150; /* Good for animations that don't convey any information */ - public static const int FAST = 250; /* Good for animations that convey duplicated information */ - public static const int NORMAL = 500; - public static const int SLOW = 1000; /* Good for animations that convey information that is only presented in the animation */ + public const int INSTANT = 150; /* Good for animations that don't convey any information */ + public const int FAST = 250; /* Good for animations that convey duplicated information */ + public const int NORMAL = 500; + public const int SLOW = 1000; /* Good for animations that convey information that is only presented in the animation */ /* speed is in milliseconds */ public unowned EasingFunc easing_func { get; private set; } diff --git a/src/background.vala b/src/background.vala index 1278c9b..e94c703 100644 --- a/src/background.vala +++ b/src/background.vala @@ -223,14 +223,14 @@ class BackgroundLoader : Object gnome-desktop3 to expose this for our use instead of copying the code... */ - static const int QUAD_MAX_LEVEL_OF_RECURSION = 16; - static const int QUAD_MIN_LEVEL_OF_RECURSION = 2; - static const int QUAD_CORNER_WEIGHT_NW = 3; - static const int QUAD_CORNER_WEIGHT_NE = 1; - static const int QUAD_CORNER_WEIGHT_SE = 1; - static const int QUAD_CORNER_WEIGHT_SW = 3; - static const int QUAD_CORNER_WEIGHT_CENTER = 2; - static const int QUAD_CORNER_WEIGHT_TOTAL = (QUAD_CORNER_WEIGHT_NW + QUAD_CORNER_WEIGHT_NE + QUAD_CORNER_WEIGHT_SE + QUAD_CORNER_WEIGHT_SW + QUAD_CORNER_WEIGHT_CENTER); + const int QUAD_MAX_LEVEL_OF_RECURSION = 16; + const int QUAD_MIN_LEVEL_OF_RECURSION = 2; + const int QUAD_CORNER_WEIGHT_NW = 3; + const int QUAD_CORNER_WEIGHT_NE = 1; + const int QUAD_CORNER_WEIGHT_SE = 1; + const int QUAD_CORNER_WEIGHT_SW = 3; + const int QUAD_CORNER_WEIGHT_CENTER = 2; + const int QUAD_CORNER_WEIGHT_TOTAL = (QUAD_CORNER_WEIGHT_NW + QUAD_CORNER_WEIGHT_NE + QUAD_CORNER_WEIGHT_SE + QUAD_CORNER_WEIGHT_SW + QUAD_CORNER_WEIGHT_CENTER); /* Pixbuf utilities */ private Gdk.RGBA get_pixbuf_sample (uint8[] pixels, diff --git a/src/greeter-list.vala b/src/greeter-list.vala index 5f830da..3ec5385 100644 --- a/src/greeter-list.vala +++ b/src/greeter-list.vala @@ -102,9 +102,9 @@ public abstract class GreeterList : FadableBox } protected Mode mode = Mode.ENTRY; - public static const int BORDER = 4; - public static const int BOX_WIDTH = 8; /* in grid_size blocks */ - public static const int DEFAULT_BOX_HEIGHT = 3; /* in grid_size blocks */ + public const int BORDER = 4; + public const int BOX_WIDTH = 8; /* in grid_size blocks */ + public const int DEFAULT_BOX_HEIGHT = 3; /* in grid_size blocks */ private uint n_above = 4; private uint n_below = 4; diff --git a/src/main-window.vala b/src/main-window.vala index 6dfd168..b7c59bb 100644 --- a/src/main-window.vala +++ b/src/main-window.vala @@ -34,7 +34,7 @@ public class MainWindow : Gtk.Window public ListStack stack; // Menubar is smaller, but with shadow, we reserve more space - public static const int MENUBAR_HEIGHT = 32; + public const int MENUBAR_HEIGHT = 32; construct { diff --git a/src/menubar.vala b/src/menubar.vala index 2f52e42..c55f31c 100644 --- a/src/menubar.vala +++ b/src/menubar.vala @@ -70,7 +70,7 @@ public class MenuBar : Gtk.MenuBar public Gtk.Window? keyboard_window { get; private set; default = null; } public Gtk.AccelGroup? accel_group { get; construct; } - private static const int HEIGHT = 24; + private const int HEIGHT = 24; public MenuBar (Background bg, Gtk.AccelGroup ag) { diff --git a/src/prompt-box.vala b/src/prompt-box.vala index 419f56d..db5e405 100644 --- a/src/prompt-box.vala +++ b/src/prompt-box.vala @@ -58,18 +58,18 @@ public class PromptBox : FadableBox protected FadingLabel small_name_label; private CachedImage small_message_image; - protected static const int COL_ACTIVE = 0; - protected static const int COL_CONTENT = 1; - protected static const int COL_SPACER = 2; + protected const int COL_ACTIVE = 0; + protected const int COL_CONTENT = 1; + protected const int COL_SPACER = 2; - protected static const int ROW_NAME = 0; - protected static const int COL_NAME_LABEL = 0; - protected static const int COL_NAME_MESSAGE = 1; - protected static const int COL_NAME_OPTIONS = 2; + protected const int ROW_NAME = 0; + protected const int COL_NAME_LABEL = 0; + protected const int COL_NAME_MESSAGE = 1; + protected const int COL_NAME_OPTIONS = 2; - protected static const int COL_ENTRIES_START = 1; - protected static const int COL_ENTRIES_END = 1; - protected static const int COL_ENTRIES_WIDTH = 1; + protected const int COL_ENTRIES_START = 1; + protected const int COL_ENTRIES_END = 1; + protected const int COL_ENTRIES_WIDTH = 1; protected int start_row; protected int last_row; @@ -619,8 +619,8 @@ public class PromptBox : FadableBox private class ActiveIndicator : Gtk.Image { public bool active { get; set; } - public static const int WIDTH = 8; - public static const int HEIGHT = 7; + public const int WIDTH = 8; + public const int HEIGHT = 7; construct { diff --git a/src/settings.vala b/src/settings.vala index e7e424d..8ffc239 100644 --- a/src/settings.vala +++ b/src/settings.vala @@ -20,31 +20,31 @@ public class AGSettings { - public static const string KEY_BACKGROUND = "background"; - public static const string KEY_BACKGROUND_COLOR = "background-color"; - public static const string KEY_DRAW_USER_BACKGROUNDS = "draw-user-backgrounds"; - public static const string KEY_DRAW_GRID = "draw-grid"; - public static const string KEY_SHOW_HOSTNAME = "show-hostname"; - public static const string KEY_LOGO = "logo"; - public static const string KEY_BACKGROUND_LOGO = "background-logo"; - public static const string KEY_THEME_NAME = "theme-name"; - public static const string KEY_ICON_THEME_NAME = "icon-theme-name"; - public static const string KEY_FONT_NAME = "font-name"; - public static const string KEY_XFT_ANTIALIAS = "xft-antialias"; - public static const string KEY_XFT_DPI = "xft-dpi"; - public static const string KEY_XFT_HINTSTYLE = "xft-hintstyle"; - public static const string KEY_XFT_RGBA = "xft-rgba"; - public static const string KEY_ONSCREEN_KEYBOARD = "onscreen-keyboard"; - public static const string KEY_HIGH_CONTRAST = "high-contrast"; - public static const string KEY_SCREEN_READER = "screen-reader"; - public static const string KEY_PLAY_READY_SOUND = "play-ready-sound"; - public static const string KEY_INDICATORS = "indicators"; - public static const string KEY_HIDDEN_USERS = "hidden-users"; - public static const string KEY_GROUP_FILTER = "group-filter"; - public static const string KEY_IDLE_TIMEOUT = "idle-timeout"; - public static const string KEY_REMOTE_SERVICE_FQDN = "remote-service-fqdn"; - public static const string KEY_TOGGLEBOX_FONT_FGCOLOR = "togglebox-font-fgcolor"; - public static const string KEY_TOGGLEBOX_BUTTON_BGCOLOR = "togglebox-button-bgcolor"; + public const string KEY_BACKGROUND = "background"; + public const string KEY_BACKGROUND_COLOR = "background-color"; + public const string KEY_DRAW_USER_BACKGROUNDS = "draw-user-backgrounds"; + public const string KEY_DRAW_GRID = "draw-grid"; + public const string KEY_SHOW_HOSTNAME = "show-hostname"; + public const string KEY_LOGO = "logo"; + public const string KEY_BACKGROUND_LOGO = "background-logo"; + public const string KEY_THEME_NAME = "theme-name"; + public const string KEY_ICON_THEME_NAME = "icon-theme-name"; + public const string KEY_FONT_NAME = "font-name"; + public const string KEY_XFT_ANTIALIAS = "xft-antialias"; + public const string KEY_XFT_DPI = "xft-dpi"; + public const string KEY_XFT_HINTSTYLE = "xft-hintstyle"; + public const string KEY_XFT_RGBA = "xft-rgba"; + public const string KEY_ONSCREEN_KEYBOARD = "onscreen-keyboard"; + public const string KEY_HIGH_CONTRAST = "high-contrast"; + public const string KEY_SCREEN_READER = "screen-reader"; + public const string KEY_PLAY_READY_SOUND = "play-ready-sound"; + public const string KEY_INDICATORS = "indicators"; + public const string KEY_HIDDEN_USERS = "hidden-users"; + public const string KEY_GROUP_FILTER = "group-filter"; + public const string KEY_IDLE_TIMEOUT = "idle-timeout"; + public const string KEY_REMOTE_SERVICE_FQDN = "remote-service-fqdn"; + public const string KEY_TOGGLEBOX_FONT_FGCOLOR = "togglebox-font-fgcolor"; + public const string KEY_TOGGLEBOX_BUTTON_BGCOLOR = "togglebox-button-bgcolor"; public static bool get_boolean (string key) { @@ -101,5 +101,5 @@ public class AGSettings return gsettings.set_strv (key, value); } - private static const string SCHEMA = "org.ArcticaProject.arctica-greeter"; + private const string SCHEMA = "org.ArcticaProject.arctica-greeter"; } diff --git a/tests/menubar.vala b/tests/menubar.vala index 028750a..f222957 100644 --- a/tests/menubar.vala +++ b/tests/menubar.vala @@ -18,7 +18,7 @@ public class MenuBar : Gtk.MenuBar { - public static const int HEIGHT = 32; + public const int HEIGHT = 32; public bool high_contrast { get; private set; default = false; } public MenuBar (Background bg, Gtk.AccelGroup ag) |