rearranged the ui a bit

xkb
sezanzeb 4 years ago committed by sezanzeb
parent 142ecdd0f8
commit 007703cabd

@ -261,18 +261,15 @@
<property name="icon_name">document-save</property>
</object>
<object class="GtkWindow" id="window">
<property name="width_request">450</property>
<property name="width_request">-1</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Key Mapper</property>
<property name="default_height">350</property>
<property name="icon_name">mouse</property>
<signal name="delete-event" handler="on_close" swapped="no"/>
<signal name="event" handler="on_window_event" swapped="no"/>
<child>
<object class="GtkBox" id="wrapper">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox">
<object class="GtkBox" id="vertical-wrapper">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@ -280,10 +277,11 @@
<object class="GtkBox" id="devices">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
<property name="border_width">15</property>
<property name="spacing">10</property>
<child>
<object class="GtkLabel">
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Device</property>
@ -308,6 +306,23 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="apply_system_layout">
<property name="label" translatable="yes">Apply Defaults</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">To give your keys back their original mapping.</property>
<property name="halign">end</property>
<property name="image">gtk-redo-icon-2</property>
<signal name="clicked" handler="on_apply_system_layout_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -326,11 +341,20 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="horizontal-wrapper">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="preset_settings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
<property name="border_width">15</property>
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
@ -420,7 +444,7 @@
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">preset</property>
<property name="label" translatable="yes">Preset</property>
<property name="width_chars">13</property>
<property name="xalign">0</property>
</object>
@ -518,7 +542,7 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
@ -530,26 +554,6 @@
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="apply_system_layout">
<property name="label" translatable="yes">Apply Defaults</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">To give your keys back their original mapping.</property>
<property name="halign">end</property>
<property name="margin_end">10</property>
<property name="margin_bottom">10</property>
<property name="border_width">0</property>
<property name="image">gtk-redo-icon-2</property>
<signal name="clicked" handler="on_apply_system_layout_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
@ -745,6 +749,13 @@
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>

@ -102,7 +102,7 @@ class Window:
window = self.get('window')
window.show()
# hide everything until stuff is populated
self.get('wrapper').set_opacity(0)
self.get('vertical-wrapper').set_opacity(0)
self.window = window
# if any of the next steps take a bit to complete, have the window
@ -116,7 +116,7 @@ class Window:
self.timeout = GLib.timeout_add(100, self.check_add_row)
# now show the proper finished content of the window
self.get('wrapper').set_opacity(1)
self.get('vertical-wrapper').set_opacity(1)
def get(self, name):
"""Get a widget from the window"""
@ -293,6 +293,7 @@ class Window:
device = self.selected_device
preset = self.selected_preset
# TODO test call this and then check config
# TODO new screenshot
config.set_autoload_preset(device, preset, active)
config.save_config()

Loading…
Cancel
Save