Added the menu in RfbPlayer
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@33 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/rfbplayer/resource.h b/rfbplayer/resource.h
index fb1f132..0199f48 100644
--- a/rfbplayer/resource.h
+++ b/rfbplayer/resource.h
@@ -4,16 +4,35 @@
//
#define IDD_DIALOGBAR 103
#define IDI_ICON1 105
+#define IDI_ICON 105
+#define IDR_MENU 128
#define IDC_BUTTON1 1000
#define IDC_EDIT1 1001
#define IDC_EDIT2 1002
+#define ID_FILE_OPENFILE 40011
+#define ID_FILE_CLOSEFILE 40012
+#define ID_FILE_EXIT 40013
+#define ID_VIEW_FULLSCREEN 40014
+#define ID_VIEW_ZOOM_50 40015
+#define ID_VIEW_ZOOM_100 40016
+#define ID_VIEW_ZOOM_200 40017
+#define ID_PLAY_PLAYPAUSE 40018
+#define ID_PLAY_STOP 40019
+#define ID_PLAY_GOTO 40020
+#define ID_PLAY_SETSPEED 40021
+#define ID_PLAY_LOOP 40022
+#define ID_FRAME_COPYTOCLIPBOARD 40023
+#define ID_FRAME_EXTRACT 40024
+#define ID_HELP_HOMEPAGE 40025
+#define ID_HELP_COMMANDLINESEITCHES 40026
+#define ID_HELP_ABOUT 40027
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 128
-#define _APS_NEXT_COMMAND_VALUE 40011
+#define _APS_NEXT_RESOURCE_VALUE 129
+#define _APS_NEXT_COMMAND_VALUE 40028
#define _APS_NEXT_CONTROL_VALUE 1003
#define _APS_NEXT_SYMED_VALUE 101
#endif
diff --git a/rfbplayer/rfbplayer.cxx b/rfbplayer/rfbplayer.cxx
index 21bd4fd..f52561f 100644
--- a/rfbplayer/rfbplayer.cxx
+++ b/rfbplayer/rfbplayer.cxx
@@ -158,7 +158,7 @@
printf("unable to load icon:%ld", GetLastError());
wndClass.hCursor = LoadCursor(NULL, IDC_ARROW);
wndClass.hbrBackground = HBRUSH(COLOR_WINDOW);
- wndClass.lpszMenuName = 0;
+ wndClass.lpszMenuName = MAKEINTRESOURCE(IDR_MENU);
wndClass.lpszClassName = _T("RfbPlayerClass");
classAtom = RegisterClass(&wndClass);
if (!classAtom) {
diff --git a/rfbplayer/rfbplayer.rc b/rfbplayer/rfbplayer.rc
index db4240c..d7b79b1 100644
--- a/rfbplayer/rfbplayer.rc
+++ b/rfbplayer/rfbplayer.rc
@@ -46,6 +46,18 @@
#endif // APSTUDIO_INVOKED
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.K.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -54,7 +66,7 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ICON1 ICON DISCARDABLE "rfbplayer.ico"
+IDI_ICON ICON DISCARDABLE "rfbplayer.ico"
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
@@ -101,7 +113,57 @@
#endif // !_MAC
-#endif // English (U.S.) resources
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_MENU MENU DISCARDABLE
+BEGIN
+ POPUP "File"
+ BEGIN
+ MENUITEM "Open File...\tCtrl+O", ID_FILE_OPENFILE
+ MENUITEM "Close File...\tCtrl+Q", ID_FILE_CLOSEFILE
+ MENUITEM SEPARATOR
+ MENUITEM "Exit\tAlt+X", ID_FILE_EXIT
+ END
+ POPUP "View"
+ BEGIN
+ MENUITEM "Full Screen\tAlt+Enter", ID_VIEW_FULLSCREEN
+ POPUP "Zoom"
+ BEGIN
+ MENUITEM "50%\tF5", ID_VIEW_ZOOM_50
+ MENUITEM "100%\tF6", ID_VIEW_ZOOM_100
+ MENUITEM "200%\tF7", ID_VIEW_ZOOM_200
+ END
+ END
+ POPUP "Play"
+ BEGIN
+ MENUITEM "Play/Pause\tSpace", ID_PLAY_PLAYPAUSE
+ MENUITEM "Stop\tC", ID_PLAY_STOP
+ MENUITEM "Go To...\tCtrl+G", ID_PLAY_GOTO
+ MENUITEM "Set Speed...\tCtrl+S", ID_PLAY_SETSPEED
+ MENUITEM SEPARATOR
+ MENUITEM "Loop\tCtrl+L", ID_PLAY_LOOP
+ END
+ POPUP "Frame"
+ BEGIN
+ MENUITEM "Copy To Clipboard\tCtrl+C", ID_FRAME_COPYTOCLIPBOARD
+ MENUITEM SEPARATOR
+ MENUITEM "Extract...\tAlt+C", ID_FRAME_EXTRACT
+ END
+ MENUITEM "Options", 65535
+ POPUP "Help"
+ BEGIN
+ MENUITEM "Home Page", ID_HELP_HOMEPAGE
+ MENUITEM "Command Line Switches", ID_HELP_COMMANDLINESEITCHES
+ MENUITEM SEPARATOR
+ MENUITEM "About RfbPlayer...", ID_HELP_ABOUT
+ END
+END
+
+#endif // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////