Fixes and closes #19.
This commit is contained in:
Graeme Humphries
parent
3e5ab6f290
commit
3c91fcf821
36
EntryDialog.py
Normal file
36
EntryDialog.py
Normal file
@ -0,0 +1,36 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
# This code taken from:
|
||||
# http://stackoverflow.com/questions/8290740/simple-versatile-and-re-usable-entry-dialog-sometimes-referred-to-as-input-dia
|
||||
|
||||
import gtk
|
||||
class EntryDialog(gtk.MessageDialog):
|
||||
def __init__(self, *args, **kwargs):
|
||||
'''
|
||||
Creates a new EntryDialog. Takes all the arguments of the usual
|
||||
MessageDialog constructor plus one optional named argument
|
||||
"default_value" to specify the initial contents of the entry.
|
||||
'''
|
||||
if 'default_value' in kwargs:
|
||||
default_value = kwargs['default_value']
|
||||
del kwargs['default_value']
|
||||
else:
|
||||
default_value = ''
|
||||
super(EntryDialog, self).__init__(*args, **kwargs)
|
||||
entry = gtk.Entry()
|
||||
entry.set_text(str(default_value))
|
||||
entry.connect("activate",
|
||||
lambda ent, dlg, resp: dlg.response(resp),
|
||||
self, gtk.RESPONSE_OK)
|
||||
self.vbox.pack_end(entry, True, True, 0)
|
||||
self.vbox.show_all()
|
||||
self.entry = entry
|
||||
def set_value(self, text):
|
||||
self.entry.set_text(text)
|
||||
def run(self):
|
||||
result = super(EntryDialog, self).run()
|
||||
if result == gtk.RESPONSE_OK:
|
||||
text = self.entry.get_text()
|
||||
else:
|
||||
text = None
|
||||
return text
|
||||
87
crussh.py
87
crussh.py
@ -17,6 +17,8 @@ except:
|
||||
print >>sys.stderr, "Missing Python GTK2 bindings."
|
||||
sys.exit(1)
|
||||
|
||||
from EntryDialog import EntryDialog
|
||||
|
||||
try:
|
||||
import vte
|
||||
except:
|
||||
@ -180,6 +182,39 @@ class CruSSH:
|
||||
self.reflowTable(cols, rows)
|
||||
self.MainWin.show_all()
|
||||
|
||||
def addHost(self, host):
|
||||
def handle_copy_paste(widget, event):
|
||||
self.EntryBox.props.buffer.delete_text(0, -1)
|
||||
# check for paste key shortcut (ctl-shift-v)
|
||||
if (event.type == gtk.gdk.KEY_PRESS) \
|
||||
and (event.state & gtk.gdk.CONTROL_MASK == gtk.gdk.CONTROL_MASK) \
|
||||
and (event.state & gtk.gdk.SHIFT_MASK == gtk.gdk.SHIFT_MASK) \
|
||||
and (event.keyval == gtk.gdk.keyval_from_name('V')):
|
||||
widget.paste_clipboard()
|
||||
return True
|
||||
elif (event.type == gtk.gdk.KEY_PRESS) \
|
||||
and (event.state & gtk.gdk.CONTROL_MASK == gtk.gdk.CONTROL_MASK) \
|
||||
and (event.state & gtk.gdk.SHIFT_MASK == gtk.gdk.SHIFT_MASK) \
|
||||
and (event.keyval == gtk.gdk.keyval_from_name('C')):
|
||||
widget.copy_clipboard()
|
||||
return True
|
||||
terminal = vte.Terminal()
|
||||
# TODO: disable only this terminal widget on child exit
|
||||
# v.connect("child-exited", lambda term: gtk.main_quit())
|
||||
cmd_str = self.ssh_cmd
|
||||
if self.ssh_args is not None:
|
||||
cmd_str += " " + self.ssh_args
|
||||
cmd_str += " " + host
|
||||
cmd = cmd_str.split(' ')
|
||||
terminal.fork_command(command=cmd[0], argv=cmd)
|
||||
# track whether we mirror output to this terminal
|
||||
terminal.copy_input = True
|
||||
# attach copy/paste handler
|
||||
terminal.connect("key_press_event", handle_copy_paste)
|
||||
self.Terminals[host] = terminal
|
||||
# hook terminals so they reflow layout on exit
|
||||
self.Terminals[host].connect("child-exited", self.removeTerminal)
|
||||
|
||||
def configTerminals(self):
|
||||
for host in self.Terminals:
|
||||
terminal = self.Terminals[host]
|
||||
@ -219,10 +254,24 @@ class CruSSH:
|
||||
MainMenuBar = gtk.MenuBar()
|
||||
MainVBox.pack_start(MainMenuBar, fill=True, expand=False)
|
||||
|
||||
def add_host_handler(self, base):
|
||||
diag = EntryDialog(buttons=gtk.BUTTONS_OK, type=gtk.MESSAGE_QUESTION,
|
||||
message_format="Hostname to add:")
|
||||
print "test"
|
||||
host = diag.run()
|
||||
if len(host) > 0:
|
||||
base.addHost(host)
|
||||
diag.destroy()
|
||||
base.reflow(force=True)
|
||||
|
||||
FileItem = gtk.MenuItem(label="File")
|
||||
FileMenu = gtk.Menu()
|
||||
FileItem.set_submenu(FileMenu)
|
||||
QuitItem = gtk.MenuItem(label="Quit")
|
||||
AddHostItem = gtk.MenuItem(label="Add Host")
|
||||
AddHostItem.connect("activate", add_host_handler, self)
|
||||
FileMenu.append(AddHostItem)
|
||||
FileMenu.append(gtk.SeparatorMenuItem())
|
||||
QuitItem = gtk.ImageMenuItem(gtk.STOCK_QUIT)
|
||||
QuitItem.connect("activate", lambda discard: gtk.main_quit())
|
||||
FileMenu.append(QuitItem)
|
||||
MainMenuBar.append(FileItem)
|
||||
@ -317,7 +366,10 @@ class CruSSH:
|
||||
# give EntryBox default focus on init
|
||||
self.EntryBox.props.has_focus = True
|
||||
|
||||
|
||||
def __init__(self, hosts, ssh_cmd="/usr/bin/ssh", ssh_args=None):
|
||||
self.ssh_cmd = ssh_cmd
|
||||
self.ssh_args = ssh_args
|
||||
# load existing config file, if present
|
||||
try:
|
||||
# merge dicts to allow upgrade from old configs
|
||||
@ -326,40 +378,9 @@ class CruSSH:
|
||||
except:
|
||||
pass
|
||||
|
||||
def handle_copy_paste(widget, event):
|
||||
self.EntryBox.props.buffer.delete_text(0, -1)
|
||||
# check for paste key shortcut (ctl-shift-v)
|
||||
if (event.type == gtk.gdk.KEY_PRESS) \
|
||||
and (event.state & gtk.gdk.CONTROL_MASK == gtk.gdk.CONTROL_MASK) \
|
||||
and (event.state & gtk.gdk.SHIFT_MASK == gtk.gdk.SHIFT_MASK) \
|
||||
and (event.keyval == gtk.gdk.keyval_from_name('V')):
|
||||
widget.paste_clipboard()
|
||||
return True
|
||||
elif (event.type == gtk.gdk.KEY_PRESS) \
|
||||
and (event.state & gtk.gdk.CONTROL_MASK == gtk.gdk.CONTROL_MASK) \
|
||||
and (event.state & gtk.gdk.SHIFT_MASK == gtk.gdk.SHIFT_MASK) \
|
||||
and (event.keyval == gtk.gdk.keyval_from_name('C')):
|
||||
widget.copy_clipboard()
|
||||
return True
|
||||
# init all terminals
|
||||
for host in hosts:
|
||||
terminal = vte.Terminal()
|
||||
# TODO: disable only this terminal widget on child exit
|
||||
# v.connect("child-exited", lambda term: gtk.main_quit())
|
||||
cmd_str = ssh_cmd
|
||||
if ssh_args is not None:
|
||||
cmd_str += " " + ssh_args
|
||||
cmd_str += " " + host
|
||||
cmd = cmd_str.split(' ')
|
||||
terminal.fork_command(command=cmd[0], argv=cmd)
|
||||
# track whether we mirror output to this terminal
|
||||
terminal.copy_input = True
|
||||
# attach copy/paste handler
|
||||
terminal.connect("key_press_event", handle_copy_paste)
|
||||
self.Terminals[host] = terminal
|
||||
|
||||
# hook terminals so they reflow layout on exit
|
||||
self.Terminals[host].connect("child-exited", self.removeTerminal)
|
||||
self.addHost(host)
|
||||
# configure all terminals
|
||||
self.configTerminals()
|
||||
# reflow after reconfig for font size changes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user