Skip to content

Commit

Permalink
Various menu and Makefile fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
dvorka committed Jan 5, 2024
1 parent ab38554 commit 97a881d
Show file tree
Hide file tree
Showing 11 changed files with 2,990 additions and 2,516 deletions.
1,093 changes: 594 additions & 499 deletions app/resources/qt/translations/mindforger_cs.ts

Large diffs are not rendered by default.

Binary file modified app/resources/qt/translations/mindforger_en.qm
Binary file not shown.
1,097 changes: 596 additions & 501 deletions app/resources/qt/translations/mindforger_en.ts

Large diffs are not rendered by default.

1,093 changes: 594 additions & 499 deletions app/resources/qt/translations/mindforger_nerd_cs.ts

Large diffs are not rendered by default.

1,093 changes: 594 additions & 499 deletions app/resources/qt/translations/mindforger_nerd_en.ts

Large diffs are not rendered by default.

1,093 changes: 594 additions & 499 deletions app/resources/qt/translations/mindforger_zh_cn.ts

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/src/qt/cli_n_breadcrumbs_presenter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void CliAndBreadcrumbsPresenter::handleCliTextChanged(const QString& text)
"<br>@ ... knowledge recherche"
"<br>> ... run a command"
"<br>: ... chat with workspace, Notebook or Note"
"<br>&nbsp;&nbsp;... or type full-text search phrase"
"<br>&nbsp;&nbsp;... or full-text search phrase"
"<br>"
"<br>Examples:"
"<br>"
Expand Down
2 changes: 1 addition & 1 deletion app/src/qt/main_menu_presenter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ MainMenuPresenter::MainMenuPresenter(MainWindowPresenter* mwp)
mwp, SLOT(doActionMindPreferences())
);
QObject::connect(
view->actionViewEmojis, SIGNAL(triggered()),
view->actionFormatEmojis, SIGNAL(triggered()),
mwp, SLOT(doActionEmojisDialog())
);
QObject::connect(
Expand Down
14 changes: 6 additions & 8 deletions app/src/qt/main_menu_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,13 +286,6 @@ MainMenuView::MainMenuView(MainWindowView& mainWindowView)
tr("Run simple command line from current MindForger workspace...")
);

actionViewEmojis = new QAction(
QIcon(":/menu-icons/bug.svg"), tr("Emo&jis"), mainWindow
);
actionViewEmojis->setStatusTip(
tr("Open dialog with emoji characters to be copy/pasted to names, descriptions and text...")
);

