From fc915fad83a85c67fd8e4cc4f6ea4da081872d9b Mon Sep 17 00:00:00 2001 From: Patrick Gaskin Date: Wed, 22 Apr 2020 04:06:44 -0400 Subject: [PATCH] Added support for utf-8 in labels, improved UI --- src/menu.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/menu.cc b/src/menu.cc index 2ed57ee..3b2db8f 100644 --- a/src/menu.cc +++ b/src/menu.cc @@ -80,8 +80,7 @@ extern "C" MenuTextItem* _nmi_menu_hook(void* _this, QMenu* menu, QString const& NMI_LOG("Adding item '%s'...", ent->lbl); - QString lbl(ent->lbl); - MenuTextItem* item = AbstractNickelMenuController_createMenuTextItem_orig(_this, menu, lbl, false, false, ""); + MenuTextItem* item = AbstractNickelMenuController_createMenuTextItem_orig(_this, menu, QString::fromUtf8(ent->lbl), false, false, ""); QAction* action = AbstractNickelMenuController_createAction(_this, menu, item, true, true, false); // note: we're capturing by value, i.e. the pointer to the global variable, rather then the stack variable, so this is safe @@ -90,9 +89,7 @@ extern "C" MenuTextItem* _nmi_menu_hook(void* _this, QMenu* menu, QString const& char *err; if (ent->execute(ent->arg, &err) && err) { NMI_LOG("Got error %s, displaying...", err); - QString title("nickel-menu-inject"); - QString text(err); - ConfirmationDialogFactory_showOKDialog(title, text); + ConfirmationDialogFactory_showOKDialog(QString::fromUtf8(ent->lbl), QString::fromUtf8(err)); free(err); return; }