- Raise error if widgets are unnamed

- Rename alignment based on settings
- Horizontal is a basic option
This commit is contained in:
trigg 2022-07-19 23:13:12 +01:00
parent 46aa178ea7
commit 20303aacfb
6 changed files with 506 additions and 337 deletions

View file

@ -155,6 +155,7 @@
<property name="page-increment">8</property>
</object>
<object class="GtkWindow" id="settings_window">
<property name="name">window</property>
<property name="can-focus">False</property>
<property name="title" translatable="yes">Discover Overlay Configuration</property>
<property name="icon-name">discover-overlay</property>
@ -166,10 +167,12 @@
<child>
<!-- n-columns=3 n-rows=4 -->
<object class="GtkGrid">
<property name="name">overview_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkImage">
<property name="name">overview_image</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">10</property>
@ -243,6 +246,7 @@
<child>
<!-- n-columns=2 n-rows=2 -->
<object class="GtkGrid">
<property name="name">voice_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">baseline</property>
@ -255,8 +259,9 @@
<property name="column-spacing">1</property>
<property name="column-homogeneous">True</property>
<child>
<!-- n-columns=2 n-rows=7 -->
<!-- n-columns=4 n-rows=7 -->
<object class="GtkGrid">
<property name="name">voice_location_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
@ -277,6 +282,22 @@
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="radiobutton1">
<property name="label" translatable="yes">Floating</property>
<property name="name">voice_floating</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="voice_floating_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton">
<property name="label" translatable="yes">Anchor To Edge</property>
@ -295,48 +316,15 @@
</packing>
</child>
<child>
<object class="GtkRadioButton" id="radiobutton1">
<property name="label" translatable="yes">Floating</property>
<property name="name">voice_floating</property>
<object class="GtkComboBoxText" id="voice_monitor">
<property name="name">voice_monitor</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="voice_floating_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="voice_place_window_button">
<property name="label" translatable="yes">Place Window</property>
<property name="name">voice_place_window_button</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="pressed" handler="voice_place_window" swapped="no"/>
<property name="can-focus">False</property>
<signal name="changed" handler="voice_monitor_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="voice_show_advanced_options_button">
<property name="label" translatable="yes">Show Advanced Options</property>
<property name="name">voice_show_advanced_options_button</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="pressed" handler="voice_show_advanced_options_button_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">6</property>
<property name="top-attach">2</property>
<property name="width">2</property>
</packing>
</child>
@ -378,18 +366,98 @@
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="voice_monitor">
<property name="name">voice_monitor</property>
<object class="GtkButton" id="voice_place_window_button">
<property name="label" translatable="yes">Place Window</property>
<property name="name">voice_place_window_button</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<signal name="changed" handler="voice_monitor_changed" swapped="no"/>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="pressed" handler="voice_place_window" swapped="no"/>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
<property name="top-attach">5</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="voice_show_advanced_options_button">
<property name="label" translatable="yes">Show Advanced Options</property>
<property name="name">voice_show_advanced_options_button</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="pressed" handler="voice_show_advanced_options_button_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">6</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_display_horizontally_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Display Horizontally</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkCheckButton">
<property name="name">voice_display_horizontally</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="voice_display_horizontally_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">3</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left-attach">0</property>
@ -399,6 +467,7 @@
<child>
<!-- n-columns=4 n-rows=5 -->
<object class="GtkGrid">
<property name="name">voice_colour_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
@ -1139,33 +1208,6 @@
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_display_horizontally_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Display Horizontally</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">4</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton">
<property name="name">voice_display_horizontally</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="voice_display_horizontally_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">5</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_highlight_self_label</property>
@ -1193,33 +1235,6 @@
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_display_speakers_only_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Display Speakers Only</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">4</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkCheckButton">
<property name="name">voice_display_speakers_only</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="voice_display_speakers_only" swapped="no"/>
</object>
<packing>
<property name="left-attach">5</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_show_test_content_label</property>
@ -1273,6 +1288,33 @@
<property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_display_speakers_only_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Display Speakers Only</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">4</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton">
<property name="name">voice_display_speakers_only</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="voice_display_speakers_only" swapped="no"/>
</object>
<packing>
<property name="left-attach">5</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_nick_length_label</property>
@ -1283,7 +1325,7 @@
</object>
<packing>
<property name="left-attach">4</property>
<property name="top-attach">7</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
@ -1296,9 +1338,15 @@
</object>
<packing>
<property name="left-attach">5</property>
<property name="top-attach">7</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left-attach">0</property>
@ -1324,8 +1372,9 @@
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=12 -->
<!-- n-columns=3 n-rows=12 -->
<object class="GtkGrid">
<property name="name">text_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
@ -1402,6 +1451,31 @@
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_server</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">Refresh List</property>
<property name="name">text_refresh_server_button</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="pressed" handler="text_server_refresh" swapped="no"/>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_channel_label</property>
@ -1412,7 +1486,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">4</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
@ -1425,73 +1499,18 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_colour_label</property>
<object class="GtkComboBoxText">
<property name="name">text_channel</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Text Colour</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_background_colour_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Background Colour</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_overlay_location_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Overlay Location</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">8</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_show_attachments_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Show Attachments</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_line_limit_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Line Limit</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">11</property>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
@ -1507,7 +1526,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">5</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
@ -1521,7 +1540,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">6</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
@ -1533,6 +1552,18 @@
<property name="use-alpha">True</property>
<signal name="color-set" handler="text_background_colour_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_monitor</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<signal name="changed" handler="text_monitor_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">7</property>
@ -1549,7 +1580,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">9</property>
<property name="top-attach">8</property>
</packing>
</child>
<child>
@ -1563,7 +1594,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">10</property>
<property name="top-attach">9</property>
</packing>
</child>
<child>
@ -1576,57 +1607,111 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">11</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_server</property>
<object class="GtkLabel">
<property name="name">text_colour_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Text Colour</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_channel</property>
<object class="GtkLabel">
<property name="name">text_background_colour_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Background Colour</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
<property name="left-attach">0</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_monitor</property>
<object class="GtkLabel">
<property name="name">text_overlay_location_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<signal name="changed" handler="text_monitor_changed" swapped="no"/>
<property name="label" translatable="yes">Overlay Location</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">8</property>
<property name="left-attach">0</property>
<property name="top-attach">7</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">Refresh List</property>
<property name="name">text_refresh_server_button</property>
<object class="GtkLabel">
<property name="name">text_show_attachments_label</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="pressed" handler="text_server_refresh" swapped="no"/>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Show Attachments</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
<property name="left-attach">0</property>
<property name="top-attach">9</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_line_limit_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Line Limit</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
@ -1650,6 +1735,7 @@
<child>
<!-- n-columns=2 n-rows=17 -->
<object class="GtkGrid">
<property name="name">notification_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
@ -2120,6 +2206,7 @@
<child>
<!-- n-columns=2 n-rows=6 -->
<object class="GtkGrid">
<property name="name">core_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
@ -2157,6 +2244,7 @@
</child>
<child>
<object class="GtkLabel">
<property name="name">core_run_conf_on_startup_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Run Configuration on Startup</property>
@ -2237,6 +2325,7 @@
</child>
<child>
<object class="GtkLabel">
<property name="name">core_settings_min_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Start Settings Minimized</property>
@ -2276,6 +2365,7 @@
</child>
<child>
<object class="GtkLabel">
<property name="name">core_hide_overlay_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Hide Overlays</property>

