diff --git a/lbrynet/lbrynet_downloader_gui/DownloaderApp.py b/lbrynet/lbrynet_gui/GuiApp.py
similarity index 98%
rename from lbrynet/lbrynet_downloader_gui/DownloaderApp.py
rename to lbrynet/lbrynet_gui/GuiApp.py
index 95f35d164..8f5081002 100644
--- a/lbrynet/lbrynet_downloader_gui/DownloaderApp.py
+++ b/lbrynet/lbrynet_gui/GuiApp.py
@@ -4,8 +4,8 @@ import sys
import tkFont
import tkMessageBox
import ttk
-from lbrynet.lbrynet_downloader_gui.LBRYDownloader import LBRYDownloader
-from lbrynet.lbrynet_downloader_gui.StreamFrame import StreamFrame
+from lbrynet.lbrynet_gui.LBRYGui import LBRYDownloader
+from lbrynet.lbrynet_gui.StreamFrame import StreamFrame
import locale
import os
from twisted.internet import defer, reactor, tksupport, task
diff --git a/lbrynet/lbrynet_downloader_gui/Ic_arrow_drop_down_48px.svg.LICENSE b/lbrynet/lbrynet_gui/Ic_arrow_drop_down_48px.svg.LICENSE
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/Ic_arrow_drop_down_48px.svg.LICENSE
rename to lbrynet/lbrynet_gui/Ic_arrow_drop_down_48px.svg.LICENSE
diff --git a/lbrynet/lbrynet_downloader_gui/LBRYDownloader.py b/lbrynet/lbrynet_gui/LBRYGui.py
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/LBRYDownloader.py
rename to lbrynet/lbrynet_gui/LBRYGui.py
diff --git a/lbrynet/lbrynet_downloader_gui/StreamFrame.py b/lbrynet/lbrynet_gui/StreamFrame.py
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/StreamFrame.py
rename to lbrynet/lbrynet_gui/StreamFrame.py
diff --git a/lbrynet/lbrynet_downloader_gui/__init__.py b/lbrynet/lbrynet_gui/__init__.py
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/__init__.py
rename to lbrynet/lbrynet_gui/__init__.py
diff --git a/lbrynet/lbrynet_downloader_gui/close.gif b/lbrynet/lbrynet_gui/close.gif
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/close.gif
rename to lbrynet/lbrynet_gui/close.gif
diff --git a/lbrynet/lbrynet_downloader_gui/close1.png b/lbrynet/lbrynet_gui/close1.png
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/close1.png
rename to lbrynet/lbrynet_gui/close1.png
diff --git a/lbrynet/lbrynet_downloader_gui/close2.gif b/lbrynet/lbrynet_gui/close2.gif
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/close2.gif
rename to lbrynet/lbrynet_gui/close2.gif
diff --git a/lbrynet/lbrynet_downloader_gui/drop_down.gif b/lbrynet/lbrynet_gui/drop_down.gif
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/drop_down.gif
rename to lbrynet/lbrynet_gui/drop_down.gif
diff --git a/lbrynet/lbrynet_downloader_gui/downloader.py b/lbrynet/lbrynet_gui/gui.py
similarity index 68%
rename from lbrynet/lbrynet_downloader_gui/downloader.py
rename to lbrynet/lbrynet_gui/gui.py
index 2b8c09825..2457d52ea 100644
--- a/lbrynet/lbrynet_downloader_gui/downloader.py
+++ b/lbrynet/lbrynet_gui/gui.py
@@ -1,25 +1,25 @@
import logging
import sys
-from lbrynet.lbrynet_downloader_gui.DownloaderApp import DownloaderApp
+from lbrynet.lbrynet_gui.GuiApp import DownloaderApp
from twisted.internet import reactor, task
import locale
-def start_downloader():
+def start_gui():
log_format = "(%(asctime)s)[%(filename)s:%(lineno)s] %(funcName)s(): %(message)s"
formatter = logging.Formatter(log_format)
logger = logging.getLogger()
logger.setLevel(logging.DEBUG)
- file_handler = logging.FileHandler("downloader.log")
+ file_handler = logging.FileHandler("gui.log")
file_handler.setFormatter(formatter)
file_handler.addFilter(logging.Filter("lbrynet"))
logger.addHandler(file_handler)
- sys.stdout = open("downloader.out.log", 'w')
- sys.stderr = open("downloader.err.log", 'w')
+ sys.stdout = open("gui.out.log", 'w')
+ sys.stderr = open("gui.err.log", 'w')
locale.setlocale(locale.LC_ALL, '')
@@ -30,4 +30,4 @@ def start_downloader():
reactor.run()
if __name__ == "__main__":
- start_downloader()
\ No newline at end of file
+ start_gui()
\ No newline at end of file
diff --git a/lbrynet/lbrynet_downloader_gui/hide_options.gif b/lbrynet/lbrynet_gui/hide_options.gif
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/hide_options.gif
rename to lbrynet/lbrynet_gui/hide_options.gif
diff --git a/lbrynet/lbrynet_downloader_gui/lbry-dark-242x80.gif b/lbrynet/lbrynet_gui/lbry-dark-242x80.gif
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/lbry-dark-242x80.gif
rename to lbrynet/lbrynet_gui/lbry-dark-242x80.gif
diff --git a/lbrynet/lbrynet_downloader_gui/lbry-dark-icon.ico b/lbrynet/lbrynet_gui/lbry-dark-icon.ico
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/lbry-dark-icon.ico
rename to lbrynet/lbrynet_gui/lbry-dark-icon.ico
diff --git a/lbrynet/lbrynet_downloader_gui/lbry-dark-icon.xbm b/lbrynet/lbrynet_gui/lbry-dark-icon.xbm
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/lbry-dark-icon.xbm
rename to lbrynet/lbrynet_gui/lbry-dark-icon.xbm
diff --git a/lbrynet/lbrynet_downloader_gui/lbry.conf b/lbrynet/lbrynet_gui/lbry.conf
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/lbry.conf
rename to lbrynet/lbrynet_gui/lbry.conf
diff --git a/lbrynet/lbrynet_downloader_gui/show_options.gif b/lbrynet/lbrynet_gui/show_options.gif
similarity index 100%
rename from lbrynet/lbrynet_downloader_gui/show_options.gif
rename to lbrynet/lbrynet_gui/show_options.gif
diff --git a/setup.py b/setup.py
index 7fba58ea6..10ffb16cc 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ setup(name='lbrynet',
'lbrynet-launch-node = lbrynet.dht.node:main',
'lbrynet-launch-rpc-node = lbrynet.rpc_node:main',
'lbrynet-rpc-node-cli = lbrynet.node_rpc_cli:main',
- 'lbrynet-gui = lbrynet.lbrynet_downloader_gui.downloader:start_downloader',
+ 'lbrynet-gui = lbrynet.lbrynet_gui.gui:start_gui',
'lbrynet-lookup-hosts-for-hash = lbrynet.dht_scripts:get_hosts_for_hash_in_dht',
'lbrynet-announce_hash_to_dht = lbrynet.dht_scripts:announce_hash_to_dht',
]
@@ -29,15 +29,15 @@ setup(name='lbrynet',
'lbrynet/lbrynet_console/plugins/blindrepeater.yapsy-plugin',
]
),
- ('lbrynet/lbrynet_downloader_gui',
+ ('lbrynet/lbrynet_gui',
[
- 'lbrynet/lbrynet_downloader_gui/close2.gif',
- 'lbrynet/lbrynet_downloader_gui/lbry-dark-242x80.gif',
- 'lbrynet/lbrynet_downloader_gui/lbry-dark-icon.xbm',
- 'lbrynet/lbrynet_downloader_gui/lbry-dark-icon.ico',
- 'lbrynet/lbrynet_downloader_gui/drop_down.gif',
- 'lbrynet/lbrynet_downloader_gui/show_options.gif',
- 'lbrynet/lbrynet_downloader_gui/hide_options.gif',
+ 'lbrynet/lbrynet_gui/close2.gif',
+ 'lbrynet/lbrynet_gui/lbry-dark-242x80.gif',
+ 'lbrynet/lbrynet_gui/lbry-dark-icon.xbm',
+ 'lbrynet/lbrynet_gui/lbry-dark-icon.ico',
+ 'lbrynet/lbrynet_gui/drop_down.gif',
+ 'lbrynet/lbrynet_gui/show_options.gif',
+ 'lbrynet/lbrynet_gui/hide_options.gif',
]
)
]