Merge lp:~slpnix/terminator/terminator into lp:terminator/gtk3

Proposed by Sergio Lopez
Status: Needs review
Proposed branch: lp:~slpnix/terminator/terminator
Merge into: lp:terminator/gtk3
Diff against target: 69 lines (+16/-4)
2 files modified
terminatorlib/preferences.glade (+6/-0)
terminatorlib/prefseditor.py (+10/-4)
To merge this branch: bzr merge lp:~slpnix/terminator/terminator
Reviewer Review Type Date Requested Status
Terminator Pending
Review via email: mp+330570@code.launchpad.net

Description of the change

Add Monokai based color theme.

Monokai is a quite popular color theme implemented in many editors, which looks gorgeous on Terminator.

To post a comment you must log in.

Unmerged revisions

1776. By Sergio Lopez

Add Monokai based color theme.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'terminatorlib/preferences.glade'
2--- terminatorlib/preferences.glade 2016-12-13 21:08:02 +0000
3+++ terminatorlib/preferences.glade 2017-09-12 08:21:09 +0000
4@@ -96,6 +96,9 @@
5 <col id="0" translatable="yes">Gruvbox dark</col>
6 </row>
7 <row>
8+ <col id="0" translatable="yes">Monokai</col>
9+ </row>
10+ <row>
11 <col id="0" translatable="yes">Custom</col>
12 </row>
13 </data>
14@@ -221,6 +224,9 @@
15 <col id="0" translatable="yes">Gruvbox dark</col>
16 </row>
17 <row>
18+ <col id="0" translatable="yes">Monokai</col>
19+ </row>
20+ <row>
21 <col id="0" translatable="yes">Custom</col>
22 </row>
23 </data>
24
25=== modified file 'terminatorlib/prefseditor.py'
26--- terminatorlib/prefseditor.py 2017-06-24 02:02:38 +0000
27+++ terminatorlib/prefseditor.py 2017-09-12 08:21:09 +0000
28@@ -50,7 +50,8 @@
29 'solarized_dark': 8,
30 'gruvbox_light': 9,
31 'gruvbox_dark': 10,
32- 'custom': 11}
33+ 'monokai': 11,
34+ 'custom': 12}
35 colourschemes = {'grey_on_black': ['#aaaaaa', '#000000'],
36 'black_on_yellow': ['#000000', '#ffffdd'],
37 'black_on_white': ['#000000', '#ffffff'],
38@@ -61,7 +62,8 @@
39 'solarized_light': ['#657b83', '#fdf6e3'],
40 'solarized_dark': ['#839496', '#002b36'],
41 'gruvbox_light': ['#3c3836', '#fbf1c7'],
42- 'gruvbox_dark': ['#ebdbb2', '#282828']}
43+ 'gruvbox_dark': ['#ebdbb2', '#282828'],
44+ 'monokai': ['#f8f8f2', '#272822']}
45 palettevalues = {'tango': 0,
46 'linux': 1,
47 'xterm': 2,
48@@ -70,7 +72,8 @@
49 'solarized': 5,
50 'gruvbox_light': 6,
51 'gruvbox_dark': 7,
52- 'custom': 8}
53+ 'monokai': 8,
54+ 'custom': 9}
55 palettes = {'tango': '#000000:#cc0000:#4e9a06:#c4a000:#3465a4:\
56 #75507b:#06989a:#d3d7cf:#555753:#ef2929:#8ae234:#fce94f:#729fcf:\
57 #ad7fa8:#34e2e2:#eeeeec',
58@@ -94,7 +97,10 @@
59 #076678:#8f3f71:#427b58:#3c3836',
60 'gruvbox_dark': '#282828:#cc241d:#98971a:#d79921:\
61 #458588:#b16286:#689d6a:#a89984:#928374:#fb4934:#b8bb26:#fabd2f:\
62-#83a598:#d3869b:#8ec07c:#ebdbb2'}
63+#83a598:#d3869b:#8ec07c:#ebdbb2',
64+ 'monokai': '#272822:#f70057:#86c30d:#d47402:\
65+#40cae4:#fb35ea:#689d6a:#a89984:#64645e:#fa518d:#bbef53:#ffac4a:\
66+#92e7f7:#fe8cf4:#8ec07c:#ebdbb2'}
67 keybindingnames = { 'zoom_in' : _('Increase font size'),
68 'zoom_out' : _('Decrease font size'),
69 'zoom_normal' : _('Restore original font size'),

Subscribers

People subscribed via source and target branches

to status/vote changes: