[RAPPS] Added option to display small application icons (reactos#7723)

Author: whindsaks

base/applications/rapps/appview.cpp

@@ -15,6 +15,7 @@ using namespace Gdiplus;
 
 HICON g_hDefaultPackageIcon = NULL;
 static int g_DefaultPackageIconILIdx = I_IMAGENONE;
+UINT g_IconSize = 0;
 
 // **** Menu helpers ****
 
@@ -1063,9 +1064,11 @@ AsyncLoadIconProc(LPVOID Param)
         if (task->TaskId == g_AsyncIconTaskId)
         {
             HICON hIcon;
+            HICON *phBigIcon = SettingsInfo.bSmallIcons ? NULL : &hIcon;
+            HICON *phSmallIcon = phBigIcon ? NULL : &hIcon;
             if (!task->Parse)
-                hIcon = (HICON)LoadImageW(NULL, task->Location, IMAGE_ICON, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE);
-            else if (!ExtractIconExW(task->Location, PathParseIconLocationW(task->Location), &hIcon, NULL, 1))
+                hIcon = (HICON)LoadImageW(NULL, task->Location, IMAGE_ICON, g_IconSize, g_IconSize, LR_LOADFROMFILE);
+            else if (!ExtractIconExW(task->Location, PathParseIconLocationW(task->Location), phBigIcon, phSmallIcon, 1))
                 hIcon = NULL;
 
             if (hIcon)
@@ -1392,13 +1395,14 @@ CAppsListView::SetDisplayAppType(APPLICATION_VIEW_TYPE AppType)
     if (!g_hDefaultPackageIcon)
     {
         ImageList_Destroy(m_hImageListView);
-        UINT IconSize = GetSystemMetrics(SM_CXICON);
+        g_IconSize = GetSystemMetrics(SettingsInfo.bSmallIcons ? SM_CXSMICON : SM_CXICON);
+        g_IconSize = max(g_IconSize, 8);
         UINT ilc = GetSystemColorDepth() | ILC_MASK;
-        m_hImageListView = ImageList_Create(IconSize, IconSize, ilc, 0, 1);
+        m_hImageListView = ImageList_Create(g_IconSize, g_IconSize, ilc, 0, 1);
         SetImageList(m_hImageListView, LVSIL_SMALL);
         SetImageList(m_hImageListView, LVSIL_NORMAL);
         g_hDefaultPackageIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_MAIN),
-                                                  IMAGE_ICON, IconSize, IconSize, LR_SHARED);
+                                                  IMAGE_ICON, g_IconSize, g_IconSize, LR_SHARED);
     }
     ImageList_RemoveAll(m_hImageListView);
 

base/applications/rapps/include/resource.h

@@ -1,4 +1,5 @@
 #pragma once
+#define LVCHECKSTYLES LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SORTASCENDING
 
 /* Icons */
 #define IDI_MAIN                 10
@@ -40,11 +41,11 @@
 #define IDC_STATUSBAR            1000
 #define IDC_DOWNLOAD_PROGRESS    1001
 #define IDC_DOWNLOAD_STATUS      1002
-#define IDC_SAVE_WINDOW_POS      1003
-#define IDC_UPDATE_AVLIST        1004
+#define IDC_GENERALLIST          1003
+
 #define IDC_DOWNLOAD_DIR_EDIT    1005
 #define IDC_DEL_AFTER_INSTALL    1006
-#define IDC_LOG_ENABLED          1007
+
 #define IDC_CHOOSE               1008
 #define IDC_DEFAULT_SETTINGS     1009
 #define IDC_INSTALL_TEXT         1010
@@ -127,6 +128,10 @@
 #define IDS_APP_DISPLAY_LIST     136
 #define IDS_APP_DISPLAY_TILE     137
 #define IDS_NO_SEARCH_RESULTS    138
+#define IDS_CFG_SAVE_WINDOW_POS  139
+#define IDS_CFG_UPDATE_AVLIST    140
+#define IDS_CFG_LOG_ENABLED      141
+#define IDS_CFG_SMALL_ICONS      142
 
 /* Tooltips */
 #define IDS_TOOLTIP_INSTALL      200

base/applications/rapps/include/settings.h

@@ -9,6 +9,7 @@ struct SETTINGS_INFO
     BOOL bLogEnabled;
     WCHAR szDownloadDir[MAX_PATH];
     BOOL bDelInstaller;
+    BOOL bSmallIcons;
     /* Window Pos */
     BOOL Maximized;
     INT Left;

