RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[Windows] Added About and Preferences into System menu

Browse source
This commit is contained in:
Alex Zolotarev 2011-02-07 17:03:32 +02:00 • committed by Alex Zolotarev
parent 7676597f28
commit 43ccb47f20
2 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
qt/mainwindow.cpp
View file

@ -24,6 +24,9 @@
#include "../base/start_mem_debug.hpp"
#define IDM_ABOUT_DIALOG 1001
#define IDM_PREFERENCES_DIALOG 1002
namespace qt
{
@ -45,11 +48,54 @@ MainWindow::MainWindow() : m_updateDialog(0)
menuBar()->addMenu(helpMenu);
helpMenu->addAction(tr("About"), this, SLOT(OnAbout()));
helpMenu->addAction(tr("Preferences"), this, SLOT(OnPreferences()));
#else
{ // create items in the system menu
QByteArray const aboutStr = tr("About MapsWithMe...").toLocal8Bit();
QByteArray const prefsStr = tr("Preferences...").toLocal8Bit();
// we use system menu for our items
HMENU menu = ::GetSystemMenu(winId(), FALSE);
MENUITEMINFOA item;
item.cbSize = sizeof(MENUITEMINFOA);
item.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING;
item.fType = MFT_STRING;
item.wID = IDM_PREFERENCES_DIALOG;
item.dwTypeData = const_cast<char *>(prefsStr.data());
item.cch = prefsStr.size();
::InsertMenuItemA(menu, ::GetMenuItemCount(menu) - 1, TRUE, &item);
item.wID = IDM_ABOUT_DIALOG;
item.dwTypeData = const_cast<char *>(aboutStr.data());
item.cch = aboutStr.size();
::InsertMenuItemA(menu, ::GetMenuItemCount(menu) - 1, TRUE, &item);
item.fType = MFT_SEPARATOR;
::InsertMenuItemA(menu, ::GetMenuItemCount(menu) - 1, TRUE, &item);
}
#endif
LoadState();
}
#if defined(Q_WS_WIN)
bool MainWindow::winEvent(MSG * msg, long * result)
{
if (msg->message == WM_SYSCOMMAND)
{
if (msg->wParam == IDM_PREFERENCES_DIALOG)
{
OnPreferences();
*result = 0;
return true;
}
else if (msg->wParam == IDM_ABOUT_DIALOG)
{
OnAbout();
*result = 0;
return true;
}
}
return false;
}
#endif
MainWindow::~MainWindow()
{
SaveState();

4
qt/mainwindow.hpp
View file

@ -38,6 +38,10 @@ namespace qt
void CreateClassifPanel();
void CreateNavigationBar();
//void CreateFindTable(QLayout * pLayout);
#if defined(Q_WS_WIN)
/// to handle menu messages
virtual bool winEvent(MSG * msg, long * result);
#endif
protected Q_SLOTS:
//void OnFeatureEntered(int row, int col);