Merge branch 'master' into feature/guake-like-functionality

gnome-terminator · Feb 18, 2024 · 8d4b661 · 8d4b661
2 parents 9248fc9 + 51e3bd2
commit 8d4b661
Show file tree

Hide file tree

Showing 22 changed files with 769 additions and 412 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -41,13 +41,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -e .
-        python setup.py develop
+        pip install -e '.[test]'
 
     - name: Compile all scripts
       run: python -m compileall -f terminatorlib/ tests/ remotinator terminator
 
     - name: Run tests
       run: |
-        pip install -e '.[test]'
-        xvfb-run -a python setup.py test
+        xvfb-run -a pytest
diff --git a/doc/terminator_config.5 b/doc/terminator_config.5
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: terminator_config
 .\"    Author: [see the "AUTHOR(S)" section]
-.\" Generator: Asciidoctor 2.0.18
-.\"      Date: 2023-04-22
+.\" Generator: Asciidoctor 2.0.16
+.\"      Date: 2023-10-10
 .\"    Manual: Manual for Terminator
 .\"    Source: Terminator
 .\"  Language: English
 .\"
-.TH "TERMINATOR_CONFIG" "5" "2023-04-22" "Terminator" "Manual for Terminator"
+.TH "TERMINATOR_CONFIG" "5" "2023-10-10" "Terminator" "Manual for Terminator"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -130,12 +130,11 @@ If set to True, the window will resize in step with font sizes.
 Default value: \fBFalse\fP
 .RE
 .sp
-\fBsuppress_multiple_term_dialog\fP = \fIboolean\fP
+\fBask_before_closing\fP = \fIstring\fP
 .RS 4
-If set to True, Terminator will ask for confirmation when closing
-multiple terminals.
-.br
-Default value: \fBFalse\fP
+Specify when to ask for confirmation before closing a window or a tab.
+Can be any of: \*(Aqalways\*(Aq, \*(Aqmultiple_terminals\*(Aq, \*(Aqnever\*(Aq.
+Default value: \fBmultiple_terminals\fP
 .RE
 .sp
 \fBborderless\fP = \fIboolean\fP

diff --git a/doc/terminator_config.adoc b/doc/terminator_config.adoc
@@ -2,7 +2,7 @@
 :doctype: manpage
 :manmanual: Manual for Terminator
 :mansource: Terminator
-:revdate: 2023-04-22
+:revdate: 2023-10-10
 :docdate: {revdate}
 
 == NAME
@@ -90,10 +90,10 @@ Default value: *False*
 If set to True, the window will resize in step with font sizes. +
 Default value: *False*
 
-*suppress_multiple_term_dialog* = _boolean_::
-If set to True, Terminator will ask for confirmation when closing
-multiple terminals. +
-Default value: *False*
+*ask_before_closing* = _string_::
+Specify when to ask for confirmation before closing a window or a tab.
+Can be any of: 'always', 'multiple_terminals', 'never'.
+Default value: *multiple_terminals*
 
 // --- Window appearance ---