Skip to content

X
ximper-shell-notification-center
Verified Commit 7f91a63b authored by Kirill Unitsaev's avatar Kirill Unitsaev
Browse files
Options

quick-settings: add submenu headers, empty states, and WiFi rescan

parent ae19d5c4
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 41 deletions
data/style/widgets/quick-settings.scss
View file @ 7f91a63b
......@@ -67,6 +67,23 @@
border: 1px solid var(--border-color);
box-shadow: 0px 0px 10px var(--headerbar-shade-color);
.submenu-header {
padding: 5px 8px;
.submenu-header-icon {
background: var(--accent-bg-color);
color: var(--accent-fg-color);
border-radius: 100%;
padding: 8px;
-gtk-icon-size: 24px;
}
.submenu-header-label {
font-weight: bold;
font-size: 1.4rem;
}
}
button {
margin: 2px 4px;
}
......
po/ru.po
View file @ 7f91a63b
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ximper-shell-notification-center 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-03-27 23:10+0300\n"
"POT-Creation-Date: 2026-03-31 19:15+0300\n"
"PO-Revision-Date: 2026-03-24 00:00+0300\n"
"Last-Translator: \n"
"Language-Team: Russian\n"
......@@ -113,20 +113,24 @@ msgstr "Отключён"
msgid "Not Connected"
msgstr "Не подключён"
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:405
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:349
msgid "No networks found"
msgstr "Сети не найдены"
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:440
msgid "Password"
msgstr "Пароль"
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:409
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:120
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:444
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:130
msgid "Connect"
msgstr "Подключить"
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:469
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:504
msgid "Connecting…"
msgstr "Подключение…"
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:485
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:520
msgid "Network Settings"
msgstr "Настройки сети"
......@@ -138,7 +142,11 @@ msgstr "VPN"
msgid "Disconnected"
msgstr "Отключён"
#: src/controlCenter/widgets/quickSettings/tiles/vpnTile.vala:344
#: src/controlCenter/widgets/quickSettings/tiles/vpnTile.vala:274
msgid "No VPN connections"
msgstr "Нет VPN-подключений"
#: src/controlCenter/widgets/quickSettings/tiles/vpnTile.vala:348
msgid "VPN Settings"
msgstr "Настройки VPN"
......@@ -146,11 +154,15 @@ msgstr "Настройки VPN"
msgid "Bluetooth"
msgstr "Bluetooth"
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:119
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:91
msgid "Searching for devices…"
msgstr "Поиск устройств…"
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:129
msgid "Disconnect"
msgstr "Отключить"
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:162
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:172
msgid "Bluetooth Settings"
msgstr "Настройки Bluetooth"
......
po/ximper-shell-notification-center.pot
View file @ 7f91a63b
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ximper-shell-notification-center\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-03-27 23:10+0300\n"
"POT-Creation-Date: 2026-03-31 19:15+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -110,20 +110,24 @@ msgstr ""
msgid "Not Connected"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:405
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:349
msgid "No networks found"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:440
msgid "Password"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:409
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:120
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:444
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:130
msgid "Connect"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:469
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:504
msgid "Connecting…"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:485
#: src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala:520
msgid "Network Settings"
msgstr ""
......@@ -135,7 +139,11 @@ msgstr ""
msgid "Disconnected"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/vpnTile.vala:344
#: src/controlCenter/widgets/quickSettings/tiles/vpnTile.vala:274
msgid "No VPN connections"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/vpnTile.vala:348
msgid "VPN Settings"
msgstr ""
......@@ -143,11 +151,15 @@ msgstr ""
msgid "Bluetooth"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:119
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:91
msgid "Searching for devices…"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:129
msgid "Disconnect"
msgstr ""
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:162
#: src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala:172
msgid "Bluetooth Settings"
msgstr ""
......
src/controlCenter/widgets/quickSettings/quickSettingsTile.vala
View file @ 7f91a63b
......@@ -115,5 +115,51 @@ namespace XimperShellNotificationCenter.Widgets {
public virtual void on_cc_visibility_change (bool visible) {
}
protected void build_submenu_header (
Gtk.Box submenu_box,
Gtk.Button ?action_button = null) {
var header = new Gtk.Box (
Gtk.Orientation.HORIZONTAL, 8);
header.add_css_class ("submenu-header");
var header_icon =
new Gtk.Image.from_icon_name (
icon.icon_name);
header_icon.set_valign (Gtk.Align.CENTER);
header_icon.add_css_class (
"submenu-header-icon");
var header_label =
new Gtk.Label (title_label.get_text ());
header_label.add_css_class (
"submenu-header-label");
header_label.set_hexpand (true);
header_label.set_halign (Gtk.Align.START);
header.append (header_icon);
header.append (header_label);
if (action_button != null) {
action_button.add_css_class ("flat");
action_button.add_css_class ("circular");
header.append (action_button);
}
submenu_box.prepend (header);
}
protected void clear_submenu_content (
Gtk.Box submenu_box) {
for (var child =
submenu_box.get_first_child ();
child != null;) {
var next = child.get_next_sibling ();
if (!child.has_css_class (
"submenu-header")) {
submenu_box.remove (child);
}
child = next;
}
}
}
}
src/controlCenter/widgets/quickSettings/tiles/bluetoothTile.vala
View file @ 7f91a63b
......@@ -78,6 +78,7 @@ namespace XimperShellNotificationCenter.Widgets {
Gtk.Orientation.VERTICAL, 0);
box.add_css_class ("quick-settings-submenu");
build_submenu_header (box);
bt_proxy.start_discovery ();
build_device_list (box);
......@@ -85,6 +86,15 @@ namespace XimperShellNotificationCenter.Widgets {
}
private void build_device_list (Gtk.Box box) {
if (bt_proxy.devices.size == 0) {
var empty = new Gtk.Label (
_("Searching for devices…"));
empty.add_css_class ("dim-label");
empty.set_margin_top (8);
empty.set_margin_bottom (8);
box.append (empty);
}
foreach (var dev in bt_proxy.devices) {
var row = new Gtk.Box (
Gtk.Orientation.HORIZONTAL, 8);
......
src/controlCenter/widgets/quickSettings/tiles/powerProfilesTile.vala
View file @ 7f91a63b
......@@ -138,9 +138,12 @@ namespace XimperShellNotificationCenter.Widgets {
public override Gtk.Widget ?create_submenu () {
if (proxy == null) return null;
var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
var box = new Gtk.Box (
Gtk.Orientation.VERTICAL, 0);
box.add_css_class ("quick-settings-submenu");
build_submenu_header (box);
string current = proxy.active_profile;
foreach (string name in profile_names) {
......
src/controlCenter/widgets/quickSettings/tiles/vpnTile.vala
View file @ 7f91a63b
......@@ -79,12 +79,8 @@ namespace XimperShellNotificationCenter.Widgets {
active = any_active;
if (any_active && active_name != null) {
icon.set_from_icon_name (
"network-vpn-symbolic");
set_subtitle (active_name);
} else {
icon.set_from_icon_name (
"network-vpn-symbolic");
set_subtitle (_("Disconnected"));
}
}
......@@ -248,6 +244,7 @@ namespace XimperShellNotificationCenter.Widgets {
box.add_css_class ("quick-settings-submenu");
current_submenu = box;
build_submenu_header (box);
refresh_submenu.begin ();
return box;
......@@ -261,19 +258,22 @@ namespace XimperShellNotificationCenter.Widgets {
yield load_vpn_list ();
if (current_submenu != null) {
for (var child =
current_submenu.get_first_child ();
child != null;) {
var next = child.get_next_sibling ();
current_submenu.remove (child);
child = next;
}
clear_submenu_content (current_submenu);
build_vpn_list (current_submenu);
}
updating_submenu = false;
}
private void build_vpn_list (Gtk.Box box) {
if (vpn_list.size == 0) {
var empty = new Gtk.Label (
_("No VPN connections"));
empty.add_css_class ("dim-label");
empty.set_margin_top (8);
empty.set_margin_bottom (8);
box.append (empty);
}
foreach (var vpn in vpn_list) {
var row = new Gtk.Box (
Gtk.Orientation.HORIZONTAL, 8);
......@@ -363,12 +363,17 @@ namespace XimperShellNotificationCenter.Widgets {
box.append (btn);
}
private static string ?_settings_cmd = null;
private static bool _settings_checked = false;
private static string ?get_settings_command () {
if (_settings_checked) return _settings_cmd;
_settings_checked = true;
if (Environment.find_program_in_path (
"nm-connection-editor") != null) {
return "nm-connection-editor";
_settings_cmd = "nm-connection-editor";
}
return null;
return _settings_cmd;
}
}
}
src/controlCenter/widgets/quickSettings/tiles/wifiTile.vala
View file @ 7f91a63b
......@@ -136,6 +136,30 @@ namespace XimperShellNotificationCenter.Widgets {
}
}
private Gtk.Button ?scan_button = null;
private async void rescan () {
if (scan_button != null) {
var spinner = new Gtk.Spinner ();
spinner.start ();
scan_button.set_child (spinner);
scan_button.set_sensitive (false);
}
wifi_dev_path =
yield nm_proxy.get_wifi_device ();
yield scan ();
Timeout.add (1000, () => {
if (scan_button != null) {
scan_button.set_child (
new Gtk.Image.from_icon_name (
"view-refresh-symbolic"));
scan_button.set_sensitive (true);
}
refresh_submenu.begin ();
return Source.REMOVE;
});
}
private async void scan () {
if (wifi_dev_path == null) return;
try {
......@@ -291,6 +315,14 @@ namespace XimperShellNotificationCenter.Widgets {
box.add_css_class ("quick-settings-submenu");
current_submenu = box;
scan_button =
new Gtk.Button.from_icon_name (
"view-refresh-symbolic");
scan_button.clicked.connect (() => {
rescan.begin ();
});
build_submenu_header (box, scan_button);
refresh_submenu.begin ();
return box;
......@@ -304,13 +336,7 @@ namespace XimperShellNotificationCenter.Widgets {
var aps = yield get_access_points ();
if (current_submenu != null) {
for (var child =
current_submenu.get_first_child ();
child != null;) {
var next = child.get_next_sibling ();
current_submenu.remove (child);
child = next;
}
clear_submenu_content (current_submenu);
build_ap_list (current_submenu, aps);
}
updating_submenu = false;
......@@ -318,6 +344,15 @@ namespace XimperShellNotificationCenter.Widgets {
private void build_ap_list (
Gtk.Box box, ApInfo[] aps) {
if (aps.length == 0) {
var empty = new Gtk.Label (
_("No networks found"));
empty.add_css_class ("dim-label");
empty.set_margin_top (8);
empty.set_margin_bottom (8);
box.append (empty);
}
foreach (var ap in aps) {
var row = new Gtk.Box (
Gtk.Orientation.HORIZONTAL, 8);
......@@ -504,12 +539,17 @@ namespace XimperShellNotificationCenter.Widgets {
box.append (btn);
}
private static string ?_settings_cmd = null;
private static bool _settings_checked = false;
private static string ?get_settings_command () {
if (_settings_checked) return _settings_cmd;
_settings_checked = true;
if (Environment.find_program_in_path (
"nm-connection-editor") != null) {
return "nm-connection-editor";
_settings_cmd = "nm-connection-editor";
}
return null;
return _settings_cmd;
}
// Connection methods
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment