Skip to content

Commit

Permalink
Merge branch 'master' into lenemter/cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
lenemter authored Feb 5, 2024
2 parents aa970bb + f733193 commit 1465786
Show file tree
Hide file tree
Showing 9 changed files with 216 additions and 2 deletions.
15 changes: 15 additions & 0 deletions compositor/WindowManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,21 @@ namespace GreeterCompositor {
public override void start () {
show_stage ();

unowned var background_actor = system_background.background_actor;
background_actor.opacity = 0;
background_actor.save_easing_state ();
background_actor.set_easing_duration (1000);
background_actor.set_easing_mode (Clutter.AnimationMode.EASE);
background_actor.opacity = 255;
background_actor.restore_easing_state ();

ui_group.opacity = 0;
ui_group.save_easing_state ();
ui_group.set_easing_duration (1000);
ui_group.set_easing_mode (Clutter.AnimationMode.EASE);
ui_group.opacity = 255;
ui_group.restore_easing_state ();

unowned Meta.Display display = get_display ();
display.gl_video_memory_purged.connect (() => {
refresh_background ();
Expand Down
1 change: 1 addition & 0 deletions po/LINGUAS
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,4 @@ aa
ab
gn
an
id_ID
1 change: 1 addition & 0 deletions po/extra/LINGUAS
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,4 @@ aa
ab
gn
an
id_ID
73 changes: 73 additions & 0 deletions po/extra/id_ID.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the extra package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: extra\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-06-19 17:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: id_ID\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: data/greeter.metainfo.xml.in:9
msgid "Login &amp; Lock Screen"
msgstr ""

#: data/greeter.metainfo.xml.in:10
msgid "Unlock or log in to your device"
msgstr ""

#: data/greeter.metainfo.xml.in:33
msgid "elementary, Inc."
msgstr ""

#: data/greeter.metainfo.xml.in:40 data/greeter.metainfo.xml.in:54
#: data/greeter.metainfo.xml.in:70 data/greeter.metainfo.xml.in:83
#: data/greeter.metainfo.xml.in:97
msgid "Minor updates:"
msgstr ""

#: data/greeter.metainfo.xml.in:42
msgid "Prevent a potential issue with dialogs that use portals"
msgstr ""

#: data/greeter.metainfo.xml.in:43
msgid "Fix potential issues with incorrect keyboard layout being set"
msgstr ""

#: data/greeter.metainfo.xml.in:44 data/greeter.metainfo.xml.in:56
#: data/greeter.metainfo.xml.in:72 data/greeter.metainfo.xml.in:85
#: data/greeter.metainfo.xml.in:99
msgid "Updated translations"
msgstr ""

#: data/greeter.metainfo.xml.in:66
msgid "New Features:"
msgstr ""

#: data/greeter.metainfo.xml.in:68
msgid "Provide panel background color interface"
msgstr ""

#: data/greeter.metainfo.xml.in:79 data/greeter.metainfo.xml.in:92
msgid "Improvements:"
msgstr ""

#: data/greeter.metainfo.xml.in:81
msgid "Fix a random issue where Greeter does not load correctly on boot"
msgstr ""

#: data/greeter.metainfo.xml.in:94
msgid "Hide clock during initial setup"
msgstr ""

#: data/greeter.metainfo.xml.in:95
msgid "Use selected accent color for logged in checkmark"
msgstr ""
103 changes: 103 additions & 0 deletions po/id_ID.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the io.elementary.greeter package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: io.elementary.greeter\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-06-19 17:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: id_ID\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"

#: compositor/WindowManager.vala:324
#, c-format
msgid "Changes will automatically revert after %i second."
msgid_plural "Changes will automatically revert after %i seconds."
msgstr[0] ""
msgstr[1] ""

#: compositor/WindowManager.vala:331
msgid "Keep new display settings?"
msgstr ""

#: compositor/WindowManager.vala:335
msgid "Keep Settings"
msgstr ""

#: compositor/WindowManager.vala:336
msgid "Use Previous Settings"
msgstr ""

#: src/MainWindow.vala:63
msgid "Log in as Guest"
msgstr ""

#: src/MainWindow.vala:65
msgid "Manual Login…"
msgstr ""

#: src/MainWindow.vala:409
msgid "Unable to Log In"
msgstr ""

#: src/MainWindow.vala:410
msgid "Starting the session has failed."
msgstr ""

#: src/MainWindow.vala:481
msgid "Unable to Launch Initial Setup"
msgstr ""

#: src/MainWindow.vala:486
msgid ""
"Initial Setup creates your first user. Without it, you will not be able to "
"log in and may need to reinstall the OS."
msgstr ""

#: src/Cards/ManualCard.vala:35
msgid "Manual Login"
msgstr ""

#: src/Cards/ManualCard.vala:44
msgid "Username"
msgstr ""

#: src/Cards/ManualCard.vala:47
msgid "Try username"
msgstr ""

#: src/Cards/UserCard.vala:112 src/Widgets/PasswordEntry.vala:27
msgid "Log In"
msgstr ""

#: src/Cards/UserCard.vala:124
msgid "Account disabled"
msgstr ""

#: src/Cards/UserCard.vala:229
msgid "Session cannot be changed while user is logged in"
msgstr ""

#: src/Widgets/CapsLockRevealer.vala:70
msgid "Caps Lock & Num Lock are on"
msgstr ""

#: src/Widgets/CapsLockRevealer.vala:72
msgid "Caps Lock is on"
msgstr ""

#: src/Widgets/CapsLockRevealer.vala:74
msgid "Num Lock is on"
msgstr ""

#: src/Widgets/PasswordEntry.vala:24
msgid "Password"
msgstr ""
4 changes: 2 additions & 2 deletions src/Application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ public int main (string[] args) {
var settings_daemon = new Greeter.SettingsDaemon ();
settings_daemon.start ();

Gtk.init (ref args);

Greeter.SubprocessSupervisor compositor;
Greeter.SubprocessSupervisor wingpanel;

Expand All @@ -43,6 +41,8 @@ public int main (string[] args) {
critical (e.message);
}

Gtk.init (ref args);

var window = new Greeter.MainWindow ();
window.show_all ();

Expand Down
3 changes: 3 additions & 0 deletions src/Cards/UserCard.vala
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,9 @@ public class Greeter.UserCard : Greeter.BaseCard {
interface_settings.set_value ("document-font-name", settings_act.document_font_name);
interface_settings.set_value ("font-name", settings_act.font_name);
interface_settings.set_value ("monospace-font-name", settings_act.monospace_font_name);

var touchscreen_settings = new GLib.Settings ("org.gnome.settings-daemon.peripherals.touchscreen");
touchscreen_settings.set_boolean ("orientation-lock", settings_act.orientation_lock);
}

private void set_night_light_settings () {
Expand Down
17 changes: 17 additions & 0 deletions src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,8 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
}

current_card.wrong_credentials ();

carousel.interactive = true;
}

private async void load_users () {
Expand Down Expand Up @@ -530,6 +532,10 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {

private unowned GLib.Binding? time_format_binding = null;
private void switch_to_card (Greeter.UserCard user_card) {
if (!carousel.interactive) {
return;
}

if (current_card != null && current_card is UserCard) {
((UserCard) current_card).show_input = false;
}
Expand Down Expand Up @@ -590,16 +596,27 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
critical (e.message);
}
}

carousel.interactive = false;
carousel.scroll_to (current_card);
}

private void go_previous () {
if (!carousel.interactive) {
return;
}

unowned Greeter.UserCard? next_card = user_cards.peek_nth (current_user_card_index - 1);
if (next_card != null) {
carousel.scroll_to (next_card);
}
}

private void go_next () {
if (!carousel.interactive) {
return;
}

unowned Greeter.UserCard? next_card = user_cards.peek_nth (current_user_card_index + 1);
if (next_card != null) {
carousel.scroll_to (next_card);
Expand Down
1 change: 1 addition & 0 deletions src/PantheonAccountsServicePlugin.vala
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ interface Pantheon.SettingsDaemon.AccountsService : Object {
public abstract string document_font_name { owned get; set; }
public abstract string font_name { owned get; set; }
public abstract string monospace_font_name { owned get; set; }
public abstract bool orientation_lock { get; set; }

/* Night Light */
public struct Coordinates {
Expand Down

0 comments on commit 1465786

Please sign in to comment.