Skip to content
Snippets Groups Projects
Commit 1e5fcd2a authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge branch 'bugfix/fix_alphanumeric_menu' into 'main'

Bugfix/fix alphanumeric menu

See merge request !24
parents 09ea19b8 62728be7
No related branches found
No related tags found
1 merge request!24Bugfix/fix alphanumeric menu
Pipeline #55879 canceled
......@@ -2,10 +2,17 @@
History
=======
0.7.1 (2022-08-26)
------------------
* Fixed incorrect method name in the context of the alphanumeric menu entry (!24).
0.7.0 (2022-08-26)
------------------
* Alphabetic order is now preserved when adding the EnPT entry into the menu in the EnMAP-Box (!16).
* Alphanumeric order is now preserved when adding the EnPT entry into the menu in the EnMAP-Box (!16).
* Migrated test calls from nosetests to pytest and implemented new test report (!17).
* Fixed CI tests, they now use EnMAP-Box 3.9 + QGIS 3.18 (!18, !19, !20).
* Refactored 'Anaconda' to 'Conda' to also include Miniconda, MiniForge, and MambaForge (!22).
......
......@@ -76,11 +76,11 @@ class EnPTEnMAPBoxApp(_EnMAPBoxApplication):
# appMenu = self.enmapbox.menu('Tools')
menu_entry = 'EnPT (EnMAP Processing Tool)'
_alphabetic_menu = False
_alphanumeric_menu = False
try:
# alphabetic menu was implemented in EnMAP-Box around 3.10.1
menu = self.utilsAddMenuInAlphabeticOrder(appMenu, menu_entry)
_alphabetic_menu = True
# alphanumeric menu ordering was implemented in EnMAP-Box around 3.10.1
menu = self.utilsAddMenuInAlphanumericOrder(appMenu, menu_entry)
_alphanumeric_menu = True
except AttributeError:
menu = appMenu.addMenu(menu_entry)
menu.setIcon(self.icon())
......@@ -93,7 +93,7 @@ class EnPTEnMAPBoxApp(_EnMAPBoxApplication):
assert isinstance(a, QAction)
a.triggered.connect(self.startGUI)
if not _alphabetic_menu:
if not _alphanumeric_menu:
appMenu.addMenu(menu)
return menu
......
......@@ -22,6 +22,6 @@
# You should have received a copy of the GNU Lesser General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.7.0'
__versionalias__ = '20220826.01'
__version__ = '0.7.1'
__versionalias__ = '20221004.01'
__author__ = 'Daniel Scheffler'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment