From 516ed3b97db39f65181c7d4e236d1e9ecc87d1ae Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 29 Aug 2014 04:12:32 +0100 Subject: [PATCH] Rename carla_style.py to carla_app.py --- source/{carla_style.py => carla_app.py} | 2 -- source/carla_database.py | 2 +- source/carla_host.py | 2 +- source/carla_settings.py | 2 +- source/carla_skin.py | 2 +- source/carla_widgets.py | 2 +- source/modules/native-plugins/resources/bigmeter-ui | 2 +- source/modules/native-plugins/resources/notes-ui | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) rename source/{carla_style.py => carla_app.py} (99%) diff --git a/source/carla_style.py b/source/carla_app.py similarity index 99% rename from source/carla_style.py rename to source/carla_app.py index 768dfad18..f4d12f896 100644 --- a/source/carla_style.py +++ b/source/carla_app.py @@ -16,8 +16,6 @@ # # For a full copy of the GNU General Public License see the GPL.txt file -# TODO - rename to carla_app.py - # ------------------------------------------------------------------------------------------------------------ # Imports (Config) diff --git a/source/carla_database.py b/source/carla_database.py index ca3efd18f..8bdd8b1e9 100755 --- a/source/carla_database.py +++ b/source/carla_database.py @@ -1741,7 +1741,7 @@ class PluginDatabaseW(QDialog): # Main if __name__ == '__main__': - from carla_style import CarlaApplication + from carla_app import CarlaApplication app = CarlaApplication() diff --git a/source/carla_host.py b/source/carla_host.py index 504e45a17..67070048b 100644 --- a/source/carla_host.py +++ b/source/carla_host.py @@ -37,9 +37,9 @@ else: import ui_carla_host +from carla_app import * from carla_database import * from carla_settings import * -from carla_style import * from carla_widgets import * # ------------------------------------------------------------------------------------------------------------ diff --git a/source/carla_settings.py b/source/carla_settings.py index 840353e33..02448038a 100755 --- a/source/carla_settings.py +++ b/source/carla_settings.py @@ -761,8 +761,8 @@ class CarlaSettingsW(QDialog): # Main if __name__ == '__main__': + from carla_app import CarlaApplication from carla_host import initHost - from carla_style import CarlaApplication app = CarlaApplication() diff --git a/source/carla_skin.py b/source/carla_skin.py index 0fad4d176..019344554 100644 --- a/source/carla_skin.py +++ b/source/carla_skin.py @@ -1469,7 +1469,7 @@ def createPluginSlot(parent, pluginId): # Main Testing if __name__ == '__main__': - from carla_style import CarlaApplication + from carla_app import CarlaApplication import resources_rc app = CarlaApplication("Carla-Skins") diff --git a/source/carla_widgets.py b/source/carla_widgets.py index 22203d524..b7818fa15 100755 --- a/source/carla_widgets.py +++ b/source/carla_widgets.py @@ -1517,7 +1517,7 @@ class PluginEdit(QDialog): # Main if __name__ == '__main__': - from carla_style import CarlaApplication + from carla_app import CarlaApplication app = CarlaApplication() diff --git a/source/modules/native-plugins/resources/bigmeter-ui b/source/modules/native-plugins/resources/bigmeter-ui index eea1b659f..28db72fca 100755 --- a/source/modules/native-plugins/resources/bigmeter-ui +++ b/source/modules/native-plugins/resources/bigmeter-ui @@ -19,7 +19,7 @@ # ----------------------------------------------------------------------- # Imports (ExternalUI) -from carla_style import CarlaApplication +from carla_app import CarlaApplication from externalui import ExternalUI from digitalpeakmeter import DigitalPeakMeter diff --git a/source/modules/native-plugins/resources/notes-ui b/source/modules/native-plugins/resources/notes-ui index 9fc8cf04d..b04c8a23e 100755 --- a/source/modules/native-plugins/resources/notes-ui +++ b/source/modules/native-plugins/resources/notes-ui @@ -34,7 +34,7 @@ else: # ----------------------------------------------------------------------- # Imports (ExternalUI) -from carla_style import CarlaApplication +from carla_app import CarlaApplication from externalui import ExternalUI from paramspinbox import ParamSpinBox