From 73afadeb7e68d4ae18353461720282f1658099f3 Mon Sep 17 00:00:00 2001 From: Correct Syntax Date: Fri, 17 Jul 2020 17:36:39 -0600 Subject: [PATCH] merge version into a single variable --- src/GimelStudio/__init__.py | 3 +-- src/GimelStudio/api/__init__.py | 3 +-- src/GimelStudio/application.py | 16 ++++------------ src/GimelStudio/meta.py | 16 +++++----------- src/GimelStudio/program/about_dialog.py | 7 ++----- src/GimelStudio/program/license_dialog.py | 7 +++---- src/GimelStudio/project/project.py | 12 +++++------- 7 files changed, 21 insertions(+), 43 deletions(-) diff --git a/src/GimelStudio/__init__.py b/src/GimelStudio/__init__.py index 77a0a18..c75582c 100644 --- a/src/GimelStudio/__init__.py +++ b/src/GimelStudio/__init__.py @@ -1,4 +1,3 @@ from GimelStudio.meta import (__NAME__, __AUTHOR__, __VERSION__, - __BUILD__, __RELEASE__, __DEBUG__, - __TITLE__) + __DEBUG__, __TITLE__) diff --git a/src/GimelStudio/api/__init__.py b/src/GimelStudio/api/__init__.py index ca7c40e..f43ffe9 100644 --- a/src/GimelStudio/api/__init__.py +++ b/src/GimelStudio/api/__init__.py @@ -4,8 +4,7 @@ # directly accessed by the API users from GimelStudio.meta import (__NAME__, __AUTHOR__, __VERSION__, - __BUILD__, __RELEASE__, __DEBUG__, - __TITLE__) + __DEBUG__, __TITLE__) from GimelStudio.utils import ConvertImageToWx, DrawGrid from GimelStudio.datatypes import Color, RenderImage, List diff --git a/src/GimelStudio/application.py b/src/GimelStudio/application.py index d74ae3f..d37ad06 100644 --- a/src/GimelStudio/application.py +++ b/src/GimelStudio/application.py @@ -24,8 +24,7 @@ import wx.lib.agw.aui as aui from GimelStudio.meta import (__NAME__, __AUTHOR__, __VERSION__, - __BUILD__, __RELEASE__, __DEBUG__, - __TITLE__) + __DEBUG__, __TITLE__) from GimelStudio.project import GimelStudioProject from GimelStudio.renderer import Renderer @@ -64,15 +63,8 @@ def __init__(self, arguments): self.SetIcon(ICON_GIMELSTUDIO_ICO.GetIcon()) # Init project, renderer and user preferences manager - self._project = GimelStudioProject( - self, - __VERSION__, - __BUILD__, - __RELEASE__ - ) - self._renderer = Renderer( - self - ) + self._project = GimelStudioProject(self) + self._renderer = Renderer(self) # self._userprefmanager = UserPreferencesManager( # self # ) @@ -533,4 +525,4 @@ def RestartProgram(self, new_args): Restart the program so that the node registry is refreshed. """ python = sys.executable - os.execl(python, python, *newArgs) \ No newline at end of file + os.execl(python, python, *newArgs) diff --git a/src/GimelStudio/meta.py b/src/GimelStudio/meta.py index 134e9c0..a3fcd2b 100644 --- a/src/GimelStudio/meta.py +++ b/src/GimelStudio/meta.py @@ -24,20 +24,14 @@ # Program author __AUTHOR__ = "Noah Rahm, Correct Syntax" -# Release version: [major].[minor] -__VERSION__ = "0.3" - -# Release number -__RELEASE__ = "0" - -# Build number -__BUILD__ = "1" +# Release version: [major].[minor].[build] +__VERSION__ = "0.3.0" # Whether this program is in development mode # USAGE: Switch to False before building as .exe or similar package to -# enable some end-user features that would otherwise hinder development -# and/or testing of the program. +# enable/disable some end-user features that would otherwise hinder +# development and/or testing of the program. __DEBUG__ = False # Title string -__TITLE__ = '{0} v{1}.{2}'.format(__NAME__, __VERSION__, __RELEASE__) +__TITLE__ = '{0} v{1}'.format(__NAME__, __VERSION__) diff --git a/src/GimelStudio/program/about_dialog.py b/src/GimelStudio/program/about_dialog.py index a347df3..f601f33 100644 --- a/src/GimelStudio/program/about_dialog.py +++ b/src/GimelStudio/program/about_dialog.py @@ -24,8 +24,7 @@ import wx from wx.lib.wordwrap import wordwrap -from GimelStudio.meta import (__NAME__, __AUTHOR__, __VERSION__, - __BUILD__, __RELEASE__, __TITLE__) +from GimelStudio.meta import (__NAME__, __AUTHOR__, __VERSION__, __TITLE__) class AboutGimelStudioDialog(object): @@ -35,8 +34,6 @@ def __init__(self, parent): self._title = __TITLE__ self._author = __AUTHOR__ self._version = __VERSION__ - self._build = __BUILD__ - self._release = __RELEASE__ self._pillowVersion = PIL.__version__ self._wxPythonVersion = wx.VERSION_STRING self._pythonVersion = sys.version.split()[0] @@ -44,7 +41,7 @@ def __init__(self, parent): def ShowDialog(self): info = wx.adv.AboutDialogInfo() info.SetName(self._name) - info.SetVersion("v{0}.{1}".format(self._version, self._release)) + info.SetVersion("v{0}".format(self._version)) info.SetCopyright("© 2020 {}. All rights reserved.".format(self._author)) info.SetDescription( wordwrap( diff --git a/src/GimelStudio/program/license_dialog.py b/src/GimelStudio/program/license_dialog.py index e8f7531..b2b2f46 100644 --- a/src/GimelStudio/program/license_dialog.py +++ b/src/GimelStudio/program/license_dialog.py @@ -21,8 +21,7 @@ import wx import wx.lib.dialogs -from GimelStudio.meta import (__NAME__, __AUTHOR__, __VERSION__, - __BUILD__, __RELEASE__, __TITLE__) +from GimelStudio.meta import (__NAME__, __AUTHOR__, __VERSION__, __TITLE__) class GimelStudioLicenseDialog(object): def __init__(self, parent): @@ -32,7 +31,7 @@ def ShowDialog(self): LICENSE = """ Gimel Studio © 2020 Noah Rahm, Correct Syntax. All rights reserved. -IMPORTANT - PLEASE READ BEFORE COPYING, INSTALLING OR USING GIMEL STUDIO VERSION {0}.{1} +IMPORTANT - PLEASE READ BEFORE COPYING, INSTALLING OR USING GIMEL STUDIO VERSION {0} Apache License Version 2.0, January 2004 @@ -236,7 +235,7 @@ def ShowDialog(self): See the License for the specific language governing permissions and limitations under the License. - """.format(__VERSION__, __RELEASE__) + """.format(__VERSION__) dlg = wx.lib.dialogs.ScrolledMessageDialog( self._parent, diff --git a/src/GimelStudio/project/project.py b/src/GimelStudio/project/project.py index 588a4e4..95db643 100644 --- a/src/GimelStudio/project/project.py +++ b/src/GimelStudio/project/project.py @@ -26,8 +26,7 @@ import wx from GimelStudio.meta import (__NAME__, __AUTHOR__, __VERSION__, - __BUILD__, __RELEASE__, __DEBUG__, - __TITLE__) + __DEBUG__, __TITLE__) DEFAULT_PROJECT = { "nodes": { @@ -46,7 +45,7 @@ }, "meta": { "content": "Gimel Studio project file", - "version": "{}.{}".format(__VERSION__, __RELEASE__) + "version": __VERSION__, }, "ui": { } @@ -54,11 +53,10 @@ class GimelStudioProject(object): - def __init__(self, parent, version, build, release): + def __init__(self, parent): self._parent = parent - self._version = version - self._build = build - self._release = release + self._version = __VERSION__ + #self._nodes = {} #self._projectData = {}