Skip to content

Commit 8d4b661

Browse files
authored
Merge branch 'master' into feature/guake-like-functionality
2 parents 9248fc9 + 51e3bd2 commit 8d4b661

22 files changed

Lines changed: 769 additions & 412 deletions

.github/workflows/python.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,11 @@ jobs:
4141
- name: Install dependencies
4242
run: |
4343
python -m pip install --upgrade pip
44-
pip install -e .
45-
python setup.py develop
44+
pip install -e '.[test]'
4645
4746
- name: Compile all scripts
4847
run: python -m compileall -f terminatorlib/ tests/ remotinator terminator
4948

5049
- name: Run tests
5150
run: |
52-
pip install -e '.[test]'
53-
xvfb-run -a python setup.py test
51+
xvfb-run -a pytest

doc/terminator_config.5

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
'\" t
22
.\" Title: terminator_config
33
.\" Author: [see the "AUTHOR(S)" section]
4-
.\" Generator: Asciidoctor 2.0.18
5-
.\" Date: 2023-04-22
4+
.\" Generator: Asciidoctor 2.0.16
5+
.\" Date: 2023-10-10
66
.\" Manual: Manual for Terminator
77
.\" Source: Terminator
88
.\" Language: English
99
.\"
10-
.TH "TERMINATOR_CONFIG" "5" "2023-04-22" "Terminator" "Manual for Terminator"
10+
.TH "TERMINATOR_CONFIG" "5" "2023-10-10" "Terminator" "Manual for Terminator"
1111
.ie \n(.g .ds Aq \(aq
1212
.el .ds Aq '
1313
.ss \n[.ss] 0
@@ -130,12 +130,11 @@ If set to True, the window will resize in step with font sizes.
130130
Default value: \fBFalse\fP
131131
.RE
132132
.sp
133-
\fBsuppress_multiple_term_dialog\fP = \fIboolean\fP
133+
\fBask_before_closing\fP = \fIstring\fP
134134
.RS 4
135-
If set to True, Terminator will ask for confirmation when closing
136-
multiple terminals.
137-
.br
138-
Default value: \fBFalse\fP
135+
Specify when to ask for confirmation before closing a window or a tab.
136+
Can be any of: \*(Aqalways\*(Aq, \*(Aqmultiple_terminals\*(Aq, \*(Aqnever\*(Aq.
137+
Default value: \fBmultiple_terminals\fP
139138
.RE
140139
.sp
141140
\fBborderless\fP = \fIboolean\fP

doc/terminator_config.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
:doctype: manpage
33
:manmanual: Manual for Terminator
44
:mansource: Terminator
5-
:revdate: 2023-04-22
5+
:revdate: 2023-10-10
66
:docdate: {revdate}
77

88
== NAME
@@ -90,10 +90,10 @@ Default value: *False*
9090
If set to True, the window will resize in step with font sizes. +
9191
Default value: *False*
9292

93-
*suppress_multiple_term_dialog* = _boolean_::
94-
If set to True, Terminator will ask for confirmation when closing
95-
multiple terminals. +
96-
Default value: *False*
93+
*ask_before_closing* = _string_::
94+
Specify when to ask for confirmation before closing a window or a tab.
95+
Can be any of: 'always', 'multiple_terminals', 'never'.
96+
Default value: *multiple_terminals*
9797

9898
// --- Window appearance ---
9999

0 commit comments

Comments
 (0)