diff options
| -rw-r--r-- | ChangeLog | 35 | ||||
| -rw-r--r-- | NEWS | 13 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/arctica-greeter-check-hidpi.1 | 2 | ||||
| -rw-r--r-- | data/arctica-greeter-enable-tap-to-click.1 | 2 | ||||
| -rw-r--r-- | data/arctica-greeter-guest-account-script.8 | 2 | ||||
| -rw-r--r-- | data/arctica-greeter-magnifier.1 | 2 | ||||
| -rw-r--r-- | data/arctica-greeter-set-keyboard-layout.1 | 2 | ||||
| -rw-r--r-- | data/arctica-greeter.1 | 2 | ||||
| -rw-r--r-- | data/org.ArcticaProject.arctica-greeter.gschema.xml | 40 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | po/el.po | 142 | ||||
| -rw-r--r-- | src/arctica-greeter.vala | 3 | ||||
| -rw-r--r-- | src/background.vala | 29 | ||||
| -rw-r--r-- | src/dash-box.vala | 8 | ||||
| -rw-r--r-- | src/greeter-list.vala | 3 | ||||
| -rw-r--r-- | src/list-stack.vala | 3 | ||||
| -rw-r--r-- | src/main-window.vala | 74 | ||||
| -rw-r--r-- | src/prompt-box.vala | 69 | ||||
| -rw-r--r-- | src/settings.vala | 23 | ||||
| -rw-r--r-- | src/shutdown-dialog.vala | 10 |
21 files changed, 361 insertions, 112 deletions
@@ -1,6 +1,39 @@ +2025-04-24 Mike Gabriel + + * Release 0.99.8.10 (HEAD -> master, tag: 0.99.8.10) + +2025-04-22 Mike Gabriel + + * Merge branch 'tari01-pr/prompt-box-tweaks' (2d6ade9) + +2025-04-11 Robert Tari + + * src/settings.vala: Drop unused safe_get_boolean (66148f4) + * Fix deprecated colour overrides (f270371) + * Add logo positioning tweaks (4d10346) + +2025-04-10 Robert Tari + + * Add prompt box tweaks (33ec57f) + +2025-04-10 Mike Gabriel + + * Merge branch 'tari01-pr/size-position-fix' (65ccc9a) + +2025-04-08 Robert Tari + + * src/shutdown-dialog: Fix possible null warning (9153eef) + * src/arctica-greeter.vala: Drop unused wm_message_pid (88c789a) + * src/main-window.vala: Drop deprecated Gdk.Screen.get_* functions + (c2bc2ca) + * src/main-window.vala: Fix content_box.margin_right and margin_left + (a0e8568) + * src/main-window.vala: Fix DBusConnection.call (b5c6f85) + * Fix size and position of elements (e0acacd) + 2025-04-08 Mike Gabriel - * Release 0.99.8.9 (HEAD -> master, tag: 0.99.8.9) + * Release 0.99.8.9 (81c3c04) (tag: 0.99.8.9) * Merge branch 'tari01-pr/greeter-accelerators' (908972c) 2025-04-07 Quentin PAGÈS @@ -1,3 +1,16 @@ +Overview of changes in arctica-greeter 0.99.8.10 + + - src/settings.vala: Drop unused safe_get_boolean. + - Fix deprecated colour overrides. + - Add logo positioning tweaks. + - Add prompt box tweaks. + - src/shutdown-dialog: Fix possible null warning. + - src/arctica-greeter.vala: Drop unused wm_message_pid. + - src/main-window.vala: Drop deprecated Gdk.Screen.get_* functions. + - src/main-window.vala: Fix content_box.margin_right and margin_left. + - src/main-window.vala: Fix DBusConnection.call. + - Fix size and position of elements. + Overview of changes in arctica-greeter 0.99.8.9 - src/main-window.vala: Toggle a11y states when accelerators are diff --git a/configure.ac b/configure.ac index 154113b..45bd24b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(arctica-greeter, 0.99.8.9) +AC_INIT(arctica-greeter, 0.99.8.10) AC_CONFIG_MACRO_DIR(m4) AM_INIT_AUTOMAKE(subdir-objects) AM_PROG_CC_C_O diff --git a/data/arctica-greeter-check-hidpi.1 b/data/arctica-greeter-check-hidpi.1 index 4745719..fbd6c8e 100644 --- a/data/arctica-greeter-check-hidpi.1 +++ b/data/arctica-greeter-check-hidpi.1 @@ -1,4 +1,4 @@ -.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.9" "LightDM Greeter" +.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.10" "LightDM Greeter" .SH NAME arctica-greeter-check-hidpi \- Check for HiDPI display in Arctica Greeter .SH SYNOPSIS diff --git a/data/arctica-greeter-enable-tap-to-click.1 b/data/arctica-greeter-enable-tap-to-click.1 index d9b5e21..fb9dbb0 100644 --- a/data/arctica-greeter-enable-tap-to-click.1 +++ b/data/arctica-greeter-enable-tap-to-click.1 @@ -1,4 +1,4 @@ -.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.9" "LightDM Greeter" +.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.10" "LightDM Greeter" .SH NAME arctica-greeter-enable-tap-to-click \- Enable tap-to-click in Arctica Greeter .SH SYNOPSIS diff --git a/data/arctica-greeter-guest-account-script.8 b/data/arctica-greeter-guest-account-script.8 index ca06500..48361ce 100644 --- a/data/arctica-greeter-guest-account-script.8 +++ b/data/arctica-greeter-guest-account-script.8 @@ -1,4 +1,4 @@ -.TH ARCTICA-GREETER 8 "Apr 2025" "Version 0.99.8.9" "LightDM Greeter" +.TH ARCTICA-GREETER 8 "Apr 2025" "Version 0.99.8.10" "LightDM Greeter" .SH NAME arctica-greeter-guest-account-script \- Create temp user for an Arctica Greeter's Guest Session .SH SYNOPSIS diff --git a/data/arctica-greeter-magnifier.1 b/data/arctica-greeter-magnifier.1 index 7f9beea..b0b4f59 100644 --- a/data/arctica-greeter-magnifier.1 +++ b/data/arctica-greeter-magnifier.1 @@ -1,4 +1,4 @@ -.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.9" "LightDM Greeter" +.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.10" "LightDM Greeter" .SH NAME arctica-greeter-magnifier \- Magnifying glass for Arctica Greeter .SH SYNOPSIS diff --git a/data/arctica-greeter-set-keyboard-layout.1 b/data/arctica-greeter-set-keyboard-layout.1 index c8a4834..9267346 100644 --- a/data/arctica-greeter-set-keyboard-layout.1 +++ b/data/arctica-greeter-set-keyboard-layout.1 @@ -1,4 +1,4 @@ -.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.9" "LightDM Greeter" +.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.10" "LightDM Greeter" .SH NAME arctica-greeter-set-keyboard-layout \- Tool to set the keyboard layout in Arctica Greeter .SH SYNOPSIS diff --git a/data/arctica-greeter.1 b/data/arctica-greeter.1 index 2819138..2373b95 100644 --- a/data/arctica-greeter.1 +++ b/data/arctica-greeter.1 @@ -1,4 +1,4 @@ -.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.9" "LightDM Greeter" +.TH ARCTICA-GREETER 1 "Apr 2025" "Version 0.99.8.10" "LightDM Greeter" .SH NAME arctica-greeter \- LightDM greeter for the modern desktop .SH SYNOPSIS diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml index 68a2522..38be872 100644 --- a/data/org.ArcticaProject.arctica-greeter.gschema.xml +++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml @@ -295,5 +295,45 @@ <default>'left'</default> <summary>Alignment of the main content</summary> </key> + <key name="dash-box-bgcolor" type="s"> + <default>'#1A1A1A'</default> + <summary>The background color of the dash box in #RRGGBB format.</summary> + </key> + <key name="dash-box-opacity" type="d"> + <range min="0.1" max="1.0"/> + <default>0.4</default> + <summary>The opacity of the dash box.</summary> + </key> + <key name="prompt-box-color-normal" type="s"> + <default>'#ffffff'</default> + <summary>The normal text color of the prompt box in #RRGGBB format.</summary> + </key> + <key name="prompt-box-color-error" type="s"> + <default>'#820900'</default> + <summary>The error text color of the prompt box in #RRGGBB format.</summary> + </key> + <key name="prompt-box-error-bg-opacity" type="d"> + <range min="0.0" max="1.0"/> + <default>1.0</default> + <summary>The background opacity of the error message in the prompt box.</summary> + </key> + <key name="logo-position" type="s"> + <choices> + <choice value='top-left'/> + <choice value='top-right'/> + <choice value='bottom-left'/> + <choice value='bottom-right'/> + </choices> + <default>'bottom-left'</default> + <summary>The position of the logo.</summary> + </key> + <key name="logo-offset-horizontal" type="i"> + <default>2</default> + <summary>The horizontal offset of the logo from the edge of the screen in grid units.</summary> + </key> + <key name="logo-offset-vertical" type="i"> + <default>1</default> + <summary>The vertical offset of the logo from the edge of the screen in grid units.</summary> + </key> </schema> </schemalist> diff --git a/debian/changelog b/debian/changelog index 607e819..9f9a509 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +arctica-greeter (0.99.8.10) unstable; urgency=medium + + * Upstream-provided Debian package for arctica-greeter. See upstream + ChangeLog for recent changes. + + -- UBports developers <developers@ubports.com> Thu, 24 Apr 2025 09:57:09 +0200 + arctica-greeter (0.99.8.9) unstable; urgency=medium * Upstream-provided Debian package for arctica-greeter. See upstream @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: arctica-greeter\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-10-12 22:13+0200\n" -"PO-Revision-Date: 2021-02-09 16:50+0000\n" -"Last-Translator: Michalis <michalisntovas@yahoo.gr>\n" +"PO-Revision-Date: 2025-04-24 14:06+0000\n" +"Last-Translator: GiannosOB <giannos2105@gmail.com>\n" "Language-Team: Greek <https://hosted.weblate.org/projects/arctica-framework/" "greeter/el/>\n" "Language: el\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.5-dev\n" +"X-Generator: Weblate 5.11.1-dev\n" "X-Launchpad-Export-Date: 2015-08-05 05:27+0000\n" #: ../src/greeter-list.vala:306 @@ -27,7 +27,7 @@ msgstr "Εισάγετε κωδικό για %s" #: ../src/greeter-list.vala:308 msgid "Enter your username" -msgstr "" +msgstr "Εισάγετε το όνομα χρήστη σας" #: ../src/greeter-list.vala:837 ../src/user-list.vala:761 msgid "Password:" @@ -38,9 +38,8 @@ msgid "Username:" msgstr "Όνομα χρήστη:" #: ../src/greeter-list.vala:906 -#, fuzzy msgid "Invalid username or password, please try again" -msgstr "Λανθασμένος κωδικός, παρακαλώ δοκιμάστε ξανά" +msgstr "Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης, δοκιμάστε ξανά" #: ../src/greeter-list.vala:917 msgid "Failed to authenticate" @@ -105,14 +104,17 @@ msgstr "Επανεκκίνηση" #. Fun begins here, actually trigger option. #: ../src/shutdown-dialog.vala:297 msgid "Executing selected action now." -msgstr "" +msgstr "Εκτέλεση της επιλεγμένης ενέργειας τώρα." #: ../src/shutdown-dialog.vala:331 #, c-format msgid "Waiting one more second before executing selected action …" msgid_plural "Waiting %u seconds before executing selected action …" msgstr[0] "" +"Αναμονή ενός ακόμη δευτερολέπτου πριν από την εκτέλεση της επιλεγμένης " +"ενέργειας …" msgstr[1] "" +"Αναμονή %u δευτερολέπτων πριν από την εκτέλεση της επιλεγμένης ενέργειας …" #. Translators: %s is a session name like KDE or Ubuntu #: ../src/toggle-box.vala:205 @@ -134,6 +136,8 @@ msgstr "Εκτέλεση σε λειτουργία δοκιμής" #: ../src/arctica-greeter.vala:1000 msgid "Run in test mode with a11y highcontrast theme enabled" msgstr "" +"Εκτέλεση σε δοκιμαστική λειτουργία με ενεργοποιημένο το θέμα υψηλής " +"αντίθεσης a11y" #. Arguments and description for --help text #: ../src/arctica-greeter.vala:1006 @@ -184,8 +188,8 @@ msgid "" "You need a Remote Logon account to use this service. Would you like to set " "up an account now?" msgstr "" -"Χρειάζεστε ένα λογαριασμό Απομακρυσμένης σύνδεσης για να χρησιμοποιήσετε " -"αυτή την υπηρεσία. Θα θέλατε να δημιουργήσετε ένα λογαριασμό τώρα;" +"Χρειάζεστε έναν λογαριασμό απομακρυσμένης σύνδεσης για να χρησιμοποιήσετε " +"αυτή την υπηρεσία. Θα θέλατε να δημιουργήσετε έναν λογαριασμό τώρα;" #: ../src/user-list.vala:613 msgid "OK" @@ -273,8 +277,8 @@ msgid "" "Another alternative is to save files in the\n" "/var/guest-data folder." msgstr "" -"Μία εναλλακτική λύση είναι να αποθηκεύσετε τα αρχεία στον φάκελο /var/guest-" -"data." +"Μια άλλη εναλλακτική λύση είναι να αποθηκεύετε αρχεία στο\n" +"/var/guest-data." #: ../data/arctica-greeter.desktop.in.h:1 msgid "Arctica Greeter" @@ -284,260 +288,315 @@ msgstr "Arctica Greeter" msgid "" "Background image file to use, either an image path or a color (e.g. #772953)." msgstr "" +"Αρχείο εικόνας φόντου που θέλετε να χρησιμοποιήσετε, είτε μια διαδρομή " +"εικόνας είτε ένα χρώμα (π.χ. #772953)." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:2 msgid "Background color (e.g. #772953), set before wallpaper is seen." msgstr "" +"Χρώμα φόντου (π.χ. #772953), που ορίζεται πριν από την εμφάνιση της " +"ταπετσαρίας." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:3 msgid "Background color (e.g. #000000 or #FFFFFF) for high contrast mode." -msgstr "" +msgstr "Χρώμα φόντου (π.χ. #000000 ή #FFFFFF) για λειτουργία υψηλής αντίθεσης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:4 msgid "" "Font foreground color (e.g. #A0A0A0) for non-active/-hovered and non-" "selected session names in the session list." msgstr "" +"Χρώμα προσκηνίου γραμματοσειράς (π.χ. #A0A0A0) για τα ονόματα μη ενεργών/" +"υπερυψωμένων και μη επιλεγμένων συνόδων στη λίστα συνόδων." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:5 msgid "" "Font foreground color (e.g. #A0A0A0) for the active/hovered-above session " "name in the session list." msgstr "" +"Χρώμα προσκηνίου γραμματοσειράς (π.χ. #A0A0A0) για το όνομα της ενεργής/" +"υπέρτατης συνεδρίας στη λίστα συνεδριών." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:6 msgid "" "Font foreground color (e.g. #A0A0A0) for the selected session name in the " "session list." msgstr "" +"Χρώμα προσκηνίου γραμματοσειράς (π.χ. #A0A0A0) για το επιλεγμένο όνομα " +"συνεδρίας στη λίστα συνεδριών." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:7 msgid "" "Background color (e.g. #391C31) for non-active/-hovered and non-selected " "session names in the session list." msgstr "" +"Χρώμα φόντου (π.χ. #391C31) για τα ονόματα μη ενεργών/υπερυψωμένων και μη " +"επιλεγμένων συνόδων στη λίστα συνόδων." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:8 msgid "" "Background color (e.g. #391C31) for the active/hovered-above session name in " "the session list." msgstr "" +"Χρώμα φόντου (π.χ. #391C31) για το όνομα της ενεργής/υπέρτατης συνεδρίας στη " +"λίστα συνεδριών." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:9 msgid "" "Background color (e.g. #391C31) for the selected session name in the session " "list." msgstr "" +"Χρώμα φόντου (π.χ. #391C31) για το επιλεγμένο όνομα συνεδρίας στη λίστα " +"συνεδριών." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:10 msgid "" "Border color (e.g. #391C31) for non-active/-hovered and non-selected session " "names in the session list." msgstr "" +"Χρώμα περιθωρίου (π.χ. #391C31) για τα ονόματα μη ενεργών/υπερυψωμένων και " +"μη επιλεγμένων συνόδων στη λίστα συνόδων." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:11 msgid "" "Border color (e.g. #391C31) for the active/hovered-above session name in the " "session list." msgstr "" +"Χρώμα περιθωρίου (π.χ. #391C31) για το ενεργό/υπέρτατο όνομα συνεδρίας στη " +"λίστα συνεδριών." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:12 msgid "" "Border color (e.g. #391C31) for the selected session name in the session " "list." msgstr "" +"Χρώμα περιθωρίου (π.χ. #391C31) για το επιλεγμένο όνομα συνεδρίας στη λίστα " +"συνεδριών." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:13 msgid "" "Background color (e.g. #391C31) of flat buttons (e.g. the session chooser " "icon)." msgstr "" +"Χρώμα φόντου (π.χ. #391C31) των επίπεδων κουμπιών (π.χ. το εικονίδιο " +"επιλογής συνεδρίας)." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:14 msgid "" "Border color (e.g. #391C31) of flat buttons (e.g. the session chooser icon)." msgstr "" +"Χρώμα περιγράμματος (π.χ. #391C31) των επίπεδων κουμπιών (π.χ. το εικονίδιο " +"επιλογής συνεδρίας)." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:15 msgid "Determines how the background image is rendered." -msgstr "" +msgstr "Καθορίζει τον τρόπο απόδοσης της εικόνας φόντου." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:16 msgid "Whether to draw user backgrounds." -msgstr "" +msgstr "Αν θα σχεδιάζονται φόντα χρηστών." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:17 msgid "Whether to draw an overlay grid." -msgstr "" +msgstr "Εάν θέλετε να σχεδιάσετε ένα πλέγμα επικάλυψης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:18 msgid "Whether to show the hostname in the menubar." -msgstr "" +msgstr "Εάν θα εμφανίζεται το όνομα κεντρικού υπολογιστή στη γραμμή μενού." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:19 msgid "" "Whether to show 'Username:' and 'Password:' labels (etc.) in the login box." msgstr "" +"Αν θα εμφανίζονται οι ετικέτες 'Όνομα χρήστη:' και 'Κωδικός πρόσβασης:' " +"(κ.λπ.) στο πλαίσιο σύνδεσης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:20 msgid "Logo file to use." -msgstr "" +msgstr "Αρχείο λογότυπου προς χρήση." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:21 msgid "Alpha value for blending the logo onto the background." -msgstr "" +msgstr "Τιμή άλφα για την ανάμειξη του λογότυπου στο φόντο." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:22 msgid "GTK+ theme to use." -msgstr "" +msgstr "Θέμα GTK+ για χρήση." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:23 msgid "GTK+ theme to use in high contrast mode." -msgstr "" +msgstr "Θέμα GTK+ για χρήση σε λειτουργία υψηλής αντίθεσης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:24 msgid "Icon theme to use." -msgstr "" +msgstr "Θέμα εικονιδίων για χρήση." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:25 msgid "Icon theme to use in high contrast mode." -msgstr "" +msgstr "Θέμα εικονιδίων για χρήση σε λειτουργία υψηλής αντίθεσης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:26 msgid "Cursor theme to use." -msgstr "" +msgstr "Θέμα δρομέα για χρήση." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:27 msgid "Size to use for cursors." -msgstr "" +msgstr "Μέγεθος που χρησιμοποιείται για τους δρομείς." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:28 msgid "Font to use." -msgstr "" +msgstr "Γραμματοσειρά προς χρήση." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:29 msgid "Whether to antialias Xft fonts." -msgstr "" +msgstr "Αν θέλετε να κάνετε antialias στις γραμματοσειρές Xft." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:30 msgid "Resolution for Xft in dots per inch." -msgstr "" +msgstr "Ανάλυση για το Xft σε κουκκίδες ανά ίντσα." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:31 msgid "What degree of hinting to use." -msgstr "" +msgstr "Ποιος βαθμός υπαινιγμού πρέπει να χρησιμοποιηθεί." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:32 msgid "Type of subpixel antialiasing." -msgstr "" +msgstr "Τύπος αντιδιαστολής υποεικονοστοιχείων." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:33 msgid "Whether to enable the onscreen keyboard." -msgstr "" +msgstr "Ενεργοποίηση του πληκτρολογίου οθόνης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:34 msgid "Whether to use a high contrast theme." -msgstr "" +msgstr "Αν θα χρησιμοποιήσετε ένα θέμα υψηλής αντίθεσης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:35 msgid "Whether to enable the screen reader." -msgstr "" +msgstr "Εάν θέλετε να ενεργοποιήσετε το πρόγραμμα ανάγνωσης οθόνης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:36 msgid "Whether to play sound when greeter is ready." -msgstr "" +msgstr "Αν θα αναπαράγεται ήχος όταν ο χαιρετιστής είναι έτοιμος." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:37 msgid "Which indicators to load." -msgstr "" +msgstr "Ποιους δείκτες να φορτώσετε." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:38 msgid "" "List of usernames that are hidden until a special key combination is hit." msgstr "" +"Λίστα με ονόματα χρηστών που είναι κρυμμένα μέχρι να πατηθεί ένας ειδικός " +"συνδυασμός πλήκτρων." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:39 msgid "" "List of groups that users must be part of to be shown (empty list shows all " "users)." msgstr "" +"Λίστα των ομάδων στις οποίες πρέπει να ανήκουν οι χρήστες για να " +"εμφανίζονται (η κενή λίστα εμφανίζει όλους τους χρήστες)." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:40 msgid "" "Number of seconds of inactivity before blanking the screen. Set to 0 to " "never timeout." msgstr "" +"Αριθμός δευτερολέπτων αδράνειας πριν από το σβήσιμο της οθόνης. Ορίστε την " +"τιμή 0 για να μην υπάρχει ποτέ timeout." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:41 msgid "Whether to enable HiDPI support" -msgstr "" +msgstr "Ενεργοποίηση της υποστήριξης HiDPI" #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:42 msgid "" "Scaling factor for fonts that can be used to adjust the greeter's font sizes." msgstr "" +"Συντελεστής κλιμάκωσης για γραμματοσειρές που μπορεί να χρησιμοποιηθεί για " +"την προσαρμογή των μεγεθών γραμματοσειράς του χαιρετιστή." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:43 msgid "" "Alpha value for menubar, multiplied with the theme-provided transparency " "value. Not used in high contrast mode." msgstr "" +"Τιμή άλφα για τη γραμμή μενού, πολλαπλασιασμένη με την τιμή διαφάνειας που " +"παρέχεται από το θέμα. Δεν χρησιμοποιείται σε λειτουργία υψηλής αντίθεσης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:44 msgid "Default FQDN for host offering Remote Logon Service." msgstr "" +"Προεπιλεγμένο FQDN για τον κεντρικό υπολογιστή που προσφέρει την υπηρεσία " +"απομακρυσμένης σύνδεσης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:45 msgid "" "Whether to activate numlock. This features requires the installation of " "numlockx." msgstr "" +"Εάν θα ενεργοποιηθεί το numlock. Αυτή η λειτουργία απαιτεί την εγκατάσταση " +"του numlockx." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:46 msgid "Monitor on which to show the Login GUI." -msgstr "" +msgstr "Οθόνη στην οποία θα εμφανιστεί το γραφικό περιβάλλον σύνδεσης." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:47 msgid "" "Name of the onscreen keyboard layout (see /usr/share/onboard/layouts/*." "onboard for available layout names)." msgstr "" +"Όνομα της διάταξης πληκτρολογίου οθόνης (δείτε /usr/share/onboard/layouts/*" +".onboard για τα διαθέσιμα ονόματα διάταξης)." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:48 msgid "" "Name of the onscreen keyboard theme (see /usr/share/onboard/themes/*.theme " "for available theme names)." msgstr "" +"Όνομα του θέματος του πληκτρολογίου οθόνης (δείτε /usr/share/onboard/themes/*" +".theme για τα διαθέσιμα ονόματα θεμάτων)." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:49 msgid "" "Name of the onscreen keyboard theme when in high contrast mode (see /usr/" "share/onboard/themes/*.theme for available theme names)." msgstr "" +"Όνομα του θέματος του πληκτρολογίου οθόνης όταν βρίσκεται σε λειτουργία " +"υψηλής αντίθεσης (δείτε /usr/share/onboard/themes/*.theme για τα διαθέσιμα " +"ονόματα θεμάτων)." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:50 msgid "Whether to hide the 'lightdm-xsession' default X11 session type." msgstr "" +"Εάν θέλετε να αποκρύψετε τον προεπιλεγμένο τύπο συνόδου X11 'lightdm-" +"xsession'." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:51 msgid "Whether to hide X11 sessions." -msgstr "" +msgstr "Εάν θέλετε να αποκρύψετε συνεδρίες X11." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:52 msgid "Whether to hide Wayland sessions." -msgstr "" +msgstr "Εάν θέλετε να αποκρύψετε συνεδρίες Wayland." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:53 msgid "" "Ordered list of preferred desktop sessions (for detecting the default " "session type)." msgstr "" +"Ταξινομημένος κατάλογος προτιμώμενων συνόδων εργασίας (για τον εντοπισμό του " +"προεπιλεγμένου τύπου συνόδου)." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:54 msgid "" "Time in seconds until the shutdown dialog forcefully selects the default " "action. Set to 0 to disable." msgstr "" +"Χρόνος σε δευτερόλεπτα έως ότου το παράθυρο διαλόγου τερματισμού επιλέξει " +"αναγκαστικά την προεπιλεγμένη ενέργεια. Ορίστε την τιμή 0 για απενεργοποίηση." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:55 msgid "" @@ -545,6 +604,10 @@ msgid "" "explicitly listed sessions types will be offered by the greeter). Takes " "precedence over the excluded-sessions list." msgstr "" +"Μη διατεταγμένη λίστα των συνόδων επιφάνειας εργασίας που περιλαμβάνουν μόνο " +"τις συνεδρίες (αν δεν είναι κενές, μόνο οι τύποι συνεδριών που αναφέρονται " +"ρητά θα προσφερθούν από την υπηρεσία υποδοχής). Έχει προτεραιότητα έναντι " +"της λίστας excluded-sessions." #: ../data/org.ArcticaProject.arctica-greeter.gschema.xml:56 msgid "" @@ -552,6 +615,9 @@ msgid "" "types will not be offered by the greeter). Only used if includeonly-sessions " "is empty." msgstr "" +"Μη διατεταγμένη λίστα των αποκλεισμένων συνόδων γραφείου (αν δεν είναι κενή, " +"οι τύποι συνόδων που παρατίθενται δεν θα προσφέρονται από την υπηρεσία " +"υποδοχής). Χρησιμοποιείται μόνο αν το includeonly-sessions είναι κενό." #~ msgid "Onscreen keyboard" #~ msgstr "Πληκτρολόγιο οθόνης" diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala index 93c88e2..5eb8a59 100644 --- a/src/arctica-greeter.vala +++ b/src/arctica-greeter.vala @@ -2,7 +2,7 @@ * * Copyright (C) 2011 Canonical Ltd * Copyright (C) 2015-2017 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - * Copyright (C) 2023-2024 Robert Tari + * Copyright (C) 2023-2025 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -1144,7 +1144,6 @@ public class ArcticaGreeter : Object try { string[] argv; - Pid wm_message_pid = 0; Shell.parse_argv ("%s-message disable-keybindings".printf(wm), out argv); diff --git a/src/background.vala b/src/background.vala index e6d52fa..bf1ca6f 100644 --- a/src/background.vala +++ b/src/background.vala @@ -2,6 +2,7 @@ * * Copyright (C) 2011,2012 Canonical Ltd * Copyright (C) 2015-2017 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + * Copyright (C) 2025 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -18,6 +19,7 @@ * Authors: Robert Ancell <robert.ancell@canonical.com> * Michael Terry <michael.terry@canonical.com> * Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + * Robert Tari <robert@tari.in> */ class BackgroundLoader : Object @@ -207,8 +209,31 @@ class BackgroundLoader : Object if (logo != null) { bc.save (); - var x = (int) (grid_x_offset + 2 * greeter.grid_size); - var y = (int) (image.height - 1 * greeter.grid_size - logo_height + grid_y_offset); + string sPosition = AGSettings.get_string (AGSettings.KEY_LOGO_POSITION); + int x = AGSettings.get_integer (AGSettings.KEY_LOGO_OFFSET_HORIZONTAL); + int y = AGSettings.get_integer (AGSettings.KEY_LOGO_OFFSET_VERTICAL); + + if (sPosition == "top-left") + { + x = (int) (grid_x_offset + (x * greeter.grid_size)); + y = (int) (grid_y_offset + ((y + 1) * greeter.grid_size)); + } + else if (sPosition == "top-right") + { + x = (int) (image.width - (x * greeter.grid_size) - logo_width + grid_x_offset); + y = (int) (grid_y_offset + ((y + 1) * greeter.grid_size)); + } + else if (sPosition == "bottom-left") + { + x = (int) (grid_x_offset + (x * greeter.grid_size)); + y = (int) (image.height - (y * greeter.grid_size) - logo_height + grid_y_offset); + } + else if (sPosition == "bottom-right") + { + x = (int) (image.width - (x * greeter.grid_size) - logo_width + grid_x_offset); + y = (int) (image.height - (y * greeter.grid_size) - logo_height + grid_y_offset); + } + bc.translate (x, y); bc.set_source_surface (logo, 0, 0); bc.paint_with_alpha (AGSettings.get_double (AGSettings.KEY_LOGO_ALPHA)); diff --git a/src/dash-box.vala b/src/dash-box.vala index 0772e3f..52dd7d4 100644 --- a/src/dash-box.vala +++ b/src/dash-box.vala @@ -2,7 +2,7 @@ * * Copyright (C) 2011,2012 Canonical Ltd * Copyright (C) 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - * Copyright (C) 2023 Robert Tari + * Copyright (C) 2023-2025 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -237,7 +237,11 @@ public class DashBox : Gtk.Box } else { - c.set_source_rgba (0.1, 0.1, 0.1, 0.4); + string sBackGround = AGSettings.get_string (AGSettings.KEY_DASHBOX_BGCOLOR); + Gdk.RGBA cBackground = {1.0, 1.0, 1.0, 1.0}; + cBackground.parse (sBackGround); + double fOpacity = AGSettings.get_double (AGSettings.KEY_DASHBOX_OPACITY); + c.set_source_rgba (cBackground.red, cBackground.green, cBackground.blue, fOpacity); } c.fill_preserve (); diff --git a/src/greeter-list.vala b/src/greeter-list.vala index 04d4ed4..da4f3e9 100644 --- a/src/greeter-list.vala +++ b/src/greeter-list.vala @@ -283,7 +283,6 @@ public abstract class GreeterList : FadableBox protected void redraw_greeter_box () { - queue_allocate (); Gtk.Allocation allocation; greeter_box.get_allocation (out allocation); queue_draw_area (allocation.x, allocation.y, allocation.width, allocation.height); @@ -298,7 +297,6 @@ public abstract class GreeterList : FadableBox } selected_entry.add_message (text, is_error); - redraw_greeter_box (); } public DashEntry add_prompt (string text, bool secret = false) @@ -870,6 +868,7 @@ public abstract class GreeterList : FadableBox /* Limit the number of characters in case a cat is sitting on the keyboard... */ entry.max_length = MAX_FIELD_SIZE; + queue_resize (); } protected virtual void authentication_complete_cb () diff --git a/src/list-stack.vala b/src/list-stack.vala index d87b37a..4f74ea7 100644 --- a/src/list-stack.vala +++ b/src/list-stack.vala @@ -1,7 +1,7 @@ /* -*- Mode: Vala; indent-tabs-mode: nil; tab-width: 4 -*- * * Copyright (C) 2011,2012 Canonical Ltd - * Copyright (C) 2023 Robert Tari + * Copyright (C) 2023-2025 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -35,6 +35,7 @@ public class ListStack : Gtk.Fixed construct { + resize_mode = Gtk.ResizeMode.QUEUE; var greeter = new ArcticaGreeter(); width = greeter.grid_size * GreeterList.BOX_WIDTH; diff --git a/src/main-window.vala b/src/main-window.vala index fc8d95a..e1e39d2 100644 --- a/src/main-window.vala +++ b/src/main-window.vala @@ -70,9 +70,21 @@ public class MainWindow : Gtk.Window var accel_group = new Gtk.AccelGroup (); add_accel_group (accel_group); - var bg_color = Gdk.RGBA (); - bg_color.parse (AGSettings.get_string (AGSettings.KEY_BACKGROUND_COLOR)); - override_background_color (Gtk.StateFlags.NORMAL, bg_color); + Gtk.StyleContext pContext = get_style_context (); + Gtk.CssProvider pProvider = new Gtk.CssProvider (); + string sColour = AGSettings.get_string (AGSettings.KEY_BACKGROUND_COLOR); + string sCss = "* {background-color: %s;}".printf (sColour); + + try + { + pProvider.load_from_data (sCss, -1); + pContext.add_provider (pProvider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + } + catch (Error pError) + { + warning ("Panic: Error loading style for main window: %s", pError.message); + } + get_accessible ().set_name (_("Login Screen")); ArcticaGreeter.add_style_class (this); @@ -133,7 +145,7 @@ public class MainWindow : Gtk.Window if (content_align == "center") { // offset for back button - align.margin_right = greeter.grid_size; + align.margin_end = greeter.grid_size; } align.show (); @@ -145,6 +157,7 @@ public class MainWindow : Gtk.Window align.add (hbox); align = new Gtk.Alignment (0.5f, 0.5f, 0.0f, 0.0f); + align.resize_mode = Gtk.ResizeMode.QUEUE; align.set_size_request (greeter.grid_size, -1); align.margin_bottom = greeter.menubar_height; /* offset for menubar at top */ align.show (); @@ -251,8 +264,8 @@ public class MainWindow : Gtk.Window if (content_box != null) { var content_align = AGSettings.get_string(AGSettings.KEY_CONTENT_ALIGN); - content_box.margin_left = get_grid_offset (get_allocated_width ()) + (content_align == "left" ? greeter.grid_size : 0); - content_box.margin_right = get_grid_offset (get_allocated_width ()) + (content_align == "right" ? greeter.grid_size : 0); + content_box.margin_start = get_grid_offset (get_allocated_width ()) + (content_align == "left" ? greeter.grid_size : 0); + content_box.margin_end = get_grid_offset (get_allocated_width ()) + (content_align == "right" ? greeter.grid_size : 0); content_box.margin_top = get_grid_offset (get_allocated_height ()); content_box.margin_bottom = get_grid_offset (get_allocated_height ()); } @@ -273,6 +286,39 @@ public class MainWindow : Gtk.Window _set_struts (MenubarPositions.TOP, greeter.menubar_height); } + private void getScreenSize (out int nScreenWidth, out int nScreenHeight) + { + Gdk.Display pDisplay = Gdk.Display.get_default (); + int nMonitors = pDisplay.get_n_monitors (); + + if (nMonitors == 0) + { + nScreenWidth = 0; + nScreenHeight = 0; + + return; + } + + int x0 = int.MAX; + int y0 = int.MAX; + int x1 = int.MIN; + int y1 = int.MIN; + + for (int nMonitor = 0; nMonitor < nMonitors; nMonitor++) + { + Gdk.Monitor pMonitor = pDisplay.get_monitor (nMonitor); + Gdk.Rectangle cRectangle = pMonitor.get_geometry (); + + x0 = int.min (x0, cRectangle.x); + y0 = int.min (y0, cRectangle.y); + x1 = int.max (x1, cRectangle.x + cRectangle.width); + y1 = int.max (y1, cRectangle.y + cRectangle.height); + } + + nScreenWidth = x1 - x0; + nScreenHeight = y1 - y0; + } + private void _set_struts (uint position, long menubar_size) { if (!get_realized()) { @@ -291,6 +337,10 @@ public class MainWindow : Gtk.Window /* Subtract (non-scaled) 5px border + 2px extra spacing (to make indicator menus render nicely below menubar) */ menubar_size = menubar_size - 7; + int nScreenWidth = 0; + int nScreenHeight = 0; + getScreenSize (out nScreenWidth, out nScreenHeight); + // Struts dependent on position switch (position) { case MenubarPositions.TOP: @@ -304,13 +354,13 @@ public class MainWindow : Gtk.Window struts[Struts.LEFT_END] = (primary_monitor.y + primary_monitor.height) * scale - 1; break; case MenubarPositions.RIGHT: - struts[Struts.RIGHT] = (menubar_size + screen.get_width() - primary_monitor.x - primary_monitor.width) * scale; + struts[Struts.RIGHT] = (menubar_size + nScreenWidth - primary_monitor.x - primary_monitor.width) * scale; struts[Struts.RIGHT_START] = primary_monitor.y * scale; struts[Struts.RIGHT_END] = (primary_monitor.y + primary_monitor.height) * scale - 1; break; case MenubarPositions.BOTTOM: default: - struts[Struts.BOTTOM] = (menubar_size + screen.get_height() - primary_monitor.y - primary_monitor.height) * scale; + struts[Struts.BOTTOM] = (menubar_size + nScreenHeight - primary_monitor.y - primary_monitor.height) * scale; struts[Struts.BOTTOM_START] = primary_monitor.x * scale; struts[Struts.BOTTOM_END] = (primary_monitor.x + primary_monitor.width) * scale - 1; break; @@ -565,7 +615,7 @@ public class MainWindow : Gtk.Window DBusConnection pConnection = Bus.get_sync (BusType.SESSION); Variant pActive = new Variant.boolean (!bActive); Variant pTuple = new Variant("(sva{sv})", "onboard", pActive, null); - pConnection.call ("org.ayatana.indicator.a11y", "/org/ayatana/indicator/a11y", "org.gtk.Actions", "SetState", pTuple, null, DBusCallFlags.NONE, -1, null); + pConnection.call.begin ("org.ayatana.indicator.a11y", "/org/ayatana/indicator/a11y", "org.gtk.Actions", "SetState", pTuple, null, DBusCallFlags.NONE, -1, null); } catch (Error pError) { @@ -589,7 +639,7 @@ public class MainWindow : Gtk.Window DBusConnection pConnection = Bus.get_sync (BusType.SESSION); Variant pActive = new Variant.boolean (!bActive); Variant pTuple = new Variant("(sva{sv})", "contrast", pActive, null); - pConnection.call ("org.ayatana.indicator.a11y", "/org/ayatana/indicator/a11y", "org.gtk.Actions", "SetState", pTuple, null, DBusCallFlags.NONE, -1, null); + pConnection.call.begin ("org.ayatana.indicator.a11y", "/org/ayatana/indicator/a11y", "org.gtk.Actions", "SetState", pTuple, null, DBusCallFlags.NONE, -1, null); } catch (Error pError) { @@ -612,7 +662,7 @@ public class MainWindow : Gtk.Window DBusConnection pConnection = Bus.get_sync (BusType.SESSION); Variant pActive = new Variant.boolean (!bActive); Variant pTuple = new Variant("(sva{sv})", "orca", pActive, null); - pConnection.call ("org.ayatana.indicator.a11y", "/org/ayatana/indicator/a11y", "org.gtk.Actions", "SetState", pTuple, null, DBusCallFlags.NONE, -1, null); + pConnection.call.begin ("org.ayatana.indicator.a11y", "/org/ayatana/indicator/a11y", "org.gtk.Actions", "SetState", pTuple, null, DBusCallFlags.NONE, -1, null); } catch (Error pError) { @@ -635,7 +685,7 @@ public class MainWindow : Gtk.Window DBusConnection pConnection = Bus.get_sync (BusType.SESSION); Variant pActive = new Variant.boolean (!bActive); Variant pTuple = new Variant("(sva{sv})", "magnifier", pActive, null); - pConnection.call ("org.ayatana.indicator.a11y", "/org/ayatana/indicator/a11y", "org.gtk.Actions", "SetState", pTuple, null, DBusCallFlags.NONE, -1, null); + pConnection.call.begin ("org.ayatana.indicator.a11y", "/org/ayatana/indicator/a11y", "org.gtk.Actions", "SetState", pTuple, null, DBusCallFlags.NONE, -1, null); } catch (Error pError) { diff --git a/src/prompt-box.vala b/src/prompt-box.vala index 1254d14..b102887 100644 --- a/src/prompt-box.vala +++ b/src/prompt-box.vala @@ -2,7 +2,7 @@ * * Copyright (C) 2011,2012 Canonical Ltd * Copyright (C) 2015,2017 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - * Copyright (C) 2023 Robert Tari + * Copyright (C) 2023-2025 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -96,6 +96,7 @@ public class PromptBox : FadableBox construct { + resize_mode = Gtk.ResizeMode.QUEUE; var greeter = new ArcticaGreeter(); set_start_row (); @@ -222,8 +223,8 @@ public class PromptBox : FadableBox try { var color_provider = new Gtk.CssProvider (); - var css = "* { color: rgba(255, 255, 255, 1.0); }\n" + - ".high_contrast { color: rgba (0, 0, 0, 1.0); }"; + string sColor = AGSettings.get_string (AGSettings.KEY_PROMPTBOX_COLOR_NORMAL); + var css = "* { color: %s; } .high_contrast { color: rgba (0, 0, 0, 1.0); }".printf (sColor); color_provider.load_from_data (css, -1); style_ctx.add_provider (color_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); @@ -321,7 +322,7 @@ public class PromptBox : FadableBox try { var font_provider = new Gtk.CssProvider (); - var css = "* {font-family: %s; font-size: %dpt;}".printf (font_family, font_size); + var css = "* {color: #FFFFFF; font-family: %s; font-size: %dpt;}".printf (font_family, font_size); font_provider.load_from_data (css, -1); style_ctx.add_provider (font_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); @@ -333,7 +334,6 @@ public class PromptBox : FadableBox var greeter = new ArcticaGreeter(); - small_name_label.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 1.0f }); small_name_label.yalign = 0.5f; small_name_label.xalign = 0.0f; small_name_label.margin_start = 2; @@ -569,15 +569,26 @@ public class PromptBox : FadableBox public void add_message (string text, bool is_error) { var label = new FadingLabel (text); - label.set_line_wrap (true); var style_ctx = label.get_style_context(); try { var font_provider = new Gtk.CssProvider (); - var css = "* {font-family: %s; font-size: %dpt; color: white} - *.high_contrast {color: black; }".printf (font_family, font_size-1); + var css = ""; + + if (is_error) + { + string sColor = AGSettings.get_string (AGSettings.KEY_PROMPTBOX_COLOR_ERROR); + double fOpacity = AGSettings.get_double (AGSettings.KEY_PROMPTBOX_ERROR_BG_OPACITY); + css = "* {font-family: %s; font-size: %dpt; color: %s; background-color: rgba(255, 255, 255, %f); text-shadow: none;}".printf (font_family, font_size-1, sColor, fOpacity); + } + else + { + string sColor = AGSettings.get_string (AGSettings.KEY_PROMPTBOX_COLOR_NORMAL); + css = "* {font-family: %s; font-size: %dpt; color: %s;} *.high_contrast {color: black; }".printf (font_family, font_size-1, sColor); + } + font_provider.load_from_data (css, -1); style_ctx.add_provider (font_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); @@ -587,23 +598,6 @@ public class PromptBox : FadableBox debug ("Internal error loading font style (%s, %dpt): %s", font_family, font_size-1, e.message); } - if (is_error) { - - /* red */ - Gdk.RGBA color = { 1.0f, 1.0f, 1.0f, 1.0f }; - color.parse ("#820900"); - - /* - * Overriding the background color will look ugly, but at least - * always make the text readable, which is probably important for - * error messages. - * We probably want to find a better way of handling this. - */ - Gdk.RGBA bg_color = { 1.0f, 1.0f, 1.0f, 1.0f }; - label.override_background_color (Gtk.StateFlags.NORMAL, bg_color); - label.override_color (Gtk.StateFlags.NORMAL, color); - } - label.xalign = 0.0f; label.set_data<bool> ("prompt-box-is-error", is_error); @@ -683,6 +677,31 @@ public class PromptBox : FadableBox } entry.respond.connect (entry_activate_cb); + Gtk.StyleContext pContext = entry.get_style_context (); + Gtk.CssProvider pProvider = new Gtk.CssProvider (); + string sKey = ""; + + if (has_errors) + { + sKey = AGSettings.KEY_PROMPTBOX_COLOR_ERROR; + } + else + { + sKey = AGSettings.KEY_PROMPTBOX_COLOR_NORMAL; + } + + string sColor = AGSettings.get_string (sKey); + string sCss = "entry {border: none; outline: none; box-shadow: 1px 0 %s inset, 0 1px %s inset, -1px 0 %s inset, 0 -1px %s inset;}".printf (sColor, sColor, sColor, sColor); + + try + { + pProvider.load_from_data (sCss, -1); + pContext.add_provider (pProvider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + } + catch (Error pError) + { + warning ("Panic: Error setting DashEntry border colour: %s", pError.message); + } attach_item (entry); diff --git a/src/settings.vala b/src/settings.vala index 1f046d4..414020d 100644 --- a/src/settings.vala +++ b/src/settings.vala @@ -3,7 +3,7 @@ * Copyright (C) 2011,2012 Canonical Ltd * Copyright (C) 2015,2017 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> * Copyright (C) 2022 Mihai Moldovan <ionic@ionic.de> - * Copyright (C) 2023-2024 Robert Tari + * Copyright (C) 2023-2025 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -90,6 +90,14 @@ public class AGSettings : Object public const string KEY_MAGNIFIER = "magnifier"; public const string KEY_CONTENT_ALIGN = "content-align"; public const string KEY_MAGNIFIER_POSITION = "magnifier-position"; + public const string KEY_DASHBOX_BGCOLOR = "dash-box-bgcolor"; + public const string KEY_DASHBOX_OPACITY = "dash-box-opacity"; + public const string KEY_PROMPTBOX_COLOR_NORMAL = "prompt-box-color-normal"; + public const string KEY_PROMPTBOX_COLOR_ERROR = "prompt-box-color-error"; + public const string KEY_PROMPTBOX_ERROR_BG_OPACITY = "prompt-box-error-bg-opacity"; + public const string KEY_LOGO_POSITION = "logo-position"; + public const string KEY_LOGO_OFFSET_HORIZONTAL = "logo-offset-horizontal"; + public const string KEY_LOGO_OFFSET_VERTICAL = "logo-offset-vertical"; public static bool get_boolean (string key) { @@ -97,19 +105,6 @@ public class AGSettings : Object return gsettings.get_boolean (key); } - /* LP: 1006497 - utility function to make sure we have the key before trying to read it (which will segfault if the key isn't there) */ - public static bool safe_get_boolean (string key, bool default) - { - var gsettings = new Settings (SCHEMA); - string[] keys = gsettings.list_keys (); - foreach (var k in keys) - if (k == key) - return gsettings.get_boolean (key); - - /* key not in child list */ - return default; - } - public static int get_integer (string key) { var gsettings = new Settings (SCHEMA); diff --git a/src/shutdown-dialog.vala b/src/shutdown-dialog.vala index d243188..fd568d7 100644 --- a/src/shutdown-dialog.vala +++ b/src/shutdown-dialog.vala @@ -2,7 +2,7 @@ * * Copyright (C) 2013 Canonical Ltd * Copyright (C) 2015,2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - * Copyright (C) 2023 Robert Tari + * Copyright (C) 2023-2025 Robert Tari * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -306,7 +306,8 @@ public class ShutdownDialog : Gtk.Fixed var focused = pWindow.get_focus (); if ((null != focused) && (focused is DialogButton)) { - (focused as DialogButton).clicked (); + DialogButton pButton = (DialogButton) focused; + pButton.clicked (); } --default_action_time_supplemental; @@ -695,7 +696,7 @@ private class DialogButton : Gtk.Button try { var font_provider = new Gtk.CssProvider (); - var css = "* {font-family: %s; font-size: %dpt;}".printf(font_family, font_size); + var css = "* {color: #FFFFFF; font-family: %s; font-size: %dpt;}".printf(font_family, font_size); font_provider.load_from_data (css, -1); style_ctx.add_provider (font_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); @@ -705,9 +706,6 @@ private class DialogButton : Gtk.Button debug ("Internal error loading font style (%s, %dpt): %s", font_family, font_size, e.message); } - l.override_color (Gtk.StateFlags.NORMAL, { 1.0f, 1.0f, 1.0f, 0.0f }); - l.override_color (Gtk.StateFlags.FOCUSED, { 1.0f, 1.0f, 1.0f, 1.0f }); - l.override_color (Gtk.StateFlags.ACTIVE, { 1.0f, 1.0f, 1.0f, 1.0f }); this.get_accessible ().set_name (l.get_text ()); } |