base/applications/rapps/lang/bg-BG.rc

@@ -49,9 +49,7 @@ CAPTION "Настройки"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Общи", -1, 4, 2, 244, 61
-    AUTOCHECKBOX "&Съхраняване разположението на прозореца", IDC_SAVE_WINDOW_POS, 15, 12, 223, 12
-    AUTOCHECKBOX "Об&новяване на списъка с достъпните приложения при пускане", IDC_UPDATE_AVLIST, 15, 29, 227, 12
-    AUTOCHECKBOX "&Вписване на слаганията и маханията на приложения", IDC_LOG_ENABLED, 15, 46, 223, 12
+    CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE
     GROUPBOX "Сваляне", -1, 4, 65, 244, 51
     LTEXT "Папка за свалените файлове", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
@@ -212,6 +210,10 @@ BEGIN
     IDS_APP_DISPLAY_LIST "List"
     IDS_APP_DISPLAY_TILE "Tile"
     IDS_NO_SEARCH_RESULTS "No search results"
+    IDS_CFG_SAVE_WINDOW_POS "Съхраняване разположението на прозореца"
+    IDS_CFG_UPDATE_AVLIST "Обновяване на списъка с достъпните приложения при пускане"
+    IDS_CFG_LOG_ENABLED "Вписване на слаганията и маханията на приложения"
+    IDS_CFG_SMALL_ICONS "Малки значета"
 END
 
 STRINGTABLE

base/applications/rapps/lang/cs-CZ.rc

@@ -50,9 +50,7 @@ CAPTION "Nastavení"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Obecné", -1, 4, 2, 240, 61
-    AUTOCHECKBOX "&Uložit pozici okna", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-    AUTOCHECKBOX "&Aktualizovat seznam dostupných programů při startu programu", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "Ukládat &záznam instalací a odstranění programů", IDC_LOG_ENABLED, 15, 46, 219, 12
+    CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE
     GROUPBOX "Stahování", -1, 4, 65, 240, 51
     LTEXT "Složka se staženými soubory:", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
@@ -213,6 +211,10 @@ BEGIN
     IDS_APP_DISPLAY_LIST "Seznam"
     IDS_APP_DISPLAY_TILE "Dlaždice"
     IDS_NO_SEARCH_RESULTS "Žádné výsledky"
+    IDS_CFG_SAVE_WINDOW_POS "Uložit pozici okna"
+    IDS_CFG_UPDATE_AVLIST "Aktualizovat seznam dostupných programů při startu programu"
+    IDS_CFG_LOG_ENABLED "Ukládat záznam instalací a odstranění programů"
+    IDS_CFG_SMALL_ICONS "Malé ikony"
 END
 
 STRINGTABLE

base/applications/rapps/lang/de-DE.rc

@@ -52,9 +52,7 @@ CAPTION "Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Allgemein", -1, 4, 2, 240, 61
-    AUTOCHECKBOX "Fensterposition &speichern", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-    AUTOCHECKBOX "Beim Start Liste der verfügbaren Programme &aktualisieren", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "Hinzufügen und Entfernen von Programmen mit&loggen", IDC_LOG_ENABLED, 15, 46, 219, 12
+    CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE
     GROUPBOX "Download", -1, 4, 65, 240, 51
     LTEXT "Ordner für Downloads:", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
@@ -215,6 +213,10 @@ BEGIN
     IDS_APP_DISPLAY_LIST "Liste"
     IDS_APP_DISPLAY_TILE "Kacheln"
     IDS_NO_SEARCH_RESULTS "No search results"
+    IDS_CFG_SAVE_WINDOW_POS "Fensterposition speichern"
+    IDS_CFG_UPDATE_AVLIST "Beim Start Liste der verfügbaren Programme aktualisieren"
+    IDS_CFG_LOG_ENABLED "Hinzufügen und Entfernen von Programmen mitloggen"
+    IDS_CFG_SMALL_ICONS "Kleine symbole"
 END
 
 STRINGTABLE

base/applications/rapps/lang/en-US.rc

@@ -52,9 +52,7 @@ CAPTION "Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "General", -1, 4, 2, 240, 61
-    AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-    AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+    CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE
     GROUPBOX "Downloading", -1, 4, 65, 240, 51
     LTEXT "Downloads folder:", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
@@ -215,6 +213,10 @@ BEGIN
     IDS_APP_DISPLAY_LIST "List"
     IDS_APP_DISPLAY_TILE "Tile"
     IDS_NO_SEARCH_RESULTS "No search results"
