From c9c3fb1924438ad385727383b28c9dc9d3c7429d Mon Sep 17 00:00:00 2001 From: Vulcalien Date: Sat, 7 Aug 2021 23:55:07 +0200 Subject: [PATCH 1/4] Titlebar settings (except title_at_bottom) moved to profiles --- terminatorlib/config.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/terminatorlib/config.py b/terminatorlib/config.py index d8a00833..1e368ff7 100644 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -102,22 +102,12 @@ DEFAULTS = { 'use_custom_url_handler': False, 'custom_url_handler' : '', 'disable_real_transparency' : False, - 'title_at_bottom' : False, - 'title_hide_sizetext' : False, - 'title_transmit_fg_color' : '#ffffff', - 'title_transmit_bg_color' : '#c80003', - 'title_receive_fg_color' : '#ffffff', - 'title_receive_bg_color' : '#0076c9', - 'title_inactive_fg_color' : '#000000', - 'title_inactive_bg_color' : '#c0bebf', 'inactive_color_offset': 0.8, 'enabled_plugins' : ['LaunchpadBugURLHandler', 'LaunchpadCodeURLHandler', 'APTURLHandler'], 'suppress_multiple_term_dialog': False, 'always_split_with_profile': False, - 'title_use_system_font' : True, - 'title_font' : 'Sans 9', 'putty_paste_style' : False, 'putty_paste_style_source_clipboard': False, 'smart_copy' : True, @@ -126,6 +116,7 @@ DEFAULTS = { 'case_sensitive' : True, 'invert_search' : False, 'link_single_click' : False, + 'title_at_bottom' : False }, 'keybindings': { 'zoom_in' : 'plus', @@ -262,7 +253,17 @@ DEFAULTS = { 'http_proxy' : '', 'ignore_hosts' : ['localhost','127.0.0.0/8','*.local'], 'background_image' : '', - 'background_alpha' : 0.0 + 'background_alpha' : 0.0, + # Titlebar + 'title_hide_sizetext' : False, + 'title_transmit_fg_color' : '#ffffff', + 'title_transmit_bg_color' : '#c80003', + 'title_receive_fg_color' : '#ffffff', + 'title_receive_bg_color' : '#0076c9', + 'title_inactive_fg_color' : '#000000', + 'title_inactive_bg_color' : '#c0bebf', + 'title_use_system_font' : True, + 'title_font' : 'Sans 9' }, }, 'layouts': { From df90bd3991bee0b8090e273748b78197efa40a0e Mon Sep 17 00:00:00 2001 From: Vulcalien Date: Sun, 8 Aug 2021 17:32:23 +0200 Subject: [PATCH 2/4] Update preferences.glade to 3.38.2 --- terminatorlib/preferences.glade | 2021 +++++++++++++++++-------------- 1 file changed, 1096 insertions(+), 925 deletions(-) diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade index 67c01c06..1b8c1e1e 100644 --- a/terminatorlib/preferences.glade +++ b/terminatorlib/preferences.glade @@ -1,5 +1,5 @@ - + @@ -243,8 +243,8 @@ 10000000 - 1 - 10 + 1 + 10 @@ -310,93 +310,90 @@ -1 20 -1 - 1 - 2 + 1 + 2 100 - 1 - 10 - 10 + 1 + 10 + 10 100 - 1 - 10 - 10 + 1 + 10 + 10 100 - 1 - 10 - 10 + 1 + 10 + 10 100 - 1 - 10 - 10 + 1 + 10 + 10 100 - 1 - 10 - 10 + 1 + 10 + 10 1 - 0.10000000000000001 - 0.20000000000000001 + 0.10 + 0.20 1 2 1 - 0.10000000000000001 - 0.20000000000000001 + 0.10 + 0.20 1 - 0.10000000000000001 - 0.20000000000000001 + 0.10 + 0.20 - False - 6 + False + 6 Terminator Preferences - 640 - 400 - - - + 640 + 400 True - False + False vertical 6 True - True + True True - False - 18 + False + 18 vertical 18 True - False + False vertical True - False + False <b>Behavior</b> - True + True 0 @@ -408,36 +405,37 @@ True - False - 12 + False + 12 True - False + False 36 True + True - False - 6 - 12 + False + 6 + 12 True - False + False Window state: 0 - 0 - 0 + 0 + 0 True - False + False True WindowStateListStore 0 @@ -450,118 +448,139 @@ - 1 - 0 + 1 + 0 Always on top - False + False True - True - False + True + False 0.5 True - True + True - 0 - 1 + 0 + 1 2 Show on all workspaces - False + False True - True - False + True + False 0.5 True - True + True - 0 - 2 + 0 + 2 2 Hide on lose focus - False + False True - True - False + True + False 0.5 True - True + True - 0 - 3 + 0 + 3 2 Hide from taskbar - False + False True - True - False + True + False 0.5 True - True + True - 0 - 4 + 0 + 4 2 Window geometry hints - False + False True - True - False + True + False 0.5 True - True + True - 0 - 5 + 0 + 5 2 DBus server - False + False True - True - False + True + False 0.5 True - True + True - 0 - 6 + 0 + 6 2 + + + + + + + + + + + + + + + + + + + + + True @@ -570,27 +589,28 @@ + True - False - 6 - 12 + False + 6 + 12 True - False + False Mouse focus: 0 - 0 - 0 + 0 + 0 True - False + False True FocusListStore 0 @@ -603,27 +623,27 @@ - 2 - 0 + 2 + 0 2 True - False + False Broadcast default: 0 - 0 - 1 + 0 + 1 True - False + False True BroadcastDefaultListStore 0 @@ -636,91 +656,91 @@ - 2 - 1 + 2 + 1 2 PuTTY style paste: - False + False True - True - False + True + False 0.5 - True + True - 0 - 2 + 0 + 2 Smart copy - False + False True - True - False + True + False 0.5 - True + True - 0 - 3 + 0 + 3 Re-use profiles for new terminals - False + False True - True - False + True + False 0 - True + True - 0 - 4 + 0 + 4 3 Use custom URL handler - False + False True - True - False + True + False 0.5 - True + True - 0 - 6 + 0 + 6 3 True - False - 12 + False + 12 True - False + False 12 True - False + False Custom URL handler: 0 @@ -733,10 +753,10 @@ True - True - • - False - False + True + • + False + False @@ -749,58 +769,58 @@ - 0 - 7 + 0 + 7 4 PRIMARY - False + False True - True - False + True + False 0.5 True - True + True - 2 - 2 + 2 + 2 Clipboard - False + False True - True - False + True + False 0.5 True - True + True putty_paste_style_source_primary_radiobutton - 3 - 2 + 3 + 2 Clear selection on copy True - True - False - True + True + False + True - 2 - 3 + 2 + 3 2 @@ -808,14 +828,14 @@ Open links with a single click (instead of Ctrl-left click) True - True - False - True + True + False + True - 0 - 5 + 0 + 5 4 @@ -863,15 +883,15 @@ True - False + False vertical True - False - 6 + False + 6 <b>Appearance</b> - True + True 0 @@ -883,193 +903,194 @@ True - False - 12 + False + 12 True - False + False 36 True + True - False - 6 - 12 + False + 6 + 12 Window borders - False + False True - True - False + True + False 0.5 True - True + True - 0 - 3 + 0 + 3 3 True - False + False Unfocused terminal font brightness: 0 - 0 - 2 + 0 + 2 True - False + False Terminal separator size: 0 - 0 - 1 + 0 + 1 - 100 + 100 True - True + True baseline True adjustment1 - 0 + 0 0 - False - bottom + False + bottom - 2 - 1 + 2 + 1 True - False + False Line Height: 0 - 0 - 4 + 0 + 4 - 100 + 100 True - True + True baseline True adjustment_lineheight - 1 - False - bottom + 1 + False + bottom - 2 - 4 + 2 + 4 True - False + False 1.0 right - 5 - 5 + 5 + 5 1 1 - 1 - 4 + 1 + 4 - 100 + 100 True - True + True baseline True adjustment7 - 2 + 2 2 - False - bottom + False + bottom - 2 - 2 + 2 + 2 True - False + False -1 right - 5 - 5 + 5 + 5 1 1 - 1 - 1 + 1 + 1 True - False + False 100% right - 5 - 5 + 5 + 5 1 1 - 1 - 2 + 1 + 2 Extra Styling (Theme dependant) - False + False True - True - False + True + False 0 True - True + True - 0 - 0 + 0 + 0 3 @@ -1081,62 +1102,63 @@ + True - False - 6 - 12 + False + 6 + 12 True - False + False Tab position: 0 - 0 - 0 + 0 + 0 Tabs homogeneous - False + False True - True - False + True + False 0.5 True - True + True - 0 - 1 + 0 + 1 2 Tabs scroll buttons - False + False True - True - False + True + False 0.5 - True + True - 0 - 2 + 0 + 2 2 True - False + False True TabPositionListStore 0 @@ -1149,10 +1171,19 @@ - 1 - 0 + 1 + 0 + + + + + + + + + True @@ -1179,14 +1210,14 @@ True - False + False vertical True - False + False <b>Terminal Titlebar</b> - True + True 0 @@ -1198,163 +1229,164 @@ True - False - 12 + False + 12 True - False + False 36 True True - False + False + True - False - 6 - 12 + False + 6 + 12 True - False + False Font color: 0 - 0 - 1 + 0 + 1 True - False + False Background: 0 - 0 - 2 + 0 + 2 True - False + False Focused - 1 - 0 + 1 + 0 True - False + False Inactive - 2 - 0 + 2 + 0 True - False + False Receiving - 3 - 0 + 3 + 0 - False + False True - True - True + True + True center - 1 - 1 + 1 + 1 - False + False True - True - True + True + True center - 2 - 1 + 2 + 1 - False + False True - True - True + True + True center - 3 - 1 + 3 + 1 - False + False True - True - True + True + True center - 1 - 2 + 1 + 2 - False + False True - True - True + True + True center - 2 - 2 + 2 + 2 - False + False True - True - True + True + True center - 3 - 2 + 3 + 2 @@ -1378,78 +1410,79 @@ + True - False - 6 - 12 + False + 6 + 12 Title bar at bottom (Require restart) - False + False True - True - False + True + False 0.5 - True + True - 1 - 0 + 1 + 0 Hide size from title - False + False True - True - False + True + False 0.5 True - True + True - 0 - 0 + 0 + 0 _Use the system font - False + False True - True - False - True + True + False + True 0.5 - True + True - 0 - 1 + 0 + 1 True - False - 12 + False + 12 True - False + False 12 True - False + False _Font: - True - font_selector + True + font_selector 0 @@ -1460,14 +1493,14 @@ - False + False True - True - False - True + True + False + True Sans 12 Choose A Titlebar Font - True + True @@ -1480,8 +1513,8 @@ - 0 - 2 + 0 + 2 @@ -1490,6 +1523,15 @@ + + + + + + + + + True @@ -1518,40 +1560,40 @@ True - False + False Global - False + False True - True - 18 + True + 18 150 - True + True True - False + False vertical 6 True - True - never - in + True + never + in True - True + True adjustment2 adjustment3 ProfilesListStore - 0 + 0 @@ -1582,15 +1624,15 @@ True - False + False gtk-add - False + False True - True - True - True + True + True + True @@ -1602,11 +1644,11 @@ gtk-remove - False + False True - True - True - True + True + True + True @@ -1634,30 +1676,30 @@ True - True + True True - False - 18 + False + 18 vertical 18 True - False + False vertical 6 _Use the system fixed width font - False + False True - True - False - True + True + False + True 0.5 - True + True @@ -1669,20 +1711,20 @@ True - False - 12 + False + 12 True - False + False 12 True - False + False _Font: - True - font_selector + True + font_selector 0 @@ -1693,14 +1735,14 @@ - False + False True - True - False - True + True + False + True Sans 12 Choose A Terminal Font - True + True @@ -1721,13 +1763,13 @@ _Allow bold text - False + False True - True - False - True + True + False + True 0.5 - True + True @@ -1739,12 +1781,12 @@ Show titlebar - False + False True - True - False + True + False 0.5 - True + True @@ -1756,12 +1798,12 @@ Copy on selection - False + False True - True - False + True + False 0.5 - True + True @@ -1773,12 +1815,12 @@ Disable Ctrl+mousewheel zoom - False + False True - True - False + True + False 0.5 - True + True @@ -1790,16 +1832,16 @@ True - False + False 12 True - False + False Select-by-_word characters: - True + True center - word_chars_entry + word_chars_entry 0 @@ -1811,8 +1853,8 @@ True - True - â + True + â @@ -1838,21 +1880,21 @@ True - False + False 36 True True - False + False vertical 6 True - False + False <b>Cursor</b> - True + True 0 @@ -1864,31 +1906,32 @@ True - False - 12 + False + 12 + True - False - 6 - 12 + False + 6 + 12 True - False + False _Shape: - True + True 0 - 0 - 0 + 0 + 0 True - False + False CursorShapeListStore 0 @@ -1900,54 +1943,54 @@ - 1 - 0 + 1 + 0 True - False + False Color: 0 - 0 - 1 + 0 + 1 Blink - False + False True - True - False + True + False 0.5 - True + True - 0 - 2 + 0 + 2 2 True - False + False 6 Foreground - False + False True - True - False + True + False 0.5 True - True + True @@ -1959,16 +2002,16 @@ True - False + False - False + False True - True - False + True + False 0.5 True - True + True cursor_color_foreground_radiobutton @@ -1980,10 +2023,10 @@ - False + False True - True - True + True + True center 0 @@ -2003,10 +2046,19 @@ - 1 - 1 + 1 + 1 + + + + + + + + + @@ -2026,15 +2078,15 @@ True - False + False vertical 6 True - False + False <b>Terminal bell</b> - True + True 0 @@ -2046,23 +2098,23 @@ True - False - 12 + False + 12 True - False + False vertical 6 Titlebar icon - False + False True - True - False + True + False 0.5 - True + True @@ -2074,13 +2126,13 @@ Visual flash - False + False True - True - False - True + True + False + True 0.5 - True + True @@ -2092,13 +2144,13 @@ Audible beep - False + False True - True - False - True + True + False + True 0.5 - True + True @@ -2110,13 +2162,13 @@ Window list flash - False + False True - True - False - True + True + False + True 0.5 - True + True @@ -2153,105 +2205,106 @@ True - False + False General - True + True center - False + False + True - False - 18 - 6 - 12 + False + 18 + 6 + 12 _Run command as a login shell - False + False True - True - False - True + True + False + True 0 - True + True - 0 - 0 + 0 + 0 2 Ru_n a custom command instead of my shell - False + False True - True - False - True + True + False + True 0 - True + True - 0 - 1 + 0 + 1 2 True - False + False Custom co_mmand: - True + True center 1 - 0 - 2 + 0 + 2 True - False + False When command _exits: - True + True center 1 - 0 - 3 + 0 + 3 True - True + True True - • - False - False + • + False + False - 1 - 2 + 1 + 2 True - False + False start ChildExitedListStore 0 @@ -2264,10 +2317,22 @@ - 1 - 3 + 1 + 3 + + + + + + + + + + + + 1 @@ -2276,35 +2341,35 @@ True - False + False Command - True + True center 1 - False + False True - False - 18 + False + 18 vertical 18 True - False + False vertical 6 True - False + False <b>Foreground and Background</b> - True + True 0 @@ -2316,82 +2381,83 @@ True - False - 12 + False + 12 + True - False - 6 - 12 + False + 6 + 12 _Use colors from system theme - False + False True - True - False - True + True + False + True 0.5 - True + True - 0 - 0 + 0 + 0 2 True - False + False Built-in sche_mes: - True + True center 0 - 0 - 1 + 0 + 1 True - False + False _Text color: - True + True center - foreground_colorbutton + foreground_colorbutton 0 - 0 - 2 + 0 + 2 True - False + False _Background color: - True + True center - background_colorbutton + background_colorbutton 0 - 0 - 3 + 0 + 3 True - False + False start - 3 + 3 ColourSchemeListStore 2 @@ -2403,21 +2469,21 @@ - 1 - 1 + 1 + 1 True - False + False 12 - 36 - 24 + 36 + 24 True - False + False @@ -2432,21 +2498,21 @@ - 1 - 2 + 1 + 2 True - False + False 12 - 36 - 24 + 36 + 24 True - False + False @@ -2461,10 +2527,22 @@ - 1 - 3 + 1 + 3 + + + + + + + + + + + + @@ -2484,15 +2562,15 @@ True - False + False vertical 6 True - False + False <b>Palette</b> - True + True 0 @@ -2504,32 +2582,33 @@ True - False - 12 + False + 12 + True - False - 6 - 12 + False + 6 + 12 True - False + False Built-in _schemes: - True + True center 0 - 0 - 0 + 0 + 0 True - False + False start PaletteListStore 0 @@ -2542,266 +2621,300 @@ - 1 - 0 + 1 + 0 True - False + False Color p_alette: - True + True center 0 0 - 0 - 1 + 0 + 1 + True - False + False start - 6 - 6 - True - True + 6 + 6 + True + True - 36 - 24 + 36 + 24 True - False + False - 0 - 0 + 0 + 0 - 36 - 24 + 36 + 24 True - False + False - 1 - 0 + 1 + 0 - 36 - 24 + 36 + 24 True - False + False - 2 - 0 + 2 + 0 - 36 - 24 + 36 + 24 True - False + False - 3 - 0 + 3 + 0 - 36 - 24 + 36 + 24 True - False + False - 4 - 0 + 4 + 0 - 36 - 24 + 36 + 24 True - False + False - 5 - 0 + 5 + 0 - 36 - 24 + 36 + 24 True - False + False - 6 - 0 + 6 + 0 - 36 - 24 + 36 + 24 True - False + False - 7 - 0 + 7 + 0 - 36 - 24 + 36 + 24 True - False + False - 0 - 1 + 0 + 1 - 36 - 24 + 36 + 24 True - False + False - 1 - 1 + 1 + 1 - 36 - 24 + 36 + 24 True - False + False - 2 - 1 + 2 + 1 - 36 - 24 + 36 + 24 True - False + False - 3 - 1 + 3 + 1 - 36 - 24 + 36 + 24 True - False + False - 4 - 1 + 4 + 1 - 36 - 24 + 36 + 24 True - False + False - 5 - 1 + 5 + 1 - 36 - 24 + 36 + 24 True - False + False - 6 - 1 + 6 + 1 - 36 - 24 + 36 + 24 True - False + False - 7 - 1 + 7 + 1 + + + + + + + + + + + + + + + + + + + + + + + + - 1 - 1 + 1 + 1 Show b_old text in bright colors - False + False True - True - False - True + True + False + True 0.5 - True + True - 0 - 2 + 0 + 2 2 + + + + + + + + + @@ -2826,34 +2939,34 @@ True - False + False Colors - True + True center 2 - False + False True - False - 18 + False + 18 vertical 6 _Solid color - False + False True - True - False - True + True + False + True 0.5 True - True + True @@ -2865,13 +2978,13 @@ _Transparent background - False + False True - True - False - True + True + False + True 0.5 - True + True solid_radiobutton @@ -2885,10 +2998,10 @@ Background Image True - True - False + True + False True - True + True solid_radiobutton @@ -2900,11 +3013,11 @@ True - False + False True - False + False Background Image File: @@ -2917,14 +3030,14 @@ True - False + False Choose file False True - end + end 1 @@ -2938,16 +3051,16 @@ True - False + False vertical 6 True - False + False S_hade background: - True - darken_background_scale + True + darken_background_scale 0 @@ -2960,14 +3073,14 @@ True - False + False True - False + False 6 <small><i>None</i></small> - True + True 0 0.15000000596046448 @@ -2980,11 +3093,11 @@ True - True + True background_darkness_scale - 2 + 2 2 - bottom + bottom @@ -2996,10 +3109,10 @@ True - False + False 6 <small><i>Maximum</i></small> - True + True 1 0.15000000596046448 @@ -3027,7 +3140,7 @@ True - False + False @@ -3055,42 +3168,43 @@ True - False + False Background - True + True 0 3 - False + False + True - False - 18 - 6 - 12 + False + 18 + 6 + 12 True - False + False center _Scrollbar is: - True + True center 1 - 0 - 0 + 0 + 0 True - False + False start True ScrollbarPositionListStore @@ -3104,81 +3218,81 @@ - 1 - 0 + 1 + 0 Scroll on _output - False + False True - True - False - True + True + False + True 0 - True + True - 0 - 1 + 0 + 1 2 Scroll on _keystroke - False + False True - True - False - True + True + False + True 0 - True + True - 0 - 2 + 0 + 2 2 Infinite Scrollback - False + False True - True - False + True + False 0 - True + True - 0 - 3 + 0 + 3 2 True - False - 12 + False + 12 True - False + False 12 True - False + False Scroll_back: - True + True center - scrollback_lines_spinbutton + scrollback_lines_spinbutton 1 @@ -3191,25 +3305,25 @@ - 0 - 4 + 0 + 4 True - False + False 6 True - True - • + True + • 0 - False - False + False + False ScrollbackAdjustmend - 1 + 1 True @@ -3222,11 +3336,11 @@ True - False + False lines - True + True center - scrollback_lines_spinbutton + scrollback_lines_spinbutton 0 @@ -3237,10 +3351,25 @@ - 1 - 4 + 1 + 4 + + + + + + + + + + + + + + + 4 @@ -3249,73 +3378,74 @@ True - False + False Scrolling - True + True 4 - False + False + True - False - 18 - 6 - 12 + False + 18 + 6 + 12 True - False - 6 + False + 6 <small><i><b>Note:</b> These options may cause some applications to behave incorrectly. They are only here to allow you to work around certain applications and operating systems that expect different terminal behavior.</i></small> - True + True True 0 7.4505801528346183e-09 - 0 - 0 + 0 + 0 2 True - False + False end _Backspace key generates: - True + True center 1 - 0 - 1 + 0 + 1 True - False + False end _Delete key generates: - True + True center 1 - 0 - 2 + 0 + 2 True - False + False start True BackspaceKeyListStore @@ -3329,14 +3459,14 @@ - 1 - 1 + 1 + 1 True - False + False start True DeleteKeyListStore @@ -3350,30 +3480,30 @@ - 1 - 2 + 1 + 2 True - False + False end Encoding: - True + True center end 0 - 0 - 3 + 0 + 3 True - False + False start True EncodingListStore @@ -3386,28 +3516,43 @@ - 1 - 3 + 1 + 3 _Reset Compatibility Options to Defaults - False + False True - True - True + True + True start - 6 - True + 6 + True - 0 - 4 + 0 + 4 2 + + + + + + + + + + + + + + + 5 @@ -3416,14 +3561,14 @@ True - False + False Compatibility - True + True center 5 - False + False @@ -3440,41 +3585,41 @@ True - False + False Profiles 1 - False + False True - True - 18 + True + 18 150 - True + True True - False + False vertical 6 True - True - never - in + True + never + in True - True + True adjustment5 adjustment6 LayoutListStore - 0 + 0 @@ -3505,15 +3650,15 @@ True - False + False gtk-add - False + False True - True - True - True + True + True + True @@ -3525,11 +3670,11 @@ gtk-remove - False + False True - True - True - True + True + True + True @@ -3541,11 +3686,11 @@ gtk-save - False + False True - True - True - True + True + True + True @@ -3570,23 +3715,23 @@ True - True + True 150 - True + True - 150 + 150 True - True - never - in + True + never + in True - True + True LayoutTreeStore - False - 0 + False + 0 @@ -3621,52 +3766,53 @@ + True - False - 6 - 6 - 12 + False + 6 + 6 + 12 True - False + False Profile: 1 - 0 - 0 + 0 + 0 True - False + False Custom command: 1 - 0 - 1 + 0 + 1 True - False + False Working directory: 1 - 0 - 2 + 0 + 2 True - False + False True 0 @@ -3675,40 +3821,49 @@ - 1 - 0 + 1 + 0 True - True + True True - • - False - False + • + False + False - 1 - 1 + 1 + 1 True - True + True True - • - False - False + • + False + False - 1 - 2 + 1 + 2 + + + + + + + + + True @@ -3729,28 +3884,28 @@ True - False + False Layouts 2 - False + False True - True + True adjustment4 - never - in + never + in True - True + True KeybindingsListStore - False - 0 + False + 0 @@ -3782,7 +3937,7 @@ True - other + other @@ -3803,35 +3958,35 @@ True - False + False Keybindings 3 - False + False True - True + True 200 - True + True - 100 + 100 True - True - never - in + True + never + in True - True + True adjustment2 adjustment3 PluginListStore - 0 + 0 @@ -3866,7 +4021,7 @@ True - False + False This plugin has no configuration options @@ -3882,50 +4037,51 @@ True - False + False Plugins 4 - False + False + True - False + False center False - 18 - 12 - 12 + 18 + 12 + 12 True - False + False 1 1 - 128 - terminator + 128 + terminator - 0 - 0 + 0 + 0 True - False + False True - False + False vertical True - False + False True @@ -3936,7 +4092,7 @@ True - False + False Terminator @@ -3951,12 +4107,12 @@ True - False - 10 + False + 10 True - False + False The robot future of terminals @@ -3970,7 +4126,7 @@ True - False + False Version: 2.1.1 @@ -3988,41 +4144,41 @@ - 1 - 0 + 1 + 0 True - False + False The goal of this project is to produce a useful tool for arranging terminals. It is inspired by programs such as gnome-multi-term, quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports). Much of the behavior of Terminator is based on GNOME Terminal, and we are adding more features from that as time goes by, but we also want to extend out in different directions with useful features for sysadmins and other users. If you have any suggestions, please file wishlist bugs! (see left for the Development link) True - 55 - 55 + 55 + 55 0 0 - 1 - 1 + 1 + 1 True - False + False vertical 12 The Manual - False + False True - True - True + True + True center False @@ -4036,10 +4192,10 @@ Much of the behavior of Terminator is based on GNOME Terminal, and we are adding True - True + True <a href="https://github.com/gnome-terminator/terminator">Development</a> <a href="https://github.com/gnome-terminator/terminator/issues">Bugs / Enhancements</a> - True + True center 0 @@ -4051,10 +4207,25 @@ Much of the behavior of Terminator is based on GNOME Terminal, and we are adding - 0 - 1 + 0 + 1 + + + + + + + + + + + + + + + 5 @@ -4063,12 +4234,12 @@ Much of the behavior of Terminator is based on GNOME Terminal, and we are adding True - False + False About 5 - False + False @@ -4081,16 +4252,16 @@ Much of the behavior of Terminator is based on GNOME Terminal, and we are adding True - False - 6 + False + 6 True gtk-help True - True - True - True + True + True + True @@ -4102,11 +4273,11 @@ Much of the behavior of Terminator is based on GNOME Terminal, and we are adding gtk-close - False + False True - True - True - True + True + True + True @@ -4156,7 +4327,7 @@ Much of the behavior of Terminator is based on GNOME Terminal, and we are adding 1 - 0.10000000000000001 - 0.01 + 0.10 + 0.01 From b28d641d97a26a2353f908493955dc410822242d Mon Sep 17 00:00:00 2001 From: Vulcalien Date: Sun, 8 Aug 2021 18:03:44 +0200 Subject: [PATCH 3/4] Moved Titlebar to Profiles menu + removing empty columns/rows from grids --- terminatorlib/preferences.glade | 726 +++++++++++++------------------- 1 file changed, 296 insertions(+), 430 deletions(-) diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade index 1b8c1e1e..90db91c4 100644 --- a/terminatorlib/preferences.glade +++ b/terminatorlib/preferences.glade @@ -414,7 +414,7 @@ 36 True - + True False @@ -560,27 +560,6 @@ 2 - - - - - - - - - - - - - - - - - - - - - True @@ -1102,7 +1081,7 @@ - + True False @@ -1176,13 +1155,21 @@ - - - - - - - + + Title bar at bottom (Require restart) + False + True + True + False + 0 + True + + + + 0 + 3 + 2 + @@ -1207,354 +1194,6 @@ 1 - - - True - False - vertical - - - True - False - <b>Terminal Titlebar</b> - True - 0 - - - False - False - 0 - - - - - True - False - 12 - - - True - False - 36 - True - - - True - False - - - - True - False - 6 - 12 - - - True - False - Font color: - 0 - - - 0 - 1 - - - - - True - False - Background: - 0 - - - 0 - 2 - - - - - True - False - Focused - - - 1 - 0 - - - - - True - False - Inactive - - - 2 - 0 - - - - - True - False - Receiving - - - 3 - 0 - - - - - False - True - True - True - center - - - - 1 - 1 - - - - - False - True - True - True - center - - - - 2 - 1 - - - - - False - True - True - True - center - - - - 3 - 1 - - - - - False - True - True - True - center - - - - 1 - 2 - - - - - False - True - True - True - center - - - - 2 - 2 - - - - - False - True - True - True - center - - - - 3 - 2 - - - - - - - - False - True - 0 - - - - - - - - True - True - 0 - - - - - - True - False - 6 - 12 - - - Title bar at bottom (Require restart) - False - True - True - False - 0.5 - True - - - - 1 - 0 - - - - - Hide size from title - False - True - True - False - 0.5 - True - True - - - - 0 - 0 - - - - - _Use the system font - False - True - True - False - True - 0.5 - True - - - - 0 - 1 - - - - - True - False - 12 - - - True - False - 12 - - - True - False - _Font: - True - font_selector - 0 - - - False - True - 0 - - - - - False - True - True - False - True - Sans 12 - Choose A Titlebar Font - True - - - - False - False - 1 - - - - - - - 0 - 2 - - - - - - - - - - - - - - - - - - - - True - True - 1 - - - - - - - False - True - 1 - - - - - True - True - 2 - - @@ -1657,9 +1296,6 @@ 1 - - - False @@ -1909,7 +1545,7 @@ False 12 - + True False @@ -2050,15 +1686,6 @@ 1 - - - - - - - - - @@ -2215,7 +1842,7 @@ - + True False @@ -2321,18 +1948,6 @@ 3 - - - - - - - - - - - - 1 @@ -3571,6 +3186,281 @@ False + + + True + False + 18 + vertical + 18 + + + + True + False + 6 + 12 + + + True + False + Font color: + 0 + + + 0 + 1 + + + + + True + False + Background: + 0 + + + 0 + 2 + + + + + True + False + Focused + + + 1 + 0 + + + + + True + False + Inactive + + + 2 + 0 + + + + + True + False + Receiving + + + 3 + 0 + + + + + False + True + True + True + center + + + + 1 + 1 + + + + + False + True + True + True + center + + + + 2 + 1 + + + + + False + True + True + True + center + + + + 3 + 1 + + + + + False + True + True + True + center + + + + 1 + 2 + + + + + False + True + True + True + center + + + + 2 + 2 + + + + + False + True + True + True + center + + + + 3 + 2 + + + + + + + + False + False + 0 + + + + + True + False + vertical + 6 + + + Hide size from title + False + True + True + False + 0 + True + True + + + + False + True + 0 + + + + + _Use the system font + False + True + True + False + True + 0 + True + + + + False + True + 1 + + + + + True + False + 12 + + + True + False + _Font: + True + font_selector + 0 + + + False + True + 0 + + + + + False + True + True + False + True + Sans 12 + Choose A Titlebar Font + True + + + + False + False + 1 + + + + + False + True + 2 + + + + + False + False + 2 + + + + + 6 + + + + + True + False + Titlebar + + + 6 + False + + True @@ -3766,7 +3656,7 @@ - + True False @@ -3855,15 +3745,6 @@ 2 - - - - - - - - - True @@ -4046,7 +3927,7 @@ - + True False @@ -4211,21 +4092,6 @@ Much of the behavior of Terminator is based on GNOME Terminal, and we are adding 1 - - - - - - - - - - - - - - - 5 From eaed1df6c416056edf56e8cba4310a0a77df7f33 Mon Sep 17 00:00:00 2001 From: Vulcalien Date: Sun, 8 Aug 2021 21:55:01 +0200 Subject: [PATCH 4/4] Fix: moved titlebar code from set_values to set_profile_values --- terminatorlib/prefseditor.py | 45 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py index 4512c32a..86218107 100755 --- a/terminatorlib/prefseditor.py +++ b/terminatorlib/prefseditor.py @@ -333,9 +333,6 @@ class PrefsEditor: #Show on all workspaces widget = guiget('stickycheck') widget.set_active(self.config['sticky']) - #Hide size text from the title bar - widget = guiget('title_hide_sizetextcheck') - widget.set_active(self.config['title_hide_sizetext']) # title bar at bottom widget = guiget('title_at_bottom_checkbutton') @@ -359,19 +356,6 @@ class PrefsEditor: # Clear selection on copy widget = guiget('clear_select_on_copy') widget.set_active(self.config['clear_select_on_copy']) - #Titlebar font selector - # Use system font - widget = guiget('title_system_font_checkbutton') - widget.set_active(self.config['title_use_system_font']) - self.on_title_system_font_checkbutton_toggled(widget) - # Font selector - widget = guiget('title_font_selector') - if self.config['title_use_system_font'] == True: - fontname = self.config.get_system_prop_font() - if fontname is not None: - widget.set_font_name(fontname) - else: - widget.set_font_name(self.config['title_font']) ## Profile tab # Populate the profile list @@ -615,12 +599,6 @@ class PrefsEditor: # Now set the palette selector widget widget = guiget('palette_combobox') widget.set_active(self.palettevalues[palette]) - # Titlebar colors - for bit in ['title_transmit_fg_color', 'title_transmit_bg_color', - 'title_receive_fg_color', 'title_receive_bg_color', - 'title_inactive_fg_color', 'title_inactive_bg_color']: - widget = guiget(bit) - widget.set_color(Gdk.color_parse(self.config[bit])) # Inactive terminal shading widget = guiget('inactive_color_offset') widget.set_value(float(self.config['inactive_color_offset'])) @@ -716,6 +694,29 @@ class PrefsEditor: if encoding[1] == value: widget.set_active_iter(rowiter) + ## Titlebar tab + # Titlebar colors + for bit in ['title_transmit_fg_color', 'title_transmit_bg_color', + 'title_receive_fg_color', 'title_receive_bg_color', + 'title_inactive_fg_color', 'title_inactive_bg_color']: + widget = guiget(bit) + widget.set_color(Gdk.color_parse(self.config[bit])) + # Hide size text from the title bar + widget = guiget('title_hide_sizetextcheck') + widget.set_active(self.config['title_hide_sizetext']) + # Use system font + widget = guiget('title_system_font_checkbutton') + widget.set_active(self.config['title_use_system_font']) + self.on_title_system_font_checkbutton_toggled(widget) + # Font selector + widget = guiget('title_font_selector') + if self.config['title_use_system_font'] == True: + fontname = self.config.get_system_prop_font() + if fontname is not None: + widget.set_font_name(fontname) + else: + widget.set_font_name(self.config['title_font']) + def set_layout(self, layout_name): """Set a layout""" self.layouteditor.set_layout(layout_name)