itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #561 from Vulcalien/cell-width-preferences 

Fix: handle_size treated as cell_width
This commit is contained in:
Matt Rose 2021-12-26 18:12:29 -05:00 committed by GitHub
parent acbaee06c5 3c575029e7
commit ca335e45eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 93 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
terminatorlib/config.py
View File

@ -113,8 +113,8 @@ DEFAULTS = {
'disable_mouse_paste' : False,
'smart_copy' : True,
'clear_select_on_copy' : False,
'cell_height' : 1.0,
'cell_width' : 1.0,
'cell_height' : 1.0,
'case_sensitive' : True,
'invert_search' : False,
'link_single_click' : False,

202
terminatorlib/preferences.glade
View File

@ -953,117 +953,6 @@
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cell_height_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Cell Height:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkScale" id="cellheight">
<property name="width-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="halign">baseline</property>
<property name="hexpand">True</property>
<property name="adjustment">adjustment_cellheight</property>
<property name="round-digits">1</property>
<property name="draw-value">False</property>
<property name="value-pos">bottom</property>
<signal name="value-changed" handler="on_cellheight_value_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cellheight_value_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label">1.0</property>
<property name="justify">right</property>
<property name="width-chars">5</property>
<property name="max-width-chars">5</property>
<property name="lines">1</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkScale" id="handlewidth">
<property name="width-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="halign">baseline</property>
<property name="hexpand">True</property>
<property name="adjustment">adjustment1</property>
<property name="round-digits">0</property>
<property name="digits">0</property>
<property name="draw-value">False</property>
<property name="value-pos">bottom</property>
<signal name="value-changed" handler="on_handlewidth_value_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cell_width_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Cell Width:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkScale" id="cellwidth">
<property name="width-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="halign">baseline</property>
<property name="hexpand">True</property>
<property name="adjustment">adjustment_cellwidth</property>
<property name="round-digits">1</property>
<property name="draw-value">False</property>
<property name="value-pos">bottom</property>
<signal name="value-changed" handler="on_handlewidth_value_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cellwidth_value_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label">1.0</property>
<property name="justify">right</property>
<property name="width-chars">5</property>
<property name="max-width-chars">5</property>
<property name="lines">1</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkScale" id="inactive_color_offset">
<property name="width-request">100</property>
@ -1132,6 +1021,97 @@
<property name="width">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cell_height_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Cell Height:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cellheight_value_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label">1.0</property>
<property name="justify">right</property>
<property name="width-chars">5</property>
<property name="max-width-chars">5</property>
<property name="lines">1</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkScale" id="cellheight">
<property name="width-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="halign">baseline</property>
<property name="hexpand">True</property>
<property name="adjustment">adjustment_cellheight</property>
<property name="round-digits">1</property>
<property name="draw-value">False</property>
<property name="value-pos">bottom</property>
<signal name="value-changed" handler="on_cellheight_value_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkScale" id="cellwidth">
<property name="width-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="adjustment">adjustment_cellwidth</property>
<property name="round-digits">1</property>
<property name="draw-value">False</property>
<property name="value-pos">bottom</property>
<signal name="value-changed" handler="on_cellwidth_value_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cellwidth_value_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label">1.0</property>
<property name="justify">right</property>
<property name="width-chars">5</property>
<property name="max-width-chars">5</property>
<property name="lines">1</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cell_width_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Cell Width:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">4</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>

6
terminatorlib/prefseditor.py
View File

@ -257,9 +257,7 @@ class PrefsEditor:
widget = guiget('handlesize_value_label')
widget.set_text(str(termsepsize))
#
# Cell Height
#
cellheightsize = self.config['cell_height']
cellheightsize = round(float(cellheightsize),1)
widget = guiget('cellheight')
@ -267,9 +265,7 @@ class PrefsEditor:
widget = guiget('cellheight_value_label')
widget.set_text(str(cellheightsize))
#
# Cell Width
#
cellwidthsize = self.config['cell_width']
cellwidthsize = round(float(cellwidthsize),1)
widget = guiget('cellwidth')
@ -1278,7 +1274,7 @@ class PrefsEditor:
label_widget = guiget('cellheight_value_label')
label_widget.set_text(str(value))
def on_handlewidth_value_changed(self, widget):
def on_cellwidth_value_changed(self, widget):
"""Handles cell width changed"""
value = widget.get_value()
value = round(float(value), 1)