diff options
| author | monsta <[email protected]> | 2017-12-15 12:26:49 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2017-12-21 21:29:50 +0300 |
| commit | 019042e65f653975f5d7bdbab18a656c9e37aa2e (patch) | |
| tree | 68eacbe25168e97c1b79a4ac3d959c2756d0e72d | |
| parent | 926ec59919a2416a09e95a7a69494187081082cc (diff) | |
| download | mate-terminal-019042e65f653975f5d7bdbab18a656c9e37aa2e.tar.bz2 mate-terminal-019042e65f653975f5d7bdbab18a656c9e37aa2e.tar.xz | |
add Solarized themes from gnome-terminal
closes https://github.com/mate-desktop/mate-terminal/issues/151
ported from:
https://git.gnome.org/browse/gnome-terminal/commit/?id=b4d7416
https://git.gnome.org/browse/gnome-terminal/commit/?id=2763ea6
| -rw-r--r-- | src/extra-strings.c | 2 | ||||
| -rw-r--r-- | src/profile-editor.c | 12 | ||||
| -rw-r--r-- | src/profile-preferences.ui | 3 | ||||
| -rw-r--r-- | src/terminal-profile.c | 22 | ||||
| -rw-r--r-- | src/terminal-profile.h | 3 |
5 files changed, 39 insertions, 3 deletions
diff --git a/src/extra-strings.c b/src/extra-strings.c index 88af00c..12078ee 100644 --- a/src/extra-strings.c +++ b/src/extra-strings.c @@ -77,4 +77,6 @@ N_("XTerm") /* Translators: This is the name of a colour scheme */ N_("Rxvt") /* Translators: This is the name of a colour scheme */ +N_("Solarized") +/* Translators: This is the name of a colour scheme */ N_("Custom") diff --git a/src/profile-editor.c b/src/profile-editor.c index d0f6d0f..1aa9f90 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c @@ -64,7 +64,17 @@ static const TerminalColorScheme color_schemes[] = N_("White on black"), { 1, 1, 1, 1 }, { 0, 0, 0, 1 } - } + }, + /* Translators: "Solarized" is the name of a colour scheme, "light" can be translated */ + { N_("Solarized light"), + { 0.396078, 0.482352, 0.513725, 1 }, + { 0.992156, 0.964705, 0.890196, 1 } + }, + /* Translators: "Solarized" is the name of a colour scheme, "dark" can be translated */ + { N_("Solarized dark"), + { 0.513725, 0.580392, 0.588235, 1 }, + { 0, 0.168627, 0.211764, 1 } + }, }; static void profile_forgotten_cb (TerminalProfile *profile, diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui index 5184a49..9c50d54 100644 --- a/src/profile-preferences.ui +++ b/src/profile-preferences.ui @@ -140,6 +140,9 @@ Author: Wolfgang Ulbrich <col id="0" translatable="yes">Rxvt</col> </row> <row> + <col id="0" translatable="yes">Solarized</col> + </row> + <row> <col id="0" translatable="yes">Custom</col> </row> </data> diff --git a/src/terminal-profile.c b/src/terminal-profile.c index f1cbfbd..44a4672 100644 --- a/src/terminal-profile.c +++ b/src/terminal-profile.c @@ -266,7 +266,27 @@ static const GdkRGBA terminal_palettes[TERMINAL_PALETTE_N_BUILTINS][TERMINAL_PAL { 1, 0, 1, 1 }, { 0, 1, 1, 1 }, { 1, 1, 1, 1 }, - } + }, + + /* Solarized palette (1.0.0beta2): http://ethanschoonover.com/solarized */ + { + { 0.02745, 0.211764, 0.258823, 1 }, + { 0.862745, 0.196078, 0.184313, 1 }, + { 0.521568, 0.6, 0, 1 }, + { 0.709803, 0.537254, 0, 1 }, + { 0.149019, 0.545098, 0.823529, 1 }, + { 0.82745, 0.211764, 0.509803, 1 }, + { 0.164705, 0.631372, 0.596078, 1 }, + { 0.933333, 0.909803, 0.835294, 1 }, + { 0, 0.168627, 0.211764, 1 }, + { 0.796078, 0.294117, 0.086274, 1 }, + { 0.345098, 0.431372, 0.458823, 1 }, + { 0.396078, 0.482352, 0.513725, 1 }, + { 0.513725, 0.580392, 0.588235, 1 }, + { 0.423529, 0.443137, 0.768627, 1 }, + { 0.57647, 0.631372, 0.631372, 1 }, + { 0.992156, 0.964705, 0.890196, 1 }, + }, }; enum diff --git a/src/terminal-profile.h b/src/terminal-profile.h index eae5a53..ae6db5c 100644 --- a/src/terminal-profile.h +++ b/src/terminal-profile.h @@ -62,7 +62,8 @@ typedef enum #define TERMINAL_PALETTE_LINUX 1 #define TERMINAL_PALETTE_XTERM 2 #define TERMINAL_PALETTE_RXVT 3 -#define TERMINAL_PALETTE_N_BUILTINS 4 +#define TERMINAL_PALETTE_SOLARIZED 4 +#define TERMINAL_PALETTE_N_BUILTINS 5 /* Property names */ #define TERMINAL_PROFILE_ALLOW_BOLD "allow-bold" |