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

Status pages for Search and backend improvements #69

Merged
merged 12 commits into from
Nov 13, 2023

Conversation

turtlegarden
Copy link
Contributor

Important!

After merging, please update the PO files! This contains new localized strings, and my computer cannot compile Blueprint localizations!

Main Content

This pull request adds a troubleshooting string to the AdwAboutWindow of Warehouse containing various informations about the system and app version. Feel free to suggest more things to add to the string, I was modeling it off this debug info screen:

Inspiration Actual
Skärmbild från 2023-11-11 09-20-09 Skärmbild från 2023-11-11 09-40-29

This pull request also adds a catch clause for creation of rows, so that in Flatpak installations without many flatpaks (like a GNOME Builder environment) Warehouse can be launched.

Other features included:

  • Version information and devel information now comes from Meson
  • blueprint-compiler format run on all Blueprint files

Copy link
Contributor Author

@turtlegarden turtlegarden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some comments

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The blueprint files' changes are mostly formatting, so I will point out the specific changes made

src/orphans.blp Outdated
title: _("No Leftover Data");
description: _("There is no leftover user data");
}
template $OrphansWindow : Adw.Window {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update syntax

description: _("There is no leftover user data");
}

Adw.StatusPage no_results {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add no_results status page

[start]
SearchEntry search_entry {
hexpand: true;
placeholder-text: _("Search for Flatpaks…");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change placeholder text

}

[start]
MenuButton remotes_dropdown {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This dropdown looks strange on my end

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will probably be removed, I'm not very happy with the structure of the Search Install window myself. So that whole window is most likely going to be reworked.

@@ -1,8 +1,7 @@
using Gtk 4.0;
using Adw 1;

template WarehouseWindow : Adw.ApplicationWindow {
styles["devel"]
template $WarehouseWindow: Adw.ApplicationWindow {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update syntax and remove hard-coded devel

Adw.Clamp{
search-mode-enabled: bind search_button.active bidirectional;
key-capture-widget: main_toolbar_view;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update syntax

Adw.StatusPage no_flatpaks {
icon-name: "error-symbolic";
title: _("No Flatpaks Found");
description: _("There are either no Flatpaks that match the current filter, Warehouse cannot see the list of installed Flatpaks, or the system has no Flatpaks installed.");
}

Adw.StatusPage no_results {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no_results status page

@turtlegarden turtlegarden changed the title Status pages for Search and backend improvements WIP: Status pages for Search and backend improvements Nov 11, 2023
@turtlegarden turtlegarden marked this pull request as draft November 11, 2023 13:09
@turtlegarden
Copy link
Contributor Author

I think it's ready to be merged now. Waiting on approval

@turtlegarden turtlegarden marked this pull request as ready for review November 11, 2023 14:08
@turtlegarden turtlegarden changed the title WIP: Status pages for Search and backend improvements Status pages for Search and backend improvements Nov 11, 2023
@turtlegarden turtlegarden mentioned this pull request Nov 11, 2023
4 tasks
@heliguy4599 heliguy4599 merged commit 173fed7 into flattool:main Nov 13, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants