1 files changed, 38 insertions, 28 deletions

diff --git a/examples/activeqt/menus/menus.cpp b/examples/activeqt/menus/menus.cpp
index 638bcd2..feb3540 100644
--- a/examples/activeqt/menus/menus.cpp
+++ b/examples/activeqt/menus/menus.cpp
@@ -6,7 +6,17 @@
 ** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
@@ -56,52 +66,52 @@ QMenus::QMenus(QWidget *parent)
 
     QMenu *file = new QMenu(this);
 
-    action = new QAction(QPixmap((const char**)fileopen), "&Open", this);
+    action = new QAction(QPixmap((const char**)fileopen), tr("&Open"), this);
     action->setShortcut(tr("CTRL+O"));
     connect(action, &QAction::triggered, this, &QMenus::fileOpen);
     file->addAction(action);
 
-    action = new QAction(QPixmap((const char**)filesave),"&Save", this);
+    action = new QAction(QPixmap((const char**)filesave), tr("&Save"), this);
     action->setShortcut(tr("CTRL+S"));
     connect(action, &QAction::triggered, this, &QMenus::fileSave);
     file->addAction(action);
 
     QMenu *edit = new QMenu(this);
 
-    action = new QAction("&Normal", this);
+    action = new QAction(tr("&Normal"), this);
     action->setShortcut(tr("CTRL+N"));
-    action->setToolTip("Normal");
-    action->setStatusTip("Toggles Normal");
+    action->setToolTip(tr("Normal"));
+    action->setStatusTip(tr("Toggles Normal"));
     action->setCheckable(true);
     connect(action, &QAction::triggered, this, &QMenus::editNormal);
     edit->addAction(action);
 
-    action = new QAction("&Bold", this);
+    action = new QAction(tr("&Bold"), this);
     action->setShortcut(tr("CTRL+B"));
     action->setCheckable(true);
     connect(action, &QAction::triggered, this, &QMenus::editBold);
     edit->addAction(action);
 
-    action = new QAction("&Underline", this);
+    action = new QAction(tr("&Underline"), this);
     action->setShortcut(tr("CTRL+U"));
     action->setCheckable(true);
     connect(action, &QAction::triggered, this, &QMenus::editUnderline);
     edit->addAction(action);
 
     QMenu *advanced = new QMenu(this);
-    action = new QAction("&Font...", this);
+    action = new QAction(tr("&Font..."), this);
     connect(action, &QAction::triggered, this, &QMenus::editAdvancedFont);
     advanced->addAction(action);
 
-    action = new QAction("&Style...", this);
+    action = new QAction(tr("&Style..."), this);
     connect(action, &QAction::triggered, this, &QMenus::editAdvancedStyle);
     advanced->addAction(action);
 
-    edit->addMenu(advanced)->setText("&Advanced");
+    edit->addMenu(advanced)->setText(tr("&Advanced"));
 
     edit->addSeparator();
 
-    action = new QAction("Una&vailable", this);
+    action = new QAction(tr("Una&vailable"), this);
     action->setShortcut(tr("CTRL+V"));
     action->setCheckable(true);
     action->setEnabled(false);
@@ -110,65 +120,65 @@ QMenus::QMenus(QWidget *parent)
 
     QMenu *help = new QMenu(this);
 
-    action = new QAction("&About...", this);
+    action = new QAction(tr("&About..."), this);
     action->setShortcut(tr("F1"));
     connect(action, &QAction::triggered, this, &QMenus::helpAbout);
     help->addAction(action);
 
-    action = new QAction("&About Qt...", this);
+    action = new QAction(tr("&About Qt..."), this);
     connect(action, &QAction::triggered, this, &QMenus::helpAboutQt);
     help->addAction(action);
 
     if (!QAxFactory::isServer())
-        menuBar()->addMenu(file)->setText("&File");
-    menuBar()->addMenu(edit)->setText("&Edit");
-    menuBar()->addMenu(help)->setText("&Help");
+        menuBar()->addMenu(file)->setText(tr("&File"));
+    menuBar()->addMenu(edit)->setText(tr("&Edit"));
+    menuBar()->addMenu(help)->setText(tr("&Help"));
 
-    editor = new QTextEdit(this);
-    setCentralWidget(editor);
+    m_editor = new QTextEdit(this);
+    setCentralWidget(m_editor);
 
     statusBar();
 }
 
 void QMenus::fileOpen()
 {
-    editor->append("File Open selected.");
+    m_editor->append(tr("File Open selected."));
 }
 
 void QMenus::fileSave()
 {
-    editor->append("File Save selected.");
+    m_editor->append(tr("File Save selected."));
 }
 
 void QMenus::editNormal()
 {
-    editor->append("Edit Normal selected.");
+    m_editor->append(tr("Edit Normal selected."));
 }
 
 void QMenus::editBold()
 {
-    editor->append("Edit Bold selected.");
+    m_editor->append(tr("Edit Bold selected."));
 }
 
 void QMenus::editUnderline()
 {
-    editor->append("Edit Underline selected.");
+    m_editor->append(tr("Edit Underline selected."));
 }
 
 void QMenus::editAdvancedFont()
 {
-    editor->append("Edit Advanced Font selected.");
+    m_editor->append(tr("Edit Advanced Font selected."));
 }
 
 void QMenus::editAdvancedStyle()
 {
-    editor->append("Edit Advanced Style selected.");
+    m_editor->append(tr("Edit Advanced Style selected."));
 }
 
 void QMenus::helpAbout()
 {
-    QMessageBox::about(this, "About QMenus",
-                       "This example implements an in-place ActiveX control with menus and status messages.");
+    QMessageBox::about(this, tr("About QMenus"),
+                       tr("This example implements an in-place ActiveX control with menus and status messages."));
 }
 
 void QMenus::helpAboutQt()