Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
pkgname=discover-overlay-git
pkgver=0.7.9
pkgrel=1
pkgdesc="Voice chat overlay"
arch=('any')
url="https://github.com/trigg/Discover"
license=('GPL3')
depends=('python' 'python-gobject' 'python-requests' 'python-pillow' 'python-xlib')
makedepends=('python-setuptools')

package() {
cd "$startdir"
python setup.py install --root="$pkgdir" --optimize=1
}
3 changes: 2 additions & 1 deletion discover_overlay/discord_connector.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ def on_message(self, message):
elif j["cmd"] == "AUTHENTICATE":
if j["evt"] == "ERROR":
self.access_token = None
self.discover.config_set("cache", "access_token", "")
self.get_access_token_stage1()
return
else:
Expand Down Expand Up @@ -793,7 +794,7 @@ def schedule_reconnect(self):
"""Set a timer to attempt reconnection"""
if self.reconnect_cb is None:
log.info("Scheduled a reconnect")
self.reconnect_cb = GLib.timeout_add_seconds(60, self.connect)
self.reconnect_cb = GLib.timeout_add_seconds(3, self.connect)
else:
log.error("Reconnect already scheduled")

Expand Down
18 changes: 11 additions & 7 deletions discover_overlay/discover_overlay.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,21 +178,21 @@ def config_changed(self, _a=None, _b=None, _c=None, _d=None):
self.voice_overlay.set_align_y(
config.getint("main", "topalign", fallback=1))
self.voice_overlay.set_bg(json.loads(config.get(
"main", "bg_col", fallback="[0.0,0.0,0.0,0.5]")))
"main", "bg_col", fallback="[0.153, 0.153, 0.165, 1.0]")))
self.voice_overlay.set_fg(json.loads(config.get(
"main", "fg_col", fallback="[1.0,1.0,1.0,1.0]")))
"main", "fg_col", fallback="[0.63, 0.63, 0.67, 1.0]")))
self.voice_overlay.set_fg_hi(json.loads(config.get(
"main", "fg_hi_col", fallback="[1.0,1.0,1.0,1.0]")))
self.voice_overlay.set_tk(json.loads(config.get(
"main", "tk_col", fallback="[0.0,0.7,0.0,1.0]")))
"main", "tk_col", fallback="[0.13, 0.77, 0.37, 1.0]")))
self.voice_overlay.set_mt(json.loads(config.get(
"main", "mt_col", fallback="[0.6,0.0,0.0,1.0]")))
self.voice_overlay.set_mute_bg(json.loads(config.get(
"main", "mt_bg_col", fallback="[0.0,0.0,0.0,0.5]")))
"main", "mt_bg_col", fallback="[0.0, 0.0, 0.0, 0.8]")))
self.voice_overlay.set_hi(json.loads(config.get(
"main", "hi_col", fallback="[0.0,0.0,0.0,0.5]")))
"main", "hi_col", fallback="[0.153, 0.153, 0.165, 1.0]")))
self.voice_overlay.set_bo(json.loads(config.get(
"main", "bo_col", fallback="[0.0,0.0,0.0,0.0]")))
"main", "bo_col", fallback="[0.63, 0.63, 0.67, 1.0]")))
self.voice_overlay.set_avatar_bg_col(json.loads(config.get(
"main", "avatar_bg_col", fallback="[0.0,0.0,0.0,0.0]")))
self.voice_overlay.set_avatar_size(
Expand All @@ -208,7 +208,11 @@ def config_changed(self, _a=None, _b=None, _c=None, _d=None):
font = config.get("main", "font", fallback=None)
title_font = config.get("main", "title_font", fallback=None)
self.voice_overlay.set_square_avatar(config.getboolean(
"main", "square_avatar", fallback=True))
"main", "square_avatar", fallback=False))
self.voice_overlay.set_rounded_names(config.getboolean(
"main", "rounded_names", fallback=True))
self.voice_overlay.set_separate_names(config.getboolean(
"main", "separate_names", fallback=False))
self.voice_overlay.set_only_speaking(config.getboolean(
"main", "only_speaking", fallback=False))
self.voice_overlay.set_only_speaking_grace_period(config.getint(
Expand Down
56 changes: 55 additions & 1 deletion discover_overlay/glade/settings.glade
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,60 @@
<property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_rounded_names_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Rounded Names</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="GtkCheckButton">
<property name="name">voice_rounded_names</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_rounded_names_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_separate_names_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Separate Names</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="GtkCheckButton">
<property name="name">voice_separate_names</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_separate_names_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">10</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="name">voice_show_test_content_label</property>
Expand Down Expand Up @@ -1276,7 +1330,7 @@
<property name="name">voice_avatar_opacity_label</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Avatar Opacity</property>
<property name="label" translatable="yes">Opacity</property>
<property name="xalign">0</property>
</object>
<packing>
Expand Down
37 changes: 29 additions & 8 deletions discover_overlay/settings_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -507,25 +507,25 @@ def read_config(self):
"main", "fg_hi_col", fallback="[1.0,1.0,1.0,1.0]")))

