brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extensions-app: Use banner instead of action bar

Browse Source 
Action bars have largely gone out of fashion, and Banner is an
appropriate replacement in our case, so switch to that.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3048>
This commit is contained in:
Florian Müllner 2023-12-07 19:10:40 +01:00 committed by Marge Bot
parent 33c074c738
commit 2d34fbe2e7
2 changed files with 44 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
subprojects/extensions-app/data/ui/extensions-window.ui
View File

@ -74,47 +74,58 @@
<object class="GtkStackPage"> <object class="GtkStackPage">
<property name="name">main</property> <property name="name">main</property>
<property name="child"> <property name="child">
<object class="AdwPreferencesPage"> <object class="GtkBox">
<property name="orientation">vertical</property>
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwBanner" id="updatesBanner">
<property name="button-label" translatable="yes">Log Out…</property>
<property name="action-name">win.logout</property>
</object>
</child>
<child>
<object class="AdwPreferencesPage">
<child> <child>
<object class="AdwActionRow"> <object class="AdwPreferencesGroup">
<property name="title" translatable="yes">Extensions</property>
<property name="subtitle" translatable="yes">Extensions can cause performance and stability issues. Disable extensions if you encounter problems with your system.</property>
<property name="activatable-widget">enabledSwitch</property>
<child> <child>
<object class="GtkSwitch" id="enabledSwitch"> <object class="AdwActionRow">
<property name="action-name">win.user-extensions-enabled</property> <property name="title" translatable="yes">Extensions</property>
<property name="valign">center</property> <property name="subtitle" translatable="yes">Extensions can cause performance and stability issues. Disable extensions if you encounter problems with your system.</property>
<property name="activatable-widget">enabledSwitch</property>
<child>
<object class="GtkSwitch" id="enabledSwitch">
<property name="action-name">win.user-extensions-enabled</property>
<property name="valign">center</property>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
</object>
</child>
<child>
<object class="AdwPreferencesGroup" id="userGroup">
<property name="title" translatable="yes">Manually Installed</property>
<property name="description" translatable="yes">To find and add extensions, visit &lt;a href="https://extensions.gnome.org"&gt;extensions.gnome.org&lt;/a&gt;.</property>
<child> <child>
<object class="GtkListBox" id="userList"> <object class="AdwPreferencesGroup" id="userGroup">
<property name="selection-mode">none</property> <property name="title" translatable="yes">Manually Installed</property>
<style> <property name="description" translatable="yes">To find and add extensions, visit &lt;a href="https://extensions.gnome.org"&gt;extensions.gnome.org&lt;/a&gt;.</property>
<class name="boxed-list"/> <child>
</style> <object class="GtkListBox" id="userList">
<property name="selection-mode">none</property>
<style>
<class name="boxed-list"/>
</style>
</object>
</child>
</object> </object>
</child> </child>
</object>
</child>
<child>
<object class="AdwPreferencesGroup" id="systemGroup">
<property name="title" translatable="yes">Built-In</property>
<child> <child>
<object class="GtkListBox" id="systemList"> <object class="AdwPreferencesGroup" id="systemGroup">
<property name="selection-mode">none</property> <property name="title" translatable="yes">Built-In</property>
<style> <child>
<class name="boxed-list"/> <object class="GtkListBox" id="systemList">
</style> <property name="selection-mode">none</property>
<style>
<class name="boxed-list"/>
</style>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -148,55 +159,6 @@
</child> </child>
</object> </object>
</property> </property>
<child type="bottom">
<object class="GtkActionBar" id="updatesBar">
<property name="revealed">False</property>
<child>
<object class="GtkImage">
<property name="pixel-size">24</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="icon-name">software-update-available-symbolic</property>
<style>
<class name="warning"/>
</style>
</object>
</child>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel">
<property name="halign">start</property>
<property name="label" translatable="yes">Extension Updates Ready</property>
<style>
<class name="heading"/>
</style>
</object>
</child>
<child>
<object class="GtkLabel" id="updatesLabel">
<property name="halign">start</property>
</object>
</child>
</object>
</child>
<child type="end">
<object class="GtkButton">
<property name="label" translatable="yes">Log Out…</property>
<property name="valign">center</property>
<property name="action-name">win.logout</property>
<property name="receives-default">True</property>
<style>
<class name="suggested-action"/>
</style>
</object>
</child>
</object>
</child>
</object> </object>
</child> </child>
</template> </template>

7
subprojects/extensions-app/js/main.js
View File

@ -88,8 +88,7 @@ var ExtensionsWindow = GObject.registerClass({
'searchBar', 'searchBar',
'searchButton', 'searchButton',
'searchEntry', 'searchEntry',
'updatesBar', 'updatesBanner',
'updatesLabel',
], ],
}, class ExtensionsWindow extends Adw.ApplicationWindow { }, class ExtensionsWindow extends Adw.ApplicationWindow {
_init(params) { _init(params) {
@ -341,11 +340,11 @@ var ExtensionsWindow = GObject.registerClass({
_checkUpdates() { _checkUpdates() {
let nUpdates = [...this._userList].filter(c => c.hasUpdate).length; let nUpdates = [...this._userList].filter(c => c.hasUpdate).length;
this._updatesLabel.label = Gettext.ngettext( this._updatesBanner.title = Gettext.ngettext(
'%d extension will be updated on next login.', '%d extension will be updated on next login.',
'%d extensions will be updated on next login.', '%d extensions will be updated on next login.',
nUpdates).format(nUpdates); nUpdates).format(nUpdates);
this._updatesBar.revealed = nUpdates > 0; this._updatesBanner.revealed = nUpdates > 0;
} }
_extensionsLoaded() { _extensionsLoaded() {