View file

@ -155,6 +155,7 @@
<property name="page-increment">8</property>
</object>
<object class="GtkWindow" id="settings_window">
<property name="name">window</property>
<property name="can-focus">False</property>
<property name="title" translatable="yes">Discover Overlay Configuration</property>
<property name="icon-name">discover-overlay</property>
@ -166,10 +167,12 @@
<child>
<!-- n-columns=3 n-rows=4 -->
<object class="GtkGrid">
<property name="name">overview_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkImage">
<property name="name">overview_image</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-bottom">10</property>
@ -243,6 +246,7 @@
<child>
<!-- n-columns=2 n-rows=2 -->
<object class="GtkGrid">
<property name="name">voice_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">baseline</property>
@ -257,6 +261,7 @@
<child>
<!-- n-columns=2 n-rows=7 -->
<object class="GtkGrid">
<property name="name">voice_location_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
@ -399,6 +404,7 @@
<child>
<!-- n-columns=4 n-rows=5 -->
<object class="GtkGrid">
<property name="name">voice_colour_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
@ -1292,7 +1298,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="adjustment">voice_nick_lenght_adj</property>
<signal name="value-changed" handler="voice_nick_length_label_changed" swapped="no"/>
<signal name="value-changed" handler="voice_nick_length_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">5</property>
@ -1324,8 +1330,9 @@
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=12 -->
<!-- n-columns=3 n-rows=12 -->
<object class="GtkGrid">
<property name="name">text_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
@ -1402,6 +1409,31 @@
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_server</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">Refresh List</property>
<property name="name">text_refresh_server_button</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="pressed" handler="text_server_refresh" swapped="no"/>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_channel_label</property>
@ -1412,7 +1444,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">4</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
@ -1425,73 +1457,18 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_colour_label</property>
<object class="GtkComboBoxText">
<property name="name">text_channel</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Text Colour</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_background_colour_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Background Colour</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_overlay_location_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Overlay Location</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">8</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_show_attachments_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Show Attachments</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_line_limit_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Line Limit</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">11</property>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
@ -1507,7 +1484,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">5</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
@ -1521,7 +1498,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">6</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
@ -1533,6 +1510,18 @@
<property name="use-alpha">True</property>
<signal name="color-set" handler="text_background_colour_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_monitor</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<signal name="changed" handler="text_monitor_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">7</property>
@ -1549,7 +1538,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">9</property>
<property name="top-attach">8</property>
</packing>
</child>
<child>
@ -1563,7 +1552,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">10</property>
<property name="top-attach">9</property>
</packing>
</child>
<child>
@ -1576,57 +1565,111 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">11</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_server</property>
<object class="GtkLabel">
<property name="name">text_colour_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Text Colour</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_channel</property>
<object class="GtkLabel">
<property name="name">text_background_colour_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Background Colour</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
<property name="left-attach">0</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<property name="name">text_monitor</property>
<object class="GtkLabel">
<property name="name">text_overlay_location_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<signal name="changed" handler="text_monitor_changed" swapped="no"/>
<property name="label" translatable="yes">Overlay Location</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">8</property>
<property name="left-attach">0</property>
<property name="top-attach">7</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">Refresh List</property>
<property name="name">text_refresh_server_button</property>
<object class="GtkLabel">
<property name="name">text_show_attachments_label</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<signal name="pressed" handler="text_server_refresh" swapped="no"/>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Show Attachments</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
<property name="left-attach">0</property>
<property name="top-attach">9</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">text_line_limit_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Line Limit</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
@ -1650,6 +1693,7 @@
<child>
<!-- n-columns=2 n-rows=17 -->
<object class="GtkGrid">
<property name="name">notification_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
@ -2120,6 +2164,7 @@
<child>
<!-- n-columns=2 n-rows=6 -->
<object class="GtkGrid">
<property name="name">core_grid</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
@ -2157,6 +2202,7 @@
</child>
<child>
<object class="GtkLabel">
<property name="name">core_run_conf_on_startup_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Run Configuration on Startup</property>
@ -2237,6 +2283,7 @@
</child>
<child>
<object class="GtkLabel">
<property name="name">core_settings_min_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Start Settings Minimized</property>
@ -2276,6 +2323,7 @@
</child>
<child>
<object class="GtkLabel">
<property name="name">core_hide_overlay_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Hide Overlays</property>

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-19 22:29+0100\n"
"POT-Creation-Date: 2022-07-19 23:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -88,6 +88,21 @@ msgstr ""
msgid " for support. Or open an issue on our GitHub "
msgstr ""
msgid "Top"
msgstr ""
msgid "Bottom"
msgstr ""
msgid "Left"
msgstr ""
msgid "Middle"
msgstr ""
msgid "Right"
msgstr ""
msgid "Settings"
msgstr ""
@ -157,12 +172,6 @@ msgstr ""
msgid "None"
msgstr ""
msgid "Left"
msgstr ""
msgid "Right"
msgstr ""
msgid "Discover Overlay Configuration"
msgstr ""
@ -187,15 +196,6 @@ msgstr ""
msgid "Show Advanced Options"
msgstr ""
msgid "Top"
msgstr ""
msgid "Middle"
msgstr ""
msgid "Bottom"
msgstr ""
msgid "Foreground"
msgstr ""
@ -301,6 +301,9 @@ msgstr ""
msgid "Server"
msgstr ""
msgid "Refresh List"
msgstr ""
msgid "Channel"
msgstr ""
@ -316,9 +319,6 @@ msgstr ""
msgid "Line Limit"
msgstr ""
msgid "Refresh List"
msgstr ""
msgid "Text"
msgstr ""

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-19 22:29+0100\n"
"POT-Creation-Date: 2022-07-19 23:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -95,6 +95,21 @@ msgstr "Ewch i'n Discord"
msgid " for support. Or open an issue on our GitHub "
msgstr " am gymorth"
msgid "Top"
msgstr "Brig"
msgid "Bottom"
msgstr "Gwaelod"
msgid "Left"
msgstr "Chwith"
msgid "Middle"
msgstr "Canol"
msgid "Right"
msgstr "Dde"
msgid "Settings"
msgstr "Gosodiadau"
@ -164,12 +179,6 @@ msgstr "Lapio"
msgid "None"
msgstr "Dim"
msgid "Left"
msgstr "Chwith"
msgid "Right"
msgstr "Dde"
msgid "Discover Overlay Configuration"
msgstr "Discover Overlay Cyfluniad"
@ -194,15 +203,6 @@ msgstr "Symudol"
msgid "Show Advanced Options"
msgstr "Dangos Mwy o Opsiynau"
msgid "Top"
msgstr "Brig"
msgid "Middle"
msgstr "Canol"
msgid "Bottom"
msgstr "Gwaelod"
msgid "Foreground"
msgstr "Blaendir"
@ -308,6 +308,9 @@ msgstr "Arddull naid"
msgid "Server"
msgstr "Gweinydd"
msgid "Refresh List"
msgstr "Adnewyddu'r rhestr"
msgid "Channel"
msgstr "Sianel"
@ -323,9 +326,6 @@ msgstr "Dangos atodiadau"
msgid "Line Limit"
msgstr "Terfyn Llinell"
msgid "Refresh List"
msgstr "Adnewyddu'r rhestr"
msgid "Text"
msgstr "Testun"
@ -381,4 +381,4 @@ msgid "Hide Overlays"
msgstr "Cuddio troslun"
msgid "Core"
msgstr "Craidd"
msgstr "Craidd"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-19 22:29+0100\n"
"POT-Creation-Date: 2022-07-19 23:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -88,6 +88,21 @@ msgstr ""
msgid " for support. Or open an issue on our GitHub "
msgstr ""
msgid "Top"
msgstr ""
msgid "Bottom"
msgstr ""
msgid "Left"
msgstr ""
msgid "Middle"
msgstr ""
msgid "Right"
msgstr ""
msgid "Settings"
msgstr ""
@ -157,12 +172,6 @@ msgstr ""
msgid "None"
msgstr ""
msgid "Left"
msgstr ""
msgid "Right"
msgstr ""
msgid "Discover Overlay Configuration"
msgstr ""
@ -187,15 +196,6 @@ msgstr ""
msgid "Show Advanced Options"
msgstr ""
msgid "Top"
msgstr ""
msgid "Middle"
msgstr ""
msgid "Bottom"
msgstr ""
msgid "Foreground"
msgstr ""
@ -301,6 +301,9 @@ msgstr ""
msgid "Server"
msgstr ""
msgid "Refresh List"
msgstr ""
msgid "Channel"
msgstr ""
@ -316,9 +319,6 @@ msgstr ""
msgid "Line Limit"
msgstr ""
msgid "Refresh List"
msgstr ""
msgid "Text"
msgstr ""

