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

Merge pull request #484 from gnome-terminator/issue-401 

fixes for --config-json
This commit is contained in:
Matt Rose 2021-08-11 21:31:57 -04:00 committed by GitHub
parent 5a3678d894 2a24c9191a
commit b4990c3c24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
terminatorlib/ipc.py
View File

@ -15,6 +15,7 @@ from .factory import Factory
from .util import dbg, err, enumerate_descendants from .util import dbg, err, enumerate_descendants
from .terminal import Terminal from .terminal import Terminal
from .container import Container from .container import Container
from .configjson import ConfigJson
from gi.repository import Gtk as gtk from gi.repository import Gtk as gtk
from gi.repository import GObject as gobject from gi.repository import GObject as gobject
@ -74,6 +75,15 @@ class DBusService(Borg, dbus.service.Object):
def new_window_cmdline(self, options=dbus.Dictionary()): def new_window_cmdline(self, options=dbus.Dictionary()):
"""Create a new Window""" """Create a new Window"""
dbg('dbus method called: new_window with parameters %s'%(options)) dbg('dbus method called: new_window with parameters %s'%(options))
if options['configjson']:
dbg(options['configjson'])
configjson = ConfigJson()
layoutname = configjson.extend_config(options['configjson'])
if layoutname and ((not options['layout']) or options['layout'] == 'default'):
options['layout'] = layoutname
if not options['profile']:
options['profile'] = configjson.get_profile_to_use()
oldopts = self.terminator.config.options_get() oldopts = self.terminator.config.options_get()
oldopts.__dict__ = options oldopts.__dict__ = options
self.terminator.config.options_set(oldopts) self.terminator.config.options_set(oldopts)

7
terminatorlib/prefseditor.py
View File

@ -362,6 +362,8 @@ class PrefsEditor:
widget = guiget('profilelist') widget = guiget('profilelist')
liststore = widget.get_model() liststore = widget.get_model()
profiles = self.config.list_profiles() profiles = self.config.list_profiles()
if '__internal_json_profile__' in profiles:
profiles.remove('__internal_json_profile__')
self.profileiters = {} self.profileiters = {}
for profile in profiles: for profile in profiles:
if profile == 'default': if profile == 'default':
@ -377,6 +379,8 @@ class PrefsEditor:
widget = guiget('layoutlist') widget = guiget('layoutlist')
liststore = widget.get_model() liststore = widget.get_model()
layouts = self.config.list_layouts() layouts = self.config.list_layouts()
if '__internal_json_layout__' in layouts:
layouts.remove('__internal_json_layout__')
self.layoutiters = {} self.layoutiters = {}
for layout in layouts: for layout in layouts:
if layout == 'default': if layout == 'default':
@ -387,7 +391,7 @@ class PrefsEditor:
selection = widget.get_selection() selection = widget.get_selection()
selection.connect('changed', self.on_layout_selection_changed) selection.connect('changed', self.on_layout_selection_changed)
terminator = Terminator() terminator = Terminator()
if terminator.layoutname: if terminator.layoutname and terminator.layoutname != '__internal_json_layout__':
layout_to_highlight = terminator.layoutname layout_to_highlight = terminator.layoutname
else: else:
layout_to_highlight = 'default' layout_to_highlight = 'default'
@ -947,7 +951,6 @@ class PrefsEditor:
self.config.save() self.config.save()
def on_background_image_file_set(self,widget): def on_background_image_file_set(self,widget):
print(widget.get_filename())
self.config['background_image'] = widget.get_filename() self.config['background_image'] = widget.get_filename()
self.config.save() self.config.save()