From 88729253b247641102884d3a72aef8f645c0ae80 Mon Sep 17 00:00:00 2001
From: trigg <triggerhapp@gmail.com>
Date: Tue, 29 Sep 2020 19:18:53 +0100
Subject: [PATCH] - Changed incorrectly named discover config directory -
 Changed discover.png to discover_overlay.png

---
 discover.png => discover_overlay.png | Bin
 discover_overlay/discover_overlay.py |   6 ++--
 discover_overlay/settings.py         |   4 +--
 setup.py                             |  48 ++++++++++++++-------------
 4 files changed, 30 insertions(+), 28 deletions(-)
 rename discover.png => discover_overlay.png (100%)

diff --git a/discover.png b/discover_overlay.png
similarity index 100%
rename from discover.png
rename to discover_overlay.png
diff --git a/discover_overlay/discover_overlay.py b/discover_overlay/discover_overlay.py
index 9334fcd..61ef774 100755
--- a/discover_overlay/discover_overlay.py
+++ b/discover_overlay/discover_overlay.py
@@ -52,15 +52,15 @@ class Discover:
             gi.require_version('AppIndicator3', '0.1')
             from gi.repository import AppIndicator3
             self.ind = AppIndicator3.Indicator.new(
-                "discover",
-                "discover",
+                "discover_overlay",
+                "discover_overlay",
                 AppIndicator3.IndicatorCategory.APPLICATION_STATUS)
             self.ind.set_status(AppIndicator3.IndicatorStatus.ACTIVE)
             self.ind.set_menu(menu)
         except:
 
             # Create System Tray
-            self.tray = Gtk.StatusIcon.new_from_icon_name("discover")
+            self.tray = Gtk.StatusIcon.new_from_icon_name("discover_overlay")
             self.tray.connect('popup-menu', show_menu)
 
     def make_menu(self):
diff --git a/discover_overlay/settings.py b/discover_overlay/settings.py
index 4c405d8..cf5f2df 100644
--- a/discover_overlay/settings.py
+++ b/discover_overlay/settings.py
@@ -16,9 +16,9 @@ except ModuleNotFoundError:
 
 class SettingsWindow(Gtk.Window):
     def init_config(self):
-        self.configDir = os.path.join(xdg_config_home, "discover")
+        self.configDir = os.path.join(xdg_config_home, "discover_overlay")
         os.makedirs(self.configDir, exist_ok=True)
-        self.configFile = os.path.join(self.configDir, "discover.ini")
+        self.configFile = os.path.join(self.configDir, "config.ini")
         self.read_config()
 
     def close_window(self, a=None, b=None):
diff --git a/setup.py b/setup.py
index 213856b..311f464 100644
--- a/setup.py
+++ b/setup.py
@@ -1,34 +1,36 @@
 from setuptools import setup, find_packages
 
+
 def readme():
-    return open('README.md','r').read()
+    return open('README.md', 'r').read()
+
 
 setup(
-    name = 'discover-overlay',
-    author = 'trigg',
-    author_email = '',
-    version = '0.1.1',
-    description= 'Voice chat overlay',
-    long_description = readme(),
-    long_description_content_type = 'text/markdown',
-    url = 'https://github.com/trigg/Discover',
-    packages = find_packages(),
-    include_package_data = True,
-    data_files = [
-        ('share/icons', ['discover.png'])
-        ],
-    install_requires = [
+    name='discover-overlay',
+    author='trigg',
+    author_email='',
+    version='0.1.1',
+    description='Voice chat overlay',
+    long_description=readme(),
+    long_description_content_type='text/markdown',
+    url='https://github.com/trigg/Discover',
+    packages=find_packages(),
+    include_package_data=True,
+    data_files=[
+        ('share/icons', ['discover_overlay.png'])
+    ],
+    install_requires=[
         'PyGObject>=3.22',
         'websocket-client',
         'pyxdg',
         'requests',
-        ],
-    entry_points = {
+    ],
+    entry_points={
         'console_scripts': [
             'discover-overlay = discover_overlay.discover_overlay:entrypoint',
-            ]
-        },
-    classifiers = [
+        ]
+    },
+    classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: X11 Applications :: GTK',
         'Intended Audience :: End Users/Desktop',
@@ -37,7 +39,7 @@ setup(
         'Programming Language :: Python :: 3 :: Only',
         'Topic :: Communications :: Chat',
         'Topic :: Communications :: Conferencing',
-        ],
-    keywords = 'discord overlay voice linux',
-    license = 'GPLv3+',
+    ],
+    keywords='discord overlay voice linux',
+    license='GPLv3+',
 )