From c0a1d32d74fb067f2abb735b628332fa772b4768 Mon Sep 17 00:00:00 2001 From: uloco Date: Fri, 23 Oct 2015 09:20:12 +0200 Subject: [PATCH 1/3] added 'Bluloco' color scheme --- src/guake/palettes.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/guake/palettes.py b/src/guake/palettes.py index 61afba963..43b6d352a 100644 --- a/src/guake/palettes.py +++ b/src/guake/palettes.py @@ -71,6 +71,12 @@ '#BDBDDBDBBDBD:#DBDBDBDBBDBD:#BDBDBDBDDBDB:#DBDBBDBDDBDB:#BDBDDBDBDBDB:' '#FFFFFFFFFFFF:#D9D9E6E6F2F2:#0D0D19192626' ), + 'Bluloco': ( + '#181818181818:#FFFF2E2E3F3F:#6F6FD7D75D5D:#FFFF6F6F2323:#23235151D9D9:' + '#98986161F8F8:#0000CDCDB3B3:#FFFFFCFCC2C2:#555557575353:#FFFF64648080:' + '#3F3FC5C56B6B:#F9F9C8C85959:#0000B1B1FEFE:#B6B68D8DFFFF:#B3B38B8B7D7D:' + '#FFFFFEFEE3E3:#DEDEE0E0DFDF:#1E1E1E1E1E1E' + ), 'Borland': ( '#4E4E4E4E4E4E:#FFFF6B6B6060:#A7A7FFFF6060:#FFFFFFFFB6B6:#9696CACAFDFD:' '#FFFF7373FDFD:#C6C6C4C4FDFD:#EEEEEEEEEEEE:#7C7C7C7C7C7C:#FFFFB6B6B0B0:' From 979b5c16a1f6670a13c2ba331b0cede01ca6952e Mon Sep 17 00:00:00 2001 From: thardev Date: Fri, 23 Oct 2015 18:56:02 +0200 Subject: [PATCH 2/3] Reset terminal shorcut --- data/guake.schemas | 12 ++++++++++++ src/guake/gconfhandler.py | 9 +++++++-- src/guake/guake_app.py | 5 +++++ src/guake/prefs.py | 2 ++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/data/guake.schemas b/data/guake.schemas index 7f68ab986..00e119774 100644 --- a/data/guake.schemas +++ b/data/guake.schemas @@ -584,6 +584,18 @@ + + /schemas/apps/guake/keybindings/local/reset_terminal + /apps/guake/keybindings/local/reset_terminal + guake + string + + + Reset + Reset terminal + + + /schemas/apps/guake/keybindings/local/quit /apps/guake/keybindings/local/quit diff --git a/src/guake/gconfhandler.py b/src/guake/gconfhandler.py index 2e4db2e68..584042603 100644 --- a/src/guake/gconfhandler.py +++ b/src/guake/gconfhandler.py @@ -375,8 +375,8 @@ def __init__(self, guake): 'increase_transparency', 'decrease_transparency', "search_on_web", 'move_tab_left', 'move_tab_right', 'switch_tab1', 'switch_tab2', 'switch_tab3', 'switch_tab4', 'switch_tab5', - 'switch_tab6', 'switch_tab7', 'switch_tab8', 'switch_tab9', 'switch_tab10' - ] + 'switch_tab6', 'switch_tab7', 'switch_tab8', 'switch_tab9', 'switch_tab10', + 'reset_terminal'] for key in keys: notify_add(LKEY(key), self.reload_accelerators) self.client.notify(LKEY(key)) @@ -419,6 +419,11 @@ def load_accelerators(self): and adds to the main accel_group. """ gets = lambda x: self.client.get_string(LKEY(x)) + key, mask = gtk.accelerator_parse(gets('reset_terminal')) + if key > 0: + self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE, + self.guake.accel_reset_terminal) + key, mask = gtk.accelerator_parse(gets('quit')) if key > 0: self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE, diff --git a/src/guake/guake_app.py b/src/guake/guake_app.py index a9ef99915..dd04eda75 100644 --- a/src/guake/guake_app.py +++ b/src/guake/guake_app.py @@ -1070,6 +1070,11 @@ def accel_quit(self, *args): else: gtk.main_quit() + def accel_reset_terminal(self, *args): + """Callback to reset and clean the terminal""" + self.reset_terminal() + return True + def accel_zoom_in(self, *args): """Callback to zoom in. """ diff --git a/src/guake/prefs.py b/src/guake/prefs.py index f9e5a8f38..14e69109e 100644 --- a/src/guake/prefs.py +++ b/src/guake/prefs.py @@ -81,6 +81,8 @@ 'label': 'Toggle Hide on Lose Focus'}, {'key': LKEY('quit'), 'label': 'Quit'}, + {'key': LKEY('reset_terminal'), + 'label': 'Reset terminal'}, ]}, {'label': 'Tab management', From a4565fa751660b91b0837be158c31e420334f001 Mon Sep 17 00:00:00 2001 From: thardev Date: Fri, 23 Oct 2015 21:28:11 +0200 Subject: [PATCH 3/3] Updated icon tray SVG --- data/pixmaps/guake-tray.svg | 6815 +++++++++++++++++++++++++++++++++++ src/guake/guake_app.py | 4 +- 2 files changed, 6817 insertions(+), 2 deletions(-) create mode 100644 data/pixmaps/guake-tray.svg diff --git a/data/pixmaps/guake-tray.svg b/data/pixmaps/guake-tray.svg new file mode 100644 index 000000000..9170c354c --- /dev/null +++ b/data/pixmaps/guake-tray.svg @@ -0,0 +1,6815 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tab + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tab + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/guake/guake_app.py b/src/guake/guake_app.py index 19796d38a..e14c71340 100644 --- a/src/guake/guake_app.py +++ b/src/guake/guake_app.py @@ -167,8 +167,8 @@ def __init__(self): self.forceHide = False self.preventHide = False - # trayicon! - img = pixmapfile('guake-tray.png') + # trayicon! Using SVG handles better different OS trays + img = pixmapfile('guake-tray.svg') try: import appindicator except ImportError: