diff --git a/helpers/DATA/unity-greeter/badge.png b/helpers/DATA/unity-greeter/badge.png new file mode 100644 index 0000000000000000000000000000000000000000..aab5f1747904c5d66d2f73ae529a0d5e9b9b3504 Binary files /dev/null and b/helpers/DATA/unity-greeter/badge.png differ diff --git a/helpers/DATA/unity-greeter/cof.png b/helpers/DATA/unity-greeter/cof.png new file mode 100644 index 0000000000000000000000000000000000000000..12f3c2f59f07f3870e2906dd70b1bd2d863e6509 Binary files /dev/null and b/helpers/DATA/unity-greeter/cof.png differ diff --git a/helpers/DATA/unity-greeter/com.canonical.unity-greeter.gschema.xml b/helpers/DATA/unity-greeter/com.canonical.unity-greeter.gschema.xml new file mode 100644 index 0000000000000000000000000000000000000000..7f49524f857c3ea8070f62724fe5a9283b1a00f1 --- /dev/null +++ b/helpers/DATA/unity-greeter/com.canonical.unity-greeter.gschema.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<schemalist gettext-domain="unity-greeter"> + <schema id="com.canonical.unity-greeter" path="/com/canonical/unity-greeter/"> + <key name="background" type="s"> + <default>'/usr/share/backgrounds/toutatis.jpg'</default> + <summary>Background file to use, either an image path or a color (e.g. #772953)</summary> + </key> + <key name="background-color" type="s"> + <default>'#000000'</default> + <summary>Background color (e.g. #772953), set before wallpaper is seen</summary> + </key> + <key name="draw-user-backgrounds" type="b"> + <default>true</default> + <summary>Whether to draw user backgrounds</summary> + </key> + <key name="draw-grid" type="b"> + <default>false</default> + <summary>Whether to draw an overlay grid</summary> + </key> + <key name="show-hostname" type="b"> + <default>true</default> + <summary>Whether to show the hostname in the menubar</summary> + </key> + <key name="logo" type="s"> + <default>'/usr/share/unity-greeter/logo.png'</default> + <summary>Logo file to use</summary> + </key> + <key name="background-logo" type="s"> + <default>'/usr/share/unity-greeter/cof.png'</default> + <summary>Background logo file to use</summary> + </key> + <key name="theme-name" type="s"> + <default>'Ambiance'</default> + <summary>GTK+ theme to use</summary> + </key> + <key name="icon-theme-name" type="s"> + <default>'ubuntu-mono-dark'</default> + <summary>Icon theme to use</summary> + </key> + <key name="font-name" type="s"> + <default>'Sans 11'</default> + <summary>Font to use</summary> + </key> + <key name="xft-antialias" type="b"> + <default>true</default> + <summary>Whether to antialias Xft fonts</summary> + </key> + <key name="xft-dpi" type="d"> + <default>96</default> + <summary>Resolution for Xft in dots per inch</summary> + </key> + <key name="xft-hintstyle" type="s"> + <choices> + <choice value='hintnone'/> + <choice value='hintslight'/> + <choice value='hintmedium'/> + <choice value='hintfull'/> + </choices> + <default>'hintslight'</default> + <summary>What degree of hinting to use</summary> + </key> + <key name="xft-rgba" type="s"> + <choices> + <choice value='none'/> + <choice value='rgb'/> + <choice value='bgr'/> + <choice value='vrgb'/> + <choice value='vbgr'/> + </choices> + <default>'rgb'</default> + <summary>Type of subpixel antialiasing</summary> + </key> + <key name="onscreen-keyboard" type="b"> + <default>false</default> + <summary>Whether to enable the onscreen keyboard</summary> + </key> + <key name="high-contrast" type="b"> + <default>false</default> + <summary>Whether to use a high contrast theme</summary> + </key> + <key name="screen-reader" type="b"> + <default>false</default> + <summary>Whether to enable the screen reader</summary> + </key> + <key name="play-ready-sound" type="b"> + <default>true</default> + <summary>Whether to play sound when greeter is ready</summary> + </key> + <key name="indicators" type="as"> + <default>['ug-accessibility', 'com.canonical.indicator.keyboard', 'com.canonical.indicator.session', 'com.canonical.indicator.datetime', 'com.canonical.indicator.power', 'com.canonical.indicator.sound', 'application']</default> + <summary>Which indicators to load</summary> + </key> + <key name="hidden-users" type="as"> + <default>[]</default> + <summary>List of usernames that are hidden until a special key combination is hit</summary> + </key> + <key name="idle-timeout" type="i"> + <default>300</default> + <summary>Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout.</summary> + </key> + </schema> +</schemalist> diff --git a/helpers/DATA/unity-greeter/logo-bare.png b/helpers/DATA/unity-greeter/logo-bare.png new file mode 100644 index 0000000000000000000000000000000000000000..16b70f869bbe16ca89a32984371c2466c0a9dfe7 Binary files /dev/null and b/helpers/DATA/unity-greeter/logo-bare.png differ diff --git a/helpers/DATA/unity-greeter/logo.png b/helpers/DATA/unity-greeter/logo.png index 602d252f455c1d8689f050c90b752b66c5f96611..34dc1cc360b408420c9b74fb5b51b56d782b16c1 100644 Binary files a/helpers/DATA/unity-greeter/logo.png and b/helpers/DATA/unity-greeter/logo.png differ diff --git a/helpers/make-unity-greeter b/helpers/make-unity-greeter index 5ff4f0ca2f6f5372ee1463c436bfded7ed9d70eb..92ec8b98ae710bf4767a460d5a4ffb54fa3a4101 100644 --- a/helpers/make-unity-greeter +++ b/helpers/make-unity-greeter @@ -17,46 +17,27 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=7 . ./config -#patch -p1 < $DATA/harcoded_orca.patch -#patch -p1 < $DATA/no_dots.patch +# Custom settings +cp $DATA/com.canonical.unity-greeter.gschema.xml data + +# Change the sound theme sed s/ubuntu/freedesktop/g src/unity-greeter.vala -i rm -f src/*.c -#% REBRAND: Replace the logo -#% CurrentState: -#% ExpectedState: -cp $DATA/logo.png data - -#% Set default background color to black -replace 2C001E 000000 . - -#% Addapt default settings to Trisquel -cat << EOF > data/unity-greeter.conf -# -# background = Background file to use, either an image path or a color (e.g. #772953) -# logo = Logo file to use -# theme-name = GTK+ theme to use -# font-name = Font to use -# xft-antialias = Whether to antialias Xft fonts (true or false) -# xft-dpi = Resolution for Xft in dots per inch (e.g. 96) -# xft-hintstyle = What degree of hinting to use (hintnone, hintslight, hintmedium, or hintfull) -# xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr) -# -[greeter] -background=/usr/share/backgrounds/toutatis.jpg -logo=/usr/share/unity-greeter/logo.png -theme-name=Trisquel -icon-theme-name=trisquel -font-name=Sans 11 -xft-antialias=true -xft-dpi=96 -xft-hintstyle=hintslight -xft-rgba=rgb -EOF +# Custom artwork +sed '/logo-bare/d; /rm.*logo.png/d' -i debian/rules +sed '/paint_with_alpha/s/0.5/1.0/' -i src/background.vala +cp $DATA/logo.png data/logo.png +cp $DATA/logo.png . +cp $DATA/logo-bare.png data/logo-bare.png +cp $DATA/cof.png data +cp $DATA/badge.png data/trisquel_badge.png +cp $DATA/badge.png data/unknown_badge.png +replace ubuntu_badge trisquel_badge . changelog "Adapted for Trisquel"