From 33dfcdcc2f8ac2836a11b1b567c662e3c2bd9339 Mon Sep 17 00:00:00 2001 From: darkelfe14728 Date: Sun, 27 Sep 2020 20:42:27 +0200 Subject: [PATCH] Minor improvements Internationalization for shortcuts App setting for light/dark theme Rewriting "about" section --- MainWindow/MainWindow.cpp | 62 +++++++++++++++---- MainWindow/MainWindow.h | 2 + MainWindow/MainWindow.ui | 123 ++++++++++++-------------------------- main.cpp | 10 +++- 4 files changed, 98 insertions(+), 99 deletions(-) diff --git a/MainWindow/MainWindow.cpp b/MainWindow/MainWindow.cpp index b22b9a8..2d07289 100644 --- a/MainWindow/MainWindow.cpp +++ b/MainWindow/MainWindow.cpp @@ -6,14 +6,46 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { + setupUi(); +} +MainWindow::~MainWindow() { + delete ui; +} +void MainWindow::setupUi() { ui->setupUi(this); - connect(ui->actionHelpAboutQt, &QAction::triggered, qApp, &QApplication::aboutQt); -} + //region Shortcuts + ui->actionFileNew->setShortcut(QKeySequence::New); + ui->actionFileOpen->setShortcut(QKeySequence::Open); + ui->actionFileSave->setShortcut(QKeySequence::Save); + ui->actionFileSaveAs->setShortcut(QKeySequence::SaveAs); + ui->actionFileReload->setShortcut(QKeySequence::Refresh); + ui->actionFileClose->setShortcut(QKeySequence::Close); + ui->actionFileSettings->setShortcut(QKeySequence::Preferences); + ui->actionFileQuit->setShortcut(QKeySequence::Quit); -MainWindow::~MainWindow() { - delete ui; + ui->actionEditUndo->setShortcut(QKeySequence::Undo); + ui->actionEditRedo->setShortcut(QKeySequence::Redo); + ui->actionEditCopy->setShortcut(QKeySequence::Copy); + ui->actionEditCut->setShortcut(QKeySequence::Cut); + ui->actionEditPaste->setShortcut(QKeySequence::Paste); + ui->actionEditModify->setShortcut(QKeySequence(tr("F2"))); + ui->actionEditDelete->setShortcut(QKeySequence::Delete); + ui->actionEditMoveUp->setShortcut(QKeySequence(tr("Ctrl+Up"))); + ui->actionEditMoveDown->setShortcut(QKeySequence(tr("Ctrl+Down"))); + + ui->actionSearchFind->setShortcut(QKeySequence::Find); + ui->actionSearchFindNext->setShortcut(QKeySequence::FindNext); + ui->actionSearchFindPrevious->setShortcut(QKeySequence::FindPrevious); + ui->actionSearchReplace->setShortcut(QKeySequence::Replace); + + ui->actionHelpAboutNBTModifier->setShortcut(QKeySequence::HelpContents); + //endregion + + //region Signals + connect(ui->actionHelpAboutQt, &QAction::triggered, qApp, &QApplication::aboutQt); + //endregion } void MainWindow::on_actionHelpAboutNBTModifier_triggered() { @@ -25,15 +57,19 @@ void MainWindow::on_actionHelpAboutNBTModifier_triggered() { info.setStandardButtons(QMessageBox::Ok); info.setTextFormat(Qt::RichText); - info.setText(tr( - "NBTModifier 1.0.0
" - "Copyright © 2020 Julien Rosset
" - "
" - "Use Qt 5.10.0 and FontAwesone icon pack
" - "
" - "jul.rosset@gmail.com
" - "Page du projet" - )); + info.setText( + tr( + // language=HTML + "NBTModifier 1.0.0
" + "Copyright © 2020 Julien Rosset
" + "
" + "Qt %1 and KDE Breeze icons
" + "
" + "jul.rosset@gmail.com
" + "Project page" + ) + .arg(QT_VERSION_STR) + ); info.exec(); } \ No newline at end of file diff --git a/MainWindow/MainWindow.h b/MainWindow/MainWindow.h index 618dfee..f7e1cb3 100644 --- a/MainWindow/MainWindow.h +++ b/MainWindow/MainWindow.h @@ -17,6 +17,8 @@ public: private: Ui::MainWindow *ui; + void setupUi(); + private slots: void on_actionHelpAboutNBTModifier_triggered(); }; diff --git a/MainWindow/MainWindow.ui b/MainWindow/MainWindow.ui index f93b468..c0a7202 100644 --- a/MainWindow/MainWindow.ui +++ b/MainWindow/MainWindow.ui @@ -73,7 +73,7 @@ - File + &File @@ -81,16 +81,16 @@ - - + + - + - Edit + &Edit @@ -167,10 +167,7 @@ .. - New - - - Ctrl+N + &New @@ -179,10 +176,7 @@ .. - Open - - - Ctrl+O + &Open @@ -191,10 +185,7 @@ .. - Save - - - Ctrl+S + &Save @@ -205,9 +196,6 @@ Save as - - Ctrl+Shift+S - @@ -215,7 +203,7 @@ .. - Quit + &Quit Ctrl+Q @@ -223,58 +211,48 @@ - + + .. Undo - - Ctrl+Z - - + + .. Redo - - Ctrl+Y, Ctrl+Shift+Z - - + + .. Copy - - Ctrl+C - - + + .. Cut - - Ctrl+X - - + + .. Paste - - Ctrl+V - @@ -338,100 +316,80 @@ - + + .. Modify name/value - - F2 - - + + .. Delete - - Del - - + + .. Move Up - - Ctrl+Up - - + + .. Move Down - - Ctrl+Down - - + Reload - - Ctrl+F5 - - + + .. - Find - - - Ctrl+F + &Find Find next - - F3 - Find Previous - - Shift+F3 - - + + .. - Replace - - - Ctrl+H + &Replace - + + .. - About NBTModifier + &About NBTModifier @@ -439,7 +397,7 @@ About Qt - + .. @@ -447,11 +405,8 @@ Close - - Ctrl+W - - + .. diff --git a/main.cpp b/main.cpp index 6d9e0ee..af2048b 100644 --- a/main.cpp +++ b/main.cpp @@ -1,3 +1,4 @@ +#include #include #include "MainWindow/MainWindow.h" @@ -5,10 +6,15 @@ int main (int argc, char* argv[]) { QApplication app(argc, argv); QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - - QIcon::setThemeName("breeze-dark"); + QApplication::setOrganizationName("JRosset"); + QApplication::setOrganizationDomain("jrosset.fr"); + QApplication::setApplicationName("NBTModifier"); app.setQuitOnLastWindowClosed(true); + QSettings settings; + const bool dark = (settings.value("application/theme", "dark").toString() == "dark"); + QIcon::setThemeName(QString("breeze") + (dark ? QString("-dark") : QString())); + MainWindow main; main.show();