itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only use ~/.config/terminator/config instead of ~/.terminatorrc. Closes LP #238070

This commit is contained in:
Chris Jones 2008-06-17 01:20:37 +01:00
parent bdbd580a45
commit 70b6588697
5 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -1,4 +1,4 @@
* Edit doc/terminatorrc.5 manpage to contain the information about the options * Edit doc/terminator_config.5 manpage to contain the information about the options
* menu entry/keybinding to hightlight a term upon: * menu entry/keybinding to hightlight a term upon:
* command ending * command ending

2
doc/terminator.1
View File

@ -114,7 +114,7 @@ and
Move the terminal over the landing terminal. Move the terminal over the landing terminal.
The zone where the terminal will be inserted will be highlighted. The zone where the terminal will be inserted will be highlighted.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR gnome\-terminal(1),terminatorrc(5) .BR gnome\-terminal(1),terminator_config(5)
.SH "AUTHOR" .SH "AUTHOR"
Terminator was written by Chris Jones <cmsj@tenshu.net> and others. Terminator was written by Chris Jones <cmsj@tenshu.net> and others.
.PP .PP

8
doc/terminatorrc.5 → doc/terminator_config.5
View File

@ -1,12 +1,12 @@
.TH "TERMINATORRC" "5" "Feb 22, 2008" "Nicolas Valcarcel <nvalcarcel@ubuntu.com>" "" .TH "TERMINATOR_CONFIG" "5" "Feb 22, 2008" "Nicolas Valcarcel <nvalcarcel@ubuntu.com>" ""
.SH "NAME" .SH "NAME"
${XDG_CONFIG_HOME}/terminator/terminatorrc (usually ~/.config/terminator/terminatorrc) ${XDG_CONFIG_HOME}/terminator/config (usually ~/.config/terminator/config)
or ~/.terminatorrc \- the config file for terminator terminal emulator. \- the config file for terminator terminal emulator.
.SH "DESCRIPTION" .SH "DESCRIPTION"
This manual page documents briefly the This manual page documents briefly the
.B termiatorrc config file. .B termiatorrc config file.
.PP .PP
\fBterminatorrc\fP is an optional file to configure the terminator terminal emulator. It is used if there is no gconf PROFILE on the system for configuring the options of the terminal(s). \fBterminator/config\fP is an optional file to configure the terminator terminal emulator. It is used if there is no gconf PROFILE on the system for configuring the options of the terminal(s).
.SH "OPTIONS" .SH "OPTIONS"
The options are defined one per line as \fB'OPTION = VALUE'\fR. The options are described below: The options are defined one per line as \fB'OPTION = VALUE'\fR. The options are described below:

2
setup.py
View File

@ -75,7 +75,7 @@ setup(name='Terminator',
data_files=[ data_files=[
('share/applications', ['data/terminator.desktop']), ('share/applications', ['data/terminator.desktop']),
('share/man/man1', ['doc/terminator.1']), ('share/man/man1', ['doc/terminator.1']),
('share/man/man5', ['doc/terminatorrc.5']), ('share/man/man5', ['doc/terminator_config.5']),
('share/pixmaps', ['data/icons/48x48/apps/terminator.png']), ('share/pixmaps', ['data/icons/48x48/apps/terminator.png']),
('share/icons/hicolor/scalable/apps', glob.glob('data/icons/scalable/apps/*.svg')), ('share/icons/hicolor/scalable/apps', glob.glob('data/icons/scalable/apps/*.svg')),
('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')), ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')),

18
terminatorlib/config.py
View File

@ -37,12 +37,6 @@ import os, sys, re
# import unix-lib # import unix-lib
import pwd import pwd
HAS_XDG = True
try:
import xdg.BaseDirectory
except:
HAS_XDG = False
# set this to true to enable debugging output # set this to true to enable debugging output
debug = True debug = True
@ -152,10 +146,12 @@ class TerminatorConfValuestoreRC (TerminatorConfValuestore):
# that can be re-used when rc changes. # that can be re-used when rc changes.
def __init__ (self): def __init__ (self):
self.type = "RCFile" self.type = "RCFile"
if HAS_XDG and xdg.BaseDirectory.load_first_config('terminator'): try:
self.rcfilename = os.path.join(xdg.BaseDirectory.load_first_config('terminator'), "terminatorrc") directory = os.environ['XDG_CONFIG_HOME']
else: except:
self.rcfilename = os.path.join(os.path.expanduser("~"), ".terminatorrc") directory = os.path.join (os.path.expanduser("~"), ".config/terminator/")
self.rcfilename = os.path.join(directory, "config")
if os.path.exists (self.rcfilename): if os.path.exists (self.rcfilename):
rcfile = open (self.rcfilename) rcfile = open (self.rcfilename)
@ -185,7 +181,7 @@ class TerminatorConfValuestoreRC (TerminatorConfValuestore):
elif deftype == 'float': elif deftype == 'float':
self.values[key] = float (value) self.values[key] = float (value)
elif deftype == 'list': elif deftype == 'list':
err (_("Reading list values from .terminatorrc is not currently supported")) err (_("Reading list values from .config/terminator/config is not currently supported"))
raise ValueError raise ValueError
else: else:
self.values[key] = value self.values[key] = value