Merge pull request 'master' (#66) from YanTheKaller/ubl-settings-bootloader:master into master

Reviewed-on: #66
pull/78/head v2.8
Dmitry Razumov 2 years ago
commit b6a2c32fc3

3
.gitignore vendored

@ -2,4 +2,5 @@ ubl-settings-bootloader.glade~
test.cpp test.cpp
.vscode .vscode
ubl-settings-bootloader ubl-settings-bootloader
ubl-settings-bootloader_ru.po~ ubl-settings-bootloader_ru.po~
terminal-commands/

@ -966,15 +966,23 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkTreeView" id="treeViewKernel"> <object class="GtkScrolledWindow">
<property name="height-request">141</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child internal-child="selection"> <property name="shadow-type">in</property>
<object class="GtkTreeSelection"/> <child>
<object class="GtkTreeView" id="treeViewKernel">
<property name="visible">True</property>
<property name="can-focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
@ -1311,10 +1319,6 @@
<object class="GtkLabel" id="lblSave"> <object class="GtkLabel" id="lblSave">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Save</property> <property name="label" translatable="yes">Save</property>
<style> <style>
<class name="toolbar"/> <class name="toolbar"/>
@ -1404,10 +1408,6 @@
<object class="GtkLabel" id="lblLoad"> <object class="GtkLabel" id="lblLoad">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Load</property> <property name="label" translatable="yes">Load</property>
</object> </object>
<packing> <packing>

Loading…
Cancel
Save