Hello community, here is the log from the commit of package slick-greeter for openSUSE:Factory checked in at 2017-10-30 21:18:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slick-greeter (Old) and /work/SRC/openSUSE:Factory/.slick-greeter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slick-greeter" Mon Oct 30 21:18:37 2017 rev:5 rq:537413 version:1.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/slick-greeter/slick-greeter.changes 2017-06-22 10:41:07.163477795 +0200 +++ /work/SRC/openSUSE:Factory/.slick-greeter.new/slick-greeter.changes 2017-10-30 21:18:58.090142749 +0100 @@ -1,0 +2,17 @@ +Sat Oct 28 19:57:36 UTC 2017 - [email protected] + +- Update to version 1.0.9: + * Remove a broken symlink. + * Session detection: Add support for more DE/WM. + * Add tooltips to applets. + * Add support for numlockx. + * Rename background-logo -> other-monitors-logo. + * Other monitors logo: Use full opacity. + * Make panel indicators optional. + * Fix compilation warnings. + * Remove idle_timeout. + * Add a GNOME 3.26 X.org session and an Ubuntu X.org equivalent + session. + * Update translations. + +------------------------------------------------------------------- Old: ---- slick-greeter-1.0.8.tar.gz New: ---- slick-greeter-1.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slick-greeter.spec ++++++ --- /var/tmp/diff_new_pack.JlDvr5/_old 2017-10-30 21:18:58.886113809 +0100 +++ /var/tmp/diff_new_pack.JlDvr5/_new 2017-10-30 21:18:58.890113663 +0100 @@ -18,10 +18,10 @@ %define _name lightdm-slick-greeter Name: slick-greeter -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: The slick-looking login screen application -License: GPL-3.0 and CC-BY-SA-3.0 +License: GPL-3.0 AND CC-BY-SA-3.0 Group: System/X11/Displaymanagers Url: https://github.com/linuxmint/slick-greeter Source: https://github.com/linuxmint/slick-greeter/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -49,6 +49,7 @@ Summary: The slick-looking login screen application Group: System/X11/Displaymanagers Requires: lightdm +Requires: numlockx Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: %{_name}-lang @@ -103,23 +104,26 @@ %endif %post -n %{_name} -%glib2_gsettings_schema_post update-alternatives --install \ %{_datadir}/xgreeters/lightdm-default-greeter.desktop \ lightdm-default-greeter.desktop \ %{_datadir}/xgreeters/%{name}.desktop \ 10 +%if 0%{?suse_version} <= 1320 +%glib2_gsettings_schema_post +%endif %postun -n %{_name} -%glib2_gsettings_schema_postun if [ "$1" = 0 ]; then update-alternatives --remove \ lightdm-default-greeter.desktop \ %{_datadir}/xgreeters/%{name}.desktop fi +%if 0%{?suse_version} <= 1320 +%glib2_gsettings_schema_postun +%endif %files -n %{_name} -%defattr(-,root,root) %doc COPYING README.md %{_sbindir}/%{name} %{_bindir}/%{name}-set-keyboard-layout @@ -138,10 +142,8 @@ %{_mandir}/man1/%{name}-check-hidpi.1%{?ext_man} %files -n %{_name}-lang -f %{name}.lang -%defattr(-,root,root) %files -n %{_name}-branding-upstream -%defattr(-,root,root) %doc README.GSettings-overrides %changelog ++++++ slick-greeter-1.0.8.tar.gz -> slick-greeter-1.0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/.github/ISSUE_TEMPLATE.md new/slick-greeter-1.0.9/.github/ISSUE_TEMPLATE.md --- old/slick-greeter-1.0.8/.github/ISSUE_TEMPLATE.md 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/.github/ISSUE_TEMPLATE.md 2017-10-27 14:33:23.000000000 +0200 @@ -0,0 +1,21 @@ + +``` + * slick-greeter version (slick-greeter --version) + * Distribution - (Mint 17.2, Arch, Fedora 25, etc...) + * Graphics hardware *and* driver used + * 32 or 64 bit + ``` + +**Issue** + + + +**Steps to reproduce** + + + +**Expected behaviour** + + + +**Other information** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/README.md new/slick-greeter-1.0.9/README.md --- old/slick-greeter-1.0.8/README.md 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/README.md 2017-10-27 14:33:23.000000000 +0200 @@ -36,8 +36,13 @@ # draw-user-backgrounds=Whether to draw user backgrounds (true or false) # draw-grid=Whether to draw an overlay grid (true or false) # show-hostname=Whether to show the hostname in the menubar (true or false) + # show-power=Whether to show the power indicator in the menubar (true or false) + # show-a11y=Whether to show the accessibility options in the menubar (true or false) + # show-keyboard=Whether to show the keyboard indicator in the menubar (true or false) + # show-clock=Whether to show the clock in the menubar (true or false) + # show-quit=Whether to show the quit menu in the menubar (true or false) # logo=Logo file to use - # background-logo=Background logo file to use + # other-monitors-logo=Logo file to use for other monitors # theme-name=GTK+ theme to use # icon-theme-name=Icon theme to use # font-name=Font to use @@ -51,6 +56,5 @@ # play-ready-sound=A sound file to play when the greeter is ready # hidden-users=List of usernames that are hidden until a special key combination is hit # group-filter=List of groups that users must be part of to be shown (empty list shows all users) - # idle-timeout=Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout # enable-hidpi=Whether to enable HiDPI support (on/off/auto) - [greeter] + [Greeter] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/configure.ac new/slick-greeter-1.0.9/configure.ac --- old/slick-greeter-1.0.8/configure.ac 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/configure.ac 2017-10-27 14:33:23.000000000 +0200 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(slick-greeter, 1.0.8) +AC_INIT(slick-greeter, 1.0.9) AC_CONFIG_MACRO_DIR(m4) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign subdir-objects]) AM_PROG_CC_C_O diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/data/slick-greeter.1 new/slick-greeter-1.0.9/data/slick-greeter.1 --- old/slick-greeter-1.0.8/data/slick-greeter.1 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/data/slick-greeter.1 2017-10-27 14:33:23.000000000 +0200 @@ -45,11 +45,26 @@ .B show-hostname= Whether to show the hostname in the menubar (true or false) .TP +.B show-keyboard= +Whether to show the keyboard indicator in the menubar (true or false) +.TP +.B show-a11y= +Whether to show the accessibility options in the menubar (true or false) +.TP +.B show-power= +Whether to show the power indicator in the menubar (true or false) +.TP +.B show-clock= +Whether to show the clock in the menubar (true or false) +.TP +.B show-quit= +Whether to show the quit menu in the menubar (true or false) +.TP .B logo= Logo file to use .TP -.B background-logo= -Background logo file to use +.B other-monitors-logo= +Logo file to use for other monitors .TP .B theme-name= GTK+ theme to use @@ -90,9 +105,6 @@ .B group-filter= List of groups that users must be part of to be shown (empty list shows all users) .TP -.B idle-timeout= -Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout -.TP .B enable-hidpi= Whether to enable HiDPI support (on/off/auto) .SH SEE ALSO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/data/x.dm.slick-greeter.gschema.xml new/slick-greeter-1.0.9/data/x.dm.slick-greeter.gschema.xml --- old/slick-greeter-1.0.8/data/x.dm.slick-greeter.gschema.xml 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/data/x.dm.slick-greeter.gschema.xml 2017-10-27 14:33:23.000000000 +0200 @@ -21,13 +21,33 @@ <default>true</default> <summary>Whether to show the hostname in the menubar</summary> </key> + <key name="show-keyboard" type="b"> + <default>true</default> + <summary>Whether to show the keyboard indicator in the menubar</summary> + </key> + <key name="show-a11y" type="b"> + <default>true</default> + <summary>Whether to show the accessibility menu in the menubar</summary> + </key> + <key name="show-power" type="b"> + <default>true</default> + <summary>Whether to show the power indicator in the menubar</summary> + </key> + <key name="show-clock" type="b"> + <default>true</default> + <summary>Whether to show the clock in the menubar</summary> + </key> + <key name="show-quit" type="b"> + <default>true</default> + <summary>Whether to show the quit menu in the menubar</summary> + </key> <key name="logo" type="s"> <default>''</default> <summary>Logo file to use</summary> </key> - <key name="background-logo" type="s"> + <key name="other-monitors-logo" type="s"> <default>''</default> - <summary>Background logo file to use</summary> + <summary>Logo file to use for other monitors</summary> </key> <key name="theme-name" type="s"> <default>'Adwaita'</default> @@ -94,10 +114,6 @@ <default>[]</default> <summary>List of groups that users must be part of to be shown (empty list shows all users)</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> <key name="enable-hidpi" type="s"> <choices> <choice value='on'/> @@ -107,5 +123,9 @@ <default>'auto'</default> <summary>Whether to enable HiDPI support</summary> </key> + <key name="activate-numlock" type="b"> + <default>false</default> + <summary>Whether to activate numlock. This features requires the installation of numlockx.</summary> + </key> </schema> </schemalist> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/debian/changelog new/slick-greeter-1.0.9/debian/changelog --- old/slick-greeter-1.0.8/debian/changelog 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/debian/changelog 2017-10-27 14:33:23.000000000 +0200 @@ -1,3 +1,40 @@ +slick-greeter (1.0.9) sylvia; urgency=medium + + [ Seth Barberee ] + * Fix typo in README.md (#56) + + [ NikoKrause ] + * update German l10n (#58) + + [ Michael Webster ] + * add an issue template + + [ Clement Lefebvre ] + * Remove broken symlink + + [ Stefano Capitani ] + * Session detection: Add support for more DE/WM (#61) + + [ Clement Lefebvre ] + * Add tooltips to applets + * Add support for numlockx + * Rename background-logo -> other-monitors-logo + * Other monitors logo: Use full opacity + * Make panel indicators optional + * Fix compilation warnings + * Remove idle_timeout + + [ NikoKrause ] + * add makepot and .pot file (#57) + + [ Clement Lefebvre ] + * l10n: Update POT file + + [ David Mohammed ] + * add GNOME 3.26 xorg session and ubuntu xorg equivalent session (#73) + + -- Clement Lefebvre <[email protected]> Fri, 27 Oct 2017 13:32:33 +0100 + slick-greeter (1.0.8) sonya; urgency=medium [ leigh123linux ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/gnome-xorg.svg new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/gnome-xorg.svg --- old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/gnome-xorg.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/gnome-xorg.svg 2017-10-30 21:18:59.570088941 +0100 @@ -0,0 +1 @@ +symbolic link to gnome.svg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/ubuntu-2d.png new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/ubuntu-2d.png --- old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/ubuntu-2d.png 2017-10-30 21:18:59.226101447 +0100 +++ new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/ubuntu-2d.png 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to ubuntu.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/ubuntu-xorg.svg new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/ubuntu-xorg.svg --- old/slick-greeter-1.0.8/files/usr/share/slick-greeter/badges/ubuntu-xorg.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/files/usr/share/slick-greeter/badges/ubuntu-xorg.svg 2017-10-30 21:18:59.462092867 +0100 @@ -0,0 +1 @@ +symbolic link to ubuntu.svg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/makepot new/slick-greeter-1.0.9/makepot --- old/slick-greeter-1.0.8/makepot 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/makepot 2017-10-27 14:33:23.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/bash +xgettext --language=Vala --keyword=_ --output=slick-greeter.pot src/*.vala diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/po/de.po new/slick-greeter-1.0.9/po/de.po --- old/slick-greeter-1.0.8/po/de.po 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/po/de.po 2017-10-27 14:33:23.000000000 +0200 @@ -7,86 +7,99 @@ msgstr "" "Project-Id-Version: slick-greeter\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2016-03-22 05:42+0000\n" -"PO-Revision-Date: 2014-12-27 16:04+0000\n" +"POT-Creation-Date: 2017-06-20 21:40+0200\n" +"PO-Revision-Date: 2017-06-20 21:44+0200\n" "Last-Translator: Tobias Bannert <Unknown>\n" "Language-Team: German <[email protected]>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2016-03-23 05:32+0000\n" -"X-Generator: Launchpad (build 17958)\n" +"X-Generator: Poedit 1.8.7.1\n" -#: ../src/greeter-list.vala:300 +#: src/greeter-list.vala:302 #, c-format msgid "Enter password for %s" msgstr "Passwort für %s eingeben" -#: ../src/greeter-list.vala:805 ../src/user-list.vala:701 +#: src/greeter-list.vala:811 src/user-list.vala:703 msgid "Password:" msgstr "Passwort:" -#: ../src/greeter-list.vala:807 ../src/user-list.vala:695 +#: src/greeter-list.vala:813 src/user-list.vala:697 msgid "Username:" msgstr "Benutzername:" -#: ../src/greeter-list.vala:859 +#: src/greeter-list.vala:868 msgid "Invalid password, please try again" msgstr "Passwort ungültig, bitte wiederholen" -#: ../src/greeter-list.vala:870 +#: src/greeter-list.vala:879 msgid "Failed to authenticate" msgstr "Legitimierung gescheitert" -#: ../src/greeter-list.vala:916 +#: src/greeter-list.vala:925 msgid "Failed to start session" msgstr "Starten der Sitzung fehlgeschlagen" -#: ../src/greeter-list.vala:931 +#: src/greeter-list.vala:940 msgid "Logging in…" msgstr "Anmeldevorgang …" -#: ../src/main-window.vala:49 +#: src/main-window.vala:49 msgid "Login Screen" msgstr "Anmeldebildschirm" -#: ../src/main-window.vala:116 +#: src/main-window.vala:113 msgid "Back" msgstr "Zurück" -#: ../src/menubar.vala:220 +#: src/menubar.vala:362 msgid "Onscreen keyboard" msgstr "Bildschirmtastatur" -#: ../src/menubar.vala:225 +#: src/menubar.vala:367 msgid "High Contrast" msgstr "Starker Kontrast" -#: ../src/menubar.vala:231 +#: src/menubar.vala:373 msgid "Screen Reader" msgstr "Bildschirmleser" -#: ../src/prompt-box.vala:212 +#: src/menubar.vala:397 src/shutdown-dialog.vala:155 +msgid "Suspend" +msgstr "Bereitschaft" + +#: src/menubar.vala:415 src/shutdown-dialog.vala:172 +msgid "Hibernate" +msgstr "Ruhezustand" + +#: src/menubar.vala:431 +msgid "Quit..." +msgstr "Beenden …" + +#: src/prompt-box.vala:215 msgid "Session Options" msgstr "Sitzungsoptionen" -#: ../src/session-list.vala:34 +#: src/session-list.vala:34 msgid "Select desktop environment" msgstr "Arbeitsumgebung wählen" -#: ../src/shutdown-dialog.vala:101 +#: src/shutdown-dialog.vala:101 msgid "Goodbye. Would you like to…" msgstr "Auf Wiedersehen. Würden Sie gerne …" -#: ../src/shutdown-dialog.vala:105 ../src/shutdown-dialog.vala:207 +#: src/shutdown-dialog.vala:105 src/shutdown-dialog.vala:207 msgid "Shut Down" msgstr "Herunterfahren" -#: ../src/shutdown-dialog.vala:112 +#: src/shutdown-dialog.vala:112 msgid "Are you sure you want to shut down the computer?" msgstr "Wollen Sie den Rechner wirklich herunterfahren?" -#: ../src/shutdown-dialog.vala:137 +#: src/shutdown-dialog.vala:137 msgid "" "Other users are currently logged in to this computer, shutting down now will " "also close these other sessions." @@ -94,60 +107,47 @@ "Zur Zeit sind noch andere Benutzer an diesem Rechner angemeldet. Wenn Sie " "jetzt den Rechner herunterfahren, werden diese Benutzer abgemeldet." -#: ../src/shutdown-dialog.vala:155 -msgid "Suspend" -msgstr "Bereitschaft" - -#: ../src/shutdown-dialog.vala:172 -msgid "Hibernate" -msgstr "Ruhezustand" - -#: ../src/shutdown-dialog.vala:190 +#: src/shutdown-dialog.vala:190 msgid "Restart" msgstr "Neustarten" -#. Translators: %s is a session name like KDE or Ubuntu -#: ../src/toggle-box.vala:98 -#, c-format -msgid "%s (Default)" -msgstr "%s (Standard)" - -#. Help string for command line --version flag -#: ../src/slick-greeter.vala:512 +#: src/slick-greeter.vala:634 msgid "Show release version" msgstr "Veröffentlichungsversion anzeigen" -#. Help string for command line --test-mode flag -#: ../src/slick-greeter.vala:515 +#: src/slick-greeter.vala:637 msgid "Run in test mode" msgstr "Im Testmodus starten" -#. Arguments and description for --help text -#: ../src/slick-greeter.vala:521 +#: src/slick-greeter.vala:643 msgid "- Slick Greeter" msgstr "- Slick Greeter" -#. Text printed out when an unknown command-line argument provided -#: ../src/slick-greeter.vala:532 +#: src/slick-greeter.vala:654 #, c-format msgid "Run '%s --help' to see a full list of available command line options." msgstr "" "Bitte »%s --help« eingeben, um eine vollständige Liste der verfügbaren " "Befehlszeilenoptionen einzusehen." -#: ../src/user-list.vala:45 +#: src/toggle-box.vala:98 +#, c-format +msgid "%s (Default)" +msgstr "%s (Standard)" + +#: src/user-list.vala:45 msgid "Guest Session" msgstr "Gastzugang" -#: ../src/user-list.vala:438 +#: src/user-list.vala:438 msgid "Please enter a complete e-mail address" msgstr "Bitte eine vollständige E-Mail-Adresse eingeben" -#: ../src/user-list.vala:518 +#: src/user-list.vala:518 msgid "Incorrect e-mail address or password" msgstr "Ungültige(s) E-Mail-Adresse oder Passwort" -#: ../src/user-list.vala:549 +#: src/user-list.vala:549 msgid "" "If you have an account on an RDP or Citrix server, Remote Login lets you run " "applications from that server." @@ -155,8 +155,7 @@ "Wenn Sie über ein Konto auf einem RDP- oder Citrix-Server verfügen, können " "Sie mit dem Fernzugriff von diesem Server aus Anwendungen ausführen." -#. For 12.10 we still don't support Citrix -#: ../src/user-list.vala:551 +#: src/user-list.vala:551 msgid "" "If you have an account on an RDP server, Remote Login lets you run " "applications from that server." @@ -164,15 +163,15 @@ "Falls Sie ein Konto auf einem RDP-Server besitzen, können Sie über den " "Fernzugriff Anwendungen von diesem Server ausführen." -#: ../src/user-list.vala:554 +#: src/user-list.vala:554 msgid "Cancel" msgstr "Abbrechen" -#: ../src/user-list.vala:555 +#: src/user-list.vala:555 msgid "Set Up…" msgstr "Einrichten …" -#: ../src/user-list.vala:557 +#: src/user-list.vala:557 msgid "" "You need an Ubuntu Remote Login account to use this service. Would you like " "to set up an account now?" @@ -180,50 +179,49 @@ "Sie benötigen ein Ubuntu-Fernzugriffskonto, um diesen Dienst zu nutzen. " "Möchten Sie jetzt ein Fernzugriffskonto einrichten?" -#: ../src/user-list.vala:561 +#: src/user-list.vala:561 msgid "OK" msgstr "OK" -#: ../src/user-list.vala:562 +#: src/user-list.vala:562 msgid "" -"You need an Ubuntu Remote Login account to use this service. Visit " -"uccs.canonical.com to set up an account." +"You need an Ubuntu Remote Login account to use this service. Visit uccs." +"canonical.com to set up an account." msgstr "" "Sie benötigen ein Ubuntu Fernzugriffskonto, um diesen Dienst zu nutzen. " "Besuchen Sie uccs.canonical.com, um ein Konto einzurichten." -#: ../src/user-list.vala:679 +#: src/user-list.vala:681 msgid "Server type not supported." msgstr "Server-Typ nicht unterstützt." -#: ../src/user-list.vala:720 +#: src/user-list.vala:722 msgid "Domain:" msgstr "Domäne:" -#: ../src/user-list.vala:781 +#: src/user-list.vala:783 msgid "Email address:" msgstr "E-Mail-Adresse:" -#. 'Log In' here is the button for logging in. -#: ../src/user-list.vala:825 +#: src/user-list.vala:827 msgid "Log In" msgstr "Anmelden" -#: ../src/user-list.vala:826 +#: src/user-list.vala:828 #, c-format msgid "Login as %s" msgstr "Als %s anmelden" -#: ../src/user-list.vala:830 +#: src/user-list.vala:832 msgid "Retry" msgstr "Erneut versuchen" -#: ../src/user-list.vala:831 +#: src/user-list.vala:833 #, c-format msgid "Retry as %s" msgstr "Erneut versuchen als %s" -#: ../src/user-list.vala:869 +#: src/user-list.vala:871 msgid "Login" msgstr "Anmelden" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/slick-greeter.pot new/slick-greeter-1.0.9/slick-greeter.pot --- old/slick-greeter-1.0.8/slick-greeter.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/slick-greeter-1.0.9/slick-greeter.pot 2017-10-27 14:33:23.000000000 +0200 @@ -0,0 +1,221 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-14 16:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/greeter-list.vala:302 +#, c-format +msgid "Enter password for %s" +msgstr "" + +#: src/greeter-list.vala:811 src/user-list.vala:703 +msgid "Password:" +msgstr "" + +#: src/greeter-list.vala:813 src/user-list.vala:697 +msgid "Username:" +msgstr "" + +#: src/greeter-list.vala:868 +msgid "Invalid password, please try again" +msgstr "" + +#: src/greeter-list.vala:879 +msgid "Failed to authenticate" +msgstr "" + +#: src/greeter-list.vala:925 +msgid "Failed to start session" +msgstr "" + +#: src/greeter-list.vala:940 +msgid "Logging in..." +msgstr "" + +#: src/main-window.vala:49 +msgid "Login Screen" +msgstr "" + +#: src/main-window.vala:110 +msgid "Back" +msgstr "" + +#: src/menubar.vala:322 +msgid "Power:" +msgstr "" + +#: src/menubar.vala:372 +msgid "Accessibility" +msgstr "" + +#: src/menubar.vala:381 +msgid "Onscreen keyboard" +msgstr "" + +#: src/menubar.vala:386 +msgid "High Contrast" +msgstr "" + +#: src/menubar.vala:392 +msgid "Screen Reader" +msgstr "" + +#: src/menubar.vala:404 src/menubar.vala:451 +msgid "Quit..." +msgstr "" + +#: src/menubar.vala:417 src/shutdown-dialog.vala:155 +msgid "Suspend" +msgstr "" + +#: src/menubar.vala:435 src/shutdown-dialog.vala:172 +msgid "Hibernate" +msgstr "" + +#: src/menubar.vala:474 +msgid "Keyboard layout:" +msgstr "" + +#: src/prompt-box.vala:215 +msgid "Session Options" +msgstr "" + +#: src/session-list.vala:34 +msgid "Select desktop environment" +msgstr "" + +#: src/shutdown-dialog.vala:101 +msgid "Goodbye. Would you like to..." +msgstr "" + +#: src/shutdown-dialog.vala:105 src/shutdown-dialog.vala:207 +msgid "Shut Down" +msgstr "" + +#: src/shutdown-dialog.vala:112 +msgid "Are you sure you want to shut down the computer?" +msgstr "" + +#: src/shutdown-dialog.vala:137 +msgid "" +"Other users are currently logged in to this computer, shutting down now will " +"also close these other sessions." +msgstr "" + +#: src/shutdown-dialog.vala:190 +msgid "Restart" +msgstr "" + +#: src/slick-greeter.vala:616 +msgid "Show release version" +msgstr "" + +#: src/slick-greeter.vala:619 +msgid "Run in test mode" +msgstr "" + +#: src/slick-greeter.vala:635 +#, c-format +msgid "Run '%s --help' to see a full list of available command line options." +msgstr "" + +#: src/toggle-box.vala:98 +#, c-format +msgid "%s (Default)" +msgstr "" + +#: src/user-list.vala:45 +msgid "Guest Session" +msgstr "" + +#: src/user-list.vala:438 +msgid "Please enter a complete e-mail address" +msgstr "" + +#: src/user-list.vala:518 +msgid "Incorrect e-mail address or password" +msgstr "" + +#: src/user-list.vala:549 +msgid "" +"If you have an account on an RDP or Citrix server, Remote Login lets you run " +"applications from that server." +msgstr "" + +#: src/user-list.vala:551 +msgid "" +"If you have an account on an RDP server, Remote Login lets you run " +"applications from that server." +msgstr "" + +#: src/user-list.vala:554 +msgid "Cancel" +msgstr "" + +#: src/user-list.vala:555 +msgid "Set Up..." +msgstr "" + +#: src/user-list.vala:557 +msgid "" +"You need an Ubuntu Remote Login account to use this service. Would you like " +"to set up an account now?" +msgstr "" + +#: src/user-list.vala:561 +msgid "OK" +msgstr "" + +#: src/user-list.vala:562 +msgid "" +"You need an Ubuntu Remote Login account to use this service. Visit uccs." +"canonical.com to set up an account." +msgstr "" + +#: src/user-list.vala:681 +msgid "Server type not supported." +msgstr "" + +#: src/user-list.vala:722 +msgid "Domain:" +msgstr "" + +#: src/user-list.vala:783 +msgid "Email address:" +msgstr "" + +#: src/user-list.vala:827 +msgid "Log In" +msgstr "" + +#: src/user-list.vala:828 +#, c-format +msgid "Login as %s" +msgstr "" + +#: src/user-list.vala:832 +msgid "Retry" +msgstr "" + +#: src/user-list.vala:833 +#, c-format +msgid "Retry as %s" +msgstr "" + +#: src/user-list.vala:871 +msgid "Login" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/background.vala new/slick-greeter-1.0.9/src/background.vala --- old/slick-greeter-1.0.8/src/background.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/background.vala 2017-10-27 14:33:23.000000000 +0200 @@ -207,7 +207,7 @@ var y = (int) (image.height / grid_size - 2) * grid_size + grid_y_offset; bc.translate (grid_x_offset, y); bc.set_source_surface (logo, 0, 0); - bc.paint_with_alpha (0.5); + bc.paint_with_alpha (1.0); bc.restore (); } @@ -397,8 +397,6 @@ /* Fallback color - shown upon first startup, until an async background loader finishes, * or until a user background or default background is loaded. */ - private bool draw_user_backgrounds = UGSettings.get_boolean (UGSettings.KEY_DRAW_USER_BACKGROUNDS); - private string _fallback_color = null; public string fallback_color { get { @@ -481,9 +479,9 @@ private Cairo.Surface? version_logo_surface = null; private int version_logo_width; private int version_logo_height; - private Cairo.Surface? background_logo_surface = null; - private int background_logo_width; - private int background_logo_height; + private Cairo.Surface? other_monitors_logo_surface = null; + private int other_monitors_logo_width; + private int other_monitors_logo_height; public Background () { @@ -503,14 +501,14 @@ timer = new AnimateTimer (AnimateTimer.ease_in_out, 700); - set_logo (UGSettings.get_string (UGSettings.KEY_LOGO), UGSettings.get_string (UGSettings.KEY_BACKGROUND_LOGO)); + set_logo (UGSettings.get_string (UGSettings.KEY_LOGO), UGSettings.get_string (UGSettings.KEY_OTHER_MONITORS_LOGO)); timer.animate.connect (animate_cb); } - public void set_logo (string version_logo, string background_logo) + public void set_logo (string version_logo, string other_monitors_logo) { version_logo_surface = load_image (version_logo, out version_logo_width, out version_logo_height); - background_logo_surface = load_image (background_logo, out background_logo_width, out background_logo_height); + other_monitors_logo_surface = load_image (other_monitors_logo, out other_monitors_logo_width, out other_monitors_logo_height); } private Cairo.Surface? load_image (string filename, out int width, out int height) @@ -645,13 +643,13 @@ c.paint_with_alpha (alpha); c.restore (); - if (monitor != active_monitor && background_logo_surface != null) + if (monitor != active_monitor && other_monitors_logo_surface != null) { - var width = background_logo_width; - var height = background_logo_height; + var width = other_monitors_logo_width; + var height = other_monitors_logo_height; c.save (); - pattern = new Cairo.Pattern.for_surface (background_logo_surface); + pattern = new Cairo.Pattern.for_surface (other_monitors_logo_surface); matrix = Cairo.Matrix.identity (); var x = monitor.x + (monitor.width - width) / 2; var y = monitor.y + (monitor.height - height) / 2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/dash-button.vala new/slick-greeter-1.0.9/src/dash-button.vala --- old/slick-greeter-1.0.8/src/dash-button.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/dash-button.vala 2017-10-27 14:33:23.000000000 +0200 @@ -67,8 +67,7 @@ try { var style = new Gtk.CssProvider (); - style.load_from_data ("* {padding: 6px 8px 6px 8px; - }", -1); + style.load_from_data ("* {padding: 6px 8px 6px 8px;}", -1); this.get_style_context ().add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); } catch (Error e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/greeter-list.vala new/slick-greeter-1.0.9/src/greeter-list.vala --- old/slick-greeter-1.0.8/src/greeter-list.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/greeter-list.vala 2017-10-27 14:33:23.000000000 +0200 @@ -937,7 +937,7 @@ sensitive = false; selected_entry.clear (); - selected_entry.add_message (_("Logging in…"), false); + selected_entry.add_message (_("Logging in..."), false); redraw_greeter_box (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/main-window.vala new/slick-greeter-1.0.9/src/main-window.vala --- old/slick-greeter-1.0.8/src/main-window.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/main-window.vala 2017-10-27 14:33:23.000000000 +0200 @@ -66,15 +66,12 @@ var shadow_style = ""; if (FileUtils.test (shadow_path, FileTest.EXISTS)) { - shadow_style = "background-image: url('%s'); - background-repeat: repeat;".printf(shadow_path); + shadow_style = "background-image: url('%s');background-repeat: repeat;".printf(shadow_path); } try { var style = new Gtk.CssProvider (); - style.load_from_data ("* {background-color: transparent; - %s - }".printf(shadow_style), -1); + style.load_from_data ("* {background-color: transparent;%s}".printf(shadow_style), -1); var context = menubox.get_style_context (); context.add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/menubar.vala new/slick-greeter-1.0.9/src/menubar.vala --- old/slick-greeter-1.0.8/src/menubar.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/menubar.vala 2017-10-27 14:33:23.000000000 +0200 @@ -139,65 +139,80 @@ pack_direction = Gtk.PackDirection.RTL; - var session_menu = make_session_item (); - session_menu.right_justified = true; - append (session_menu); - - clock_label = new Gtk.Label (""); - var fg = clock_label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); - clock_label.override_color (Gtk.StateFlags.INSENSITIVE, fg); - clock_label.show (); - var item = new Gtk.MenuItem (); - item.add (clock_label); - item.sensitive = false; - item.show (); - append (item); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_QUIT)) + { + var session_menu = make_session_item (); + append (session_menu); + } - update_clock (); - Timeout.add (1000, update_clock); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_CLOCK)) + { + clock_label = new Gtk.Label (""); + var clock_fg = clock_label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); + clock_label.override_color (Gtk.StateFlags.INSENSITIVE, clock_fg); + clock_label.show (); + var item = new Gtk.MenuItem (); + item.add (clock_label); + item.sensitive = false; + item.show (); + append (item); + update_clock (); + Timeout.add (1000, update_clock); + } - power_menu_item = new Gtk.MenuItem (); - var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3); - hbox.show (); - power_icon = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "battery.svg")); - power_icon.show (); - hbox.add (power_icon); - hbox.set_spacing (6); - power_label = new Gtk.Label (""); - power_label.sensitive = false; - fg = power_label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); - power_label.override_color (Gtk.StateFlags.INSENSITIVE, fg); - power_label.show (); - hbox.add (power_label); - power_menu_item.add (hbox); - power_menu_item.hide (); - append (power_menu_item); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_POWER)) + { + power_menu_item = new Gtk.MenuItem (); + var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3); + hbox.show (); + power_icon = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "battery.svg")); + power_icon.show (); + hbox.add (power_icon); + hbox.set_spacing (6); + power_label = new Gtk.Label (""); + power_label.sensitive = false; + var power_fg = power_label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); + power_label.override_color (Gtk.StateFlags.INSENSITIVE, power_fg); + power_label.show (); + hbox.add (power_label); + power_menu_item.add (hbox); + power_menu_item.hide (); + append (power_menu_item); - var keyboard_menu = make_keyboard_item (); - append (keyboard_menu); + try + { + upowerd = Bus.get_proxy_sync(BusType.SYSTEM, "org.freedesktop.UPower", "/org/freedesktop/UPower"); + upowerd.device_added.connect(on_power_device_added); + upowerd.device_removed.connect(on_power_device_removed); + upowerd.device_changed.connect(on_power_device_changed); + upowerd.changed.connect(on_changed); + upowerd.sleeping.connect(on_sleeping); + upowerd.resuming.connect(on_resuming); + query_upower_daemon (); + Timeout.add (60000, query_upower_daemon); + } catch (IOError e) + { + warning("Could not connect to Upower: %s", e.message); + } + } - try { - upowerd = Bus.get_proxy_sync(BusType.SYSTEM, "org.freedesktop.UPower", "/org/freedesktop/UPower"); - upowerd.device_added.connect(on_power_device_added); - upowerd.device_removed.connect(on_power_device_removed); - upowerd.device_changed.connect(on_power_device_changed); - upowerd.changed.connect(on_changed); - upowerd.sleeping.connect(on_sleeping); - upowerd.resuming.connect(on_resuming); - query_upower_daemon (); - Timeout.add (60000, query_upower_daemon); - } catch (IOError e) { - warning("Could not connect to Upower: %s", e.message); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_KEYBOARD)) + { + var keyboard_menu = make_keyboard_item (); + append (keyboard_menu); } - var a11y_item = make_a11y_item (); - append (a11y_item); + if (UGSettings.get_boolean (UGSettings.KEY_SHOW_A11Y)) + { + var a11y_item = make_a11y_item (); + append (a11y_item); + } if (UGSettings.get_boolean (UGSettings.KEY_SHOW_HOSTNAME)) { var label = new Gtk.Label (Posix.utsname ().nodename); - fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); - label.override_color (Gtk.StateFlags.INSENSITIVE, fg); + var hostname_fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); + label.override_color (Gtk.StateFlags.INSENSITIVE, hostname_fg); label.show (); var hostname_item = new Gtk.MenuItem (); hostname_item.add (label); @@ -302,7 +317,9 @@ else { char[] buffer = new char[double.DTOSTR_BUF_SIZE]; unowned string str = device.percentage.to_str (buffer); - power_label.set_label(str.concat("%")); + var percentage_string = str.concat("%"); + power_label.set_label(percentage_string); + power_menu_item.set_tooltip_text (_("Power:").concat(" ").concat(percentage_string)); var icon = "battery.svg"; if (device.percentage <= 50.0) { icon = "battery_50.svg"; @@ -322,6 +339,7 @@ { var current_time = new DateTime.now_local (); clock_label.set_label(current_time.format ("%H:%M")); + clock_label.set_tooltip_text (current_time.format ("%x")); return true; } @@ -351,6 +369,7 @@ private Gtk.MenuItem make_a11y_item () { var a11y_item = new Gtk.MenuItem (); + a11y_item.set_tooltip_text(_("Accessibility")); var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3); hbox.show (); a11y_item.add (hbox); @@ -382,6 +401,7 @@ private Gtk.MenuItem make_session_item () { var item = new Gtk.MenuItem (); + item.set_tooltip_text(_("Quit...")); var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3); hbox.show (); item.add (hbox); @@ -451,9 +471,10 @@ var current_layout = LightDM.get_layout (); if (current_layout != null) { label.set_label (current_layout.name); + item.set_tooltip_text(_("Keyboard layout:").concat(" ").concat(current_layout.description)); } - var fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); - label.override_color (Gtk.StateFlags.INSENSITIVE, fg); + var keyboard_fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL); + label.override_color (Gtk.StateFlags.INSENSITIVE, keyboard_fg); label.show (); hbox.add (label); item.show (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/settings.vala new/slick-greeter-1.0.9/src/settings.vala --- old/slick-greeter-1.0.8/src/settings.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/settings.vala 2017-10-27 14:33:23.000000000 +0200 @@ -25,8 +25,13 @@ 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_SHOW_POWER = "show-power"; + public const string KEY_SHOW_A11Y = "show-a11y"; + public const string KEY_SHOW_CLOCK = "show-clock"; + public const string KEY_SHOW_KEYBOARD = "show-keyboard"; + public const string KEY_SHOW_QUIT = "show-quit"; public const string KEY_LOGO = "logo"; - public const string KEY_BACKGROUND_LOGO = "background-logo"; + public const string KEY_OTHER_MONITORS_LOGO = "other-monitors-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"; @@ -40,8 +45,8 @@ public const string KEY_PLAY_READY_SOUND = "play-ready-sound"; 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_ENABLE_HIDPI = "enable-hidpi"; + public const string KEY_ACTIVATE_NUMLOCK = "activate-numlock"; public static bool get_boolean (string key) { @@ -114,7 +119,7 @@ string_keys.append (KEY_BACKGROUND); string_keys.append (KEY_BACKGROUND_COLOR); string_keys.append (KEY_LOGO); - string_keys.append (KEY_BACKGROUND_LOGO); + string_keys.append (KEY_OTHER_MONITORS_LOGO); string_keys.append (KEY_THEME_NAME); string_keys.append (KEY_ICON_THEME_NAME); string_keys.append (KEY_FONT_NAME); @@ -127,10 +132,15 @@ bool_keys.append (KEY_DRAW_USER_BACKGROUNDS); bool_keys.append (KEY_DRAW_GRID); bool_keys.append (KEY_SHOW_HOSTNAME); + bool_keys.append (KEY_SHOW_POWER); + bool_keys.append (KEY_SHOW_A11Y); + bool_keys.append (KEY_SHOW_CLOCK); + bool_keys.append (KEY_SHOW_KEYBOARD); + bool_keys.append (KEY_SHOW_QUIT); bool_keys.append (KEY_XFT_ANTIALIAS); + bool_keys.append (KEY_ACTIVATE_NUMLOCK); var int_keys = new List<string> (); - int_keys.append (KEY_IDLE_TIMEOUT); int_keys.append (KEY_XFT_DPI); var strv_keys = new List<string> (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/shutdown-dialog.vala new/slick-greeter-1.0.9/src/shutdown-dialog.vala --- old/slick-greeter-1.0.8/src/shutdown-dialog.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/shutdown-dialog.vala 2017-10-27 14:33:23.000000000 +0200 @@ -98,7 +98,7 @@ if (type == ShutdownDialogType.SHUTDOWN) { - text = _("Goodbye. Would you like to…"); + text = _("Goodbye. Would you like to..."); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/slick-greeter.vala new/slick-greeter-1.0.9/src/slick-greeter.vala --- old/slick-greeter-1.0.8/src/slick-greeter.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/slick-greeter.vala 2017-10-27 14:33:23.000000000 +0200 @@ -58,16 +58,7 @@ greeter = new LightDM.Greeter (); greeter.show_message.connect ((text, type) => { show_message (text, type); }); greeter.show_prompt.connect ((text, type) => { show_prompt (text, type); }); - greeter.autologin_timer_expired.connect (() => { - try - { - greeter.authenticate_autologin (); - } - catch (Error e) - { - warning ("Failed to autologin authenticate: %s", e.message); - } - }); + greeter.autologin_timer_expired.connect (() => { greeter.authenticate_autologin (); }); greeter.authentication_complete.connect (() => { authentication_complete (); }); var connected = false; try @@ -183,7 +174,19 @@ sessions.append ("plasma"); sessions.append ("kde-plasma"); sessions.append ("kde"); + sessions.append ("budgie-desktop"); sessions.append ("gnome"); + sessions.append ("LXDE"); + sessions.append ("lxqt"); + sessions.append ("pekwm"); + sessions.append ("pantheon"); + sessions.append ("i3"); + sessions.append ("enlightenment"); + sessions.append ("deepin"); + sessions.append ("openbox"); + sessions.append ("awesome"); + sessions.append ("gnome-xorg"); + sessions.append ("ubuntu-xorg"); foreach (string session in sessions) { var path = Path.build_filename ("/usr/share/xsessions/", session.concat(".desktop"), null); @@ -229,7 +232,7 @@ // bg.draw_full (c, Background.DrawFlags.NONE); // c = null; // refresh_background (screen, background_surface); - + main_window.before_session_start(); if (test_mode) @@ -300,62 +303,27 @@ public void authenticate (string? userid = null) { - try - { - greeter.authenticate (userid); - } - catch (Error e) - { - warning ("Failed to authenticate: %s", e.message); - } + greeter.authenticate (userid); } public void authenticate_as_guest () { - try - { - greeter.authenticate_as_guest (); - } - catch (Error e) - { - warning ("Failed to authenticate as guest: %s", e.message); - } + greeter.authenticate_as_guest (); } public void authenticate_remote (string session, string? userid) { - try - { - SlickGreeter.singleton.greeter.authenticate_remote (session, userid); - } - catch (Error e) - { - warning ("Failed to remote authenticate: %s", e.message); - } + SlickGreeter.singleton.greeter.authenticate_remote (session, userid); } public void cancel_authentication () { - try - { - greeter.cancel_authentication (); - } - catch (Error e) - { - warning ("Failed to cancel authentication: %s", e.message); - } + greeter.cancel_authentication (); } public void respond (string response) { - try - { - greeter.respond (response); - } - catch (Error e) - { - warning ("Failed to respond: %s", e.message); - } + greeter.respond (response); } public string authentication_user () @@ -556,6 +524,16 @@ } } + private static void activate_numlock () + { + try { + Process.spawn_command_line_sync("/usr/bin/numlockx on", null, null, null); + } + catch (Error e){ + warning ("Error while activating numlock: %s", e.message); + } + } + public static int main (string[] args) { /* Protect memory from being paged to disk, as we deal with passwords */ @@ -597,6 +575,12 @@ /* Set the keyboard layout */ set_keyboard_layout (); + /* Set the numlock state */ + if (UGSettings.get_boolean (UGSettings.KEY_ACTIVATE_NUMLOCK)) { + debug ("Activating numlock"); + activate_numlock (); + } + Pid atspi_pid = 0; try @@ -639,8 +623,7 @@ OptionEntry[] options = { versionOption, testOption, nullOption }; debug ("Loading command line options"); - var c = new OptionContext (/* Arguments and description for --help text */ - _("- Slick Greeter")); + var c = new OptionContext ("- Slick Greeter"); c.add_main_entries (options, Config.GETTEXT_PACKAGE); c.add_group (Gtk.get_option_group (true)); try diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.0.8/src/user-list.vala new/slick-greeter-1.0.9/src/user-list.vala --- old/slick-greeter-1.0.8/src/user-list.vala 2017-06-19 16:53:19.000000000 +0200 +++ new/slick-greeter-1.0.9/src/user-list.vala 2017-10-27 14:33:23.000000000 +0200 @@ -552,7 +552,7 @@ if (offer_guest) { dialog.add_button (_("Cancel"), 0); - var b = dialog.add_button (_("Set Up…"), 1); + var b = dialog.add_button (_("Set Up..."), 1); b.grab_focus (); dialog.text = _("You need an Ubuntu Remote Login account to use this service. Would you like to set up an account now?"); }
