From c79bdb2af511569ede9b778599826dd2a71dca5f Mon Sep 17 00:00:00 2001 From: Eugenio Parodi Date: Tue, 11 Jul 2023 15:08:49 +0100 Subject: [PATCH] Added extra controls in the MenuEditor --- setup.py | 2 +- setup.ttkDesigner.py | 4 ++-- ttkDesigner/app/menuBarEditor.py | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index e52269aa..9356a1e5 100644 --- a/setup.py +++ b/setup.py @@ -33,5 +33,5 @@ setuptools.setup( # packages=setuptools.find_packages(), packages = setuptools.find_packages(where="."), package_dir = {"":"."}, - python_requires=">=3.8", + python_requires=">=3.9", ) diff --git a/setup.ttkDesigner.py b/setup.ttkDesigner.py index 3e540305..7ae3f8f4 100644 --- a/setup.ttkDesigner.py +++ b/setup.ttkDesigner.py @@ -31,9 +31,9 @@ setup( include_package_data=False, packages=['ttkDesigner','ttkDesigner.app', 'ttkDesigner.app.superobj'], package_data={'ttkDesigner': ['tui/*']}, - python_requires=">=3.8", + python_requires=">=3.9", install_requires=[ - 'pyTermTk>=0.30.0a69', + 'pyTermTk>=0.30.0a115', 'pyperclip', 'Pillow'], entry_points={ diff --git a/ttkDesigner/app/menuBarEditor.py b/ttkDesigner/app/menuBarEditor.py index 700def15..e3d31376 100644 --- a/ttkDesigner/app/menuBarEditor.py +++ b/ttkDesigner/app/menuBarEditor.py @@ -69,6 +69,7 @@ class _MenuItem(ttk.TTkWidget): self.resize(width+7,1) self._lineEdit.setGeometry(1,0,width,1) self.processWidgetName(f"menu_{text}") + self._designer.weModified.emit() self.update() def mouseDoubleClickEvent(self, evt) -> bool: @@ -94,6 +95,8 @@ class _MenuItem(ttk.TTkWidget): self.closeClicked.emit(self) elif evt.x > w-7: self.expandMenuItem() + else: + self._designer.thingSelected.emit(self._menuButton,self._superMenuButton) return True def paintEvent(self, canvas: TTkCanvas): @@ -208,6 +211,7 @@ class _SubMenuAreaWidget(ttk.TTkAbstractScrollView): item.closeClicked.disconnect(self.removeMenuItem) self._resizeEvent() self.itemsChanged.emit(self._items) + self._designer.weModified.emit() def _addMenuItem(self, item): item.closeClicked.clear() @@ -216,6 +220,7 @@ class _SubMenuAreaWidget(ttk.TTkAbstractScrollView): self._minWidth = max(self._minWidth,item.minimumWidth()) self._resizeEvent() self.itemsChanged.emit(self._items) + self._designer.weModified.emit() def addMenuItem(self, item): self._items.append(item) @@ -306,6 +311,7 @@ class _MenuBarItemEditorView(ttk.TTkAbstractScrollView): self.layout().removeWidget(item) self._items.pop(self._items.index(item)) self._refreshItems() + self._designer.weModified.emit() def _addMenuItem(self, item): item.sizeChanged.clear() @@ -314,6 +320,7 @@ class _MenuBarItemEditorView(ttk.TTkAbstractScrollView): item.closeClicked.connect(self.removeMenuItem) self.layout().addWidget(item) self._refreshItems() + self._designer.weModified.emit() @ttk.pyTTkSlot() def addMenuItem(self): @@ -393,6 +400,7 @@ class MenuBarEditor(ttk.TTkWindow): self._widget.setMenuBar(mb, place) else: self._widget.setMenuBar(None, place) + self._designer.weModified.emit() def _showEditor(self, place): if place==ttk.TTkK.TOP: