Author: mjansen Date: Sun Apr 2 14:46:54 2017 New Revision: 74269
URL: http://svn.reactos.org/svn/reactos?rev=74269&view=rev Log: [RAPPS][RAPPS_NEW] Finally replace rapps with rapps_new. CORE-13017 #resolve
Added: trunk/reactos/base/applications/rapps/ - copied from r74268, trunk/reactos/base/applications/rapps_new/ trunk/reactos/base/applications/rapps/rappsmsg.mc - copied unchanged from r74256, trunk/reactos/base/applications/rapps_new/rappsmsg_new.mc Removed: trunk/reactos/base/applications/rapps/rappsmsg_new.mc trunk/reactos/base/applications/rapps_new/ Modified: trunk/reactos/base/applications/CMakeLists.txt trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/rapps/aboutdlg.cpp trunk/reactos/base/applications/rapps/available.cpp trunk/reactos/base/applications/rapps/installdlg.cpp trunk/reactos/base/applications/rapps/installed.cpp trunk/reactos/base/applications/rapps/integrity.cpp trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/loaddlg.cpp trunk/reactos/base/applications/rapps/misc.cpp trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/rapps.rc trunk/reactos/base/applications/rapps/settingsdlg.cpp trunk/reactos/base/applications/rapps/splitter.cpp trunk/reactos/base/applications/rapps/winmain.cpp
Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeList... ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -28,7 +28,6 @@ add_subdirectory(notepad) add_subdirectory(osk) add_subdirectory(rapps) -add_subdirectory(rapps_new) add_subdirectory(regedit) add_subdirectory(regedt32) add_subdirectory(sc)
Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CMa... ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,4 +1,4 @@ -project(RAPPS_NEW) +project(rapps)
set_cpp(WITH_RUNTIME)
@@ -19,13 +19,13 @@ rapps.h)
add_definitions(-DUSE_CERT_PINNING) -file(GLOB_RECURSE rapps_new_rc_deps res/*.*) -add_rc_deps(rapps.rc ${rapps_new_rc_deps}) -add_executable(rapps_new ${SOURCE} rapps.rc) -set_module_type(rapps_new win32gui UNICODE) -target_link_libraries(rapps_new atlnew uuid wine) -add_importlibs(rapps_new advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) -add_pch(rapps_new rapps.h SOURCE) -add_dependencies(rapps_new rappsmsg_new) -add_message_headers(ANSI rappsmsg_new.mc) -add_cd_file(TARGET rapps_new DESTINATION reactos/system32 FOR all) +file(GLOB_RECURSE rapps_rc_deps res/*.*) +add_rc_deps(rapps.rc ${rapps_rc_deps}) +add_executable(rapps ${SOURCE} rapps.rc) +set_module_type(rapps win32gui UNICODE) +target_link_libraries(rapps atlnew uuid wine) +add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) +add_pch(rapps rapps.h SOURCE) +add_dependencies(rapps rappsmsg) +add_message_headers(ANSI rappsmsg.mc) +add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/applications/rapps/aboutdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/abo... ============================================================================== --- trunk/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/aboutdlg.cpp + * FILE: base/applications/rapps/aboutdlg.cpp * PURPOSE: About Dialog * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) */
Modified: trunk/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ava... ============================================================================== --- trunk/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/available.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/available.cpp + * FILE: base/applications/rapps/available.cpp * PURPOSE: Functions for working with available applications * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) * Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com)
Modified: trunk/reactos/base/applications/rapps/installdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ins... ============================================================================== --- trunk/reactos/base/applications/rapps/installdlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installdlg.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/installdlg.cpp + * FILE: base/applications/rapps/installdlg.cpp * PURPOSE: "Download and Install" Dialog * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) */
Modified: trunk/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ins... ============================================================================== --- trunk/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/installed.cpp + * FILE: base/applications/rapps/installed.cpp * PURPOSE: Functions for working with installed applications * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) */
Modified: trunk/reactos/base/applications/rapps/integrity.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/int... ============================================================================== --- trunk/reactos/base/applications/rapps/integrity.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/integrity.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/integrity.cpp + * FILE: base/applications/rapps/integrity.cpp * PURPOSE: Various integrity check mechanisms * PROGRAMMERS: Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) * Mark Jansen
Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,5 +1,5 @@ /* - * FILE: base/applications/rapps_new/lang/ro-RO.rc + * FILE: base/applications/rapps/lang/ro-RO.rc * ReactOS Project (http://www.reactos.org) * TRANSLATOR: Ètefan Fulea (stefan dot fulea at mail dot md) */
Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS RAPPS - * FILE: base/applications/rapps_new/lang/sv-SE.rc + * FILE: base/applications/rapps/lang/sv-SE.rc * PURPOSE: Swedish resource file * Translation: Jaix Bly */
Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/lang/uk-UA.rc + * FILE: base/applications/rapps/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for ReactOS ReactOS Applications Manager * TRANSLATOR: Sakara Yevhen, Igor Paliychuk */
Modified: trunk/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/loa... ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,6 +1,6 @@ /* PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/loaddlg.cpp + * FILE: base/applications/rapps/loaddlg.cpp * PURPOSE: Displaying a download dialog * COPYRIGHT: Copyright 2001 John R. Sheets (for CodeWeavers) * Copyright 2004 Mike McCormack (for CodeWeavers)
Modified: trunk/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mis... ============================================================================== --- trunk/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/misc.cpp + * FILE: base/applications/rapps/misc.cpp * PURPOSE: Misc functions * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) * Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com)
Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rap... ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -24,7 +24,7 @@ #include <strsafe.h> #include <ndk/rtlfuncs.h>
-#include <rappsmsg_new.h> +#include <rappsmsg.h>
#include "resource.h"
Modified: trunk/reactos/base/applications/rapps/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rap... ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.rc [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -52,7 +52,7 @@
#include <reactos/manifest_exe.rc>
-#include <rappsmsg_new.rc> +#include <rappsmsg.rc>
/* UTF-8 */ #pragma code_page(65001)
Removed: trunk/reactos/base/applications/rapps/rappsmsg_new.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_new... ============================================================================== --- trunk/reactos/base/applications/rapps/rappsmsg_new.mc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rappsmsg_new.mc (removed) @@ -1,27 +0,0 @@ -MessageIdTypedef=ULONG - -SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS -Informational=0x1:STATUS_SEVERITY_INFORMATIONAL -Warning=0x2:STATUS_SEVERITY_WARNING -Error=0x3:STATUS_SEVERITY_ERROR) - -FacilityNames=(System=0x0:FACILITY_SYSTEM) - -LanguageNames=(English=0x409:MSG00409) - -MessageId=1 -Severity=Success -Facility=Application -SymbolicName=MSG_SUCCESS_INSTALL -Language=English -Installation of the program "%1" is called. -. - -MessageId=2 -Severity=Success -Facility=Application -SymbolicName=MSG_SUCCESS_REMOVE -Language=English -Removal of the program "%1" is called. -. -
Modified: trunk/reactos/base/applications/rapps/settingsdlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/set... ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/settingsdlg.cpp + * FILE: base/applications/rapps/settingsdlg.cpp * PURPOSE: Settings Dialog * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) */
Modified: trunk/reactos/base/applications/rapps/splitter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/spl... ============================================================================== --- trunk/reactos/base/applications/rapps/splitter.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/splitter.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/splitter.cpp + * FILE: base/applications/rapps/splitter.cpp * PURPOSE: SplitterBar functions * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) */
Modified: trunk/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/win... ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Sun Apr 2 14:46:54 2017 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps_new/winmain.cpp + * FILE: base/applications/rapps/winmain.cpp * PURPOSE: Main program * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) * Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com)