self.widget['voice_talking_background'].set_rgba(self.make_colour(config.get(
"main", "hi_col", fallback="[0.0,0.0,0.0,0.5]")))
"main", "hi_col", fallback="[0.153,0.153,0.165,1.0]")))

self.widget['voice_talking_border'].set_rgba(self.make_colour(config.get(
"main", "tk_col", fallback="[0.0,0.7,0.0,1.0]")))
"main", "tk_col", fallback="[0.13, 0.77, 0.37, 1.0]")))

self.widget['voice_idle_foreground'].set_rgba(self.make_colour(config.get(
"main", "fg_col", fallback="[1.0,1.0,1.0,1.0]")))
"main", "fg_col", fallback="[0.63,0.63,0.67,1.0]")))

self.widget['voice_idle_background'].set_rgba(self.make_colour(config.get(
"main", "bg_col", fallback="[0.0,0.0,0.0,0.5]")))
"main", "bg_col", fallback="[0.153,0.153,0.165,1.0]")))

self.widget['voice_idle_border'].set_rgba(self.make_colour(config.get(
"main", "bo_col", fallback="[0.0,0.0,0.0,0.0]")))
"main", "bo_col", fallback="[0.63,0.63,0.67,1.0]")))

self.widget['voice_mute_foreground'].set_rgba(self.make_colour(config.get(
"main", "mt_col", fallback="[0.6,0.0,0.0,1.0]")))

self.widget['voice_mute_background'].set_rgba(self.make_colour(config.get(
"main", "mt_bg_col", fallback="[0.0,0.0,0.0,0.5]")))
"main", "mt_bg_col", fallback="[0.0,0.0,0.0,0.8]")))

self.widget['voice_avatar_background'].set_rgba(self.make_colour(config.get(
"main", "avatar_bg_col", fallback="[0.0,0.0,0.0,0.0]")))
Expand All @@ -544,7 +544,12 @@ def read_config(self):
self.voice_show_name_hide_others(show_name)

self.widget['voice_square_avatar'].set_active(config.getboolean(
"main", "square_avatar", fallback=True))
"main", "square_avatar", fallback=False))

self.widget['voice_rounded_names'].set_active(config.getboolean(
"main", "rounded_names", fallback=True))
self.widget['voice_separate_names'].set_active(config.getboolean(
"main", "separate_names", fallback=False))

self.widget['voice_fancy_avatar_shapes'].set_active(
config.getboolean("main", "fancy_border", fallback=True))
Expand Down Expand Up @@ -1126,7 +1131,19 @@ def voice_display_icon_only_changed(self, button):
self.voice_show_name_hide_others(button.get_active())

def voice_square_avatar_changed(self, button):
self.config_set("main", "square_avatar", f"{button.get_active()}")
"""Update active setting for config option"""
update = button.get_active()
self.config_set("main", "square_avatar", f"{update}")

def voice_rounded_names_changed(self, button):
"""Update active setting for config option"""
update = button.get_active()
self.config_set("main", "rounded_names", f"{update}")

def voice_separate_names_changed(self, button):
"""Update active setting for config option"""
update = button.get_active()
self.config_set("main", "separate_names", f"{update}")

def voice_fancy_avatar_shapes_changed(self, button):
self.config_set("main", "fancy_border", f"{button.get_active()}")
Expand Down Expand Up @@ -1163,12 +1180,16 @@ def voice_show_name_hide_others(self, val):
self.widget['voice_text_padding'].set_sensitive(True)
self.widget['voice_text_vertical_offset'].set_sensitive(True)
self.widget['voice_nick_length'].set_sensitive(True)
self.widget['voice_rounded_names'].set_sensitive(True)
self.widget['voice_separate_names'].set_sensitive(True)
else:
# Hide name options
self.widget['voice_font'].set_sensitive(False)
self.widget['voice_text_padding'].set_sensitive(False)
self.widget['voice_text_vertical_offset'].set_sensitive(False)
self.widget['voice_nick_length'].set_sensitive(False)
self.widget['voice_rounded_names'].set_sensitive(False)
self.widget['voice_separate_names'].set_sensitive(False)

def voice_show_avatar_hide_others(self, val):
if val:
Expand Down
Loading