diff --git a/discover_overlay/glade/settings.glade b/discover_overlay/glade/settings.glade index a8606d9..3be2a5b 100644 --- a/discover_overlay/glade/settings.glade +++ b/discover_overlay/glade/settings.glade @@ -252,11 +252,11 @@ True False + center 40 1 1 True - True voice_overlay_location_label @@ -394,7 +394,7 @@ True False - end + center 40 1 1 @@ -635,14 +635,13 @@ - + voice_advanced_grid True False 1 5 - True True @@ -793,45 +792,6 @@ 6 - - - voice_display_horizontally_label - True - False - Display Horizontally - 0 - - - 0 - 7 - - - - - voice_highlight_self_label - True - False - Highlight Self - 0 - - - 0 - 8 - - - - - voice_display_speakers_only_label - True - False - Display Speakers Only - 0 - - - 0 - 9 - - voice_avatar_opacity_label @@ -897,71 +857,6 @@ 4 - - - voice_order_avatars_by_label - True - False - Order Avatars By - 0 - - - 2 - 5 - - - - - voice_border_width_label - True - False - Border width - 0 - - - 2 - 6 - - - - - voice_overflow_style_label - True - False - Overflow Style - 0 - - - 2 - 7 - - - - - voice_show_title_label - True - False - Show Title - 0 - - - 2 - 8 - - - - - voice_show_connection_status_label - True - False - Show Connection Status - 0 - - - 2 - 9 - - voice_avatar_opacity @@ -1031,103 +926,6 @@ 4 - - - voice_show_title - True - True - False - True - - - - 3 - 8 - - - - - voice_show_connection_status - True - True - False - True - - - - 3 - 9 - - - - - voice_show_disconnected_label - True - False - Show While Disconnected - 0 - - - 2 - 10 - - - - - voice_show_disconnected - True - True - False - True - - - - 3 - 10 - - - - - voice_display_speakers_only - True - True - False - True - - - - 1 - 9 - - - - - voice_highlight_self - True - True - False - True - - - - 1 - 8 - - - - - voice_display_horizontally - True - True - False - True - - - - 1 - 7 - - voice_horizontal_padding @@ -1169,68 +967,45 @@ - voice_show_test_content_label + voice_overflow_style_label True False - Show Test Content + Overflow Style 0 - 0 - 11 + 4 + 0 - - voice_show_test_content + + voice_overflow_style True - True - False - True - + False + + None + Wrap + Shrink + + - 1 - 11 + 5 + 0 - voice_dummy_count_label + voice_order_avatars_by_label True False - Dummy Count + Order Avatars By 0 - 2 - 11 - - - - - voice_dummy_count - True - True - voice_dummy_count_adj - - - - 3 - 11 - - - - - voice_border_width - True - True - border_width_adj - - - - 3 - 6 + 4 + 1 @@ -1245,22 +1020,246 @@ + + 5 + 1 + + + + + voice_border_width_label + True + False + Border width + 0 + + + 2 + 5 + + + + + voice_border_width + True + True + border_width_adj + + 3 5 - - voice_overflow_style + + voice_show_title_label True False - - None - Wrap - Shrink - - + Show Title + 0 + + + 4 + 2 + + + + + voice_show_title + True + True + False + True + + + + 5 + 2 + + + + + voice_show_connection_status_label + True + False + Show Connection Status + 0 + + + 4 + 3 + + + + + voice_show_connection_status + True + True + False + True + + + + 5 + 3 + + + + + voice_show_disconnected_label + True + False + Show While Disconnected + 0 + + + 4 + 4 + + + + + voice_show_disconnected + True + True + False + True + + + + 5 + 4 + + + + + voice_display_horizontally_label + True + False + Display Horizontally + 0 + + + 4 + 5 + + + + + voice_display_horizontally + True + True + False + True + + + + 5 + 5 + + + + + voice_highlight_self_label + True + False + Highlight Self + 0 + + + 2 + 6 + + + + + voice_highlight_self + True + True + False + True + + + + 3 + 6 + + + + + voice_display_speakers_only_label + True + False + Display Speakers Only + 0 + + + 4 + 6 + + + + + voice_display_speakers_only + True + True + False + True + + + + 5 + 6 + + + + + voice_show_test_content_label + True + False + Show Test Content + 0 + + + 0 + 7 + + + + + voice_show_test_content + True + True + False + True + + + + 1 + 7 + + + + + voice_dummy_count_label + True + False + Dummy Count + 0 + + + 2 + 7 + + + + + voice_dummy_count + True + True + voice_dummy_count_adj + 3 diff --git a/discover_overlay/glade/settings.glade~ b/discover_overlay/glade/settings.glade~ index a8606d9..e88ac8c 100644 --- a/discover_overlay/glade/settings.glade~ +++ b/discover_overlay/glade/settings.glade~ @@ -252,11 +252,11 @@ True False + center 40 1 1 True - True voice_overlay_location_label @@ -394,7 +394,7 @@ True False - end + center 40 1 1 @@ -635,7 +635,7 @@ - + voice_advanced_grid True @@ -793,45 +793,6 @@ 6 - - - voice_display_horizontally_label - True - False - Display Horizontally - 0 - - - 0 - 7 - - - - - voice_highlight_self_label - True - False - Highlight Self - 0 - - - 0 - 8 - - - - - voice_display_speakers_only_label - True - False - Display Speakers Only - 0 - - - 0 - 9 - - voice_avatar_opacity_label @@ -897,71 +858,6 @@ 4 - - - voice_order_avatars_by_label - True - False - Order Avatars By - 0 - - - 2 - 5 - - - - - voice_border_width_label - True - False - Border width - 0 - - - 2 - 6 - - - - - voice_overflow_style_label - True - False - Overflow Style - 0 - - - 2 - 7 - - - - - voice_show_title_label - True - False - Show Title - 0 - - - 2 - 8 - - - - - voice_show_connection_status_label - True - False - Show Connection Status - 0 - - - 2 - 9 - - voice_avatar_opacity @@ -1031,103 +927,6 @@ 4 - - - voice_show_title - True - True - False - True - - - - 3 - 8 - - - - - voice_show_connection_status - True - True - False - True - - - - 3 - 9 - - - - - voice_show_disconnected_label - True - False - Show While Disconnected - 0 - - - 2 - 10 - - - - - voice_show_disconnected - True - True - False - True - - - - 3 - 10 - - - - - voice_display_speakers_only - True - True - False - True - - - - 1 - 9 - - - - - voice_highlight_self - True - True - False - True - - - - 1 - 8 - - - - - voice_display_horizontally - True - True - False - True - - - - 1 - 7 - - voice_horizontal_padding @@ -1169,68 +968,45 @@ - voice_show_test_content_label + voice_overflow_style_label True False - Show Test Content + Overflow Style 0 - 0 - 11 + 4 + 0 - - voice_show_test_content + + voice_overflow_style True - True - False - True - + False + + None + Wrap + Shrink + + - 1 - 11 + 5 + 0 - voice_dummy_count_label + voice_order_avatars_by_label True False - Dummy Count + Order Avatars By 0 - 2 - 11 - - - - - voice_dummy_count - True - True - voice_dummy_count_adj - - - - 3 - 11 - - - - - voice_border_width - True - True - border_width_adj - - - - 3 - 6 + 4 + 1 @@ -1245,22 +1021,246 @@ + + 5 + 1 + + + + + voice_border_width_label + True + False + Border width + 0 + + + 2 + 5 + + + + + voice_border_width + True + True + border_width_adj + + 3 5 - - voice_overflow_style + + voice_show_title_label True False - - None - Wrap - Shrink - - + Show Title + 0 + + + 4 + 2 + + + + + voice_show_title + True + True + False + True + + + + 5 + 2 + + + + + voice_show_connection_status_label + True + False + Show Connection Status + 0 + + + 4 + 3 + + + + + voice_show_connection_status + True + True + False + True + + + + 5 + 3 + + + + + voice_show_disconnected_label + True + False + Show While Disconnected + 0 + + + 4 + 4 + + + + + voice_show_disconnected + True + True + False + True + + + + 5 + 4 + + + + + voice_display_horizontally_label + True + False + Display Horizontally + 0 + + + 4 + 5 + + + + + voice_display_horizontally + True + True + False + True + + + + 5 + 5 + + + + + voice_highlight_self_label + True + False + Highlight Self + 0 + + + 2 + 6 + + + + + voice_highlight_self + True + True + False + True + + + + 3 + 6 + + + + + voice_display_speakers_only_label + True + False + Display Speakers Only + 0 + + + 4 + 6 + + + + + voice_display_speakers_only + True + True + False + True + + + + 5 + 6 + + + + + voice_show_test_content_label + True + False + Show Test Content + 0 + + + 0 + 7 + + + + + voice_show_test_content + True + True + False + True + + + + 1 + 7 + + + + + voice_dummy_count_label + True + False + Dummy Count + 0 + + + 2 + 7 + + + + + voice_dummy_count + True + True + voice_dummy_count_adj + 3 diff --git a/discover_overlay/settings_window.py b/discover_overlay/settings_window.py index 2882123..ae46de0 100644 --- a/discover_overlay/settings_window.py +++ b/discover_overlay/settings_window.py @@ -102,10 +102,13 @@ class MainSettingsWindow(): # Larger fonts needed css = Gtk.CssProvider.new() - css.load_from_data(bytes("* { font-size:20px; }", "utf-8")) + css.load_from_data(bytes("* { font-size:18px; }", "utf-8")) window.get_style_context().add_provider( css, Gtk.STYLE_PROVIDER_PRIORITY_USER) + # Space is premium. Sorry Craig + self.widget['voice_advanced_grid'].set_column_homogeneous(False) + screen = window.get_screen() screen_type = "%s" % (screen) self.is_wayland = False