- Initialised all variables in respective __init__.. even if it gets set instantly elsewhere

This commit is contained in:
trigg 2020-10-19 18:06:39 +00:00
parent 39b1a19e3c
commit fddd68eeb1
5 changed files with 59 additions and 7 deletions

View file

@ -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()

View file

@ -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

View file

@ -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):

View file

@ -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

View file

@ -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()