Skip to content

Save tabs when directory changed, not on_terminal_title_changed (#1633) #1786

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
gsemet merged 4 commits into from
Oct 20, 2020
Merged

Save tabs when directory changed, not on_terminal_title_changed (#1633) #1786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cbd534
Update `session.json` when directory changed, not terminal title changed
mlouielu Jul 21, 2020
02a70be
Add SLUG
mlouielu Jul 21, 2020
48467b4
Update coding style by black
mlouielu Jul 22, 2020
9a7c555
Check terminal directory change first
mlouielu Jul 22, 2020
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
21 changes: 19 additions & 2 deletions guake/guake_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ def show_hide(self, *args):
self.set_terminal_focus()
return

should_refocus = self.settings.general.get_boolean('window-refocus')
should_refocus = self.settings.general.get_boolean("window-refocus")
has_focus = self.window.get_window().get_state() & Gdk.WindowState.FOCUSED
if should_refocus and not has_focus:
log.info("Refocussing the terminal")
Expand Down Expand Up @@ -1097,11 +1097,25 @@ def compute_tab_title(self, vte):
pass
return TabNameUtils.shorten(vte_title, self.settings)

@save_tabs_when_changed
def check_if_terminal_directory_changed(self, term):
@save_tabs_when_changed
def terminal_directory_changed(self):
# Yep, just used for save tabs when changed
pass

current_directory = term.get_current_directory()
if current_directory != term.directory:
term.directory = current_directory
terminal_directory_changed(self)

def on_terminal_title_changed(self, vte, term):
# box must be a page
if not term.get_parent():
return

# Check if terminal directory has changed
self.check_if_terminal_directory_changed(term)

box = term.get_parent().get_root_box()
use_vte_titles = self.settings.general.get_boolean("use-vte-titles")
if not use_vte_titles:
Expand Down Expand Up @@ -1162,6 +1176,9 @@ def terminal_spawned(self, notebook, terminal, pid):
terminal.connect("window-title-changed", self.on_terminal_title_changed, terminal)
)

# Use to detect if directory has changed
terminal.directory = terminal.get_current_directory()

@save_tabs_when_changed
def add_tab(self, directory=None):
"""Adds a new tab to the terminal notebook.
Expand Down
3 changes: 3 additions & 0 deletions releasenotes/notes/fragment_name-9338b9eaa7544152.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fixes:
- |
- Update `session.json` when directory changed, not terminal title changed #1633