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.

Sign up for GitHub

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

Jump to bottom

Port to Gtk4 #90

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Port to Gtk4 #90

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9f12a62
feat: port to gtk4
alainm23 Sep 24, 2024
389156c
feat: initial port gtk4
alainm23 Sep 25, 2024
75b0b29
feat: add new placeholder and dialog to replace
alainm23 Sep 26, 2024
adcd79b
feat: fix dnd
alainm23 Sep 27, 2024
a22ffe5
feat: fix lint
alainm23 Sep 27, 2024
75ad30f
fix lint
alainm23 Sep 27, 2024
221d46a
feat: add new filerow widget
alainm23 Sep 30, 2024
70a623b
fix lint
alainm23 Sep 30, 2024
422d0be
Merge branch 'main' into feat/port-gtk4
alainm23 Sep 30, 2024
da20cc0
fix lint
alainm23 Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/Application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ button.pathbar {
border-radius: 0;
padding: 0 6px;
}

.combo {
padding: 2.5px 3px;
alainm23 marked this conversation as resolved.
Show resolved Hide resolved
}
18 changes: 14 additions & 4 deletions src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ public class Taxi.Taxi : Gtk.Application {
protected override void startup () {
base.startup ();

Hdy.init ();
Granite.init ();

var provider = new Gtk.CssProvider ();
provider.load_from_resource ("com/github/alecaddd/taxi/Application.css");
Gtk.StyleContext.add_provider_for_screen (
Gdk.Screen.get_default (),
Gtk.StyleContext.add_provider_for_display (
Gdk.Display.get_default (),
provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
);

Expand All @@ -57,7 +57,17 @@ public class Taxi.Taxi : Gtk.Application {
new ConnectionSaver ()
);

main_window.show_all ();
var settings = new Settings ("com.github.alecaddd.taxi.state");
settings.bind ("window-height", main_window, "default-height", SettingsBindFlags.DEFAULT);
settings.bind ("window-width", main_window, "default-width", SettingsBindFlags.DEFAULT);

if (settings.get_boolean ("maximized")) {
main_window.maximize ();
}

settings.bind ("maximized", main_window, "maximized", SettingsBindFlags.SET);

main_window.show ();
alainm23 marked this conversation as resolved.
Show resolved Hide resolved
}

public static int main (string[] args) {
Expand Down
201 changes: 96 additions & 105 deletions src/Frontend/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
with program. If not, see <http://www.gnu.org/licenses>
***/

class Taxi.MainWindow : Hdy.ApplicationWindow {
class Taxi.MainWindow : Gtk.ApplicationWindow {
public IConnectionSaver conn_saver { get; construct; }
public IFileOperations file_operation { get; construct; }
public IFileAccess local_access { get; construct; }
public IFileAccess remote_access { get; construct; }

private Granite.Widgets.Toast toast;
private Granite.Toast toast;
private Gtk.Revealer spinner_revealer;
private Gtk.Grid bookmark_list;
private Gtk.Grid outer_box;
private Gtk.Box bookmark_list;
private Gtk.Box outer_box;
private Gtk.MenuButton bookmark_menu_button;
private Gtk.Stack alert_stack;
private ConnectBox connect_box;
private Granite.Widgets.Welcome welcome;
private Granite.Placeholder welcome;
private FilePane local_pane;
private FilePane remote_pane;
private GLib.Uri conn_uri;
Expand Down Expand Up @@ -71,50 +71,57 @@ class Taxi.MainWindow : Hdy.ApplicationWindow {

var popover = new OperationsPopover (spinner);

var operations_button = new Gtk.MenuButton ();
operations_button.popover = popover;
operations_button.valign = Gtk.Align.CENTER;
operations_button.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
operations_button.add (spinner);
var operations_button = new Gtk.MenuButton () {
popover = popover,
valign = CENTER,
child = spinner
};
operations_button.add_css_class (Granite.STYLE_CLASS_FLAT);

spinner_revealer = new Gtk.Revealer ();
spinner_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_RIGHT;
spinner_revealer.add (operations_button);
spinner_revealer = new Gtk.Revealer () {
transition_type = Gtk.RevealerTransitionType.SLIDE_RIGHT,
child = operations_button
};

bookmark_list = new Gtk.Grid ();
bookmark_list.margin_top = bookmark_list.margin_bottom = 3;
bookmark_list.orientation = Gtk.Orientation.VERTICAL;
bookmark_list = new Gtk.Box (Gtk.Orientation.VERTICAL, 0) {
margin_top = 6,
margin_bottom = 6,
margin_start = 3,
margin_end = 3
alainm23 marked this conversation as resolved.
Show resolved Hide resolved
};

var bookmark_scrollbox = new Gtk.ScrolledWindow (null, null);
bookmark_scrollbox.hscrollbar_policy = Gtk.PolicyType.NEVER;
bookmark_scrollbox.max_content_height = 500;
bookmark_scrollbox.propagate_natural_height = true;
bookmark_scrollbox.add (bookmark_list);
bookmark_scrollbox.show ();
var bookmark_scrollbox = new Gtk.ScrolledWindow () {
child = bookmark_list,
hscrollbar_policy = Gtk.PolicyType.NEVER,
max_content_height = 500,
propagate_natural_height = true,
};

var bookmark_popover = new Gtk.Popover (null);
bookmark_popover.add (bookmark_scrollbox);
var bookmark_popover = new Gtk.Popover () {
child = bookmark_scrollbox,
width_request = 250
};

bookmark_menu_button = new Gtk.MenuButton ();
bookmark_menu_button.image = new Gtk.Image.from_icon_name ("user-bookmarks", Gtk.IconSize.LARGE_TOOLBAR);
bookmark_menu_button.popover = bookmark_popover;
bookmark_menu_button.tooltip_text = _("Access Bookmarks");
bookmark_menu_button = new Gtk.MenuButton () {
icon_name = "user-bookmarks",
tooltip_text = _("Access Bookmarks"),
popover = bookmark_popover,
valign = CENTER
};
alainm23 marked this conversation as resolved.
Show resolved Hide resolved

update_bookmark_menu ();

var header_bar = new Hdy.HeaderBar () {
custom_title = new Gtk.Label (null),
show_close_button = true
var header_bar = new Adw.HeaderBar () {
show_title = false
};
header_bar.pack_start (connect_box);
header_bar.pack_start (spinner_revealer);
header_bar.pack_start (bookmark_menu_button);

welcome = new Granite.Widgets.Welcome (
_("Connect"),
_("Type a URL and press 'Enter' to\nconnect to a server.")
);
welcome.vexpand = true;
welcome = new Granite.Placeholder (_("Connect")) {
description = _("Type a URL and press 'Enter' to connect to a server."),
vexpand = true
};

local_pane = new FilePane ();
local_pane.open.connect (on_local_open);
Expand All @@ -129,49 +136,47 @@ class Taxi.MainWindow : Hdy.ApplicationWindow {
remote_pane.file_dragged.connect (on_remote_file_dragged);
remote_pane.transfer.connect (on_local_file_dragged);

outer_box = new Gtk.Grid ();
outer_box.add (local_pane);
outer_box.add (new Gtk.Separator (Gtk.Orientation.VERTICAL));
outer_box.add (remote_pane);
outer_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
outer_box.append (local_pane);
outer_box.append (new Gtk.Separator (Gtk.Orientation.VERTICAL));
outer_box.append (remote_pane);

var size_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
size_group.add_widget (local_pane);
size_group.add_widget (remote_pane);

alert_stack = new Gtk.Stack ();
alert_stack.add (welcome);
alert_stack.add (outer_box);
alert_stack.add_child (welcome);
alert_stack.add_child (outer_box);

toast = new Granite.Widgets.Toast ("");
toast = new Granite.Toast ("");

var overlay = new Gtk.Overlay ();
overlay.add (alert_stack);
var overlay = new Gtk.Overlay () {
child = alert_stack
};
overlay.add_overlay (toast);

var grid = new Gtk.Grid ();
grid.attach (header_bar, 0, 0);
grid.attach (overlay, 0, 1);
var grid = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
grid.append (header_bar);
grid.append (overlay);

add (grid);

saved_state = new GLib.Settings ("com.github.alecaddd.taxi.state");
// We need to hide the title area for the split headerbar
var null_title = new Gtk.Grid () {
visible = false
};
set_titlebar (null_title);
alainm23 marked this conversation as resolved.
Show resolved Hide resolved

default_height = saved_state.get_int ("window-height");
default_width = saved_state.get_int ("window-width");
child = grid;

if (saved_state.get_boolean ("maximized")) {
maximize ();
}
saved_state = new GLib.Settings ("com.github.alecaddd.taxi.state");
alainm23 marked this conversation as resolved.
Show resolved Hide resolved

connect_box.connect_initiated.connect (on_connect_initiated);
connect_box.ask_hostname.connect (on_ask_hostname);
connect_box.bookmarked.connect (bookmark);

file_operation.operation_added.connect (popover.add_operation);
file_operation.operation_removed.connect (popover.remove_operation);
file_operation.ask_overwrite.connect (on_ask_overwrite);

key_press_event.connect (connect_box.on_key_press_event);
// file_operation.ask_overwrite.connect (on_ask_overwrite);
alainm23 marked this conversation as resolved.
Show resolved Hide resolved

popover.operations_pending.connect (show_spinner);
popover.operations_finished.connect (hide_spinner);
Expand All @@ -182,9 +187,6 @@ class Taxi.MainWindow : Hdy.ApplicationWindow {
remote_access.connect_to_device.begin (uri, this, (obj, res) => {
if (remote_access.connect_to_device.end (res)) {
alert_stack.visible_child = outer_box;
if (local_pane == null) {
key_press_event.disconnect (connect_box.on_key_press_event);
}
update_pane (Location.LOCAL);
update_pane (Location.REMOTE);
connect_box.show_favorite_icon (
Expand Down Expand Up @@ -221,25 +223,29 @@ class Taxi.MainWindow : Hdy.ApplicationWindow {
}

private void update_bookmark_menu () {
foreach (Gtk.Widget child in bookmark_list.get_children ()) {
child.destroy ();
for (Gtk.Widget? child = bookmark_list.get_first_child (); child != null;) {
Gtk.Widget? next = child.get_next_sibling ();
bookmark_list.remove (child);
child = next;
}

var uri_list = conn_saver.get_saved_conns ();
if (uri_list.length () == 0) {
bookmark_menu_button.sensitive = false;
} else {
foreach (string uri in uri_list) {
var bookmark_item = new Gtk.ModelButton ();
bookmark_item.text = uri;

bookmark_list.add (bookmark_item);

var bookmark_item = new Gtk.Button () {
child = new Gtk.Label (uri) {
halign = START
}
};
bookmark_item.add_css_class (Granite.STYLE_CLASS_FLAT);
alainm23 marked this conversation as resolved.
Show resolved Hide resolved
bookmark_item.clicked.connect (() => {
connect_box.go_to_uri (uri);
});

bookmark_list.append (bookmark_item);
}
bookmark_list.show_all ();
bookmark_menu_button.sensitive = true;
}
}
Expand Down Expand Up @@ -383,39 +389,24 @@ class Taxi.MainWindow : Hdy.ApplicationWindow {
return conn_uri;
}

private int on_ask_overwrite (File destination) {
var dialog = new Gtk.MessageDialog (
this,
Gtk.DialogFlags.MODAL,
Gtk.MessageType.QUESTION,
Gtk.ButtonsType.NONE,
_("Replace existing file?")
);
dialog.format_secondary_markup (
_("<i>\"%s\"</i> already exists. You can replace this file, replace all conflicting files or choose not to replace the file by skipping.".printf (destination.get_basename ()))
);
dialog.add_button (_("Replace All Conflicts"), 2);
dialog.add_button (_("Skip"), 0);
dialog.add_button (_("Replace"), 1);
dialog.get_widget_for_response (1).get_style_context ().add_class ("suggested-action");

var response = dialog.run ();
dialog.destroy ();
return response;
}

public override bool configure_event (Gdk.EventConfigure event) {
if (is_maximized) {
saved_state.set_boolean ("maximized", true);
} else {
saved_state.set_boolean ("maximized", false);

int window_width, window_height;
get_size (out window_width, out window_height);
saved_state.set_int ("window-height", window_height);
saved_state.set_int ("window-width", window_width);
}

return base.configure_event (event);
}
// private int on_ask_overwrite (File destination) {
// var dialog = new Gtk.MessageDialog (
// this,
// Gtk.DialogFlags.MODAL,
// Gtk.MessageType.QUESTION,
// Gtk.ButtonsType.NONE,
// _("Replace existing file?")
// );
// dialog.format_secondary_markup (
// _("<i>\"%s\"</i> already exists. You can replace this file, replace all conflicting files or choose not to replace the file by skipping.".printf (destination.get_basename ()))
// );
// dialog.add_button (_("Replace All Conflicts"), 2);
// dialog.add_button (_("Skip"), 0);
// dialog.add_button (_("Replace"), 1);
// dialog.get_widget_for_response (1).get_style_context ().add_class ("suggested-action");

// var response = dialog.run ();
// dialog.destroy ();
// return response;
// }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Oops, commented code?

}
Loading
Loading