diff --git a/HACKING.md b/HACKING.md index 52ae2ae1..9cc4889f 100644 --- a/HACKING.md +++ b/HACKING.md @@ -107,3 +107,4 @@ ninja -C builddir run > **Note** > During testing and development, as a convenience, you can use the `local.sh` script to quickly rebuild local builds. > If you want to use CLI in local builds, you should type: `./local_cli.sh ` instead of `gradience-cli`. + diff --git a/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json b/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json index da5d1407..d38065f5 100644 --- a/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json +++ b/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json @@ -22,8 +22,10 @@ "--filesystem=xdg-download:ro", "--filesystem=~/.mozilla/firefox", "--filesystem=~/.librewolf", + "--filesystem=~/.waterfox", "--filesystem=~/.var/app/org.mozilla.firefox/.mozilla/firefox", "--filesystem=~/.var/app/io.gitlab.librewolf-community/.librewolf", + "--filesystem=~/.var/app/net.waterfox.waterfox/.waterfox", "--filesystem=~/snap/firefox/common/.mozilla/firefox", "--filesystem=/.var/app/com.getmailspring.Mailspring/config/Mailspring/packages/Libadwaita/styles", "--filesystem=xdg-config/Mailspring" @@ -51,8 +53,8 @@ "sources": [ { "type": "archive", - "url": "https://github.com/lxml/lxml/releases/download/lxml-4.9.3/lxml-4.9.3.tar.gz", - "sha256": "48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c" + "url": "https://github.com/lxml/lxml/releases/download/lxml-5.0.0-1/lxml-5.0.0.tar.gz", + "sha256": "67216b13a832adb984cfd20437261236f8c05fc19a0f7d4c59c235fddb17dfdb" } ] }, @@ -62,7 +64,7 @@ "sources" : [ { "type" : "git", - "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler", + "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler.git", "branch" : "main" } ] @@ -93,7 +95,7 @@ { "type": "git", "url": "https://github.com/sass/libsass.git", - "tag": "3.6.5" + "tag": "3.6.6" }, { "type": "script", @@ -120,8 +122,8 @@ "sources": [ { "type": "git", - "url": "https://github.com/flatpak/libportal", - "tag": "main" + "url": "https://github.com/flatpak/libportal.git", + "branch": "main" } ] }, diff --git a/build-aux/flatpak/com.github.GradienceTeam.Gradience.json b/build-aux/flatpak/com.github.GradienceTeam.Gradience.json index 209dd491..77445008 100644 --- a/build-aux/flatpak/com.github.GradienceTeam.Gradience.json +++ b/build-aux/flatpak/com.github.GradienceTeam.Gradience.json @@ -1,7 +1,7 @@ { "app-id" : "com.github.GradienceTeam.Gradience", "runtime" : "org.gnome.Platform", - "runtime-version" : "44", + "runtime-version" : "45", "sdk" : "org.gnome.Sdk", "command" : "gradience", "finish-args" : [ @@ -22,10 +22,11 @@ "--filesystem=xdg-download:ro", "--filesystem=~/.mozilla/firefox", "--filesystem=~/.librewolf", + "--filesystem=~/.waterfox", "--filesystem=~/.var/app/org.mozilla.firefox/.mozilla/firefox", "--filesystem=~/.var/app/io.gitlab.librewolf-community/.librewolf", + "--filesystem=~/.var/app/net.waterfox.waterfox/.waterfox", "--filesystem=~/snap/firefox/common/.mozilla/firefox", - "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules/", "--filesystem=/.var/app/com.getmailspring.Mailspring/config/Mailspring/packages/Libadwaita/styles", "--filesystem=xdg-config/Mailspring" ], @@ -52,8 +53,8 @@ "sources": [ { "type": "archive", - "url": "https://github.com/lxml/lxml/releases/download/lxml-4.9.3/lxml-4.9.3.tar.gz", - "sha256": "48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c" + "url": "https://github.com/lxml/lxml/releases/download/lxml-5.0.0-1/lxml-5.0.0.tar.gz", + "sha256": "67216b13a832adb984cfd20437261236f8c05fc19a0f7d4c59c235fddb17dfdb" } ] }, @@ -68,23 +69,6 @@ } ] }, - { - "name" : "dconf", - "buildsystem" : "meson", - "config-opts": [ - "-Dbash_completion=false", - "-Dman=false", - "-Dgtk_doc=false", - "-Dvapi=false" - ], - "sources" : [ - { - "type" : "archive", - "url" : "https://download.gnome.org/sources/dconf/0.40/dconf-0.40.0.tar.xz", - "sha256" : "cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533" - } - ] - }, { "name": "sassc", "sources": [ @@ -111,7 +95,7 @@ { "type": "git", "url": "https://github.com/sass/libsass.git", - "tag": "3.6.5" + "tag": "3.6.6" }, { "type": "script", @@ -133,13 +117,13 @@ "config-opts": [ "-Ddocs=false", "-Dvapi=false", - "-Dbackends=gtk4" + "-Dbackend-gtk4=enabled" ], "sources": [ { "type": "git", "url": "https://github.com/flatpak/libportal.git", - "tag": "0.6" + "tag": "0.7.1" } ] }, diff --git a/data/com.github.GradienceTeam.Gradience.appdata.xml.in.in b/data/com.github.GradienceTeam.Gradience.appdata.xml.in.in index 6557e883..99d4e4ec 100644 --- a/data/com.github.GradienceTeam.Gradience.appdata.xml.in.in +++ b/data/com.github.GradienceTeam.Gradience.appdata.xml.in.in @@ -86,6 +86,14 @@ + + +

Gradience 0.8.0-beta2 release is the second beta for upcoming major release.

+
    +
  • See GitHub releases for more info
    • +
+ + "

Gradience 0.8.0-beta1 release is the first beta for upcoming major release.

diff --git a/data/gradience.gresource.xml b/data/gradience.gresource.xml index 53001d53..be192d51 100644 --- a/data/gradience.gresource.xml +++ b/data/gradience.gresource.xml @@ -34,13 +34,15 @@ icons/scalable/actions/adw-gtk3-warning-symbolic.svg icons/scalable/actions/bug-symbolic.svg - icons/scalable/actions/checkmark-large-symbolic.svg + icons/scalable/actions/checkmark-symbolic.svg icons/scalable/actions/code-symbolic.svg icons/scalable/actions/color-picker-symbolic.svg - icons/scalable/actions/drive-symbolic.svg - icons/scalable/actions/drive-unsaved-symbolic.svg + icons/scalable/actions/document-edit-symbolic.svg + icons/scalable/actions/document-save-symbolic.svg icons/scalable/actions/larger-brush-symbolic.svg icons/scalable/actions/palette-symbolic.svg icons/scalable/actions/settings-symbolic.svg + icons/scalable/actions/star-large-symbolic.svg + icons/scalable/actions/star-outline-rounded-symbolic.svg diff --git a/data/icons/scalable/actions/bug-symbolic.svg b/data/icons/scalable/actions/bug-symbolic.svg index e9017736..78fe9699 100644 --- a/data/icons/scalable/actions/bug-symbolic.svg +++ b/data/icons/scalable/actions/bug-symbolic.svg @@ -1,6 +1,2 @@ - - - - - - + + diff --git a/data/icons/scalable/actions/checkmark-large-symbolic.svg b/data/icons/scalable/actions/checkmark-large-symbolic.svg deleted file mode 100644 index e232bedb..00000000 --- a/data/icons/scalable/actions/checkmark-large-symbolic.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/data/icons/scalable/actions/checkmark-symbolic.svg b/data/icons/scalable/actions/checkmark-symbolic.svg new file mode 100644 index 00000000..da74bc35 --- /dev/null +++ b/data/icons/scalable/actions/checkmark-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/data/icons/scalable/actions/code-symbolic.svg b/data/icons/scalable/actions/code-symbolic.svg index 0ab6331d..2966ea31 100644 --- a/data/icons/scalable/actions/code-symbolic.svg +++ b/data/icons/scalable/actions/code-symbolic.svg @@ -1,105 +1,2 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/data/icons/scalable/actions/color-picker-symbolic.svg b/data/icons/scalable/actions/color-picker-symbolic.svg index abfaea7e..37f78439 100644 --- a/data/icons/scalable/actions/color-picker-symbolic.svg +++ b/data/icons/scalable/actions/color-picker-symbolic.svg @@ -1,105 +1,2 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/data/icons/scalable/actions/document-edit-symbolic.svg b/data/icons/scalable/actions/document-edit-symbolic.svg new file mode 100644 index 00000000..d5d54f68 --- /dev/null +++ b/data/icons/scalable/actions/document-edit-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/document-save-symbolic.svg b/data/icons/scalable/actions/document-save-symbolic.svg new file mode 100644 index 00000000..9c5584d9 --- /dev/null +++ b/data/icons/scalable/actions/document-save-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/drive-symbolic.svg b/data/icons/scalable/actions/drive-symbolic.svg deleted file mode 100644 index 9e8e4abb..00000000 --- a/data/icons/scalable/actions/drive-symbolic.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/data/icons/scalable/actions/drive-unsaved-symbolic.svg b/data/icons/scalable/actions/drive-unsaved-symbolic.svg deleted file mode 100644 index b908bb3c..00000000 --- a/data/icons/scalable/actions/drive-unsaved-symbolic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/data/icons/scalable/actions/larger-brush-symbolic.svg b/data/icons/scalable/actions/larger-brush-symbolic.svg index 5a3bd1aa..f06709bb 100644 --- a/data/icons/scalable/actions/larger-brush-symbolic.svg +++ b/data/icons/scalable/actions/larger-brush-symbolic.svg @@ -1,105 +1,2 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/data/icons/scalable/actions/settings-symbolic.svg b/data/icons/scalable/actions/settings-symbolic.svg index 49b0a294..4ac785e2 100644 --- a/data/icons/scalable/actions/settings-symbolic.svg +++ b/data/icons/scalable/actions/settings-symbolic.svg @@ -1,3 +1,2 @@ - - - + + diff --git a/data/icons/scalable/actions/star-large-symbolic.svg b/data/icons/scalable/actions/star-large-symbolic.svg new file mode 100644 index 00000000..5d67dd2a --- /dev/null +++ b/data/icons/scalable/actions/star-large-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/data/icons/scalable/actions/star-outline-rounded-symbolic.svg b/data/icons/scalable/actions/star-outline-rounded-symbolic.svg new file mode 100644 index 00000000..f19847d8 --- /dev/null +++ b/data/icons/scalable/actions/star-outline-rounded-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/data/submodules b/data/submodules index 8365bebe..cc95cdf3 160000 --- a/data/submodules +++ b/data/submodules @@ -1 +1 @@ -Subproject commit 8365bebebdc9833ddc66252d6d758ac69ea98c08 +Subproject commit cc95cdf36c7c52ffa5d34dcf337e1523db89de26 diff --git a/data/ui/builtin_preset_row.blp b/data/ui/builtin_preset_row.blp index 8e495e0e..826a8b7a 100644 --- a/data/ui/builtin_preset_row.blp +++ b/data/ui/builtin_preset_row.blp @@ -8,7 +8,7 @@ template $GradienceBuiltinPresetRow : Adw.ActionRow { [suffix] Button apply_button { valign: center; - icon-name: "checkmark-large-symbolic"; + icon-name: "checkmark-symbolic"; tooltip-text: _("Apply Preset"); clicked => $on_apply_button_clicked(); styles [ diff --git a/data/ui/explore_preset_row.blp b/data/ui/explore_preset_row.blp index 62d598c5..787be47a 100644 --- a/data/ui/explore_preset_row.blp +++ b/data/ui/explore_preset_row.blp @@ -19,7 +19,7 @@ template $GradienceExplorePresetRow : Adw.ActionRow { Button apply_button { valign: center; - icon-name: "checkmark-large-symbolic"; + icon-name: "checkmark-symbolic"; tooltip-text: _("Download and Apply"); clicked => $on_apply_button_clicked(); diff --git a/data/ui/help_overlay.blp b/data/ui/help_overlay.blp index c002021e..79a7bd03 100644 --- a/data/ui/help_overlay.blp +++ b/data/ui/help_overlay.blp @@ -4,11 +4,8 @@ ShortcutsWindow help_overlay { modal: true; ShortcutsSection { - section-name: "shortcuts"; - max-height: 10; - ShortcutsGroup { - title: C_("shortcut window", "General"); + title: _("General"); ShortcutsShortcut { title: C_("shortcut window", "Show Shortcuts"); diff --git a/data/ui/monet_theming_group.blp b/data/ui/monet_theming_group.blp index d8ef6595..83126b3d 100644 --- a/data/ui/monet_theming_group.blp +++ b/data/ui/monet_theming_group.blp @@ -20,7 +20,7 @@ template $GradienceMonetThemingGroup : Adw.PreferencesGroup { } Adw.ActionRow file-chooser-row { - title: _("Select an Image"); + title: _("Background Image"); activatable-widget: file-chooser-button; [suffix] diff --git a/data/ui/plugin_row.blp b/data/ui/plugin_row.blp index 2a0305d3..ccb20abe 100644 --- a/data/ui/plugin_row.blp +++ b/data/ui/plugin_row.blp @@ -11,17 +11,20 @@ template $GradiencePluginRow : Adw.ActionRow { state-set => $on_switch_toggled(); } - [suffix] - Button settings-button { - valign: center; - icon-name: "settings-symbolic"; - tooltip-text: _("Preferences"); - clicked => $on_settings_plugin_clicked(); + // TODO: Detect if plugin has preferences, and if it does display the + // settings button - styles [ - "flat", - ] - } + // [suffix] + // Button settings-button { + // valign: center; + // icon-name: "settings-symbolic"; + // tooltip-text: _("Preferences"); + // clicked => $on_settings_plugin_clicked(); + + // styles [ + // "flat", + // ] + // } [suffix] Button remove-button { diff --git a/data/ui/preferences_window.blp b/data/ui/preferences_window.blp index 01bdebea..cfafd870 100644 --- a/data/ui/preferences_window.blp +++ b/data/ui/preferences_window.blp @@ -85,7 +85,7 @@ template $GradiencePreferencesWindow : Adw.PreferencesWindow { Gtk.Button custom_repository_apply { valign: center; - icon-name: "checkmark-large-symbolic"; + icon-name: "checkmark-symbolic"; } } } diff --git a/data/ui/preset_row.blp b/data/ui/preset_row.blp index 1b92a27d..296c2158 100644 --- a/data/ui/preset_row.blp +++ b/data/ui/preset_row.blp @@ -46,7 +46,7 @@ template $GradiencePresetRow : Adw.ExpanderRow { Button apply_button { valign: center; - icon-name: "checkmark-large-symbolic"; + icon-name: "checkmark-symbolic"; tooltip-text: _("Apply Preset"); clicked => $on_apply_button_clicked(); styles ["flat"] @@ -99,7 +99,7 @@ template $GradiencePresetRow : Adw.ExpanderRow { Button report_button { valign: center; icon-name: "bug-symbolic"; - tooltip-text: _("Report Preset Issue"); + tooltip-text: _("Report an Issue"); clicked => $on_report_button_clicked(); } diff --git a/data/ui/presets_manager_window.blp b/data/ui/presets_manager_window.blp index 8d12ea72..1387955c 100644 --- a/data/ui/presets_manager_window.blp +++ b/data/ui/presets_manager_window.blp @@ -55,7 +55,7 @@ template $GradiencePresetWindow : Adw.Window { tooltip-text: _("Open in File Manager"); clicked => $on_file_manager_button_clicked(); Adw.ButtonContent { - icon-name: "folder-symbolic"; + icon-name: "folder-open-symbolic"; } } diff --git a/data/ui/window.blp b/data/ui/window.blp index 26b9c5bb..c0fc99b0 100644 --- a/data/ui/window.blp +++ b/data/ui/window.blp @@ -31,6 +31,15 @@ template $GradienceMainWindow : Adw.ApplicationWindow { action-name: "app.apply_color_scheme"; } + [start] + Button save-preset-button { + action-name: "app.save_preset"; + tooltip-text: _("Save Preset"); + Adw.ButtonContent { + icon-name: "document-save-symbolic"; + } + } + [start] Button { icon-name: "applications-science-symbolic"; @@ -58,15 +67,6 @@ template $GradienceMainWindow : Adw.ApplicationWindow { icon-name: "palette-symbolic"; } - [end] - Button save-preset-button { - action-name: "app.save_preset"; - tooltip-text: _("Save Preset"); - Adw.ButtonContent { - icon-name: "drive-symbolic"; - } - } - [end] MenuButton errors-button { styles ["raised", "error"] diff --git a/gradience/frontend/dialogs/save_dialog.py b/gradience/frontend/dialogs/save_dialog.py index 1fd3e143..36f9b7b6 100644 --- a/gradience/frontend/dialogs/save_dialog.py +++ b/gradience/frontend/dialogs/save_dialog.py @@ -36,7 +36,7 @@ class GradienceSaveDialog(Adw.MessageDialog): self.app = self.parent.get_application() self.body = _( - "Saving preset to {0}. If that preset already " + "Saving preset to \n {0}. \n If that preset already " "exists, it will be overwritten." ) @@ -74,3 +74,4 @@ class GradienceSaveDialog(Adw.MessageDialog): self.set_response_appearance( "save", Adw.ResponseAppearance.SUGGESTED ) + diff --git a/gradience/frontend/main.py b/gradience/frontend/main.py index 3a671afe..77a3880e 100644 --- a/gradience/frontend/main.py +++ b/gradience/frontend/main.py @@ -408,25 +408,18 @@ class GradienceApplication(Adw.Application): def mark_as_dirty(self): self.is_dirty = True - self.props.active_window.save_preset_button.get_child().set_icon_name( - "drive-unsaved-symbolic" - ) self.props.active_window.save_preset_button.add_css_class("warning") - self.props.active_window.save_preset_button.get_child().set_tooltip_text( - _("Unsaved Changes") - ) + self.props.active_window.save_preset_button.set_tooltip_text(_("Unsaved Changes")) def clear_dirty(self): self.is_dirty = False self.props.active_window.save_preset_button.get_child().set_icon_name( - "drive-symbolic" + "document-save-symbolic" ) self.props.active_window.save_preset_button.remove_css_class("warning") - self.props.active_window.save_preset_button.get_child().set_label("") - self.props.active_window.save_preset_button.get_child().set_tooltip_text( - _("Save Changes") - ) + self.props.active_window.save_preset_button.get_child().set_label(_("Save")) + self.props.active_window.save_preset_button.set_tooltip_text(_("Save Preset")) def reload_variables(self): parsing_errors = [] diff --git a/gradience/frontend/views/presets_manager_window.py b/gradience/frontend/views/presets_manager_window.py index b7275746..b0f2dabc 100644 --- a/gradience/frontend/views/presets_manager_window.py +++ b/gradience/frontend/views/presets_manager_window.py @@ -404,3 +404,4 @@ class GradiencePresetWindow(Adw.Window): self.repos.add(self.repos_list) self._repos = {**self.user_repositories, **self.preset_repos} + diff --git a/gradience/frontend/widgets/monet_theming_group.py b/gradience/frontend/widgets/monet_theming_group.py index e419f838..8b79dd42 100644 --- a/gradience/frontend/widgets/monet_theming_group.py +++ b/gradience/frontend/widgets/monet_theming_group.py @@ -62,7 +62,7 @@ class GradienceMonetThemingGroup(Adw.PreferencesGroup): def setup_palette_shades(self): self.monet_palette_shades = GradiencePaletteShades( - "monet", _("Monet Palette"), 6 + "monet", _("Palette"), 6 ) self.app.pref_palette_shades["monet"] = self.monet_palette_shades @@ -88,7 +88,7 @@ class GradienceMonetThemingGroup(Adw.PreferencesGroup): def setup_theme_row(self): self.theme_row = Adw.ComboRow() - self.theme_row.set_title(_("Theme")) + self.theme_row.set_title(_("Style")) theme_store = Gtk.StringList() theme_store.append(_("Auto")) diff --git a/gradience/frontend/widgets/preset_row.py b/gradience/frontend/widgets/preset_row.py index 4beff529..be189c4c 100644 --- a/gradience/frontend/widgets/preset_row.py +++ b/gradience/frontend/widgets/preset_row.py @@ -81,10 +81,10 @@ class GradiencePresetRow(Adw.ExpanderRow): # self.share_button.connect("clicked", self.on_share_btn_clicked) if name in self.win.app.favourite: - self.star_button.set_icon_name("starred-symbolic") + self.star_button.set_icon_name("star-large-symbolic") self.star_button.set_tooltip_text(_("Remove from Favorites")) else: - self.star_button.set_icon_name("non-starred-symbolic") + self.star_button.set_icon_name("star-outline-rounded-symbolic") self.star_button.set_tooltip_text(_("Add to Favorites")) # def on_share_btn_clicked(self, *_args): diff --git a/meson.build b/meson.build index a8858071..f5290174 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gradience', - version: '0.8.0-beta1', + version: '0.8.0-beta2', meson_version: '>= 0.59.0', default_options: [ 'warning_level=2', 'werror=false',