Skip to content

Commit

Permalink
support for gnpme 47 and fixed bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
alainm23 committed Oct 14, 2024
1 parent 4ce0da8 commit 59a64fa
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 31 deletions.
5 changes: 2 additions & 3 deletions core/Widgets/ContextMenu/MenuItem.vala
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,8 @@ public class Widgets.ContextMenu.MenuItem : Gtk.Button {

loading_revealer = new Gtk.Revealer () {
transition_type = Gtk.RevealerTransitionType.SLIDE_RIGHT,
child = new Gtk.Spinner () {
css_classes = { "submit-spinner" },
spinning = true
child = new Adw.Spinner () {
css_classes = { "submit-spinner" }
}
};

Expand Down
5 changes: 2 additions & 3 deletions core/Widgets/LabelsPickerCore.vala
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,13 @@ public class Widgets.LabelsPickerCore : Adw.Bin {
css_classes = { "dim-label", "caption" }
};

var spinner = new Gtk.Spinner () {
var spinner = new Adw.Spinner () {
valign = Gtk.Align.CENTER,
halign = Gtk.Align.CENTER,
height_request = 24,
width_request = 24,
margin_top = 12,
css_classes = { "text-color" },
spinning = true
css_classes = { "text-color" }
};

spinner_revealer = new Gtk.Revealer () {
Expand Down
5 changes: 2 additions & 3 deletions core/Widgets/LoadingButton.vala
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ public class Widgets.LoadingButton : Gtk.Button {
}

construct {
var submit_spinner = new Gtk.Spinner () {
var submit_spinner = new Adw.Spinner () {
valign = Gtk.Align.CENTER,
halign = Gtk.Align.CENTER,
spinning = true
halign = Gtk.Align.CENTER
};

submit_stack = new Gtk.Stack () {
Expand Down
5 changes: 2 additions & 3 deletions core/Widgets/ProjectPicker/ProjectPickerButton.vala
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,13 @@ public class Widgets.ProjectPicker.ProjectPickerButton : Adw.Bin {
css_classes = { "dim-label" }
};

var spinner = new Gtk.Spinner () {
var spinner = new Adw.Spinner () {
valign = Gtk.Align.CENTER,
halign = Gtk.Align.CENTER,
height_request = 24,
width_request = 24,
margin_top = 12,
css_classes = { "text-color" },
spinning = true
css_classes = { "text-color" }
};

spinner_revealer = new Gtk.Revealer () {
Expand Down
8 changes: 8 additions & 0 deletions data/io.github.alainm23.planify.appdata.xml.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@
<url type="donation">https://www.patreon.com/alainm23</url>
<launchable type="desktop-id">@[email protected]</launchable>
<releases>
<release version="4.11.5" date="2024-10-14">
<description translate="no">
<ul>
<li>Bug fixes and performance improvements.</li>
</ul>
</description>
</release>

<release version="4.11.4" date="2024-09-19">
<description translate="no">
<ul>
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'io.github.alainm23.planify',
'vala', 'c',
version: '4.11.4'
version: '4.11.5'
)

gnome = import('gnome')
Expand Down
8 changes: 1 addition & 7 deletions src/Dialogs/GoogleOAuth.vala
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ public class Dialogs.GoogleOAuth : Adw.Window {

var info_label = new Gtk.Label (_("Loading"));

var spinner = new Gtk.Spinner ();
var spinner = new Adw.Spinner ();
spinner.add_css_class ("text-color");
spinner.start ();

var container_grid = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
container_grid.valign = Gtk.Align.CENTER;
Expand Down Expand Up @@ -130,20 +129,15 @@ public class Dialogs.GoogleOAuth : Adw.Window {
if (redirect_uri.has_prefix (REDIRECT_URI)) {
string authorization_code = extractAuthorizationCode (redirect_uri);
get_token (authorization_code);
spinner.stop ();
}

if (load_event == WebKit.LoadEvent.FINISHED) {
info_label.label = _("Please enter your credentials");
spinner.stop ();
spinner.hide ();
return;
}

if (load_event == WebKit.LoadEvent.STARTED) {
info_label.label = _("Loading");
spinner.start ();
spinner.show ();
return;
}

Expand Down
5 changes: 2 additions & 3 deletions src/Dialogs/Preferences/PreferencesWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -1197,12 +1197,11 @@ public class Dialogs.Preferences.PreferencesWindow : Adw.PreferencesDialog {

webview.load_uri (oauth_open_url);

var sync_image = new Gtk.Spinner () {
var sync_image = new Adw.Spinner () {
valign = Gtk.Align.CENTER,
halign = Gtk.Align.CENTER,
height_request = 64,
width_request = 64,
spinning = true
width_request = 64
};

// Loading
Expand Down
5 changes: 2 additions & 3 deletions src/Layouts/ItemSidebarView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,9 @@ public class Layouts.ItemSidebarView : Adw.Bin {

pin_button = new Widgets.PinButton ();

var spinner = new Gtk.Spinner () {
var spinner = new Adw.Spinner () {
valign = Gtk.Align.CENTER,
halign = Gtk.Align.CENTER,
spinning = true
halign = Gtk.Align.CENTER
};

spinner_revealer = new Gtk.Revealer () {
Expand Down
3 changes: 1 addition & 2 deletions src/Layouts/ProjectRow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,9 @@ public class Layouts.ProjectRow : Gtk.ListBoxRow {
end_box.append (menu_stack);
end_box.append (arrow_revealer);

var loading_spinner = new Gtk.Spinner () {
var loading_spinner = new Adw.Spinner () {
valign = Gtk.Align.CENTER,
halign = Gtk.Align.CENTER,
spinning = true,
margin_end = 6
};

Expand Down
5 changes: 2 additions & 3 deletions src/Views/Project/Project.vala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class Views.Project : Adw.Bin {
public Objects.Project project { get; construct; }

private Gtk.Revealer project_view_revealer;
private Gtk.Spinner loading_spinner;
private Adw.Spinner loading_spinner;
private Adw.ViewStack project_stack;
private Adw.ToolbarView toolbar_view;
private Widgets.ContextMenu.MenuItem expand_all_item;
Expand Down Expand Up @@ -107,12 +107,11 @@ public class Views.Project : Adw.Bin {
transition_type = Gtk.RevealerTransitionType.CROSSFADE
};

loading_spinner = new Gtk.Spinner () {
loading_spinner = new Adw.Spinner () {
valign = Gtk.Align.CENTER,
halign = Gtk.Align.CENTER,
height_request = 64,
width_request = 64,
spinning = true
};

project_stack = new Adw.ViewStack () {
Expand Down

0 comments on commit 59a64fa

Please sign in to comment.