actionViewRecentNotes = new QAction(
QIcon(":/menu-icons/open-recent.svg"),
tr("&Recent Notes"),
Expand Down Expand Up @@ -350,7 +343,6 @@ MainMenuView::MainMenuView(MainWindowView& mainWindowView)
menuView->addAction(actionViewTags);
menuView->addAction(actionViewNavigator);
menuView->addAction(actionViewCli);
menuView->addAction(actionViewEmojis);
menuView->addAction(actionViewTerminal);
#ifdef MF_WIP
menuView->addAction(actionViewStencils);
Expand Down Expand Up @@ -982,6 +974,11 @@ MainMenuView::MainMenuView(MainWindowView& mainWindowView)
actionFormatHr = new QAction(tr("&Horizontal ruler"), mainWindow);
actionFormatHr->setStatusTip(tr("Horizontal ruler"));

actionFormatEmojis = new QAction(tr("Emo&jis"), mainWindow);
actionFormatEmojis->setStatusTip(
tr("Open dialog with emoji characters to be copy/pasted to names, descriptions and text...")
);

menuFormat->addAction(actionFormatBold);
menuFormat->addAction(actionFormatItalic);
menuFormat->addAction(actionFormatCode);
Expand All @@ -998,6 +995,7 @@ MainMenuView::MainMenuView(MainWindowView& mainWindowView)
menuFormat->addMenu(submenuFormatMathJax);
menuFormat->addAction(actionFormatTimestamp);
menuFormat->addAction(actionFormatHr);
menuFormat->addAction(actionFormatEmojis);
menuFormat->addSeparator();
menuFormat->addAction(actionFormatLink);
menuFormat->addAction(actionFormatImage);
Expand Down
2 changes: 1 addition & 1 deletion app/src/qt/main_menu_view.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ class MainMenuView : public QObject
QAction* actionViewDwell;
QAction* actionViewStencils;
QAction* actionViewCli;
QAction* actionViewEmojis;
QAction* actionViewTerminal;
QAction* actionViewRecentNotes;
QAction* actionViewLimbo;
Expand Down Expand Up @@ -260,6 +259,7 @@ class MainMenuView : public QObject
QAction* actionFormatImage;
QAction* actionFormatTable;
QAction* actionFormatHr;
QAction* actionFormatEmojis;
QAction* actionFormatTimestamp;

// menu: Help
Expand Down
17 changes: 9 additions & 8 deletions build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ CLASS_NAME := "New_Class"
MF_LANG := "en"
# Ubuntu distro: trusty xenial bionic focal jammy kinetic
DISTRO := "bionic"

# CPU cores thant can be used to build the project
CPU_CORES := 7

#
# targets
Expand Down Expand Up @@ -87,7 +88,7 @@ gen-ui-class: ## generate UI C++ class skeleton: CLASS_NAME=My_Class

../app/mindforger:
@echo "Building PRODUCTION MindForger executable..."
cd .. && qmake -r mindforger.pro && make -j ; cd ..
cd .. && qmake -r mindforger.pro && make -j $(CPU_CORES) ; cd ..
@echo "If build succeeded, then MindForger executable can be found in:\n app/mindforger"
ls -al ../app/mindforger

Expand All @@ -99,7 +100,7 @@ build: clean-app ../app/mindforger ## build production MindForger application bi
.PHONY: build-dev
build-dev: clean-app ## build development MindForger application binary
@echo "Building DEV MindForger executable..."
cd .. && qmake -r mindforger.pro DEFINES+=DO_MF_DEBUG && make -j ; cd ..
cd .. && qmake -r mindforger.pro DEFINES+=DO_MF_DEBUG && make -j $(CPU_CORES) ; cd ..
@echo "If build succeeded, then MindForger executable can be found in:\n app/mindforger"
ls -al ../app/mindforger

Expand All @@ -110,15 +111,15 @@ build-dev: clean-app ## build development MindForger application binary
.PHONY: build-rc
build-rc: clean-app ## build RC MindForger application binary
@echo "MindForger RC build..."
cd .. && qmake CONFIG+=mfrc -r mindforger.pro && make -j
cd .. && qmake CONFIG+=mfrc -r mindforger.pro && make -j $(CPU_CORES)
@echo "If RC build succeeded, then MindForger executable can be found in:\n app/mindforger"
ls -al ../app/mindforger


.PHONY: build-ci
build-ci: clean-app ## build CI MindForger application binary
@echo "MindForger CI build..."
cd .. && qmake CONFIG+=mfci -r mindforger.pro && make -j
cd .. && qmake CONFIG+=mfci -r mindforger.pro && make -j $(CPU_CORES)
@echo "If CI build succeeded, then MindForger executable can be found in:\n app/mindforger"
ls -al ../app/mindforger

Expand Down Expand Up @@ -164,8 +165,8 @@ install-dev-local: clean build-rc ## install MindForger RC build to ~/bin as 'mi
#


.PHONY: l10n
l10n: ## update and release localization strings: MF_LANG=en
.PHONY: localization
localization: ## update and release localization strings: MF_LANG=en
cd make && ./l10n-update-strings.sh && ./l10n-edit-and-release.sh $(MF_LANG)


Expand Down Expand Up @@ -266,7 +267,7 @@ doc-to-wiki: ## mindforger-documentation to mindforger.wiki
cd doc && ./mf-doc-to-wiki.py


.PHONY: api-reference
.PHONY: doc-api-reference
api-reference: ## generate Doxygen source code documentation
cd doxygen && doxygen ./mindforger.cfg

Expand Down

0 comments on commit 97a881d

Please sign in to comment.