[REACTOS]

Add columns and column titles to the partition listview.

svn path=/trunk/; revision=70701

diff --git a/reactos/base/setup/reactos/drivepage.c b/reactos/base/setup/reactos/drivepage.c
index 619bfc3..8416305 100644 (file)
--- a/reactos/base/setup/reactos/drivepage.c
+++ b/reactos/base/setup/reactos/drivepage.c
@@ -30,6 +30,12 @@
 
 /* GLOBALS ******************************************************************/
 
+#define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1)
+static const int default_column_widths[MAX_LIST_COLUMNS] = {200, 150, 150};
+static const int column_alignment[MAX_LIST_COLUMNS] = {LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_LEFT};
+
+/* FUNCTIONS ****************************************************************/
+
 static INT_PTR CALLBACK
 MoreOptDlgProc(HWND hwndDlg,
                UINT uMsg,
@@ -103,6 +109,37 @@ PartitionDlgProc(HWND hwndDlg,
     return FALSE;
 }
 
+
+static
+BOOL
+CreateListViewColumns(
+    HINSTANCE hInstance,
+    HWND hWndListView)
+{
+    WCHAR szText[50];
+    int index;
+    LVCOLUMN lvC;
+
+    /* Create columns. */
+    lvC.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
+    lvC.pszText = szText;
+
+    /* Load the column labels from the resource file. */
+    for (index = 0; index < MAX_LIST_COLUMNS; index++)
+    {
+        lvC.iSubItem = index;
+        lvC.cx = default_column_widths[index];
+        lvC.fmt = column_alignment[index];
+
+        LoadStringW(hInstance, IDS_LIST_COLUMN_FIRST + index, szText, 50);
+
+        if (ListView_InsertColumn(hWndListView, index, &lvC) == -1)
+            return FALSE;
+    }
+    return TRUE;
+}
+
+
 INT_PTR
 CALLBACK
 DriveDlgProc(
@@ -130,6 +167,9 @@ DriveDlgProc(
             pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
             SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
 
+            CreateListViewColumns(pSetupData->hInstance,
+                                  GetDlgItem(hwndDlg, IDC_PARTITION));
+
 #if 1
             h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT);
             if (h != INVALID_HANDLE_VALUE)

diff --git a/reactos/base/setup/reactos/lang/bg-BG.rc b/reactos/base/setup/reactos/lang/bg-BG.rc
index e73a9f5..51c5e1e 100644 (file)
--- a/reactos/base/setup/reactos/lang/bg-BG.rc
+++ b/reactos/base/setup/reactos/lang/bg-BG.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "Настройка на РеактОС"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/cs-CZ.rc b/reactos/base/setup/reactos/lang/cs-CZ.rc
index fe16359..c8a139c 100644 (file)
--- a/reactos/base/setup/reactos/lang/cs-CZ.rc
+++ b/reactos/base/setup/reactos/lang/cs-CZ.rc
@@ -134,3 +134,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "Instalace systému ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/de-DE.rc b/reactos/base/setup/reactos/lang/de-DE.rc
index 141cbbb..f2528f6 100644 (file)
--- a/reactos/base/setup/reactos/lang/de-DE.rc
+++ b/reactos/base/setup/reactos/lang/de-DE.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Die Datei 'txtsetup.sif' konnte nicht gefunden werden.\nSetup kann nicht fortfahren."
     IDS_CAPTION "ReactOS Setup"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/el-GR.rc b/reactos/base/setup/reactos/lang/el-GR.rc
index a606de1..d09edc7 100644 (file)
--- a/reactos/base/setup/reactos/lang/el-GR.rc
+++ b/reactos/base/setup/reactos/lang/el-GR.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/en-US.rc b/reactos/base/setup/reactos/lang/en-US.rc
index d5df880..f72446d 100644 (file)
--- a/reactos/base/setup/reactos/lang/en-US.rc
+++ b/reactos/base/setup/reactos/lang/en-US.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue"
     IDS_CAPTION "ReactOS Setup"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END
\ No newline at end of file

diff --git a/reactos/base/setup/reactos/lang/es-ES.rc b/reactos/base/setup/reactos/lang/es-ES.rc
index 9210ef8..33cd82b 100644 (file)
--- a/reactos/base/setup/reactos/lang/es-ES.rc
+++ b/reactos/base/setup/reactos/lang/es-ES.rc
@@ -130,3 +130,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "Instalación de ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/et-EE.rc b/reactos/base/setup/reactos/lang/et-EE.rc
index 21a5f64..d92f7ca 100644 (file)
--- a/reactos/base/setup/reactos/lang/et-EE.rc
+++ b/reactos/base/setup/reactos/lang/et-EE.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "ReactOSi paigaldamine"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/fi-FI.rc b/reactos/base/setup/reactos/lang/fi-FI.rc
index 269403f..9f8c8af 100644 (file)
--- a/reactos/base/setup/reactos/lang/fi-FI.rc
+++ b/reactos/base/setup/reactos/lang/fi-FI.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/fr-FR.rc b/reactos/base/setup/reactos/lang/fr-FR.rc
index 8199553..65cabb2 100644 (file)
--- a/reactos/base/setup/reactos/lang/fr-FR.rc
+++ b/reactos/base/setup/reactos/lang/fr-FR.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "Installation de ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/he-IL.rc b/reactos/base/setup/reactos/lang/he-IL.rc
index de822d4..514d55f 100644 (file)
--- a/reactos/base/setup/reactos/lang/he-IL.rc
+++ b/reactos/base/setup/reactos/lang/he-IL.rc
@@ -130,3 +130,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "התקנת ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/hu-HU.rc b/reactos/base/setup/reactos/lang/hu-HU.rc
index 5f5747f..60a86e2 100644 (file)
--- a/reactos/base/setup/reactos/lang/hu-HU.rc
+++ b/reactos/base/setup/reactos/lang/hu-HU.rc
@@ -130,3 +130,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/it-IT.rc b/reactos/base/setup/reactos/lang/it-IT.rc
index 1b47dde..3575ef9 100644 (file)
--- a/reactos/base/setup/reactos/lang/it-IT.rc
+++ b/reactos/base/setup/reactos/lang/it-IT.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "Installazione di ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/ms-MY.rc b/reactos/base/setup/reactos/lang/ms-MY.rc
index 5177a6e..38bbba2 100644 (file)
--- a/reactos/base/setup/reactos/lang/ms-MY.rc
+++ b/reactos/base/setup/reactos/lang/ms-MY.rc
@@ -130,3 +130,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Persediaan tidak dapat mencari 'txtsetup.sif'\nPersediaan tidak dapat meneruskan"
     IDS_CAPTION "ReactOS Persediaan"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/no-NO.rc b/reactos/base/setup/reactos/lang/no-NO.rc
index 8fc0b0c..7a1f46c 100644 (file)
--- a/reactos/base/setup/reactos/lang/no-NO.rc
+++ b/reactos/base/setup/reactos/lang/no-NO.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "ReactOS installering"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/pl-PL.rc b/reactos/base/setup/reactos/lang/pl-PL.rc
index 6afec6a..81587e3 100644 (file)
--- a/reactos/base/setup/reactos/lang/pl-PL.rc
+++ b/reactos/base/setup/reactos/lang/pl-PL.rc
@@ -138,3 +138,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Nie można znaleźć 'txtsetup.sif'\nInstalator nie może kontynuować."
     IDS_CAPTION "Instalator ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/pt-BR.rc b/reactos/base/setup/reactos/lang/pt-BR.rc
index 1327baa..9d0d94c 100644 (file)
--- a/reactos/base/setup/reactos/lang/pt-BR.rc
+++ b/reactos/base/setup/reactos/lang/pt-BR.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "Instalação do ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/ro-RO.rc b/reactos/base/setup/reactos/lang/ro-RO.rc
index b2c971a..1373bfa 100644 (file)
--- a/reactos/base/setup/reactos/lang/ro-RO.rc
+++ b/reactos/base/setup/reactos/lang/ro-RO.rc
@@ -137,3 +137,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Nu se poate găsi „txtsetup.sif”\nInstalarea nu se poate continua."
     IDS_CAPTION "Asistentul de instalare ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/ru-RU.rc b/reactos/base/setup/reactos/lang/ru-RU.rc
index 4b4bb69..1cf26c9 100644 (file)
--- a/reactos/base/setup/reactos/lang/ru-RU.rc
+++ b/reactos/base/setup/reactos/lang/ru-RU.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Не удалось найти файл 'txtsetup.sif'\nПродолжение установки невозможно."
     IDS_CAPTION "Установка ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/sk-SK.rc b/reactos/base/setup/reactos/lang/sk-SK.rc
index 45c23d8..a9beaf3 100644 (file)
--- a/reactos/base/setup/reactos/lang/sk-SK.rc
+++ b/reactos/base/setup/reactos/lang/sk-SK.rc
@@ -133,3 +133,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/sq-AL.rc b/reactos/base/setup/reactos/lang/sq-AL.rc
index 985c5d0..3cd195f 100644 (file)
--- a/reactos/base/setup/reactos/lang/sq-AL.rc
+++ b/reactos/base/setup/reactos/lang/sq-AL.rc
@@ -130,3 +130,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "ReactOS Setup"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/tr-TR.rc b/reactos/base/setup/reactos/lang/tr-TR.rc
index 942e251..afb1414 100644 (file)
--- a/reactos/base/setup/reactos/lang/tr-TR.rc
+++ b/reactos/base/setup/reactos/lang/tr-TR.rc
@@ -130,3 +130,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF """txtsetup.sif"" bulunamıyor.\nKur sürdüremiyor."
     IDS_CAPTION "ReactOS Kur"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/uk-UA.rc b/reactos/base/setup/reactos/lang/uk-UA.rc
index 198ddcc..7487e2b 100644 (file)
--- a/reactos/base/setup/reactos/lang/uk-UA.rc
+++ b/reactos/base/setup/reactos/lang/uk-UA.rc
@@ -136,3 +136,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
     IDS_CAPTION "Встановлення ReactOS"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/zh-CN.rc b/reactos/base/setup/reactos/lang/zh-CN.rc
index 78fbaca..1a7639b 100644 (file)
--- a/reactos/base/setup/reactos/lang/zh-CN.rc
+++ b/reactos/base/setup/reactos/lang/zh-CN.rc
@@ -128,3 +128,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "无法找到 'txtsetup.sif'\n安装程序无法继续。"
     IDS_CAPTION "ReactOS 安装"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/lang/zh-TW.rc b/reactos/base/setup/reactos/lang/zh-TW.rc
index b93869f..5dc7b70 100644 (file)
--- a/reactos/base/setup/reactos/lang/zh-TW.rc
+++ b/reactos/base/setup/reactos/lang/zh-TW.rc
@@ -130,3 +130,10 @@ BEGIN
     IDS_NO_TXTSETUP_SIF "無法找到 'txtsetup.sif'\n安裝程式無法繼續。"
     IDS_CAPTION "ReactOS 安裝"
 END
+
+STRINGTABLE
+BEGIN
+    IDS_PARTITION_NAME "Name"
+    IDS_PARTITION_SIZE "Size"
+    IDS_PARTITION_TYPE "Type"
+END

diff --git a/reactos/base/setup/reactos/resource.h b/reactos/base/setup/reactos/resource.h
index 857ebe3..58faa03 100644 (file)
--- a/reactos/base/setup/reactos/resource.h
+++ b/reactos/base/setup/reactos/resource.h
@@ -72,3 +72,11 @@
 #define IDS_SUMMARYSUBTITLE  5051
 #define IDS_NO_TXTSETUP_SIF  5053
 #define IDS_CAPTION          5054
+
+
+#define IDS_PARTITION_NAME   5200
+#define IDS_PARTITION_SIZE   5201
+#define IDS_PARTITION_TYPE   5202
+
+#define IDS_LIST_COLUMN_FIRST IDS_PARTITION_NAME
+#define IDS_LIST_COLUMN_LAST IDS_PARTITION_TYPE