ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-28 12:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RAPPS] Merged two Installed and Available enum values into one enum

Browse Source 
svn path=/branches/GSoC_2017/rapps/; revision=75761
This commit is contained in:
Alexander Shaposhnikov
2017-09-03 21:10:24 +00:00
parent 1b21bb0fc5
commit 40b95d2e89
6 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/applications/rapps/gui.cpp
+6 -6
View File
@@ -923,7 +923,7 @@ private:
FreeLogs();
m_AvailableApps.FreeCachedEntries();
if (IS_INSTALLED_ENUM(SelectedEnumType))
if (IsInstalledEnum(SelectedEnumType))
FreeInstalledAppList();
delete m_ClientPanel;
@@ -953,7 +953,7 @@ private:
break;
case IDS_APPLICATIONS:
UpdateApplicationsList(ENUM_APPLICATIONS);
UpdateApplicationsList(ENUM_INSTALLED_APPLICATIONS);
break;
case IDS_UPDATES:
@@ -1087,7 +1087,7 @@ private:
(pnic->uNewState & LVIS_FOCUSED) &&
!(pnic->uOldState & LVIS_FOCUSED))
{
if (IS_INSTALLED_ENUM(SelectedEnumType))
if (IsInstalledEnum(SelectedEnumType))
ShowInstalledAppInfo(ItemIndex);
if (IsAvailableEnum(SelectedEnumType))
CAvailableAppView::ShowAvailableAppInfo(ItemIndex);
@@ -1125,7 +1125,7 @@ private:
{
if (data->hwndFrom == m_ListView->m_hWnd && ((LPNMLISTVIEW) lParam)->iItem != -1)
{
if (IS_INSTALLED_ENUM(SelectedEnumType))
if (IsInstalledEnum(SelectedEnumType))
ShowInstalledAppInfo(-1);
if (IsAvailableEnum(SelectedEnumType))
CAvailableAppView::ShowAvailableAppInfo(-1);
@@ -1502,7 +1502,7 @@ private:
{
ATL::CStringW szBuffer1, szBuffer2;
HIMAGELIST hImageListView;
BOOL bWasInInstalled = IS_INSTALLED_ENUM(SelectedEnumType);
BOOL bWasInInstalled = IsInstalledEnum(SelectedEnumType);
bUpdating = TRUE;
m_ListView->SetRedraw(FALSE);
@@ -1533,7 +1533,7 @@ private:
ImageList_Destroy(hImageListBuf);
}
if (IS_INSTALLED_ENUM(EnumType))
if (IsInstalledEnum(EnumType))
{
if (!bWasInInstalled)
{
reactos/base/applications/rapps/include/available.h
-28
View File
@@ -7,34 +7,6 @@
#include "misc.h"
/* EnumType flags for EnumAvailableApplications */
enum AvailableCategories
{
ENUM_ALL_AVAILABLE,
ENUM_CAT_AUDIO,
ENUM_CAT_VIDEO,
ENUM_CAT_GRAPHICS,
ENUM_CAT_GAMES,
ENUM_CAT_INTERNET,
ENUM_CAT_OFFICE,
ENUM_CAT_DEVEL,
ENUM_CAT_EDU,
ENUM_CAT_ENGINEER,
ENUM_CAT_FINANCE,
ENUM_CAT_SCIENCE,
ENUM_CAT_TOOLS,
ENUM_CAT_DRIVERS,
ENUM_CAT_LIBS,
ENUM_CAT_OTHER,
ENUM_AVAILABLE_MIN = ENUM_ALL_AVAILABLE,
ENUM_AVAILABLE_MAX = ENUM_CAT_OTHER
};
inline BOOL IsAvailableEnum(INT x)
{
return (x >= AvailableCategories::ENUM_AVAILABLE_MIN && x <= AvailableCategories::ENUM_AVAILABLE_MAX);
}
enum LicenseType
{
LICENSE_NONE,
reactos/base/applications/rapps/include/defines.h
+37 -1
View File
@@ -31,4 +31,40 @@
#define APPLICATION_DATABASE_URL L"https://svn.reactos.org/packages/rappmgr.cab"
#define MAX_STR_LEN 256
#define ENUM_ALL_COMPONENTS 30
enum AppsCategories
{
ENUM_ALL_AVAILABLE,
ENUM_CAT_AUDIO,
ENUM_CAT_VIDEO,
ENUM_CAT_GRAPHICS,
ENUM_CAT_GAMES,
ENUM_CAT_INTERNET,
ENUM_CAT_OFFICE,
ENUM_CAT_DEVEL,
ENUM_CAT_EDU,
ENUM_CAT_ENGINEER,
ENUM_CAT_FINANCE,
ENUM_CAT_SCIENCE,
ENUM_CAT_TOOLS,
ENUM_CAT_DRIVERS,
ENUM_CAT_LIBS,
ENUM_CAT_OTHER,
ENUM_ALL_INSTALLED,
ENUM_INSTALLED_APPLICATIONS = 31,
ENUM_UPDATES = 32,
ENUM_INSTALLED_MIN = ENUM_ALL_INSTALLED,
ENUM_INSTALLED_MAX = ENUM_UPDATES,
ENUM_AVAILABLE_MIN = ENUM_ALL_AVAILABLE,
ENUM_AVAILABLE_MAX = ENUM_CAT_OTHER,
};
inline BOOL IsAvailableEnum(INT x)
{
return (x >= AppsCategories::ENUM_AVAILABLE_MIN && x <= AppsCategories::ENUM_AVAILABLE_MAX);
}
inline BOOL IsInstalledEnum(INT x)
{
return (x >= AppsCategories::ENUM_INSTALLED_MIN && x <= AppsCategories::ENUM_INSTALLED_MAX);
}
reactos/base/applications/rapps/include/installed.h
-8
View File
@@ -3,14 +3,6 @@
#include <windef.h>
#include <atlstr.h>
#define ENUM_APPLICATIONS 31
#define ENUM_UPDATES 32
#define ENUM_INSTALLED_MIN ENUM_ALL_COMPONENTS
#define ENUM_INSTALLED_MAX ENUM_UPDATES
#define IS_INSTALLED_ENUM(a) (a >= ENUM_INSTALLED_MIN && a <= ENUM_INSTALLED_MAX)
struct INSTALLED_INFO
{
HKEY hRootKey;
reactos/base/applications/rapps/installed.cpp
+6 -6
View File
@@ -54,7 +54,7 @@ UninstallApplication(INT Index, BOOL bModify)
HKEY hKey;
PINSTALLED_INFO ItemInfo;
if (!IS_INSTALLED_ENUM(SelectedEnumType))
if (!IsInstalledEnum(SelectedEnumType))
return FALSE;
if (Index == -1)
@@ -146,7 +146,7 @@ RemoveAppFromRegistry(INT Index)
ATL::CStringW szMsgText, szMsgTitle;
INT ItemIndex = SendMessageW(hListView, LVM_GETNEXTITEM, -1, LVNI_FOCUSED);
if (!IS_INSTALLED_ENUM(SelectedEnumType))
if (!IsInstalledEnum(SelectedEnumType))
return;
Info = (PINSTALLED_INFO) ListViewGetlParam(Index);
@@ -238,13 +238,13 @@ EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc)
&dwSize) == ERROR_SUCCESS)
{
szDisplayName.ReleaseBuffer();
if (EnumType < ENUM_ALL_COMPONENTS || EnumType > ENUM_UPDATES)
EnumType = ENUM_ALL_COMPONENTS;
if (EnumType < ENUM_ALL_INSTALLED || EnumType > ENUM_UPDATES)
EnumType = ENUM_ALL_INSTALLED;
if (!bIsSystemComponent)
{
if ((EnumType == ENUM_ALL_COMPONENTS) || /* All components */
((EnumType == ENUM_APPLICATIONS) && (!bIsUpdate)) || /* Applications only */
if ((EnumType == ENUM_ALL_INSTALLED) || /* All components */
((EnumType == ENUM_INSTALLED_APPLICATIONS) && (!bIsUpdate)) || /* Applications only */
((EnumType == ENUM_UPDATES) && (bIsUpdate))) /* Updates only */
{
if (!lpEnumProc(ItemIndex, szDisplayName, &Info))
reactos/base/applications/rapps/winmain.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
HWND hMainWnd;
HINSTANCE hInst;
INT SelectedEnumType = ENUM_ALL_COMPONENTS;
INT SelectedEnumType = ENUM_ALL_INSTALLED;
SETTINGS_INFO SettingsInfo;
ATL::CStringW szSearchPattern;