Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1256] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2012-04-28 13:00:55
|
Revision: 1256
http://modplug.svn.sourceforge.net/modplug/?rev=1256&view=rev
Author: saga-games
Date: 2012-04-28 13:00:47 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
[Mod] Changed help menu entries (we are not going to use a HLP file anymore).
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/InputHandler.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/Mptrack.h
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2012-04-27 20:05:26 UTC (rev 1255)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2012-04-28 13:00:47 UTC (rev 1256)
@@ -447,7 +447,7 @@
DefineKeyCommand(kcViewMain, 1367, _T("Toggle Main View"));
DefineKeyCommand(kcViewTree, 1368, _T("Toggle Tree View"));
DefineKeyCommand(kcViewOptions, 1369, _T("View Options"));
- DefineKeyCommand(kcHelp, 1370, _T("Help (to do)"));
+ DefineKeyCommand(kcHelp, 1370, _T("Help"));
/*
DefineKeyCommand(kcWindowNew, 1370, _T("New Window"));
DefineKeyCommand(kcWindowCascade, 1371, _T("Cascade Windows"));
Modified: trunk/OpenMPT/mptrack/InputHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/InputHandler.cpp 2012-04-27 20:05:26 UTC (rev 1255)
+++ trunk/OpenMPT/mptrack/InputHandler.cpp 2012-04-28 13:00:47 UTC (rev 1256)
@@ -514,7 +514,7 @@
case MAINVIEW: s="&Main\t"; c = kcViewMain; break;
case IDD_TREEVIEW: s="&Tree\t"; c = kcViewTree; break;
case ID_VIEW_OPTIONS: s="S&etup...\t"; c = kcViewOptions; break;
- case ID_HELP: s="C&ontents (todo)"; c = kcHelp; break;
+ case ID_HELP: s="&Help"; c = kcHelp; break;
case ID_PLUGIN_SETUP: s="Pl&ugin Manager...\t"; c = kcViewAddPlugin; break;
case ID_CHANNEL_MANAGER: s="Ch&annel Manager...\t"; c = kcViewChannelManager; break;
case ID_VIEW_SONGPROPERTIES:s="Song P&roperties...\t"; c = kcViewSongProperties; break; //rewbs.graph
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2012-04-27 20:05:26 UTC (rev 1255)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2012-04-28 13:00:47 UTC (rev 1256)
@@ -112,6 +112,7 @@
ON_MESSAGE(WM_MOD_KEYCOMMAND, OnCustomKeyMsg) //rewbs.customKeys
ON_COMMAND(ID_INTERNETUPDATE, OnInternetUpdate)
ON_COMMAND(ID_HELP_SHOWSETTINGSFOLDER, OnShowSettingsFolder)
+ ON_COMMAND(ID_HELP, OnHelp)
//}}AFX_MSG_MAP
ON_WM_INITMENU()
ON_WM_KILLFOCUS() //rewbs.fix3116
@@ -2311,14 +2312,17 @@
BOOL CMainFrame::OnInternetLink(UINT nID)
//---------------------------------------
{
- LPCSTR pszURL = NULL;
+ LPCSTR pszURL = nullptr;
switch(nID)
{
case ID_NETLINK_MODPLUG: pszURL = "http://openmpt.org/"; break;
case ID_NETLINK_TOP_PICKS: pszURL = "http://openmpt.org/top_picks"; break;
}
- if (pszURL) return CTrackApp::OpenURL(pszURL);
+ if(pszURL != nullptr)
+ {
+ return CTrackApp::OpenURL(pszURL) ? TRUE : FALSE;
+ }
return FALSE;
}
@@ -2535,16 +2539,16 @@
void CMainFrame::OnShowWindow(BOOL bShow, UINT /*nStatus*/)
//---------------------------------------------------------
{
- static bool firstShow = true;
- if (bShow && !IsWindowVisible() && firstShow)
+ static bool firstShow = true;
+ if (bShow && !IsWindowVisible() && firstShow)
{
- firstShow = false;
+ firstShow = false;
WINDOWPLACEMENT wpl;
if (GetPrivateProfileStruct("Display", "WindowPlacement", &wpl, sizeof(WINDOWPLACEMENT), theApp.GetConfigFileName()))
{
SetWindowPlacement(&wpl);
}
- }
+ }
}
@@ -2588,6 +2592,19 @@
}
+void CMainFrame::OnHelp()
+//-----------------------
+{
+ CString helpFile = theApp.GetAppDirPath();
+ helpFile += "OpenMPT Manual.pdf";
+ if(!theApp.OpenFile(helpFile))
+ {
+ helpFile = "Could not find help file:\n" + helpFile;
+ Reporting::Error(helpFile);
+ }
+}
+
+
HMENU CMainFrame::CreateFileMenu(const size_t nMaxCount, std::vector<CString>& vPaths, const LPCTSTR pszFolderName, const uint16 nIdRangeBegin)
//---------------------------------------------------------------------------------------------------------------------------------------------
{
Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h 2012-04-27 20:05:26 UTC (rev 1255)
+++ trunk/OpenMPT/mptrack/Mainfrm.h 2012-04-28 13:00:47 UTC (rev 1256)
@@ -651,6 +651,7 @@
afx_msg void OnViewEditHistory();
afx_msg void OnInternetUpdate();
afx_msg void OnShowSettingsFolder();
+ afx_msg void OnHelp();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
public:
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2012-04-27 20:05:26 UTC (rev 1255)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2012-04-28 13:00:47 UTC (rev 1256)
@@ -2279,20 +2279,23 @@
///////////////////////////////////////////////////////////////////////////////////
// Internet-related functions
-BOOL CTrackApp::OpenURL(const LPCSTR lpszURL)
+bool CTrackApp::OpenURL(const LPCSTR lpszURL)
//-------------------------------------------
{
- if ((lpszURL) && (lpszURL[0]) && (theApp.m_pMainWnd))
+ if(lpszURL != nullptr && lpszURL[0] != '\0' && theApp.m_pMainWnd)
{
- if (((ULONG)ShellExecute(
- theApp.m_pMainWnd->m_hWnd,
- "open",
- lpszURL,
- NULL,
- NULL,
- SW_SHOW)) >= 32) return TRUE;
+ if(reinterpret_cast<int>(ShellExecute(
+ theApp.m_pMainWnd->m_hWnd,
+ "open",
+ lpszURL,
+ NULL,
+ NULL,
+ SW_SHOW)) >= 32)
+ {
+ return true;
+ }
}
- return FALSE;
+ return false;
}
Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h 2012-04-27 20:05:26 UTC (rev 1255)
+++ trunk/OpenMPT/mptrack/Mptrack.h 2012-04-28 13:00:47 UTC (rev 1256)
@@ -166,9 +166,9 @@
static BOOL SaveDefaultDLSBanks();
static BOOL RemoveDLSBank(UINT nBank);
static BOOL AddDLSBank(LPCSTR);
- static BOOL OpenURL(const LPCSTR lpszURL);
- static BOOL OpenFile(const LPCSTR file) { return OpenURL(file); };
- static BOOL OpenDirectory(const LPCSTR directory) { return OpenURL(directory); };
+ static bool OpenURL(const LPCSTR lpszURL);
+ static bool OpenFile(const LPCSTR file) { return OpenURL(file); };
+ static bool OpenDirectory(const LPCSTR directory) { return OpenURL(directory); };
static FileDlgResult ShowOpenSaveFileDialog(const bool load, const std::string defaultExtension, const std::string defaultFilename, const std::string extFilter, const std::string workingDirectory = "", const bool allowMultiSelect = false, int *filterIndex = nullptr);
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2012-04-27 20:05:26 UTC (rev 1255)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2012-04-28 13:00:47 UTC (rev 1256)
@@ -2125,8 +2125,7 @@
END
POPUP "&Help"
BEGIN
- MENUITEM "&Contents", ID_HELP_FINDER
- MENUITEM "&Search...", ID_HELP_SEARCH
+ MENUITEM "&Help...", ID_HELP
MENUITEM "&Report a Bug", ID_REPORT_BUG
MENUITEM SEPARATOR
MENUITEM "&Example Modules", ID_EXAMPLE_MODULES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
