diff options
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/org.ArcticaProject.ArcticaGreeterSession.gschema.xml | 193 | ||||
| -rw-r--r-- | src/arctica-greeter.vala | 6 | ||||
| -rw-r--r-- | src/greeter-list.vala | 2 |
4 files changed, 200 insertions, 5 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index c0e49c9..4f5774c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -41,7 +41,9 @@ logo.png: logo-bare.png ../src/logo-generator --logo logo-bare.png --text '$(VERSION)' --output logo.png @GSETTINGS_RULES@ -gsettings_SCHEMAS = org.ArcticaProject.arctica-greeter.gschema.xml +gsettings_SCHEMAS = \ + org.ArcticaProject.arctica-greeter.gschema.xml \ + org.ArcticaProject.ArcticaGreeterSession.gschema.xml dist_man1_MANS = arctica-greeter.1 diff --git a/data/org.ArcticaProject.ArcticaGreeterSession.gschema.xml b/data/org.ArcticaProject.ArcticaGreeterSession.gschema.xml new file mode 100644 index 0000000..6377b78 --- /dev/null +++ b/data/org.ArcticaProject.ArcticaGreeterSession.gschema.xml @@ -0,0 +1,193 @@ +<schemalist> + <enum id="form-factor-enum"> + <value nick="Automatic" value="0" /> + <value nick="Desktop" value="1" /> + <value nick="Netbook" value="2" /> + <value nick="TV" value="3" /> + </enum> + <enum id="home-expanded-enum"> + <value nick="Not Expanded" value="0" /> + <value nick="Expanded" value="1" /> + </enum> + + <schema path="/org/ArcticaProject/ArcticaGreeterSession/" id="org.ArcticaProject.ArcticaGreeterSession" gettext-domain="unity"> + <key enum="form-factor-enum" name="form-factor"> + <default>"Automatic"</default> + <summary>The form factor Unity should target.</summary> + <description>The form factor chosen will affect the size and appearance of the Dash, Launcher and also the Window Management behaviour.</description> + </key> + <key enum="home-expanded-enum" name="home-expanded"> + <default>"Expanded"</default> + <summary>Whether the home screen should be expanded.</summary> + <description>Whether the home screen should be expanded.</description> + </key> + <key type="i" name="minimize-count"> + <default>0</default> + <summary>Number of times a normal window has been minimized.</summary> + <description>This is used to adjust the animation speed by making it progressively faster the more it is used.</description> + </key> + <key type="i" name="minimize-fast-duration"> + <default>300</default> + <summary>The duration for the minimize animation when it is at its fastest setting.</summary> + <description>This is the duration that the minimize animation will have when it has been used more than an number of times equal minimize-speed-threshold.</description> + </key> + <key type="i" name="minimize-slow-duration"> + <default>800</default> + <summary>The duration for the minimize animation when it is at its slowest setting.</summary> + <description>This is the duration that the minimize animation will have when it has never been used.</description> + </key> + <key type="i" name="minimize-speed-threshold"> + <default>100</default> + <summary>The number of minimizations required to reach maximum speed.</summary> + <description>The speed of the minimize animation will progressively get faster as minimize-count approaches this value.</description> + </key> + <key type="b" name="double-click-activate"> + <default>true</default> + <summary>Enable/Disable dash result double-click activation.</summary> + <description>This is used to enable/disable double-click result activation in the dash. Double-click to activate, single click preview</description> + </key> + <key type="b" name="integrated-menus"> + <default>false</default> + <summary>Enable/Disable the integrated menus in Unity.</summary> + <description>When this is enabled, the application menus will be shown + on the window decoration, otherwise they will be always shown on the + unity top panel</description> + </key> + <key type="u" name="show-menus-now-delay"> + <default>180</default> + <range min="0" max="5000"/> + <summary>Delay (in ms) before showing the menus when pressing Alt</summary> + <description>This allows tune the delay before presenting unity menus + (in non always-show-menus mode).</description> + </key> + <key type="b" name="always-show-menus"> + <default>false</default> + <summary>Toggle the menu visibility based on mouse hovering.</summary> + <description>When this is enabled, the application menus will be always + shown (on the window decoration or in the unity panel, depending whether + integrated menus are enabled), otherwise they will be shown only when + the mouse cursor is over the relative mouse area.</description> + </key> + </schema> + <schema path="/org/ArcticaProject/ArcticaGreeterSession/interface/" id="org.ArcticaProject.ArcticaGreeterSession.Interface" gettext-domain="unity"> + <key type="d" name="text-scale-factor"> + <default>1.0</default> + <range min="0.5" max="3.0"/> + <summary>Font scaling for unity and applications.</summary> + <description>This value defines the global font scaling used by both + unity and applications. It will match the current system font scaling.</description> + </key> + <key type="d" name="cursor-scale-factor"> + <default>1.0</default> + <range min="0.5" max="3.0"/> + <summary>Mouse cursor scaling.</summary> + <description>This value defines the global mouse cursor scaling used by both + unity and applications. Changing this value allows to use a custom scaling + for the mouse cursor.</description> + </key> + <key type="s" name="app-scale-factor-monitor"> + <default>''</default> + <summary>The name of the monitor that controls the global app scaling factor.</summary> + <description>This value defines the monitor that unity will use (if found) as reference + for scaling all the applications.</description> + </key> + <key type="b" name="app-fallback-to-maximum-scale-factor"> + <default>true</default> + <summary>Use the maximum per-monitor scale-factor as application scale factor if no target monitor is found.</summary> + <description>When this is enabled, the applications scale factor will match + the scale factor of the monitor with the greater value, in case the monitor + defined in 'app-scale-factor-monitor' is not provided or available.</description> + </key> + </schema> + <schema path="/org/ArcticaProject/ArcticaGreeterSession/launcher/" id="org.ArcticaProject.ArcticaGreeterSession.Launcher" gettext-domain="unity"> + <key type="as" name="favorites"> + <default>[ + 'application://ubiquity.desktop', + 'application://org.gnome.Nautilus.desktop', + 'application://firefox.desktop', + 'application://libreoffice-writer.desktop', + 'application://libreoffice-calc.desktop', + 'application://libreoffice-impress.desktop', + 'application://ubuntu-software-center.desktop', + 'application://ubuntu-amazon-default.desktop', + 'application://unity-control-center.desktop', + 'unity://running-apps', + 'unity://expo-icon', + 'unity://devices' + ]</default> + <summary>List of items that should be shown by default in the launcher</summary> + <description>These items can be: application://desktop-id.desktop, device://uiid and unity://special-id (including: unity://running-apps (icons of running applications) unity://devices (icons of attached devices), unity://expo-icon (icon of the workspace switcher) and unity://desktop-icon (the show-desktop icon)); the order of this list determines the launcher item's position.</description> + </key> + <key type="as" name="items"> + <default>[ + 'application:///dialer-app.desktop', + 'application:///messaging-app.desktop', + 'application:///address-book-app.desktop', + 'application:///ubuntu-system-settings.desktop', + 'appid://com.ubuntu.camera/camera/current-user-version', + 'appid://com.ubuntu.gallery/gallery/current-user-version', + 'application:///webbrowser-app.desktop' + ]</default> + <summary>List of items that should be shown by default in the launcher</summary> + <description>These items can be: application:///desktop-id.desktop or appid://package/app/current-user-version.</description> + </key> + <key type="s" name="favorite-migration"> + <default>''</default> + <summary>Version of last migration done</summary> + <description>This is a detection key for the favorite migration script to know whether the needed migration is done or not.</description> + </key> + </schema> + <schema path="/org/ArcticaProject/ArcticaGreeterSession/devices/" id="org.ArcticaProject.ArcticaGreeterSession.Devices" gettext-domain="unity"> + <key type="as" name="blacklist"> + <default>[]</default> + <summary>List of device uuid blacklist from the launcher.</summary> + <description>These devices are not shown in the launcher by default.</description> + </key> + </schema> + <schema path="/org/ArcticaProject/ArcticaGreeterSession/dash/" id="org.ArcticaProject.ArcticaGreeterSession.Dash" gettext-domain="unity"> + <key type="as" name="scopes"> + <default>[ 'home.scope', 'applications.scope', 'files.scope', 'video.scope', 'music.scope', 'photos.scope', 'social.scope' ]</default> + <summary>List of scope ids specifying which scopes should be created and the order to display them in.</summary> + <description>The scopes listed in the scope bar will be ordered according to this list.</description> + </key> + <key type="as" name="favorite-scopes"> + <default>[ 'scope://clickscope', 'scope://musicaggregator', 'scope://videoaggregator' ]</default> + <summary>List of scope queries specifying what should be displayed in the dash.</summary> + <description>List of favorite scopes displayed in the dash.</description> + </key> + </schema> + <schema path="/org/ArcticaProject/ArcticaGreeterSession/decorations/" id="org.ArcticaProject.ArcticaGreeterSession.Decorations" gettext-domain="unity"> + <key type="u" name="grab-wait"> + <default>175</default> + <range min="0" max="1000"/> + <summary>Milliseconds to wait before considering a mouse pressure a grab</summary> + <description>The number of ms to wait before starting the window movement (and then + showing the proper mouse cursor, and grabbing the window)</description> + </key> + </schema> + <schema path="/org/ArcticaProject/ArcticaGreeterSession/integrated-menus/" id="org.ArcticaProject.ArcticaGreeterSession.IntegratedMenus" gettext-domain="unity"> + <key type="u" name="click-movement-threshold"> + <default>15</default> + <range min="0" max="30"/> + <summary>Number of pixels to ignore on mouse pressure</summary> + <description>This value define how many pixels the user can move the mouse + when holding the mouse button, before we consider his action a movement + (to grab the window).</description> + </key> + <key type="u" name="double-click-wait"> + <default>0</default> + <range min="0" max="300"/> + <summary>Milliseconds to wait before activating a menu after mouse release</summary> + <description>The number of ms to wait after a mouse button release event before considering + it a click. When this value is greater than 0, then it's possible to maximize + a window by double-clicking on its menus if the second click happens before the + specified value of ms is elapsed</description> + </key> + <key type="b" name="unfocused-windows-popup"> + <default>true</default> + <summary>Whether to pop-up a menu when clicking over unfocused windows entries</summary> + <description>By disabling this setting you can make unity to only focus a window + when clicking over unfocused menu entries</description> + </key> + </schema> +</schemalist> diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala index 9c1f282..1c23bf4 100644 --- a/src/arctica-greeter.vala +++ b/src/arctica-greeter.vala @@ -100,7 +100,7 @@ public class ArcticaGreeter main_window = new MainWindow (); - Bus.own_name (BusType.SESSION, "com.canonical.ArcticaGreeter", BusNameOwnerFlags.NONE); + Bus.own_name (BusType.SESSION, "org.ArcticaProject.ArcticaGreeter", BusNameOwnerFlags.NONE); dbus_object = new DialogDBusInterface (); dbus_object.open_dialog.connect ((type) => @@ -119,7 +119,7 @@ public class ArcticaGreeter main_window.show_shutdown_dialog (dialog_type); }); dbus_object.close_dialog.connect ((type) => { main_window.close_shutdown_dialog (); }); - Bus.own_name (BusType.SESSION, "com.canonical.Unity", BusNameOwnerFlags.NONE, + Bus.own_name (BusType.SESSION, "org.ArcticaProject.ArcticaGreeterSession", BusNameOwnerFlags.NONE, (c) => { try @@ -132,7 +132,7 @@ public class ArcticaGreeter } }, null, - () => debug ("Failed to acquire name com.canonical.Unity")); + () => debug ("Failed to acquire name org.ArcticaProject.ArcticaGreeterSession")); start_fake_wm (); Gdk.threads_add_idle (ready_cb); diff --git a/src/greeter-list.vala b/src/greeter-list.vala index 965da26..7fafdcb 100644 --- a/src/greeter-list.vala +++ b/src/greeter-list.vala @@ -24,7 +24,7 @@ private int get_grid_offset (int size) return (int) (size % grid_size) / 2; } -[DBus (name="com.canonical.ArcticaGreeter.List")] +[DBus (name="org.ArcticaProject.ArcticaGreeter.List")] public class ListDBusInterface : Object { private GreeterList list; |