+    IDS_CFG_SAVE_WINDOW_POS "Save window position"
+    IDS_CFG_UPDATE_AVLIST "Update the list of accessible programs at start"
+    IDS_CFG_LOG_ENABLED "Log of installation and removal of programs"
+    IDS_CFG_SMALL_ICONS "Small icons"
 END
 
 STRINGTABLE

base/applications/rapps/lang/es-ES.rc

@@ -51,9 +51,7 @@ CAPTION "Ajustes"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "General", -1, 4, 2, 240, 61
-    AUTOCHECKBOX "&Guardar posición de la ventana", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-    AUTOCHECKBOX "&Actualizar la lista de programas accesibles al comenzar", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "&Registro de programas instalados y desinstalados", IDC_LOG_ENABLED, 15, 46, 219, 12
+    CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE
     GROUPBOX "Descargas", -1, 4, 65, 240, 51
     LTEXT "Carpeta de descargas:", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
@@ -214,6 +212,10 @@ BEGIN
     IDS_APP_DISPLAY_LIST "Lista"
     IDS_APP_DISPLAY_TILE "Título"
     IDS_NO_SEARCH_RESULTS "Búsqueda sin resultados."
+    IDS_CFG_SAVE_WINDOW_POS "Guardar posición de la ventana"
+    IDS_CFG_UPDATE_AVLIST "Actualizar la lista de programas accesibles al comenzar"
+    IDS_CFG_LOG_ENABLED "Registro de programas instalados y desinstalados"
+    IDS_CFG_SMALL_ICONS "Iconos pequeños"
 END
 
 STRINGTABLE

base/applications/rapps/lang/et-EE.rc

@@ -49,9 +49,7 @@ CAPTION "Sätted"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Üldine", -1, 4, 2, 240, 61
-    AUTOCHECKBOX "&Salvesta akna asukoht", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-    AUTOCHECKBOX "&Värskenda kättesaadavate programmide nimekirja käivitusel", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "Installeerimiste ja eemalduste &logi", IDC_LOG_ENABLED, 15, 46, 219, 12
+    CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE
     GROUPBOX "Allalaadimine", -1, 4, 65, 240, 51
     LTEXT "Allalaadimiste kaust:", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
@@ -212,6 +210,10 @@ BEGIN
     IDS_APP_DISPLAY_LIST "List"
     IDS_APP_DISPLAY_TILE "Tile"
     IDS_NO_SEARCH_RESULTS "No search results"
+    IDS_CFG_SAVE_WINDOW_POS "Salvesta akna asukoht"
+    IDS_CFG_UPDATE_AVLIST "Värskenda kättesaadavate programmide nimekirja käivitusel"
+    IDS_CFG_LOG_ENABLED "Installeerimiste ja eemalduste logi"
+    IDS_CFG_SMALL_ICONS "Väikesed ikoonid"
 END
 
 STRINGTABLE

base/applications/rapps/lang/fr-FR.rc

@@ -52,9 +52,7 @@ CAPTION "Configuration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Général", -1, 4, 2, 240, 61
-    AUTOCHECKBOX "&Enregistrer la position de la fenêtre", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-    AUTOCHECKBOX "&Mettre à jour la liste des programmes accessibles au démarrage", IDC_UPDATE_AVLIST, 15, 29, 222, 12
-    AUTOCHECKBOX "&Journal de l'installation et de la suppression des programmes", IDC_LOG_ENABLED, 15, 46, 219, 12
+    CONTROL "", IDC_GENERALLIST, "SysListView32", WS_TABSTOP | LVCHECKSTYLES, 15, 12, 219, 46, WS_EX_STATICEDGE
     GROUPBOX "Téléchargement", -1, 4, 65, 240, 51
     LTEXT "Dossier des téléchargements :", -1, 16, 75, 100, 9
     EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
@@ -215,6 +213,10 @@ BEGIN
     IDS_APP_DISPLAY_LIST "Liste"
     IDS_APP_DISPLAY_TILE "Tuile"
     IDS_NO_SEARCH_RESULTS "Aucun résultat"
+    IDS_CFG_SAVE_WINDOW_POS "Enregistrer la position de la fenêtre"
+    IDS_CFG_UPDATE_AVLIST "Mettre à jour la liste des programmes accessibles au démarrage"
+    IDS_CFG_LOG_ENABLED "Journal de l'installation et de la suppression des programmes"
+    IDS_CFG_SMALL_ICONS "Petites icônes"
 END
 
 STRINGTABLE