Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert the Network Auth dialog to a Clutter dialog #12460

Merged
merged 4 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/icons/hicolor_actions_scalable_view-conceal-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 88 additions & 0 deletions data/icons/hicolor_actions_scalable_view-reveal-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions data/theme/cinnamon-sass/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ stage {
StLabel.hint-text { color: transparentize($fg_color, 0.7); }

.capslock-warning { icon-size: $scalable_icon_size; }

StIcon.peek-password {
icon-size: 16px;
color: $fg_color;
}
}

// buttons in dialogs
Expand Down
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Build-Depends:
libpolkit-agent-1-dev (>= 0.100),
libpulse-dev,
librsvg2-dev,
libsecret-1-dev,
libstartup-notification0-dev (>= 0.11),
libxapp-dev (>= 2.6.0),
meson,
Expand Down
2 changes: 2 additions & 0 deletions js/misc/config.js.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
var PACKAGE_NAME = '@PACKAGE_NAME@';
/* The version of this package */
var PACKAGE_VERSION = '@PACKAGE_VERSION@';
/* 1 if networkmanager is available, 0 otherwise */
var HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
10 changes: 4 additions & 6 deletions js/ui/keyringPrompt.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,23 @@ class KeyringDialog extends ModalDialog.ModalDialog {
vertical: true,
});

this._passwordEntry = new St.Entry({
this._passwordEntry = new St.PasswordEntry({
style_class: 'prompt-dialog-password-entry',
can_focus: true,
x_align: Clutter.ActorAlign.CENTER,
});
this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
CinnamonEntry.addContextMenu(this._passwordEntry, { isPassword: true });
CinnamonEntry.addContextMenu(this._passwordEntry);
this._passwordEntry.clutter_text.connect('activate', this._onPasswordActivate.bind(this));
this.prompt.bind_property('password-visible',
this._passwordEntry, 'visible', GObject.BindingFlags.SYNC_CREATE);
passwordBox.add_child(this._passwordEntry);

this._confirmEntry = new St.Entry({
this._confirmEntry = new St.PasswordEntry({
style_class: 'prompt-dialog-password-entry',
can_focus: true,
x_align: Clutter.ActorAlign.CENTER,
});
this._confirmEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
CinnamonEntry.addContextMenu(this._confirmEntry, { isPassword: true });
CinnamonEntry.addContextMenu(this._confirmEntry);
this._confirmEntry.clutter_text.connect('activate', this._onConfirmActivate.bind(this));
this.prompt.bind_property('confirm-visible',
this._confirmEntry, 'visible', GObject.BindingFlags.SYNC_CREATE);
Expand Down
6 changes: 6 additions & 0 deletions js/ui/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ const PointerTracker = imports.misc.pointerTracker;

const SoundManager = imports.ui.soundManager;
const BackgroundManager = imports.ui.backgroundManager;
const Config = imports.misc.config;
const SlideshowManager = imports.ui.slideshowManager;
var AppletManager = imports.ui.appletManager;
const SearchProviderManager = imports.ui.searchProviderManager;
Expand All @@ -107,6 +108,7 @@ const KeyringPrompt = imports.ui.keyringPrompt;
const RunDialog = imports.ui.runDialog;
const Layout = imports.ui.layout;
const LookingGlass = imports.ui.lookingGlass;
const NetworkAgent = imports.ui.networkAgent;
const NotificationDaemon = imports.ui.notificationDaemon;
const WindowAttentionHandler = imports.ui.windowAttentionHandler;
const CinnamonDBus = imports.ui.cinnamonDBus;
Expand Down Expand Up @@ -163,6 +165,7 @@ var xdndHandler = null;
var statusIconDispatcher = null;
var virtualKeyboard = null;
var layoutManager = null;
var networkAgent = null;
var monitorLabeler = null;
var themeManager = null;
var keybindingManager = null;
Expand Down Expand Up @@ -419,6 +422,9 @@ function start() {
windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
placesManager = new PlacesManager.PlacesManager();

if (Config.HAVE_NETWORKMANAGER)
networkAgent = new NetworkAgent.NetworkAgent();

magnifier = new Magnifier.Magnifier();
locatePointer = new LocatePointer.locatePointer();

Expand Down
Loading
Loading