AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa QPA: Code clean up, make some bits more readable

Browse Source 
Change-Id: I7f37c1b0f7f72a79bb2ac5828ba54111a90a0a00
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Gabriel de Dietrich 2017-10-20 11:07:59 +07:00 committed by Liang Qi
parent 4f9b2cb026
commit 37a1478787
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/messages.cpp
View File

@ -75,7 +75,7 @@ QString qt_mac_applicationmenu_string(int type)
QPlatformMenuItem::MenuRole detectMenuRole(const QString &caption) QPlatformMenuItem::MenuRole detectMenuRole(const QString &caption)
{ {
QString captionNoAmpersand(caption); QString captionNoAmpersand(caption);
captionNoAmpersand.remove(QChar('&')); captionNoAmpersand.remove(QLatin1Char('&'));
const QString aboutString = QCoreApplication::translate("QCocoaMenuItem", "About"); const QString aboutString = QCoreApplication::translate("QCocoaMenuItem", "About");
if (captionNoAmpersand.startsWith(aboutString, Qt::CaseInsensitive) || caption.endsWith(aboutString, Qt::CaseInsensitive)) if (captionNoAmpersand.startsWith(aboutString, Qt::CaseInsensitive) || caption.endsWith(aboutString, Qt::CaseInsensitive))
return QPlatformMenuItem::AboutRole; return QPlatformMenuItem::AboutRole;

11
src/plugins/platforms/cocoa/messages.h
View File

@ -45,6 +45,17 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
enum {
ServicesAppMenuItem = 0,
HideAppMenuItem,
HideOthersAppMenuItem,
ShowAllAppMenuItem,
PreferencesAppMenuItem,
QuitAppMenuItem,
AboutAppMenuItem
};
QString msgAboutQt(); QString msgAboutQt();
QString qt_mac_applicationmenu_string(int type); QString qt_mac_applicationmenu_string(int type);

10
src/plugins/platforms/cocoa/qcocoamenuitem.mm
View File

@ -370,24 +370,20 @@ NSMenuItem *QCocoaMenuItem::sync()
return m_native; return m_native;
} }
QT_BEGIN_NAMESPACE
extern QString qt_mac_applicationmenu_string(int type);
QT_END_NAMESPACE
QString QCocoaMenuItem::mergeText() QString QCocoaMenuItem::mergeText()
{ {
QCocoaMenuLoader *loader = [QCocoaMenuLoader sharedMenuLoader]; QCocoaMenuLoader *loader = [QCocoaMenuLoader sharedMenuLoader];
if (m_native == [loader aboutMenuItem]) { if (m_native == [loader aboutMenuItem]) {
return qt_mac_applicationmenu_string(6).arg(qt_mac_applicationName()); return qt_mac_applicationmenu_string(AboutAppMenuItem).arg(qt_mac_applicationName());
} else if (m_native== [loader aboutQtMenuItem]) { } else if (m_native== [loader aboutQtMenuItem]) {
if (m_text == QString("About Qt")) if (m_text == QString("About Qt"))
return msgAboutQt(); return msgAboutQt();
else else
return m_text; return m_text;
} else if (m_native == [loader preferencesMenuItem]) { } else if (m_native == [loader preferencesMenuItem]) {
return qt_mac_applicationmenu_string(4); return qt_mac_applicationmenu_string(PreferencesAppMenuItem);
} else if (m_native == [loader quitMenuItem]) { } else if (m_native == [loader quitMenuItem]) {
return qt_mac_applicationmenu_string(5).arg(qt_mac_applicationName()); return qt_mac_applicationmenu_string(QuitAppMenuItem).arg(qt_mac_applicationName());
} else if (m_text.contains('\t')) { } else if (m_text.contains('\t')) {
return m_text.left(m_text.indexOf('\t')); return m_text.left(m_text.indexOf('\t'));
} }

20
src/plugins/platforms/cocoa/qcocoamenuloader.mm
View File

@ -47,14 +47,8 @@
#include <QtCore/private/qcore_mac_p.h> #include <QtCore/private/qcore_mac_p.h>
#include <QtCore/private/qthread_p.h> #include <QtCore/private/qthread_p.h>
#include <QtCore/qcoreapplication.h> #include <QtCore/qcoreapplication.h>
#include <QtCore/qdir.h>
#include <QtCore/qstring.h>
#include <QtCore/qdebug.h>
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>
QT_FORWARD_DECLARE_CLASS(QCFString)
QT_FORWARD_DECLARE_CLASS(QString)
@implementation QCocoaMenuLoader @implementation QCocoaMenuLoader
+ (instancetype)sharedMenuLoader + (instancetype)sharedMenuLoader
@ -314,13 +308,13 @@ QT_FORWARD_DECLARE_CLASS(QString)
{ {
#ifndef QT_NO_TRANSLATION #ifndef QT_NO_TRANSLATION
[servicesItem setTitle:qt_mac_applicationmenu_string(0).toNSString()]; [servicesItem setTitle:qt_mac_applicationmenu_string(ServicesAppMenuItem).toNSString()];
[hideItem setTitle:qt_mac_applicationmenu_string(1).arg(qt_mac_applicationName()).toNSString()]; [hideItem setTitle:qt_mac_applicationmenu_string(HideAppMenuItem).arg(qt_mac_applicationName()).toNSString()];
[hideAllOthersItem setTitle:qt_mac_applicationmenu_string(2).toNSString()]; [hideAllOthersItem setTitle:qt_mac_applicationmenu_string(HideOthersAppMenuItem).toNSString()];
[showAllItem setTitle:qt_mac_applicationmenu_string(3).toNSString()]; [showAllItem setTitle:qt_mac_applicationmenu_string(ShowAllAppMenuItem).toNSString()];
[preferencesItem setTitle:qt_mac_applicationmenu_string(4).toNSString()]; [preferencesItem setTitle:qt_mac_applicationmenu_string(PreferencesAppMenuItem).toNSString()];
[quitItem setTitle:qt_mac_applicationmenu_string(5).arg(qt_mac_applicationName()).toNSString()]; [quitItem setTitle:qt_mac_applicationmenu_string(QuitAppMenuItem).arg(qt_mac_applicationName()).toNSString()];
[aboutItem setTitle:qt_mac_applicationmenu_string(6).arg(qt_mac_applicationName()).toNSString()]; [aboutItem setTitle:qt_mac_applicationmenu_string(AboutAppMenuItem).arg(qt_mac_applicationName()).toNSString()];
#endif #endif
} }