diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:39:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:58:20 +0100 |
| commit | 66fb4a7d97b8e3dd90c983a9a94c2e7352f9d5e8 (patch) | |
| tree | af78d7d89a71e6e973b30d450fec1de5b08d8c9c /src/distancefieldgenerator | |
| parent | e238a37c1888e069ca1a6464f9e4e8f659e53fe7 (diff) | |
| parent | 7249ba659951a9ca388a7a09cd301a2d9f79eaa4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.12.1
Conflicts:
qttools.pro
Change-Id: Ibf247399306794b1d79ebbcd230b853896d0bc87
Diffstat (limited to 'src/distancefieldgenerator')
| -rw-r--r-- | src/distancefieldgenerator/mainwindow.cpp | 9 | ||||
| -rw-r--r-- | src/distancefieldgenerator/mainwindow.ui | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/distancefieldgenerator/mainwindow.cpp b/src/distancefieldgenerator/mainwindow.cpp index 09784aca7..763aeaa6b 100644 --- a/src/distancefieldgenerator/mainwindow.cpp +++ b/src/distancefieldgenerator/mainwindow.cpp @@ -35,6 +35,7 @@ #include <QtCore/qmath.h> #include <QtCore/qendian.h> #include <QtCore/qbuffer.h> +#include <QtGui/qdesktopservices.h> #include <QtGui/qrawfont.h> #include <QtWidgets/qmessagebox.h> #include <QtWidgets/qlabel.h> @@ -49,6 +50,11 @@ QT_BEGIN_NAMESPACE +static void openHelp() +{ + QDesktopServices::openUrl(QUrl(QLatin1String("http://doc.qt.io/qt-5/qtdistancefieldgenerator-index.html"))); +} + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , ui(new Ui::MainWindow) @@ -60,6 +66,8 @@ MainWindow::MainWindow(QWidget *parent) ui->setupUi(this); ui->lvGlyphs->setModel(m_model); + ui->actionHelp->setShortcut(QKeySequence::HelpContents); + m_statusBarLabel = new QLabel(this); m_statusBarLabel->setText(tr("Ready")); ui->statusbar->addPermanentWidget(m_statusBarLabel); @@ -117,6 +125,7 @@ void MainWindow::setupConnections() connect(ui->tbSelectAll, &QToolButton::clicked, this, &MainWindow::selectAll); connect(ui->actionSelect_all, &QAction::triggered, this, &MainWindow::selectAll); connect(ui->actionSelect_string, &QAction::triggered, this, &MainWindow::selectString); + connect(ui->actionHelp, &QAction::triggered, this, openHelp); connect(ui->actionAbout_App, &QAction::triggered, this, &MainWindow::about); connect(ui->actionAbout_Qt, &QAction::triggered, this, [this]() { QMessageBox::aboutQt(this); diff --git a/src/distancefieldgenerator/mainwindow.ui b/src/distancefieldgenerator/mainwindow.ui index 09a3c4112..e7fe0d788 100644 --- a/src/distancefieldgenerator/mainwindow.ui +++ b/src/distancefieldgenerator/mainwindow.ui @@ -145,6 +145,7 @@ <property name="title"> <string>&Help</string> </property> + <addaction name="actionHelp"/> <addaction name="actionAbout_App"/> <addaction name="actionAbout_Qt"/> </widget> @@ -205,6 +206,11 @@ <string>About Qt</string> </property> </action> + <action name="actionHelp"> + <property name="text"> + <string>Help</string> + </property> + </action> </widget> <resources/> <connections/> |