From 8fba7b448182df01558f8cd19cbfe9d6a8d424c9 Mon Sep 17 00:00:00 2001 From: Tom Schimansky Date: Sat, 17 Sep 2022 00:54:32 +0200 Subject: [PATCH 1/8] update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8726190..dde83c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.6.0] - 2022-06-23 +### Added + - CTkProgressBar indeterminate mode, automatic progress loop with .start() and .stop() + ## [4.5.0] - 2022-06-23 ### Added - CTkScrollbar (vertical, horizontal) From 3f156f564884186a768961a4f53fe4c0d1adf2bc Mon Sep 17 00:00:00 2001 From: Tom Schimansky Date: Sat, 17 Sep 2022 00:55:31 +0200 Subject: [PATCH 2/8] Bump to 4.6.0 --- customtkinter/__init__.py | 2 +- pyproject.toml | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/customtkinter/__init__.py b/customtkinter/__init__.py index e98bf33..db3aa4e 100644 --- a/customtkinter/__init__.py +++ b/customtkinter/__init__.py @@ -1,4 +1,4 @@ -__version__ = "4.5.11" +__version__ = "4.6.0" import os import sys diff --git a/pyproject.toml b/pyproject.toml index 14b1562..71d2679 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" github_url = "https://github.com/TomSchimansky/CustomTkinter" [tool.tbump.version] -current = "4.5.11" +current = "4.6.0" # Example of a semver regexp. # Make sure this matches current_version before diff --git a/setup.cfg b/setup.cfg index ed2f980..dea6f17 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = customtkinter -version = 4.5.11 +version = 4.6.0 description = Create modern looking GUIs with Python long_description = CustomTkinter UI-Library\n\n[](https://github.com/TomSchimansky/CustomTkinter/blob/master/documentation_images/Windows_dark.png)\n\nMore Information: https://github.com/TomSchimansky/CustomTkinter long_description_content_type = text/markdown From 7dd945adbb6e3fd02c53252f324639beaf2e1255 Mon Sep 17 00:00:00 2001 From: Tom Schimansky Date: Sat, 17 Sep 2022 01:20:33 +0200 Subject: [PATCH 3/8] revert linux font path to ~/.fonts/ --- CHANGELOG.md | 2 +- customtkinter/font_manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dde83c6..95e0d0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [4.6.0] - 2022-06-23 +## [4.6.0] - 2022-09-17 ### Added - CTkProgressBar indeterminate mode, automatic progress loop with .start() and .stop() diff --git a/customtkinter/font_manager.py b/customtkinter/font_manager.py index 886a988..91dfd04 100644 --- a/customtkinter/font_manager.py +++ b/customtkinter/font_manager.py @@ -6,7 +6,7 @@ from typing import Union class FontManager: - linux_font_path = "~/.local/share/fonts/" + linux_font_path = "~/.fonts/" @classmethod def init_font_manager(cls): From b350224f060bb28c3e3932cbd81740ff03f88609 Mon Sep 17 00:00:00 2001 From: Tom Schimansky Date: Sat, 17 Sep 2022 01:21:00 +0200 Subject: [PATCH 4/8] Bump to 4.6.1 --- customtkinter/__init__.py | 2 +- pyproject.toml | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/customtkinter/__init__.py b/customtkinter/__init__.py index db3aa4e..dcda741 100644 --- a/customtkinter/__init__.py +++ b/customtkinter/__init__.py @@ -1,4 +1,4 @@ -__version__ = "4.6.0" +__version__ = "4.6.1" import os import sys diff --git a/pyproject.toml b/pyproject.toml index 71d2679..b3c4503 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" github_url = "https://github.com/TomSchimansky/CustomTkinter" [tool.tbump.version] -current = "4.6.0" +current = "4.6.1" # Example of a semver regexp. # Make sure this matches current_version before diff --git a/setup.cfg b/setup.cfg index dea6f17..b4e895d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = customtkinter -version = 4.6.0 +version = 4.6.1 description = Create modern looking GUIs with Python long_description = CustomTkinter UI-Library\n\n[](https://github.com/TomSchimansky/CustomTkinter/blob/master/documentation_images/Windows_dark.png)\n\nMore Information: https://github.com/TomSchimansky/CustomTkinter long_description_content_type = text/markdown From 67ab575b78c425625292f6c10f04fe29817fb18f Mon Sep 17 00:00:00 2001 From: Tom Schimansky Date: Sat, 17 Sep 2022 12:41:45 +0200 Subject: [PATCH 5/8] changed CTkCheckBox command to be only triggered by .toggle() --- customtkinter/widgets/ctk_checkbox.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/customtkinter/widgets/ctk_checkbox.py b/customtkinter/widgets/ctk_checkbox.py index 18f5883..38931c0 100644 --- a/customtkinter/widgets/ctk_checkbox.py +++ b/customtkinter/widgets/ctk_checkbox.py @@ -309,9 +309,6 @@ class CTkCheckBox(CTkBaseClass): self.variable.set(self.onvalue) self.variable_callback_blocked = False - if self.command is not None: - self.command() - def deselect(self, from_variable_callback=False): self.check_state = False self.draw() @@ -321,8 +318,5 @@ class CTkCheckBox(CTkBaseClass): self.variable.set(self.offvalue) self.variable_callback_blocked = False - if self.command is not None: - self.command() - def get(self): return self.onvalue if self.check_state is True else self.offvalue From 89fa0a87588e49dbdc0c86cb586f8d8e265a26a5 Mon Sep 17 00:00:00 2001 From: Tom Schimansky Date: Sat, 17 Sep 2022 12:47:43 +0200 Subject: [PATCH 6/8] Bump to 4.6.2 --- customtkinter/__init__.py | 2 +- pyproject.toml | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/customtkinter/__init__.py b/customtkinter/__init__.py index dcda741..8ad04ab 100644 --- a/customtkinter/__init__.py +++ b/customtkinter/__init__.py @@ -1,4 +1,4 @@ -__version__ = "4.6.1" +__version__ = "4.6.2" import os import sys diff --git a/pyproject.toml b/pyproject.toml index b3c4503..f2a29c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" github_url = "https://github.com/TomSchimansky/CustomTkinter" [tool.tbump.version] -current = "4.6.1" +current = "4.6.2" # Example of a semver regexp. # Make sure this matches current_version before diff --git a/setup.cfg b/setup.cfg index b4e895d..d4406dc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = customtkinter -version = 4.6.1 +version = 4.6.2 description = Create modern looking GUIs with Python long_description = CustomTkinter UI-Library\n\n[](https://github.com/TomSchimansky/CustomTkinter/blob/master/documentation_images/Windows_dark.png)\n\nMore Information: https://github.com/TomSchimansky/CustomTkinter long_description_content_type = text/markdown From dab93a6a5e40228e61531ea84f0bddd5ee53784b Mon Sep 17 00:00:00 2001 From: Tom Schimansky Date: Sat, 17 Sep 2022 13:39:22 +0200 Subject: [PATCH 7/8] Fixed variable configuring for CTkOptionMennu --- customtkinter/widgets/ctk_optionmenu.py | 3 ++- test/manual_integration_tests/test_variables.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/customtkinter/widgets/ctk_optionmenu.py b/customtkinter/widgets/ctk_optionmenu.py index e05e054..cc8601f 100644 --- a/customtkinter/widgets/ctk_optionmenu.py +++ b/customtkinter/widgets/ctk_optionmenu.py @@ -226,7 +226,8 @@ class CTkOptionMenu(CTkBaseClass): if self.variable is not None and self.variable != "": self.variable_callback_name = self.variable.trace_add("write", self.variable_callback) - self.set(self.variable.get(), block_set_variable=True) + self.current_value = self.variable.get() + self.text_label.configure(text=self.current_value) else: self.variable = None diff --git a/test/manual_integration_tests/test_variables.py b/test/manual_integration_tests/test_variables.py index 04bb0dc..c4595fa 100644 --- a/test/manual_integration_tests/test_variables.py +++ b/test/manual_integration_tests/test_variables.py @@ -78,8 +78,9 @@ switch_2 = customtkinter.CTkSwitch(master=app, variable=s_var, textvariable=s_va switch_2.pack(pady=20, padx=10) optionmenu_var = tkinter.StringVar(value="test") -optionmenu_1 = customtkinter.CTkOptionMenu(master=app, variable=optionmenu_var, values=["Option 1", "Option 2", "Option 3"]) +optionmenu_1 = customtkinter.CTkOptionMenu(master=app, variable=None, values=["Option 1", "Option 2", "Option 3"]) optionmenu_1.pack(pady=20, padx=10) +optionmenu_1.configure(variable=optionmenu_var) combobox_1 = customtkinter.CTkComboBox(master=app, values=["Option 1", "Option 2", "Option 3"]) combobox_1.pack(pady=20, padx=10) combobox_1.configure(variable=optionmenu_var) From 31c0afe15b60c6e2a0a70491300f0a98ac8679e1 Mon Sep 17 00:00:00 2001 From: Tom Schimansky Date: Sat, 17 Sep 2022 13:41:58 +0200 Subject: [PATCH 8/8] Bump to 4.6.3 --- customtkinter/__init__.py | 2 +- pyproject.toml | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/customtkinter/__init__.py b/customtkinter/__init__.py index 8ad04ab..f760bd6 100644 --- a/customtkinter/__init__.py +++ b/customtkinter/__init__.py @@ -1,4 +1,4 @@ -__version__ = "4.6.2" +__version__ = "4.6.3" import os import sys diff --git a/pyproject.toml b/pyproject.toml index f2a29c5..5bdba2b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" github_url = "https://github.com/TomSchimansky/CustomTkinter" [tool.tbump.version] -current = "4.6.2" +current = "4.6.3" # Example of a semver regexp. # Make sure this matches current_version before diff --git a/setup.cfg b/setup.cfg index d4406dc..ec181cc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = customtkinter -version = 4.6.2 +version = 4.6.3 description = Create modern looking GUIs with Python long_description = CustomTkinter UI-Library\n\n[](https://github.com/TomSchimansky/CustomTkinter/blob/master/documentation_images/Windows_dark.png)\n\nMore Information: https://github.com/TomSchimansky/CustomTkinter long_description_content_type = text/markdown