[dreimer] 67926: [ROSAPPS] General improvements to rosapps by Jared Smudde ROSAPPS-301 #resolve #comment Committed, thx for help.
Author: dreimer Date: Tue May 26 17:35:57 2015 New Revision: 67926
URL: http://svn.reactos.org/svn/reactos?rev=67926&view=rev Log: [ROSAPPS] General improvements to rosapps by Jared Smudde ROSAPPS-301 #resolve #comment Committed, thx for help.
Removed: trunk/rosapps/templates/old_wordpad/wordpad.rc Modified: trunk/rosapps/templates/dialog/dialog.rc trunk/rosapps/templates/mdi/mdi.rc trunk/rosapps/templates/old_wordpad/CMakeLists.txt trunk/rosapps/templates/old_wordpad/rsrc.rc
Modified: trunk/rosapps/templates/dialog/dialog.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/dialog/dialog.rc?... ============================================================================== --- trunk/rosapps/templates/dialog/dialog.rc [iso-8859-1] (original) +++ trunk/rosapps/templates/dialog/dialog.rc [iso-8859-1] Tue May 26 17:35:57 2015 @@ -1,31 +1,12 @@ -//Microsoft Developer Studio generated resource script. -// -// #include "resrc1.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// #include <windows.h> #include "resource.h"
-///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS +#define REACTOS_STR_FILE_DESCRIPTION "Tab Control Test\0" +#define REACTOS_STR_INTERNAL_NAME "template_dialog\0" +#define REACTOS_STR_ORIGINAL_FILENAME "template_dialog.exe\0" +#include <reactos/version.rc>
-///////////////////////////////////////////////////////////////////////////// -// English (Australia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_TABBED_DIALOG DIALOGEX DISCARDABLE 0, 0, 243, 230 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -61,48 +42,4 @@ GROUPBOX "Static",IDC_STATIC,7,7,159,70 CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,40,30,92,17 -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resrc1.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""windows.h""\r\n" - "#include ""reactos\resource.h""\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (Australia) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +END
Modified: trunk/rosapps/templates/mdi/mdi.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/mdi/mdi.rc?rev=67... ============================================================================== --- trunk/rosapps/templates/mdi/mdi.rc [iso-8859-1] (original) +++ trunk/rosapps/templates/mdi/mdi.rc [iso-8859-1] Tue May 26 17:35:57 2015 @@ -1,4 +1,4 @@ - +#include "resource.h" #include <windows.h>
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS MDI Sample Application by Robert Dickenson\0" @@ -7,54 +7,15 @@ #define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright © 2002 Robert Dickenson\0" #include <reactos/version.rc>
-//Microsoft Developer Studio generated resource script. -// -#include "resource.h" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -#include "resource.h" +/* Icons */ +IDI_MDI_APP ICON DISCARDABLE "res/mdi.ico" +IDI_SMALL ICON DISCARDABLE "res/small.ico"
-///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -/* UTF-8 */ -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_MDI_APP ICON DISCARDABLE "res/mdi.ico" -IDI_SMALL ICON DISCARDABLE "res/small.ico" - -//////////////////////////////////////////////////////////////////////////////// -// Bitmaps -// - -IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" -IDB_IMAGES BITMAP DISCARDABLE "res/images.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// +/* Bitmaps */ +IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" +IDB_IMAGES BITMAP DISCARDABLE "res/images.bmp"
IDC_MDI_APP MENU DISCARDABLE BEGIN @@ -98,10 +59,14 @@ END END
-///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// +IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 +END
IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU @@ -114,36 +79,6 @@ LTEXT "Copyright (C) 2002 ReactOS Team",IDC_STATIC,49,20,119,8 DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""resource.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -//
STRINGTABLE DISCARDABLE BEGIN @@ -182,91 +117,4 @@
IDC_MDI_APP "MDI_APP" IDC_MDI_APP_CHILD "MDI_APP_CHILD" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (Australia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - ID_HELP_ABOUT "Displays program information, version number, and copyright." -END - -#endif // English (Australia) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +END
Modified: trunk/rosapps/templates/old_wordpad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/CMake... ============================================================================== --- trunk/rosapps/templates/old_wordpad/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/templates/old_wordpad/CMakeLists.txt [iso-8859-1] Tue May 26 17:35:57 2015 @@ -7,7 +7,7 @@ opensave.c wordpad.c)
-add_executable(old_wordpad ${SOURCE} wordpad.rc) +add_executable(old_wordpad ${SOURCE} rsrc.rc) set_module_type(old_wordpad win32gui UNICODE) add_importlibs(old_wordpad user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET old_wordpad DESTINATION reactos/system32 FOR all)
Modified: trunk/rosapps/templates/old_wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/rsrc.... ============================================================================== --- trunk/rosapps/templates/old_wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/templates/old_wordpad/rsrc.rc [iso-8859-1] Tue May 26 17:35:57 2015 @@ -1,6 +1,22 @@ #include <windows.h> #include <commctrl.h> #include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Document Editor\0" +#define REACTOS_STR_INTERNAL_NAME "wordpad\0" +#define REACTOS_STR_ORIGINAL_FILENAME "wordpad.exe\0" +//#include <reactos/version.rc> + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "WordPad" + IDS_VERSION "v0.1" +END + +IDI_ICON ICON "res/wordpad.ico" + +/* main toolbar icons */ +IDB_TEXTTOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp"
#include <reactos/manifest_exe.rc>
Removed: trunk/rosapps/templates/old_wordpad/wordpad.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/wordp... ============================================================================== --- trunk/rosapps/templates/old_wordpad/wordpad.rc [iso-8859-1] (original) +++ trunk/rosapps/templates/old_wordpad/wordpad.rc (removed) @@ -1,24 +0,0 @@ -#include <windows.h> -#include <commctrl.h> -#include "resource.h" - -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Document Editor\0" -#define REACTOS_STR_INTERNAL_NAME "wordpad\0" -#define REACTOS_STR_ORIGINAL_FILENAME "wordpad.exe\0" -//#include <reactos/version.rc> - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "WordPad" - IDS_VERSION "v0.1" -END - -IDI_ICON ICON "res/wordpad.ico" - -/* main toolbar icons */ -IDB_TEXTTOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" - -#include "rsrc.rc" - - -
-
dreimer＠svn.reactos.org