From 0b89cc1e47b6916c96fe6a942362b8e1284b9c79 Mon Sep 17 00:00:00 2001 From: Trilarion Date: Wed, 7 Dec 2016 22:48:14 +0100 Subject: [PATCH] more packaging for pypi --- documentation/development/source/base.rst | 46 ----------- documentation/development/source/client.rst | 78 ------------------ .../source/imperialism_remake.base.rst | 46 +++++++++++ .../source/imperialism_remake.client.rst | 78 ++++++++++++++++++ .../source/imperialism_remake.lib.rst | 46 +++++++++++ .../development/source/imperialism_remake.rst | 37 ++++++++- .../source/imperialism_remake.server.rst | 30 +++++++ documentation/development/source/lib.rst | 46 ----------- documentation/development/source/modules.rst | 5 -- documentation/development/source/server.rst | 30 ------- documentation/development/source/version.rst | 7 -- setup.py | 2 +- source/imperialism_remake/base/constants.py | 8 +- source/imperialism_remake/base/network.py | 6 +- source/imperialism_remake/base/tools.py | 16 ++-- source/imperialism_remake/client/audio.py | 4 +- source/imperialism_remake/client/client.py | 32 +++---- source/imperialism_remake/client/editor.py | 8 +- source/imperialism_remake/client/game.py | 4 +- source/imperialism_remake/client/graphics.py | 4 +- source/imperialism_remake/client/lobby.py | 14 ++-- .../imperialism_remake/client/preferences.py | 8 +- .../client/server_monitor.py | 8 +- .../data}/artwork/graphics/map/city.png | Bin .../data}/artwork/graphics/map/licenses.info | 0 .../data}/artwork/graphics/ui/icon.add.png | Bin .../graphics/ui/icon.back_to_startscreen.png | Bin .../artwork/graphics/ui/icon.backward.png | Bin .../data}/artwork/graphics/ui/icon.close.png | Bin .../artwork/graphics/ui/icon.confirm.png | Bin .../data}/artwork/graphics/ui/icon.delete.png | Bin .../data}/artwork/graphics/ui/icon.edit.png | Bin .../ui/icon.editor.change_terrain.png | Bin .../graphics/ui/icon.editor.general.png | Bin .../graphics/ui/icon.editor.nation_info.png | Bin .../graphics/ui/icon.editor.nations.png | Bin .../graphics/ui/icon.editor.province_info.png | Bin .../graphics/ui/icon.editor.provinces.png | Bin .../artwork/graphics/ui/icon.forward.png | Bin .../data}/artwork/graphics/ui/icon.help.png | Bin .../data}/artwork/graphics/ui/icon.home.png | Bin .../ui/icon.lobby.multiplayer-game.png | Bin .../graphics/ui/icon.lobby.network.png | Bin .../graphics/ui/icon.lobby.single.load.png | Bin .../graphics/ui/icon.lobby.single.new.png | Bin .../graphics/ui/icon.mini.geographical.png | Bin .../graphics/ui/icon.mini.political.png | Bin .../graphics/ui/icon.preferences.general.png | Bin .../graphics/ui/icon.preferences.graphics.png | Bin .../graphics/ui/icon.preferences.music.png | Bin .../graphics/ui/icon.preferences.network.png | Bin .../graphics/ui/icon.preferences.reset.png | Bin .../graphics/ui/icon.scenario.load.png | Bin .../artwork/graphics/ui/icon.scenario.new.png | Bin .../graphics/ui/icon.scenario.save.png | Bin .../data}/artwork/graphics/ui/licenses.info | 0 .../data}/artwork/graphics/ui/loading.gif | Bin .../artwork/graphics/ui/start.background.jpg | Bin .../graphics/ui/start.overlay.door.right.png | Bin .../graphics/ui/start.overlay.fireplace.png | Bin .../artwork/graphics/ui/start.overlay.info | 0 .../artwork/graphics/ui/start.overlay.map.png | Bin .../graphics/ui/start.overlay.throne.png | Bin .../graphics/ui/start.overlay.window.left.png | Bin .../data}/artwork/graphics/ui/style.css | 0 .../data}/artwork/graphics/ui/window.icon.ico | Bin .../music/soundtrack/01 Imperialism Theme.ogg | Bin .../music/soundtrack/02 Silent Ashes.ogg | Bin .../artwork/music/soundtrack/licenses.info | 0 .../artwork/music/soundtrack/soundtrack.info | 0 .../data}/scenarios/client/standard.config | 0 .../data}/scenarios/core/Europe1814.scenario | Bin .../data}/scenarios/rules/standard.rules | 0 source/imperialism_remake/server/scenario.py | 4 +- source/imperialism_remake/server/server.py | 18 ++-- .../{imperialism_remake.py => start.py} | 21 +++-- tools/build_documentation.py | 11 +-- 77 files changed, 317 insertions(+), 300 deletions(-) delete mode 100644 documentation/development/source/base.rst delete mode 100644 documentation/development/source/client.rst create mode 100644 documentation/development/source/imperialism_remake.base.rst create mode 100644 documentation/development/source/imperialism_remake.client.rst create mode 100644 documentation/development/source/imperialism_remake.lib.rst create mode 100644 documentation/development/source/imperialism_remake.server.rst delete mode 100644 documentation/development/source/lib.rst delete mode 100644 documentation/development/source/server.rst delete mode 100644 documentation/development/source/version.rst rename {data => source/imperialism_remake/data}/artwork/graphics/map/city.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/map/licenses.info (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.add.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.back_to_startscreen.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.backward.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.close.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.confirm.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.delete.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.edit.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.editor.change_terrain.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.editor.general.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.editor.nation_info.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.editor.nations.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.editor.province_info.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.editor.provinces.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.forward.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.help.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.home.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.lobby.multiplayer-game.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.lobby.network.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.lobby.single.load.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.lobby.single.new.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.mini.geographical.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.mini.political.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.preferences.general.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.preferences.graphics.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.preferences.music.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.preferences.network.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.preferences.reset.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.scenario.load.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.scenario.new.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/icon.scenario.save.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/licenses.info (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/loading.gif (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/start.background.jpg (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/start.overlay.door.right.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/start.overlay.fireplace.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/start.overlay.info (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/start.overlay.map.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/start.overlay.throne.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/start.overlay.window.left.png (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/style.css (100%) rename {data => source/imperialism_remake/data}/artwork/graphics/ui/window.icon.ico (100%) rename {data => source/imperialism_remake/data}/artwork/music/soundtrack/01 Imperialism Theme.ogg (100%) rename {data => source/imperialism_remake/data}/artwork/music/soundtrack/02 Silent Ashes.ogg (100%) rename {data => source/imperialism_remake/data}/artwork/music/soundtrack/licenses.info (100%) rename {data => source/imperialism_remake/data}/artwork/music/soundtrack/soundtrack.info (100%) rename {data => source/imperialism_remake/data}/scenarios/client/standard.config (100%) rename {data => source/imperialism_remake/data}/scenarios/core/Europe1814.scenario (100%) rename {data => source/imperialism_remake/data}/scenarios/rules/standard.rules (100%) rename source/imperialism_remake/{imperialism_remake.py => start.py} (88%) diff --git a/documentation/development/source/base.rst b/documentation/development/source/base.rst deleted file mode 100644 index e03520d..0000000 --- a/documentation/development/source/base.rst +++ /dev/null @@ -1,46 +0,0 @@ -base package -============ - -Submodules ----------- - -base.constants module ---------------------- - -.. automodule:: base.constants - :members: - :undoc-members: - :show-inheritance: - -base.network module -------------------- - -.. automodule:: base.network - :members: - :undoc-members: - :show-inheritance: - -base.switches module --------------------- - -.. automodule:: base.switches - :members: - :undoc-members: - :show-inheritance: - -base.tools module ------------------ - -.. automodule:: base.tools - :members: - :undoc-members: - :show-inheritance: - - -Module contents ---------------- - -.. automodule:: base - :members: - :undoc-members: - :show-inheritance: diff --git a/documentation/development/source/client.rst b/documentation/development/source/client.rst deleted file mode 100644 index 82cdfb7..0000000 --- a/documentation/development/source/client.rst +++ /dev/null @@ -1,78 +0,0 @@ -client package -============== - -Submodules ----------- - -client.audio module -------------------- - -.. automodule:: client.audio - :members: - :undoc-members: - :show-inheritance: - -client.client module --------------------- - -.. automodule:: client.client - :members: - :undoc-members: - :show-inheritance: - -client.editor module --------------------- - -.. automodule:: client.editor - :members: - :undoc-members: - :show-inheritance: - -client.graphics module ----------------------- - -.. automodule:: client.graphics - :members: - :undoc-members: - :show-inheritance: - -client.lobby module -------------------- - -.. automodule:: client.lobby - :members: - :undoc-members: - :show-inheritance: - -client.main_screen module -------------------------- - -.. automodule:: client.main_screen - :members: - :undoc-members: - :show-inheritance: - -client.preferences module -------------------------- - -.. automodule:: client.preferences - :members: - :undoc-members: - :show-inheritance: - -client.server_monitor module ----------------------------- - -.. automodule:: client.server_monitor - :members: - :undoc-members: - :show-inheritance: - - -Module contents ---------------- - -.. automodule:: client - :members: - :undoc-members: - :show-inheritance: diff --git a/documentation/development/source/imperialism_remake.base.rst b/documentation/development/source/imperialism_remake.base.rst new file mode 100644 index 0000000..cd15c58 --- /dev/null +++ b/documentation/development/source/imperialism_remake.base.rst @@ -0,0 +1,46 @@ +imperialism_remake.base package +=============================== + +Submodules +---------- + +imperialism_remake.base.constants module +---------------------------------------- + +.. automodule:: imperialism_remake.base.constants + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.base.network module +-------------------------------------- + +.. automodule:: imperialism_remake.base.network + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.base.switches module +--------------------------------------- + +.. automodule:: imperialism_remake.base.switches + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.base.tools module +------------------------------------ + +.. automodule:: imperialism_remake.base.tools + :members: + :undoc-members: + :show-inheritance: + + +Module contents +--------------- + +.. automodule:: imperialism_remake.base + :members: + :undoc-members: + :show-inheritance: diff --git a/documentation/development/source/imperialism_remake.client.rst b/documentation/development/source/imperialism_remake.client.rst new file mode 100644 index 0000000..ffbb4eb --- /dev/null +++ b/documentation/development/source/imperialism_remake.client.rst @@ -0,0 +1,78 @@ +imperialism_remake.client package +================================= + +Submodules +---------- + +imperialism_remake.client.audio module +-------------------------------------- + +.. automodule:: imperialism_remake.client.audio + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.client.client module +--------------------------------------- + +.. automodule:: imperialism_remake.client.client + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.client.editor module +--------------------------------------- + +.. automodule:: imperialism_remake.client.editor + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.client.game module +------------------------------------- + +.. automodule:: imperialism_remake.client.game + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.client.graphics module +----------------------------------------- + +.. automodule:: imperialism_remake.client.graphics + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.client.lobby module +-------------------------------------- + +.. automodule:: imperialism_remake.client.lobby + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.client.preferences module +-------------------------------------------- + +.. automodule:: imperialism_remake.client.preferences + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.client.server_monitor module +----------------------------------------------- + +.. automodule:: imperialism_remake.client.server_monitor + :members: + :undoc-members: + :show-inheritance: + + +Module contents +--------------- + +.. automodule:: imperialism_remake.client + :members: + :undoc-members: + :show-inheritance: diff --git a/documentation/development/source/imperialism_remake.lib.rst b/documentation/development/source/imperialism_remake.lib.rst new file mode 100644 index 0000000..7dff4eb --- /dev/null +++ b/documentation/development/source/imperialism_remake.lib.rst @@ -0,0 +1,46 @@ +imperialism_remake.lib package +============================== + +Submodules +---------- + +imperialism_remake.lib.network module +------------------------------------- + +.. automodule:: imperialism_remake.lib.network + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.lib.qt module +-------------------------------- + +.. automodule:: imperialism_remake.lib.qt + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.lib.qt_webengine module +------------------------------------------ + +.. automodule:: imperialism_remake.lib.qt_webengine + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.lib.utils module +----------------------------------- + +.. automodule:: imperialism_remake.lib.utils + :members: + :undoc-members: + :show-inheritance: + + +Module contents +--------------- + +.. automodule:: imperialism_remake.lib + :members: + :undoc-members: + :show-inheritance: diff --git a/documentation/development/source/imperialism_remake.rst b/documentation/development/source/imperialism_remake.rst index 5070095..a753688 100644 --- a/documentation/development/source/imperialism_remake.rst +++ b/documentation/development/source/imperialism_remake.rst @@ -1,5 +1,38 @@ -imperialism_remake module -========================= +imperialism_remake package +========================== + +Subpackages +----------- + +.. toctree:: + + imperialism_remake.base + imperialism_remake.client + imperialism_remake.lib + imperialism_remake.server + +Submodules +---------- + +imperialism_remake.start module +------------------------------- + +.. automodule:: imperialism_remake.start + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.version module +--------------------------------- + +.. automodule:: imperialism_remake.version + :members: + :undoc-members: + :show-inheritance: + + +Module contents +--------------- .. automodule:: imperialism_remake :members: diff --git a/documentation/development/source/imperialism_remake.server.rst b/documentation/development/source/imperialism_remake.server.rst new file mode 100644 index 0000000..7ebc9c3 --- /dev/null +++ b/documentation/development/source/imperialism_remake.server.rst @@ -0,0 +1,30 @@ +imperialism_remake.server package +================================= + +Submodules +---------- + +imperialism_remake.server.scenario module +----------------------------------------- + +.. automodule:: imperialism_remake.server.scenario + :members: + :undoc-members: + :show-inheritance: + +imperialism_remake.server.server module +--------------------------------------- + +.. automodule:: imperialism_remake.server.server + :members: + :undoc-members: + :show-inheritance: + + +Module contents +--------------- + +.. automodule:: imperialism_remake.server + :members: + :undoc-members: + :show-inheritance: diff --git a/documentation/development/source/lib.rst b/documentation/development/source/lib.rst deleted file mode 100644 index 997c7f9..0000000 --- a/documentation/development/source/lib.rst +++ /dev/null @@ -1,46 +0,0 @@ -lib package -=========== - -Submodules ----------- - -lib.network module ------------------- - -.. automodule:: lib.network - :members: - :undoc-members: - :show-inheritance: - -lib.qt module -------------- - -.. automodule:: lib.qt - :members: - :undoc-members: - :show-inheritance: - -lib.qt_webengine module ------------------------ - -.. automodule:: lib.qt_webengine - :members: - :undoc-members: - :show-inheritance: - -lib.utils module ----------------- - -.. automodule:: lib.utils - :members: - :undoc-members: - :show-inheritance: - - -Module contents ---------------- - -.. automodule:: lib - :members: - :undoc-members: - :show-inheritance: diff --git a/documentation/development/source/modules.rst b/documentation/development/source/modules.rst index 81bb3c3..b1f2270 100644 --- a/documentation/development/source/modules.rst +++ b/documentation/development/source/modules.rst @@ -4,9 +4,4 @@ source .. toctree:: :maxdepth: 4 - base - client imperialism_remake - lib - server - version diff --git a/documentation/development/source/server.rst b/documentation/development/source/server.rst deleted file mode 100644 index 72b9c4b..0000000 --- a/documentation/development/source/server.rst +++ /dev/null @@ -1,30 +0,0 @@ -server package -============== - -Submodules ----------- - -server.scenario module ----------------------- - -.. automodule:: server.scenario - :members: - :undoc-members: - :show-inheritance: - -server.server module --------------------- - -.. automodule:: server.server - :members: - :undoc-members: - :show-inheritance: - - -Module contents ---------------- - -.. automodule:: server - :members: - :undoc-members: - :show-inheritance: diff --git a/documentation/development/source/version.rst b/documentation/development/source/version.rst deleted file mode 100644 index 6dcf30a..0000000 --- a/documentation/development/source/version.rst +++ /dev/null @@ -1,7 +0,0 @@ -version module -============== - -.. automodule:: version - :members: - :undoc-members: - :show-inheritance: diff --git a/setup.py b/setup.py index 588b4c0..c32e354 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def get_data_files2(): package_dir={'':'source'}, packages=find_packages(where=os.path.join(HERE, 'source')), install_requires=['PyYAML>=3.1', 'PyQt5>=5.6'], - #data_files=get_data_files(), + data_files=get_data_files(), package_data={'imperialism_remake': 'data'}, entry_points={'console_scripts': ['imperialism_remake_start=imperialism_remake.imperialism_remake:main']}, zip_safe=False) diff --git a/source/imperialism_remake/base/constants.py b/source/imperialism_remake/base/constants.py index e302f3a..e943682 100644 --- a/source/imperialism_remake/base/constants.py +++ b/source/imperialism_remake/base/constants.py @@ -23,7 +23,7 @@ from enum import unique from base import switches -from lib import utils +from imperialism_remake.lib import utils def extend(path, *parts): @@ -97,17 +97,15 @@ class Option(utils.AutoNumberedEnum): SOUNDTRACK_MUTE = () # bool SOUNDTRACK_VOLUME = () # int from 0 to 100 - def __init__(self): - self.default = None - - Options = list(Option) #: default values for the Options Option.LOCALSERVER_OPEN.default = False Option.LOCALSERVER_NAME.default = 'Alice' Option.LOCALCLIENT_NAME.default = 'Bob' +Option.MAINWINDOW_BOUNDS.default = None # no bounds Option.MAINWINDOW_FULLSCREEN.default = True # we start full screen (can be unset by the program for some linux desktop environments +Option.MAINWINDOW_FULLSCREEN_SUPPORTED.default = True # we assume it is until we detect it isn't Option.SOUNDTRACK_MUTE.default = False Option.SOUNDTRACK_VOLUME.default = 50 diff --git a/source/imperialism_remake/base/network.py b/source/imperialism_remake/base/network.py index 9da3ea0..f3c9a76 100644 --- a/source/imperialism_remake/base/network.py +++ b/source/imperialism_remake/base/network.py @@ -22,11 +22,11 @@ import PyQt5.QtCore as QtCore import PyQt5.QtNetwork as QtNetwork -from base import constants -import lib.network +from imperialism_remake.base import constants +import imperialism_remake.lib.network as lib_network -class NetworkClient(lib.network.ExtendedTcpSocket): +class NetworkClient(lib_network.ExtendedTcpSocket): """ Extending the Client class (wrapper around QTcpSocket sending and receiving messages) with channels (see Channel) and processing logic, as well as further wrapping the messages (specifying the channel as address). diff --git a/source/imperialism_remake/base/tools.py b/source/imperialism_remake/base/tools.py index 50fad03..568bccd 100644 --- a/source/imperialism_remake/base/tools.py +++ b/source/imperialism_remake/base/tools.py @@ -20,12 +20,10 @@ """ import sys - -import PyQt5.QtCore as QtCore import PyQt5.QtGui as QtGui -import base.constants as constants -import lib.utils as utils +import imperialism_remake.base.constants as constants +import imperialism_remake.lib.utils as utils def load_ui_icon(name): @@ -96,14 +94,14 @@ def load_options(file_name): options = {} # delete entries that are not in Constants.Options - for option in options.keys(): - if option not in constants.Options: - del options[option] + remove = [o for o in options.keys() if o not in constants.Options] + for o in remove: + del options[o] # copy values that are in Constants.Options but not here for option in constants.Options: - if option not in options: - options[option] = option.default + if option not in options and hasattr(option, 'default'): + options[option] = option.default def get_option(option): """ diff --git a/source/imperialism_remake/client/audio.py b/source/imperialism_remake/client/audio.py index 10d0bb9..4109a19 100644 --- a/source/imperialism_remake/client/audio.py +++ b/source/imperialism_remake/client/audio.py @@ -23,8 +23,8 @@ import PyQt5.QtMultimedia as QtMultimedia -from base import constants -from lib import utils, qt +from imperialism_remake.base import constants +from imperialism_remake.lib import utils, qt soundtrack_player = None soundtrack_playlist = None diff --git a/source/imperialism_remake/client/client.py b/source/imperialism_remake/client/client.py index b613f38..05824d9 100644 --- a/source/imperialism_remake/client/client.py +++ b/source/imperialism_remake/client/client.py @@ -21,23 +21,23 @@ # TODO automatic placement of help dialog depending on if another dialog is open from functools import partial - from PyQt5 import QtCore, QtGui, QtWidgets -from base import constants, tools -import base.network -from client import audio -import client.graphics -from lib import qt, utils -import version + +from imperialism_remake.base import constants, tools +import imperialism_remake.base.network as base_network +from imperialism_remake.client import audio +import imperialism_remake.client.graphics as graphics +from imperialism_remake.lib import qt, utils +import imperialism_remake.version as version # TODO like in audio, set the network client singleton somewhere else -local_network_client = base.network.NetworkClient() +local_network_client = base_network.NetworkClient() -from client.editor import EditorScreen -from client.lobby import GameLobbyWidget -from client.game import GameMainScreen -from client.preferences import PreferencesWidget -from client.server_monitor import ServerMonitorWidget +from imperialism_remake.client.editor import EditorScreen +from imperialism_remake.client.lobby import GameLobbyWidget +from imperialism_remake.client.game import GameMainScreen +from imperialism_remake.client.preferences import PreferencesWidget +from imperialism_remake.client.server_monitor import ServerMonitorWidget class MapItem(QtCore.QObject): @@ -291,7 +291,7 @@ def show_server_monitor(self): Is invoked when pressing F2. """ monitor_widget = ServerMonitorWidget() - dialog = client.graphics.GameDialog(self.main_window, monitor_widget, modal=False, delete_on_close=True, title='Server Monitor', help_callback=self.show_help_browser) + dialog = graphics.GameDialog(self.main_window, monitor_widget, modal=False, delete_on_close=True, title='Server Monitor', help_callback=self.show_help_browser) dialog.setFixedSize(QtCore.QSize(900, 700)) dialog.show() @@ -307,7 +307,7 @@ def show_game_lobby_dialog(self): Shows the game lobby dialog. """ lobby_widget = GameLobbyWidget() - dialog = client.graphics.GameDialog(self.main_window, lobby_widget, delete_on_close=True, title='Game Lobby', help_callback=self.show_help_browser) + dialog = graphics.GameDialog(self.main_window, lobby_widget, delete_on_close=True, title='Game Lobby', help_callback=self.show_help_browser) dialog.setFixedSize(QtCore.QSize(900, 700)) lobby_widget.single_player_start.connect(self.single_player_start) dialog.show() @@ -332,7 +332,7 @@ def show_preferences_dialog(self): Shows the preferences dialog. """ preferences_widget = PreferencesWidget() - dialog = client.graphics.GameDialog(self.main_window, preferences_widget, delete_on_close=True, title='Preferences', + dialog = graphics.GameDialog(self.main_window, preferences_widget, delete_on_close=True, title='Preferences', help_callback=partial(self.show_help_browser, path=constants.DOCUMENTATION_PREFERENCES_FILE), close_callback=preferences_widget.close_request) dialog.setFixedSize(QtCore.QSize(900, 700)) diff --git a/source/imperialism_remake/client/editor.py b/source/imperialism_remake/client/editor.py index e167597..61e3036 100644 --- a/source/imperialism_remake/client/editor.py +++ b/source/imperialism_remake/client/editor.py @@ -27,10 +27,10 @@ import PyQt5.QtGui as QtGui import PyQt5.QtWidgets as QtWidgets -import client.graphics as graphics -from base import constants, tools -from lib import qt, utils -from server.scenario import Scenario +import imperialism_remake.client.graphics as graphics +from imperialism_remake.base import constants, tools +from imperialism_remake.lib import qt, utils +from imperialism_remake.server.scenario import Scenario class MiniMap(QtWidgets.QWidget): diff --git a/source/imperialism_remake/client/game.py b/source/imperialism_remake/client/game.py index 63ff9f1..900dcdd 100644 --- a/source/imperialism_remake/client/game.py +++ b/source/imperialism_remake/client/game.py @@ -20,9 +20,9 @@ import math from PyQt5 import QtWidgets, QtCore -from base import tools, constants -from lib import qt +from imperialism_remake.base import tools, constants +from imperialism_remake.lib import qt # TODO merge with minimap of the editor class MiniMap(QtWidgets.QWidget): diff --git a/source/imperialism_remake/client/graphics.py b/source/imperialism_remake/client/graphics.py index 0603603..c159866 100644 --- a/source/imperialism_remake/client/graphics.py +++ b/source/imperialism_remake/client/graphics.py @@ -22,8 +22,8 @@ from PyQt5 import QtGui, QtCore, QtWidgets -from base import tools -from lib import qt +from imperialism_remake.base import tools +from imperialism_remake.lib import qt class GameDialog(QtWidgets.QWidget): diff --git a/source/imperialism_remake/client/lobby.py b/source/imperialism_remake/client/lobby.py index 95f3433..18fd567 100644 --- a/source/imperialism_remake/client/lobby.py +++ b/source/imperialism_remake/client/lobby.py @@ -24,11 +24,11 @@ import PyQt5.QtGui as QtGui import PyQt5.QtWidgets as QtWidgets -from base import constants, tools -import base.network -import client.graphics as graphics -from lib import qt, utils -from client.client import local_network_client +from imperialism_remake.base import constants, tools +import imperialism_remake.base.network as base_network +import imperialism_remake.client.graphics as graphics +from imperialism_remake.lib import qt, utils +from imperialism_remake.client.client import local_network_client class GameLobbyWidget(QtWidgets.QWidget): @@ -196,7 +196,7 @@ def send_chat_message(self): local_network_client.send(constants.C.CHAT, constants.M.CHAT_MESSAGE, chat_message) self.chat_input_edit.setText('') - def receive_chat_messages(self, client: base.network.NetworkClient, channel: constants.C, action: constants.M, content): + def receive_chat_messages(self, client: base_network.NetworkClient, channel: constants.C, action: constants.M, content): """ Receives a chat message. Adds it to the chat log. @@ -214,7 +214,7 @@ def request_updated_client_list(self): """ local_network_client.send(constants.C.LOBBY, constants.M.LOBBY_CONNECTED_CLIENTS) - def receive_lobby_messages(self, client: base.network.NetworkClient, channel: constants.C, action: constants.M, content): + def receive_lobby_messages(self, client: base_network.NetworkClient, channel: constants.C, action: constants.M, content): """ Handles all received lobby messages. diff --git a/source/imperialism_remake/client/preferences.py b/source/imperialism_remake/client/preferences.py index 184ba53..600b875 100644 --- a/source/imperialism_remake/client/preferences.py +++ b/source/imperialism_remake/client/preferences.py @@ -22,10 +22,10 @@ import PyQt5.QtWidgets as QtWidgets import PyQt5.QtNetwork as QtNetwork -from base import constants, tools -from client import audio -from lib import qt -from client.client import local_network_client +from imperialism_remake.base import constants, tools +from imperialism_remake.client import audio +from imperialism_remake.lib import qt +from imperialism_remake.client.client import local_network_client class PreferencesWidget(QtWidgets.QWidget): diff --git a/source/imperialism_remake/client/server_monitor.py b/source/imperialism_remake/client/server_monitor.py index 495875f..7e03a98 100644 --- a/source/imperialism_remake/client/server_monitor.py +++ b/source/imperialism_remake/client/server_monitor.py @@ -22,9 +22,9 @@ from PyQt5 import QtCore, QtWidgets -from base import constants -import base.network -from client.client import local_network_client +from imperialism_remake.base import constants +import imperialism_remake.base.network as base_network +from imperialism_remake.client.client import local_network_client class ServerMonitorWidget(QtWidgets.QWidget): """ @@ -57,7 +57,7 @@ def request_monitor_update(self): """ local_network_client.send(constants.C.SYSTEM, constants.M.SYSTEM_MONITOR_UPDATE) - def update_monitor(self, client: base.network.NetworkClient, channel: constants.C, action: constants.M, content): + def update_monitor(self, client: base_network.NetworkClient, channel: constants.C, action: constants.M, content): """ Regular updates of the server stats """ diff --git a/data/artwork/graphics/map/city.png b/source/imperialism_remake/data/artwork/graphics/map/city.png similarity index 100% rename from data/artwork/graphics/map/city.png rename to source/imperialism_remake/data/artwork/graphics/map/city.png diff --git a/data/artwork/graphics/map/licenses.info b/source/imperialism_remake/data/artwork/graphics/map/licenses.info similarity index 100% rename from data/artwork/graphics/map/licenses.info rename to source/imperialism_remake/data/artwork/graphics/map/licenses.info diff --git a/data/artwork/graphics/ui/icon.add.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.add.png similarity index 100% rename from data/artwork/graphics/ui/icon.add.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.add.png diff --git a/data/artwork/graphics/ui/icon.back_to_startscreen.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.back_to_startscreen.png similarity index 100% rename from data/artwork/graphics/ui/icon.back_to_startscreen.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.back_to_startscreen.png diff --git a/data/artwork/graphics/ui/icon.backward.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.backward.png similarity index 100% rename from data/artwork/graphics/ui/icon.backward.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.backward.png diff --git a/data/artwork/graphics/ui/icon.close.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.close.png similarity index 100% rename from data/artwork/graphics/ui/icon.close.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.close.png diff --git a/data/artwork/graphics/ui/icon.confirm.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.confirm.png similarity index 100% rename from data/artwork/graphics/ui/icon.confirm.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.confirm.png diff --git a/data/artwork/graphics/ui/icon.delete.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.delete.png similarity index 100% rename from data/artwork/graphics/ui/icon.delete.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.delete.png diff --git a/data/artwork/graphics/ui/icon.edit.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.edit.png similarity index 100% rename from data/artwork/graphics/ui/icon.edit.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.edit.png diff --git a/data/artwork/graphics/ui/icon.editor.change_terrain.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.editor.change_terrain.png similarity index 100% rename from data/artwork/graphics/ui/icon.editor.change_terrain.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.editor.change_terrain.png diff --git a/data/artwork/graphics/ui/icon.editor.general.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.editor.general.png similarity index 100% rename from data/artwork/graphics/ui/icon.editor.general.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.editor.general.png diff --git a/data/artwork/graphics/ui/icon.editor.nation_info.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.editor.nation_info.png similarity index 100% rename from data/artwork/graphics/ui/icon.editor.nation_info.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.editor.nation_info.png diff --git a/data/artwork/graphics/ui/icon.editor.nations.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.editor.nations.png similarity index 100% rename from data/artwork/graphics/ui/icon.editor.nations.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.editor.nations.png diff --git a/data/artwork/graphics/ui/icon.editor.province_info.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.editor.province_info.png similarity index 100% rename from data/artwork/graphics/ui/icon.editor.province_info.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.editor.province_info.png diff --git a/data/artwork/graphics/ui/icon.editor.provinces.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.editor.provinces.png similarity index 100% rename from data/artwork/graphics/ui/icon.editor.provinces.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.editor.provinces.png diff --git a/data/artwork/graphics/ui/icon.forward.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.forward.png similarity index 100% rename from data/artwork/graphics/ui/icon.forward.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.forward.png diff --git a/data/artwork/graphics/ui/icon.help.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.help.png similarity index 100% rename from data/artwork/graphics/ui/icon.help.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.help.png diff --git a/data/artwork/graphics/ui/icon.home.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.home.png similarity index 100% rename from data/artwork/graphics/ui/icon.home.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.home.png diff --git a/data/artwork/graphics/ui/icon.lobby.multiplayer-game.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.lobby.multiplayer-game.png similarity index 100% rename from data/artwork/graphics/ui/icon.lobby.multiplayer-game.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.lobby.multiplayer-game.png diff --git a/data/artwork/graphics/ui/icon.lobby.network.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.lobby.network.png similarity index 100% rename from data/artwork/graphics/ui/icon.lobby.network.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.lobby.network.png diff --git a/data/artwork/graphics/ui/icon.lobby.single.load.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.lobby.single.load.png similarity index 100% rename from data/artwork/graphics/ui/icon.lobby.single.load.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.lobby.single.load.png diff --git a/data/artwork/graphics/ui/icon.lobby.single.new.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.lobby.single.new.png similarity index 100% rename from data/artwork/graphics/ui/icon.lobby.single.new.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.lobby.single.new.png diff --git a/data/artwork/graphics/ui/icon.mini.geographical.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.mini.geographical.png similarity index 100% rename from data/artwork/graphics/ui/icon.mini.geographical.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.mini.geographical.png diff --git a/data/artwork/graphics/ui/icon.mini.political.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.mini.political.png similarity index 100% rename from data/artwork/graphics/ui/icon.mini.political.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.mini.political.png diff --git a/data/artwork/graphics/ui/icon.preferences.general.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.general.png similarity index 100% rename from data/artwork/graphics/ui/icon.preferences.general.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.general.png diff --git a/data/artwork/graphics/ui/icon.preferences.graphics.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.graphics.png similarity index 100% rename from data/artwork/graphics/ui/icon.preferences.graphics.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.graphics.png diff --git a/data/artwork/graphics/ui/icon.preferences.music.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.music.png similarity index 100% rename from data/artwork/graphics/ui/icon.preferences.music.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.music.png diff --git a/data/artwork/graphics/ui/icon.preferences.network.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.network.png similarity index 100% rename from data/artwork/graphics/ui/icon.preferences.network.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.network.png diff --git a/data/artwork/graphics/ui/icon.preferences.reset.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.reset.png similarity index 100% rename from data/artwork/graphics/ui/icon.preferences.reset.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.preferences.reset.png diff --git a/data/artwork/graphics/ui/icon.scenario.load.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.scenario.load.png similarity index 100% rename from data/artwork/graphics/ui/icon.scenario.load.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.scenario.load.png diff --git a/data/artwork/graphics/ui/icon.scenario.new.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.scenario.new.png similarity index 100% rename from data/artwork/graphics/ui/icon.scenario.new.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.scenario.new.png diff --git a/data/artwork/graphics/ui/icon.scenario.save.png b/source/imperialism_remake/data/artwork/graphics/ui/icon.scenario.save.png similarity index 100% rename from data/artwork/graphics/ui/icon.scenario.save.png rename to source/imperialism_remake/data/artwork/graphics/ui/icon.scenario.save.png diff --git a/data/artwork/graphics/ui/licenses.info b/source/imperialism_remake/data/artwork/graphics/ui/licenses.info similarity index 100% rename from data/artwork/graphics/ui/licenses.info rename to source/imperialism_remake/data/artwork/graphics/ui/licenses.info diff --git a/data/artwork/graphics/ui/loading.gif b/source/imperialism_remake/data/artwork/graphics/ui/loading.gif similarity index 100% rename from data/artwork/graphics/ui/loading.gif rename to source/imperialism_remake/data/artwork/graphics/ui/loading.gif diff --git a/data/artwork/graphics/ui/start.background.jpg b/source/imperialism_remake/data/artwork/graphics/ui/start.background.jpg similarity index 100% rename from data/artwork/graphics/ui/start.background.jpg rename to source/imperialism_remake/data/artwork/graphics/ui/start.background.jpg diff --git a/data/artwork/graphics/ui/start.overlay.door.right.png b/source/imperialism_remake/data/artwork/graphics/ui/start.overlay.door.right.png similarity index 100% rename from data/artwork/graphics/ui/start.overlay.door.right.png rename to source/imperialism_remake/data/artwork/graphics/ui/start.overlay.door.right.png diff --git a/data/artwork/graphics/ui/start.overlay.fireplace.png b/source/imperialism_remake/data/artwork/graphics/ui/start.overlay.fireplace.png similarity index 100% rename from data/artwork/graphics/ui/start.overlay.fireplace.png rename to source/imperialism_remake/data/artwork/graphics/ui/start.overlay.fireplace.png diff --git a/data/artwork/graphics/ui/start.overlay.info b/source/imperialism_remake/data/artwork/graphics/ui/start.overlay.info similarity index 100% rename from data/artwork/graphics/ui/start.overlay.info rename to source/imperialism_remake/data/artwork/graphics/ui/start.overlay.info diff --git a/data/artwork/graphics/ui/start.overlay.map.png b/source/imperialism_remake/data/artwork/graphics/ui/start.overlay.map.png similarity index 100% rename from data/artwork/graphics/ui/start.overlay.map.png rename to source/imperialism_remake/data/artwork/graphics/ui/start.overlay.map.png diff --git a/data/artwork/graphics/ui/start.overlay.throne.png b/source/imperialism_remake/data/artwork/graphics/ui/start.overlay.throne.png similarity index 100% rename from data/artwork/graphics/ui/start.overlay.throne.png rename to source/imperialism_remake/data/artwork/graphics/ui/start.overlay.throne.png diff --git a/data/artwork/graphics/ui/start.overlay.window.left.png b/source/imperialism_remake/data/artwork/graphics/ui/start.overlay.window.left.png similarity index 100% rename from data/artwork/graphics/ui/start.overlay.window.left.png rename to source/imperialism_remake/data/artwork/graphics/ui/start.overlay.window.left.png diff --git a/data/artwork/graphics/ui/style.css b/source/imperialism_remake/data/artwork/graphics/ui/style.css similarity index 100% rename from data/artwork/graphics/ui/style.css rename to source/imperialism_remake/data/artwork/graphics/ui/style.css diff --git a/data/artwork/graphics/ui/window.icon.ico b/source/imperialism_remake/data/artwork/graphics/ui/window.icon.ico similarity index 100% rename from data/artwork/graphics/ui/window.icon.ico rename to source/imperialism_remake/data/artwork/graphics/ui/window.icon.ico diff --git a/data/artwork/music/soundtrack/01 Imperialism Theme.ogg b/source/imperialism_remake/data/artwork/music/soundtrack/01 Imperialism Theme.ogg similarity index 100% rename from data/artwork/music/soundtrack/01 Imperialism Theme.ogg rename to source/imperialism_remake/data/artwork/music/soundtrack/01 Imperialism Theme.ogg diff --git a/data/artwork/music/soundtrack/02 Silent Ashes.ogg b/source/imperialism_remake/data/artwork/music/soundtrack/02 Silent Ashes.ogg similarity index 100% rename from data/artwork/music/soundtrack/02 Silent Ashes.ogg rename to source/imperialism_remake/data/artwork/music/soundtrack/02 Silent Ashes.ogg diff --git a/data/artwork/music/soundtrack/licenses.info b/source/imperialism_remake/data/artwork/music/soundtrack/licenses.info similarity index 100% rename from data/artwork/music/soundtrack/licenses.info rename to source/imperialism_remake/data/artwork/music/soundtrack/licenses.info diff --git a/data/artwork/music/soundtrack/soundtrack.info b/source/imperialism_remake/data/artwork/music/soundtrack/soundtrack.info similarity index 100% rename from data/artwork/music/soundtrack/soundtrack.info rename to source/imperialism_remake/data/artwork/music/soundtrack/soundtrack.info diff --git a/data/scenarios/client/standard.config b/source/imperialism_remake/data/scenarios/client/standard.config similarity index 100% rename from data/scenarios/client/standard.config rename to source/imperialism_remake/data/scenarios/client/standard.config diff --git a/data/scenarios/core/Europe1814.scenario b/source/imperialism_remake/data/scenarios/core/Europe1814.scenario similarity index 100% rename from data/scenarios/core/Europe1814.scenario rename to source/imperialism_remake/data/scenarios/core/Europe1814.scenario diff --git a/data/scenarios/rules/standard.rules b/source/imperialism_remake/data/scenarios/rules/standard.rules similarity index 100% rename from data/scenarios/rules/standard.rules rename to source/imperialism_remake/data/scenarios/rules/standard.rules diff --git a/source/imperialism_remake/server/scenario.py b/source/imperialism_remake/server/scenario.py index 1a08c92..e246adc 100644 --- a/source/imperialism_remake/server/scenario.py +++ b/source/imperialism_remake/server/scenario.py @@ -23,8 +23,8 @@ from PyQt5 import QtCore -import base.constants as constants -import lib.utils as utils +import imperialism_remake.base.constants as constants +import imperialism_remake.lib.utils as utils # TODO rivers are implemented inefficiently diff --git a/source/imperialism_remake/server/server.py b/source/imperialism_remake/server/server.py index 099d55b..1afd8c1 100644 --- a/source/imperialism_remake/server/server.py +++ b/source/imperialism_remake/server/server.py @@ -27,12 +27,12 @@ from PyQt5 import QtCore, QtNetwork -import imperialism_remake -from base import constants -import base.network -from lib import utils -import lib.network -from server.scenario import Scenario +import imperialism_remake.start as start +from imperialism_remake.base import constants +import imperialism_remake.base.network as base_network +from imperialism_remake.lib import utils +import imperialism_remake.lib.network as lib_network +from imperialism_remake.server.scenario import Scenario # TODO start this in its own process # TODO ping server clients regularly and throw them out if not reacting @@ -51,7 +51,7 @@ def run(self): Runs the server process by starting its own QCoreApplication. """ # because PyQt5 eats exceptions in the event thread this workaround - sys.excepthook = imperialism_remake.exception_hook + sys.excepthook = start.exception_hook app = QtCore.QCoreApplication([]) @@ -64,7 +64,7 @@ def run(self): # run event loop of app app.exec_() -class ServerNetworkClient(base.network.NetworkClient): +class ServerNetworkClient(base_network.NetworkClient): """ Server network client. """ @@ -91,7 +91,7 @@ def __init__(self): We start with a server (ExtendedTcpServer) and an empty list of server clients (NetworkClient). """ super().__init__() - self.server = lib.network.ExtendedTcpServer() + self.server = lib_network.ExtendedTcpServer() self.server.new_client.connect(self._new_client) self.server_clients = [] self.chat_log = [] diff --git a/source/imperialism_remake/imperialism_remake.py b/source/imperialism_remake/start.py similarity index 88% rename from source/imperialism_remake/imperialism_remake.py rename to source/imperialism_remake/start.py index 4748c9d..55c5b8d 100644 --- a/source/imperialism_remake/imperialism_remake.py +++ b/source/imperialism_remake/start.py @@ -91,7 +91,7 @@ def main(): os.mkdir(user_folder) # determine DEBUG_MODE from runtime arguments - from base import switches + from imperialism_remake.base import switches if len(sys.argv) > 1 and sys.argv[1] == 'debug': switches.DEBUG_MODE = True @@ -109,7 +109,7 @@ def main(): sys.stderr = codecs.open(Error_File, encoding='utf-8', mode='w') # import some base libraries - import base.tools as tools + import imperialism_remake.base.tools as tools # search for existing options file, if not existing, save it once (should just save an empty dictionary) Options_File = os.path.join(user_folder, 'options.info') @@ -121,16 +121,15 @@ def main(): tools.log_info('options loaded from user folder ({})'.format(user_folder)) # special case of some desktop environments under Linux where full screen mode does not work well - from base import constants + from imperialism_remake.base import constants + # full screen support if tools.get_option(constants.Option.MAINWINDOW_FULLSCREEN_SUPPORTED): - desktop_session = os.environ.get("DESKTOP_SESSION") - if desktop_session and ( - desktop_session.startswith('ubuntu') or 'xfce' in desktop_session or desktop_session.startswith( - 'xubuntu') or 'gnome' in desktop_session): + session = os.environ.get("DESKTOP_SESSION") + if session and (session.startswith('ubuntu') or 'xfce' in session or session.startswith('xubuntu') or 'gnome' in session): tools.set_option(constants.Option.MAINWINDOW_FULLSCREEN_SUPPORTED, False) - tools.log_warning( - 'Desktop environment {} has problems with full screen mode. Will turn if off.'.format(desktop_session)) + tools.log_warning('Desktop environment {} has problems with full screen mode. Will turn if off.'.format(session)) + # we cannot have full screen without support if not tools.get_option(constants.Option.MAINWINDOW_FULLSCREEN_SUPPORTED): tools.set_option(constants.Option.MAINWINDOW_FULLSCREEN, False) @@ -141,13 +140,13 @@ def main(): # multiprocessing.freeze_support() multiprocessing.set_start_method('spawn') - from server.server import ServerProcess + from imperialism_remake.server.server import ServerProcess server_process = ServerProcess() server_process.start() # start client, we will return when the program finishes - from client.client import start_client + from imperialism_remake.client.client import start_client start_client() diff --git a/tools/build_documentation.py b/tools/build_documentation.py index 50d1573..d7555f7 100644 --- a/tools/build_documentation.py +++ b/tools/build_documentation.py @@ -1,5 +1,7 @@ """ - see also sphinx.main(), sphinx.build_main(), cmdline.main() +Builds the documentation. + +See also sphinx.main(), sphinx.build_main(), cmdline.main() """ import os @@ -9,8 +11,6 @@ import sphinx from sphinx import apidoc -from imperialism_remake import set_start_directory - def sphinx_build(directory): """ @@ -68,7 +68,8 @@ def copy_manual(source, target): if __name__ == '__main__': - set_start_directory() + # start with directory one down + os.chdir('..') # sphinx api build source_directory = 'source' @@ -80,7 +81,7 @@ def copy_manual(source, target): sphinx_build(manual_rst_directory) # copy manual to ./data - manual_data_directory = os.path.join('data', 'manual') + manual_data_directory = os.path.join('source', 'imperialism_remake', 'data', 'manual') manual_build_directory = os.path.join(manual_rst_directory, '_build') copy_manual(manual_build_directory, manual_data_directory)