Alexandre Julliard : winefile: Merge accelerators into the main resource file.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0185c471ec3ffd90b5deed86087012afc4356873
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0185c471ec3ffd90b5deed86087012afc4356873

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Dec 19 20:14:11 2011 +0100

winefile: Merge accelerators into the main resource file.

---

 programs/winefile/En.rc       |   42 -----------------------------------------
 programs/winefile/Makefile.in |    5 +---
 programs/winefile/winefile.rc |   16 +++++++++++++++
 3 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc
deleted file mode 100644
index ea43a05..0000000
--- a/programs/winefile/En.rc
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * WineFile
- * English Language Support
- *
- * Copyright 2000 Martin Fuchs
- * Copyright 2002 Steven Edwards
- * Copyright 2002 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "resource.h"
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-IDA_WINEFILE ACCELERATORS
-{
-	VK_F1, ID_HELP, VIRTKEY
-	VK_F5, ID_REFRESH, VIRTKEY
-	VK_F7, ID_FILE_MOVE, VIRTKEY
-	VK_F8, ID_FILE_COPY, VIRTKEY
-	VK_DELETE, ID_FILE_DELETE, VIRTKEY
-	VK_RETURN, ID_ACTIVATE, VIRTKEY
-	VK_RETURN, ID_EDIT_PROPERTIES, VIRTKEY, ALT
-#ifndef _NO_EXTENSIONS
-	"X", ID_FILE_EXIT, VIRTKEY, ALT
-	"S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL
-	VK_ADD, ID_PREFERRED_SIZES, VIRTKEY, CONTROL
-#endif
-}
diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in
index d6e085b..1b1ce0d 100644
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -7,10 +7,7 @@ C_SRCS = \
 	splitpath.c \
 	winefile.c
 
-RC_SRCS = \
-	En.rc \
-	winefile.rc
-
+RC_SRCS = winefile.rc
 PO_SRCS = winefile.rc
 
 MANPAGE = winefile.man
diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc
index 2384f3f..39686d8 100644
--- a/programs/winefile/winefile.rc
+++ b/programs/winefile/winefile.rc
@@ -188,6 +188,22 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,191,110,50,14
 END
 
+IDA_WINEFILE ACCELERATORS
+{
+	VK_F1, ID_HELP, VIRTKEY
+	VK_F5, ID_REFRESH, VIRTKEY
+	VK_F7, ID_FILE_MOVE, VIRTKEY
+	VK_F8, ID_FILE_COPY, VIRTKEY
+	VK_DELETE, ID_FILE_DELETE, VIRTKEY
+	VK_RETURN, ID_ACTIVATE, VIRTKEY
+	VK_RETURN, ID_EDIT_PROPERTIES, VIRTKEY, ALT
+#ifndef _NO_EXTENSIONS
+	"X", ID_FILE_EXIT, VIRTKEY, ALT
+	"S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL
+	VK_ADD, ID_PREFERRED_SIZES, VIRTKEY, CONTROL
+#endif
+}
+
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* @makedep: winefile.ico */