summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.py20
-rw-r--r--main.spec11
-rw-r--r--poetry.lock29
-rw-r--r--pyproject.toml1
4 files changed, 54 insertions, 7 deletions
diff --git a/main.py b/main.py
index b5a0f15..89549cb 100644
--- a/main.py
+++ b/main.py
@@ -146,13 +146,13 @@ class CompanySelector:
self.companies_label.place(x=340,y=320,width=200, height=30)
self.pyramid_title_string = tk.StringVar()
- self.pyramid_title_string.set(f"Copyright (2004-{datetime.today().year}) by Gentry Capital Corporation")
+ self.pyramid_title_string.set(f"Copyright (2004) by Gentry Capital Corporation")
#self.pyramid_title = ttk.Entry(self.master, textvariable=self.pyramid_title_string)
#self.pyramid_title.pack()
self.customization_label = ttk.Label(self.master, text="Customization", font='SunValleyBodyStrongFont 12 bold')
- self.customization_label.place(x=250, y=20, width=100, height=20)
+ self.customization_label.place(x=250, y=20, width=150, height=20)
self.options_label = ttk.Label(self.master, text="Options", font='SunValleyBodyStrongFont 12 bold')
self.options_label.place(x=250, y=150, width=100, height=20)
@@ -438,16 +438,24 @@ class CompanySelector:
text2 = f"({num_dividends} Dividend payors - all identified by asterisk)"
text3 = "FOR INTERNAL USE ONLY"
text4 = datetime.today().strftime("%B %d, %Y")
- text5 = ""
+ text5 = f"{len([self.company_listbox.listbox.get(index) for index in self.company_listbox.listbox.curselection()])}"
+ text6 = f"{len([self.company_listbox.listbox.get(index) for index in self.company_listbox.listbox.curselection()])} Companies"
if self.prepared_for_string.get() != "":
print(f"Prepared for string present - {self.prepared_for_string.get()}")
- text5 += f"Prepared for {self.prepared_for_string.get()}"
+ if text5 != "":
+ if type(text5 == list):
+ text5.append(f"Prepared for {self.prepared_for_string.get()}")
+ else:
+ text5 = [text5, f"Prepared for {self.prepared_for_string.get()}"]
if self.advisor_string.get() != "":
advisor = self.advisor_string.get()
if text5 != "":
- tmp_var = [text5, f"By {advisor}"]
- text5 = tmp_var
+ if type(text5) == list:
+ text5.append(f"By {advisor}")
+ else:
+ tmp_var = [text5, f"By {advisor}"]
+ text5 = tmp_var
else:
text5 = f"By {advisor}"
diff --git a/main.spec b/main.spec
index ab14294..5cecf15 100644
--- a/main.spec
+++ b/main.spec
@@ -24,10 +24,20 @@ a = Analysis(
noarchive=False,
)
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+splash = Splash(
+ 'assets/GentryCapitalRGB.jpg',
+ binaries=a.binaries,
+ datas=a.datas,
+ text_pos=None,
+ text_size=12,
+ minify_script=True,
+ always_on_top=True,
+)
exe = EXE(
pyz,
a.scripts,
+ splash,
[],
exclude_binaries=True,
name='main',
@@ -47,6 +57,7 @@ coll = COLLECT(
a.binaries,
a.zipfiles,
a.datas,
+ splash.binaries,
strip=False,
upx=True,
upx_exclude=[],
diff --git a/poetry.lock b/poetry.lock
index e568d73..ffa4e8f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -105,6 +105,20 @@ optional = false
python-versions = ">=3.7"
[[package]]
+name = "lxml"
+version = "4.9.2"
+description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*"
+
+[package.extras]
+cssselect = ["cssselect (>=0.7)"]
+html5 = ["html5lib"]
+htmlsoup = ["beautifulsoup4"]
+source = ["Cython (>=0.29.7)"]
+
+[[package]]
name = "macholib"
version = "1.16.2"
description = "Mach-O header analysis and editing"
@@ -274,6 +288,17 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
six = ">=1.5"
[[package]]
+name = "python-docx"
+version = "0.8.11"
+description = "Create and update Microsoft Word .docx files."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+lxml = ">=2.3.2"
+
+[[package]]
name = "pytz"
version = "2023.3"
description = "World timezone definitions, modern and historical"
@@ -454,7 +479,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "flake8 (<5)", "pytest-co
[metadata]
lock-version = "1.1"
python-versions = ">=3.9,<3.12"
-content-hash = "ba4a511abe2a32ba16b21a014272059c023a1a675fab76e48f9762c70b536122"
+content-hash = "242394fa63b58fdef34d257fdbf2ca18320dd2168a2c841af4e7fd9dc014afce"
[metadata.files]
altgraph = []
@@ -466,6 +491,7 @@ et-xmlfile = []
fonttools = []
importlib-resources = []
kiwisolver = []
+lxml = []
macholib = []
matplotlib = []
numpy = []
@@ -478,6 +504,7 @@ pyinstaller = []
pyinstaller-hooks-contrib = []
pyparsing = []
python-dateutil = []
+python-docx = []
pytz = []
pywin32-ctypes = []
sentry-sdk = []
diff --git a/pyproject.toml b/pyproject.toml
index 663d7a6..8d4d211 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,6 +16,7 @@ sv-ttk = "^2.4.5"
ttkwidgets = "^0.13.0"
sentry-sdk = "^1.23.1"
darkdetect = "^0.8.0"
+python-docx = "^0.8.11"
[tool.poetry.dev-dependencies]