Skip to content

TerminalView: Clean/Gtk4 preparation #886

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

Merged
jeremypw merged 9 commits into from
Aug 8, 2025
Merged

TerminalView: Clean/Gtk4 preparation #886

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b1b4f47
Update header
jeremypw Aug 1, 2025
2c54f37
Do not use `construct;` for property if not creation parameter
jeremypw Aug 1, 2025
4d43d17
Drop enum namespacing where possible
jeremypw Aug 1, 2025
f50d507
Remove superfluous comma
jeremypw Aug 1, 2025
2d32d58
Remove GLib namespace when not ambiguous
jeremypw Aug 1, 2025
2609443
Fix lint
jeremypw Aug 1, 2025
e0e61c4
Merge branch 'master' into jeremypw/terminalview/gtk4prep
jeremypw Aug 3, 2025
99d8e4c
Fix copyright date format
jeremypw Aug 3, 2025
64deaec
Merge branch 'master' into jeremypw/terminalview/gtk4prep
jeremypw Aug 8, 2025
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
24 changes: 12 additions & 12 deletions src/Widgets/TerminalView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/* Copyright 2024 elementary, Inc. <https://elementary.io>
* SPDX-License-Identifier: GPL-3.0-or-later
/*
* SPDX-License-Identifier: LGPL-3.0-or-later
* SPDX-FileCopyrightText: 2024-25 elementary, Inc. (https://elementary.io)
Comment thread
jeremypw marked this conversation as resolved.
Outdated
*/

public class Terminal.TerminalView : Gtk.Box {
Expand Down Expand Up @@ -30,7 +30,7 @@ public class Terminal.TerminalView : Gtk.Box {
}

public unowned MainWindow main_window { get; construct; }
public Hdy.TabView tab_view { get; construct; }
public Hdy.TabView tab_view { get; private set; }
private Hdy.TabBar tab_bar;
public Hdy.TabPage? tab_menu_target { get; private set; default = null; }
private Gtk.CssProvider style_provider;
Expand All @@ -43,7 +43,7 @@ public class Terminal.TerminalView : Gtk.Box {
}

construct {
orientation = Gtk.Orientation.VERTICAL;
orientation = VERTICAL;
hexpand = true;
vexpand = true;

Expand All @@ -57,7 +57,7 @@ public class Terminal.TerminalView : Gtk.Box {
tab_view.setup_menu.connect (tab_view_setup_menu);

var new_tab_button = new Gtk.Button.from_icon_name ("list-add-symbolic") {
relief = Gtk.ReliefStyle.NONE,
relief = NONE,
tooltip_markup = Granite.markup_accel_tooltip (
app_instance.get_accels_for_action (MainWindow.ACTION_PREFIX + MainWindow.ACTION_NEW_TAB),
_("New Tab")
Expand All @@ -66,9 +66,9 @@ public class Terminal.TerminalView : Gtk.Box {
};

tab_history_button = new Gtk.MenuButton () {
image = new Gtk.Image.from_icon_name ("document-open-recent-symbolic", Gtk.IconSize.MENU),
image = new Gtk.Image.from_icon_name ("document-open-recent-symbolic", MENU),
tooltip_text = _("Closed Tabs"),
use_popover = false,
use_popover = false
};

tab_bar = new Hdy.TabBar () {
Expand Down Expand Up @@ -211,8 +211,8 @@ public class Terminal.TerminalView : Gtk.Box {
}
}

private GLib.Menu create_menu_model () {
var menu = new GLib.Menu ();
private Menu create_menu_model () {
var menu = new Menu ();

var close_tab_section = new Menu ();
close_tab_section.append (_("Close Tabs to the Right"), MainWindow.ACTION_PREFIX + MainWindow.ACTION_CLOSE_TABS_TO_RIGHT);
Expand Down Expand Up @@ -245,7 +245,7 @@ public class Terminal.TerminalView : Gtk.Box {
var new_tab_action = Utils.action_from_group (MainWindow.ACTION_NEW_TAB_AT, main_window.actions);
// ACTION_NEW_TAB_AT only works with local paths to folders
foreach (var uri in uris) {
var file = GLib.File.new_for_uri (uri);
var file = File.new_for_uri (uri);
var scheme = file.get_uri_scheme ();
if (scheme != "file" && scheme != "") {
return;
Expand Down Expand Up @@ -281,7 +281,7 @@ public class Terminal.TerminalView : Gtk.Box {
var active_shell_action = Utils.action_from_group (MainWindow.ACTION_TAB_ACTIVE_SHELL, main_window.actions);
// ACTION_TAB_ACTIVE_SHELL only works with local paths to folders
foreach (var uri in uris) {
var file = GLib.File.new_for_uri (uri);
var file = File.new_for_uri (uri);
var scheme = file.get_uri_scheme ();
if (scheme != "file" && scheme != "") {
return;
Expand Down