View file

@ -73,6 +73,9 @@ class MainSettingsWindow():
for widget in builder.get_objects():
if widget.find_property("name"):
name = widget.get_property("name")
if name == "":
log.error("Unnamed widget. All widgets must be named")
log.info(widget)
self.widget[name] = widget
# Translate labels and buttons
@ -221,6 +224,32 @@ class MainSettingsWindow():
self.widget['notebook'].set_current_page(0)
self.window.show()
def set_alignment_labels(self, horz):
m1 = self.widget['voice_align_1'].get_model()
m2 = self.widget['voice_align_2'].get_model()
i = m1.get_iter_first()
i2 = m2.get_iter_first()
if horz:
m1.set_value(i, 0, _("Top"))
i = m1.iter_next(i)
m1.set_value(i, 0, _("Bottom"))
m2.set_value(i2, 0, _("Left"))
i2 = m2.iter_next(i2)
m2.set_value(i2, 0, _("Middle"))
i2 = m2.iter_next(i2)
m2.set_value(i2, 0, _("Right"))
else:
m1.set_value(i, 0, _("Left"))
i = m1.iter_next(i)
m1.set_value(i, 0, _("Right"))
m2.set_value(i2, 0, _("Top"))
i2 = m2.iter_next(i2)
m2.set_value(i2, 0, _("Middle"))
i2 = m2.iter_next(i2)
m2.set_value(i2, 0, _("Bottom"))
def read_config(self):
self.widget['voice_advanced_grid'].hide()
@ -271,8 +300,9 @@ class MainSettingsWindow():
self.widget['voice_horizontal_padding'].set_value(
config.getint("main", "horz_edge_padding", fallback=0))
self.widget['voice_display_horizontally'].set_active(
config.getboolean("main", "horizontal", fallback=False))
horz = config.getboolean("main", "horizontal", fallback=False)
self.set_alignment_labels(horz)
self.widget['voice_display_horizontally'].set_active(horz)
self.widget['voice_highlight_self'].set_active(
config.getboolean("main", "highlight_self", fallback=False))
@ -763,6 +793,7 @@ class MainSettingsWindow():
def voice_display_horizontally_changed(self, button):
self.config_set("main", "horizontal", "%s" % (button.get_active()))
self.set_alignment_labels(button.get_active())
def voice_highlight_self_changed(self, button):
self.config_set("main", "highlight_self", "%s" % (button.get_active()))