diff --git a/discover_overlay/overlay.py b/discover_overlay/overlay.py index d4905ae..798ef75 100644 --- a/discover_overlay/overlay.py +++ b/discover_overlay/overlay.py @@ -34,11 +34,16 @@ class OverlayWindow(Gtk.Window): def __init__(self): Gtk.Window.__init__(self, type=self.detect_type()) screen = self.get_screen() - self.set_size_request(50, 50) - - self.connect('draw', self.overlay_draw) - self.compositing = False + self.text_font = None + self.text_size = None + self.x = None + self.y = None + self.w = None + self.h = None + + self.set_size_request(50, 50) + self.connect('draw', self.overlay_draw) # Set RGBA screen = self.get_screen() visual = screen.get_rgba_visual() diff --git a/discover_overlay/text_overlay.py b/discover_overlay/text_overlay.py index 389ac5c..b383fbc 100644 --- a/discover_overlay/text_overlay.py +++ b/discover_overlay/text_overlay.py @@ -32,6 +32,9 @@ class TextOverlayWindow(OverlayWindow): self.content = [] self.text_font = None self.text_size = 13 + self.text_time = None + self.show_attach = None + self.popup_style = None # 0, 0, self.text_size, self.text_size) self.pango_rect = Pango.Rectangle() self.pango_rect.width = self.text_size * Pango.SCALE diff --git a/discover_overlay/text_settings.py b/discover_overlay/text_settings.py index f224bcf..2c6fe75 100644 --- a/discover_overlay/text_settings.py +++ b/discover_overlay/text_settings.py @@ -29,9 +29,7 @@ class TextSettingsWindow(SettingsWindow): def __init__(self, overlay): SettingsWindow.__init__(self) self.overlay = overlay - self.set_size_request(400, 200) - self.connect("destroy", self.close_window) - self.connect("delete-event", self.close_window) + self.placement_window = None self.init_config() self.list_channels_keys = [] @@ -40,6 +38,31 @@ class TextSettingsWindow(SettingsWindow): self.list_guilds = {} self.ignore_channel_change = False self.ignore_guild_change = False + self.channel_lookup = None + self.channel_model = None + self.connector = None + self.guild_lookup = None + self.guild_model = None + self.guild_widget = None + self.align_x = None + self.align_y = None + self.monitor = None + self.floating = None + self.channel = None + self.guild = None + self.font = None + self.bg_col = None + self.fg_col = None + self.popup_style = None + self.text_time = None + self.show_attach = None + self.enabled = None + + self.set_size_request(400, 200) + self.connect("destroy", self.close_window) + self.connect("delete-event", self.close_window) + + self.init_config() self.create_gui() def update_channel_model(self): diff --git a/discover_overlay/voice_overlay.py b/discover_overlay/voice_overlay.py index 6ac1b06..3ee6be6 100644 --- a/discover_overlay/voice_overlay.py +++ b/discover_overlay/voice_overlay.py @@ -31,6 +31,10 @@ class VoiceOverlayWindow(OverlayWindow): self.icon_spacing = 8 self.vert_edge_padding = 0 self.horz_edge_padding = 0 + self.only_speaking = None + self.highlight_self = None + self.order = None + self.def_avatar = None self.round_avatar = True self.icon_only = True diff --git a/discover_overlay/voice_settings.py b/discover_overlay/voice_settings.py index abc43f5..23ea1a1 100644 --- a/discover_overlay/voice_settings.py +++ b/discover_overlay/voice_settings.py @@ -31,6 +31,23 @@ class VoiceSettingsWindow(SettingsWindow): self.placement_window = None self.align_x = None self.align_y = None + self.bg_col = None + self.fg_col = None + self.tk_col = None + self.mt_col = None + self.avatar_size = None + self.icon_spacing = None + self.text_padding = None + self.font = None + self.square_avatar = None + self.only_speaking = None + self.highlight_self = None + self.icon_only = None + self.monitor = None + self.vert_edge_padding = None + self.horz_edge_padding = None + self.floating = None + self.order = None self.init_config() self.create_gui()