Skip to content

Commit

Permalink
Merge branch 'main' into danirabbit/release-8.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit authored May 21, 2024
2 parents 5daa4a1 + d6034f2 commit 932ff0f
Show file tree
Hide file tree
Showing 407 changed files with 10,188 additions and 8,022 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
GIT_USER_NAME: "elementaryBot"
GIT_USER_EMAIL: "[email protected]"
with:
release_branch: 'horus'
release_branch: 'noble'
Binary file modified data/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion data/styles/SettingsPage.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
settingspage {
> box > scrolledwindow {
> scrolledwindow {
overshoot.top {
background:
linear-gradient(
Expand Down
34 changes: 18 additions & 16 deletions lib/SettingsPage.vala
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public abstract class Switchboard.SettingsPage : Gtk.Widget {
private Gtk.SizeGroup end_button_group;

static construct {
set_layout_manager_type (typeof (Gtk.BinLayout));
set_layout_manager_type (typeof (Gtk.BoxLayout));
}

class construct {
Expand Down Expand Up @@ -126,18 +126,16 @@ public abstract class Switchboard.SettingsPage : Gtk.Widget {
title_label.add_css_class (Granite.STYLE_CLASS_H2_LABEL);

var description_label = new Gtk.Label (description) {
hexpand = true,
max_width_chars = 0,
selectable = true,
use_markup = true,
wrap = true,
xalign = 0
};

var header_area = new Gtk.Grid () {
halign = CENTER
};
var header_area = new Gtk.Grid ();
header_area.attach (title_label, 1, 0);
header_area.add_css_class ("header-area");

if (description != null) {
header_area.attach (header_widget, 0, 0, 1, 2);
Expand All @@ -157,8 +155,15 @@ public abstract class Switchboard.SettingsPage : Gtk.Widget {
valign = START
};

var header_clamp = new Adw.Clamp () {
child = header_area,
maximum_size = 600,
tightening_threshold = 600
};
header_clamp.add_css_class ("header-area");

var headerbar = new Gtk.CenterBox () {
center_widget = header_area,
center_widget = header_clamp,
end_widget = end_widget
};

Expand All @@ -173,10 +178,6 @@ public abstract class Switchboard.SettingsPage : Gtk.Widget {
};
content_area.add_css_class ("content-area");

var size_group = new Gtk.SizeGroup (HORIZONTAL);
size_group.add_widget (header_area);
size_group.add_widget (content_area);

var scrolled = new Gtk.ScrolledWindow () {
child = content_area,
hscrollbar_policy = NEVER
Expand All @@ -190,11 +191,10 @@ public abstract class Switchboard.SettingsPage : Gtk.Widget {
};
action_bar.add_css_class ("action-area");

var grid = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
grid.append (window_handle);
grid.append (scrolled);
grid.append (action_bar);
grid.set_parent (this);
((Gtk.BoxLayout) get_layout_manager ()).orientation = VERTICAL;
window_handle.set_parent (this);
scrolled.set_parent (this);
action_bar.set_parent (this);

bind_property ("description", description_label, "label");
bind_property ("title", title_label, "label");
Expand All @@ -210,7 +210,9 @@ public abstract class Switchboard.SettingsPage : Gtk.Widget {
}

~SettingsPage () {
get_first_child ().unparent ();
while (get_first_child () != null) {
get_first_child ().unparent ();
}
}

public Gtk.Button add_start_button (string label) {
Expand Down
18 changes: 9 additions & 9 deletions po/aa.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-21 20:59+0000\n"
"POT-Creation-Date: 2024-05-09 16:28+0000\n"
"PO-Revision-Date: 2016-11-01 03:29+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,39 +18,39 @@ msgstr ""
msgid "Specified link '%s' does not exist, going back to the main panel"
msgstr ""

#: src/Application.vala:141
#: src/Application.vala:144
msgid "System Settings"
msgstr ""

#: src/CategoryView.vala:28
msgid "Search Settings"
msgstr ""

#: src/CategoryView.vala:46
#: src/CategoryView.vala:45
msgid "No Settings Found"
msgstr ""

#: src/CategoryView.vala:47
#: src/CategoryView.vala:46
msgid "Install settings plugins and re-launch System Settings."
msgstr ""

#: src/CategoryView.vala:91
#: src/CategoryView.vala:92
msgid "All Settings"
msgstr ""

#: src/CategoryView.vala:214
#: src/CategoryView.vala:215
msgid "Personal"
msgstr ""

#: src/CategoryView.vala:216
#: src/CategoryView.vala:217
msgid "Hardware"
msgstr ""

#: src/CategoryView.vala:218
#: src/CategoryView.vala:219
msgid "Network & Wireless"
msgstr ""

#: src/CategoryView.vala:220
#: src/CategoryView.vala:221
msgid "Administration"
msgstr ""

Expand Down
18 changes: 9 additions & 9 deletions po/ab.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-21 20:59+0000\n"
"POT-Creation-Date: 2024-05-09 16:28+0000\n"
"PO-Revision-Date: 2016-11-01 03:29+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,39 +18,39 @@ msgstr ""
msgid "Specified link '%s' does not exist, going back to the main panel"
msgstr ""

#: src/Application.vala:141
#: src/Application.vala:144
msgid "System Settings"
msgstr ""

#: src/CategoryView.vala:28
msgid "Search Settings"
msgstr ""

#: src/CategoryView.vala:46
#: src/CategoryView.vala:45
msgid "No Settings Found"
msgstr ""

#: src/CategoryView.vala:47
#: src/CategoryView.vala:46
msgid "Install settings plugins and re-launch System Settings."
msgstr ""

#: src/CategoryView.vala:91
#: src/CategoryView.vala:92
msgid "All Settings"
msgstr ""

#: src/CategoryView.vala:214
#: src/CategoryView.vala:215
msgid "Personal"
msgstr ""

#: src/CategoryView.vala:216
#: src/CategoryView.vala:217
msgid "Hardware"
msgstr ""

#: src/CategoryView.vala:218
#: src/CategoryView.vala:219
msgid "Network & Wireless"
msgstr ""

#: src/CategoryView.vala:220
#: src/CategoryView.vala:221
msgid "Administration"
msgstr ""

Expand Down
18 changes: 9 additions & 9 deletions po/ae.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-21 20:59+0000\n"
"POT-Creation-Date: 2024-05-09 16:28+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand All @@ -10,39 +10,39 @@ msgstr ""
msgid "Specified link '%s' does not exist, going back to the main panel"
msgstr ""

#: src/Application.vala:141
#: src/Application.vala:144
msgid "System Settings"
msgstr ""

#: src/CategoryView.vala:28
msgid "Search Settings"
msgstr ""

#: src/CategoryView.vala:46
#: src/CategoryView.vala:45
msgid "No Settings Found"
msgstr ""

#: src/CategoryView.vala:47
#: src/CategoryView.vala:46
msgid "Install settings plugins and re-launch System Settings."
msgstr ""

#: src/CategoryView.vala:91
#: src/CategoryView.vala:92
msgid "All Settings"
msgstr ""

#: src/CategoryView.vala:214
#: src/CategoryView.vala:215
msgid "Personal"
msgstr ""

#: src/CategoryView.vala:216
#: src/CategoryView.vala:217
msgid "Hardware"
msgstr ""

#: src/CategoryView.vala:218
#: src/CategoryView.vala:219
msgid "Network & Wireless"
msgstr ""

#: src/CategoryView.vala:220
#: src/CategoryView.vala:221
msgid "Administration"
msgstr ""

Expand Down
18 changes: 9 additions & 9 deletions po/af.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: switchboard\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-21 20:59+0000\n"
"POT-Creation-Date: 2024-05-09 16:28+0000\n"
"PO-Revision-Date: 2015-12-06 12:56+0000\n"
"Last-Translator: Avi Romanoff <Unknown>\n"
"Language-Team: Afrikaans <[email protected]>\n"
Expand All @@ -23,39 +23,39 @@ msgstr ""
msgid "Specified link '%s' does not exist, going back to the main panel"
msgstr ""

#: src/Application.vala:141
#: src/Application.vala:144
msgid "System Settings"
msgstr "Stelsel Instellings"

#: src/CategoryView.vala:28
msgid "Search Settings"
msgstr "Soek Instellings"

#: src/CategoryView.vala:46
#: src/CategoryView.vala:45
msgid "No Settings Found"
msgstr ""

#: src/CategoryView.vala:47
#: src/CategoryView.vala:46
msgid "Install settings plugins and re-launch System Settings."
msgstr ""

#: src/CategoryView.vala:91
#: src/CategoryView.vala:92
msgid "All Settings"
msgstr "Alle Instellings"

#: src/CategoryView.vala:214
#: src/CategoryView.vala:215
msgid "Personal"
msgstr "Persoonlik"

#: src/CategoryView.vala:216
#: src/CategoryView.vala:217
msgid "Hardware"
msgstr "Hardeware"

#: src/CategoryView.vala:218
#: src/CategoryView.vala:219
msgid "Network & Wireless"
msgstr ""

#: src/CategoryView.vala:220
#: src/CategoryView.vala:221
msgid "Administration"
msgstr "Administrasie"

Expand Down
18 changes: 9 additions & 9 deletions po/ak.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-21 20:59+0000\n"
"POT-Creation-Date: 2024-05-09 16:28+0000\n"
"PO-Revision-Date: 2016-11-01 03:29+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,39 +18,39 @@ msgstr ""
msgid "Specified link '%s' does not exist, going back to the main panel"
msgstr ""

#: src/Application.vala:141
#: src/Application.vala:144
msgid "System Settings"
msgstr ""

#: src/CategoryView.vala:28
msgid "Search Settings"
msgstr ""

#: src/CategoryView.vala:46
#: src/CategoryView.vala:45
msgid "No Settings Found"
msgstr ""

#: src/CategoryView.vala:47
#: src/CategoryView.vala:46
msgid "Install settings plugins and re-launch System Settings."
msgstr ""

#: src/CategoryView.vala:91
#: src/CategoryView.vala:92
msgid "All Settings"
msgstr ""

#: src/CategoryView.vala:214
#: src/CategoryView.vala:215
msgid "Personal"
msgstr ""

#: src/CategoryView.vala:216
#: src/CategoryView.vala:217
msgid "Hardware"
msgstr ""

#: src/CategoryView.vala:218
#: src/CategoryView.vala:219
msgid "Network & Wireless"
msgstr ""

#: src/CategoryView.vala:220
#: src/CategoryView.vala:221
msgid "Administration"
msgstr ""

Expand Down
Loading

0 comments on commit 932ff0f

Please sign in to comment.