From 4ec67d948c1404e4a76706a4fa7d3ef51aa26577 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Thu, 7 Aug 2008 08:55:34 +0000 Subject: [PATCH] * implement retrieving column names for nethood & font shell folder * make column names mui aware svn path=/trunk/; revision=35157 --- reactos/dll/win32/shell32/lang/bg-BG.rc | 5 +++ reactos/dll/win32/shell32/lang/ca-ES.rc | 5 +++ reactos/dll/win32/shell32/lang/cs-CZ.rc | 5 +++ reactos/dll/win32/shell32/lang/da-DK.rc | 5 +++ reactos/dll/win32/shell32/lang/de-DE.rc | 5 +++ reactos/dll/win32/shell32/lang/el-GR.rc | 5 +++ reactos/dll/win32/shell32/lang/en-GB.rc | 5 +++ reactos/dll/win32/shell32/lang/en-US.rc | 5 +++ reactos/dll/win32/shell32/lang/es-ES.rc | 5 +++ reactos/dll/win32/shell32/lang/fi-FI.rc | 5 +++ reactos/dll/win32/shell32/lang/fr-FR.rc | 5 +++ reactos/dll/win32/shell32/lang/hu-HU.rc | 5 +++ reactos/dll/win32/shell32/lang/it-IT.rc | 5 +++ reactos/dll/win32/shell32/lang/ja-JP.rc | 5 +++ reactos/dll/win32/shell32/lang/ko-KR.rc | 5 +++ reactos/dll/win32/shell32/lang/nl-NL.rc | 5 +++ reactos/dll/win32/shell32/lang/no-NO.rc | 5 +++ reactos/dll/win32/shell32/lang/pl-PL.rc | 5 +++ reactos/dll/win32/shell32/lang/pt-BR.rc | 5 +++ reactos/dll/win32/shell32/lang/pt-PT.rc | 5 +++ reactos/dll/win32/shell32/lang/ru-RU.rc | 5 +++ reactos/dll/win32/shell32/lang/sk-SK.rc | 5 +++ reactos/dll/win32/shell32/lang/sl-SI.rc | 5 +++ reactos/dll/win32/shell32/lang/sv-SE.rc | 5 +++ reactos/dll/win32/shell32/lang/tr-TR.rc | 5 +++ reactos/dll/win32/shell32/lang/uk-UA.rc | 5 +++ reactos/dll/win32/shell32/lang/zh-CN.rc | 5 +++ reactos/dll/win32/shell32/lang/zh-TW.rc | 5 +++ reactos/dll/win32/shell32/shfldr_fonts.c | 35 ++++++++++++++++-- reactos/dll/win32/shell32/shfldr_netplaces.c | 39 +++++++++++++++++--- reactos/dll/win32/shell32/shresdef.h | 5 +++ 31 files changed, 210 insertions(+), 9 deletions(-) diff --git a/reactos/dll/win32/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc index 47b1737d79d..b45b50caad8 100644 --- a/reactos/dll/win32/shell32/lang/bg-BG.rc +++ b/reactos/dll/win32/shell32/lang/bg-BG.rc @@ -595,8 +595,13 @@ BEGIN IDS_SHV_COLUMN9 "" IDS_SHV_COLUMN10 "" IDS_SHV_COLUMN11 "" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM " " IDS_SHV_COLUMN_DELDATE " " + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" // special folders IDS_DESKTOP " " diff --git a/reactos/dll/win32/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc index 684923a6c92..ac6db9bd05e 100644 --- a/reactos/dll/win32/shell32/lang/ca-ES.rc +++ b/reactos/dll/win32/shell32/lang/ca-ES.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc index 676ef9adb73..3b96a8ab7ae 100644 --- a/reactos/dll/win32/shell32/lang/cs-CZ.rc +++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc @@ -594,8 +594,13 @@ BEGIN IDS_SHV_COLUMN9 "Koment" IDS_SHV_COLUMN10 "Vlastnk" IDS_SHV_COLUMN11 "Skupina" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Pvodn umstn" IDS_SHV_COLUMN_DELDATE "Odstranno" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Plocha" diff --git a/reactos/dll/win32/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc index 87e4a50e4df..afbf725be69 100644 --- a/reactos/dll/win32/shell32/lang/da-DK.rc +++ b/reactos/dll/win32/shell32/lang/da-DK.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc index 03a965cea7f..91d1bf4176d 100644 --- a/reactos/dll/win32/shell32/lang/de-DE.rc +++ b/reactos/dll/win32/shell32/lang/de-DE.rc @@ -594,8 +594,13 @@ BEGIN IDS_SHV_COLUMN9 "Kommentar" IDS_SHV_COLUMN10 "Besitzer" IDS_SHV_COLUMN11 "Gruppe" + IDS_SHV_COLUMN12 "Dateinamen" + IDS_SHV_COLUMN13 "Kategorie" IDS_SHV_COLUMN_DELFROM "Ursprung" IDS_SHV_COLUMN_DELDATE "Gelscht am" + IDS_SHV_COLUMN_FONTTYPE "Schriftartentyp" + IDS_SHV_COLUMN_WORKGROUP "Arbeitsgruppe" + IDS_SHV_NETWORKLOCATION "Netzwerkstandort" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/el-GR.rc b/reactos/dll/win32/shell32/lang/el-GR.rc index fa6dcf7107d..c11fe4d38ed 100644 --- a/reactos/dll/win32/shell32/lang/el-GR.rc +++ b/reactos/dll/win32/shell32/lang/el-GR.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "" IDS_SHV_COLUMN10 "" IDS_SHV_COLUMN11 "" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM " " IDS_SHV_COLUMN_DELDATE " " + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP " " diff --git a/reactos/dll/win32/shell32/lang/en-GB.rc b/reactos/dll/win32/shell32/lang/en-GB.rc index 04eae991aee..0e749495f9f 100644 --- a/reactos/dll/win32/shell32/lang/en-GB.rc +++ b/reactos/dll/win32/shell32/lang/en-GB.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc index b54f54cf873..bd64228f3ee 100644 --- a/reactos/dll/win32/shell32/lang/en-US.rc +++ b/reactos/dll/win32/shell32/lang/en-US.rc @@ -593,8 +593,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc index ca5b75807e8..c6bfe8a6a4d 100644 --- a/reactos/dll/win32/shell32/lang/es-ES.rc +++ b/reactos/dll/win32/shell32/lang/es-ES.rc @@ -594,8 +594,13 @@ BEGIN IDS_SHV_COLUMN9 "Comentarios" IDS_SHV_COLUMN10 "Propietario" IDS_SHV_COLUMN11 "Grupo" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Ubicacin original" IDS_SHV_COLUMN_DELDATE "Fecha de eliminacin" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Escritorio" diff --git a/reactos/dll/win32/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc index b2b9f75252a..d0a7c4cd740 100644 --- a/reactos/dll/win32/shell32/lang/fi-FI.rc +++ b/reactos/dll/win32/shell32/lang/fi-FI.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Kommentit" IDS_SHV_COLUMN10 "Omistaja" IDS_SHV_COLUMN11 "Ryhm" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Typyt" diff --git a/reactos/dll/win32/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc index d1fda84d685..df41379101d 100644 --- a/reactos/dll/win32/shell32/lang/fr-FR.rc +++ b/reactos/dll/win32/shell32/lang/fr-FR.rc @@ -596,8 +596,13 @@ BEGIN IDS_SHV_COLUMN9 "Commentaires" IDS_SHV_COLUMN10 "Propritaire" IDS_SHV_COLUMN11 "Groupe" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Localisation d'origine" IDS_SHV_COLUMN_DELDATE "Date de suppression" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Bureau" diff --git a/reactos/dll/win32/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc index f13e1a82ae9..370c4fd3d63 100644 --- a/reactos/dll/win32/shell32/lang/hu-HU.rc +++ b/reactos/dll/win32/shell32/lang/hu-HU.rc @@ -595,8 +595,13 @@ BEGIN IDS_SHV_COLUMN9 "Megjegyzsek" IDS_SHV_COLUMN10 "Tulajdonos" IDS_SHV_COLUMN11 "Csoport" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Asztal" diff --git a/reactos/dll/win32/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc index 630ee78ca12..1530d2a2076 100644 --- a/reactos/dll/win32/shell32/lang/it-IT.rc +++ b/reactos/dll/win32/shell32/lang/it-IT.rc @@ -593,8 +593,13 @@ BEGIN IDS_SHV_COLUMN9 "Commenti" IDS_SHV_COLUMN10 "Proprietario" IDS_SHV_COLUMN11 "Gruppo" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Posizione originale" IDS_SHV_COLUMN_DELDATE "Data di cancellazione" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc index a916b5a7c5e..a0767b56845 100644 --- a/reactos/dll/win32/shell32/lang/ja-JP.rc +++ b/reactos/dll/win32/shell32/lang/ja-JP.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Rg" IDS_SHV_COLUMN10 "L" IDS_SHV_COLUMN11 "O[v" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "fXNgbv" diff --git a/reactos/dll/win32/shell32/lang/ko-KR.rc b/reactos/dll/win32/shell32/lang/ko-KR.rc index c8ddf2b4061..7ec532ed1c9 100644 --- a/reactos/dll/win32/shell32/lang/ko-KR.rc +++ b/reactos/dll/win32/shell32/lang/ko-KR.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc index 7646070b54e..358e9135f9f 100644 --- a/reactos/dll/win32/shell32/lang/nl-NL.rc +++ b/reactos/dll/win32/shell32/lang/nl-NL.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/no-NO.rc b/reactos/dll/win32/shell32/lang/no-NO.rc index 62d8a9516cc..e90433a219e 100644 --- a/reactos/dll/win32/shell32/lang/no-NO.rc +++ b/reactos/dll/win32/shell32/lang/no-NO.rc @@ -571,8 +571,13 @@ BEGIN IDS_SHV_COLUMN9 "Kommentarer" IDS_SHV_COLUMN10 "Eier" IDS_SHV_COLUMN11 "Gruppe" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Opprinnelig plassering" IDS_SHV_COLUMN_DELDATE "Dato slettet" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Skrivebord" diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc index 4b5d0e33571..a0bc75683d8 100644 --- a/reactos/dll/win32/shell32/lang/pl-PL.rc +++ b/reactos/dll/win32/shell32/lang/pl-PL.rc @@ -598,8 +598,13 @@ BEGIN IDS_SHV_COLUMN9 "Komentarz" IDS_SHV_COLUMN10 "Waciciel" IDS_SHV_COLUMN11 "Grupa" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Lokacja oryginalna" IDS_SHV_COLUMN_DELDATE "Data usunicia" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Pulpit" diff --git a/reactos/dll/win32/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc index ffb735954e2..e96b707ee3f 100644 --- a/reactos/dll/win32/shell32/lang/pt-BR.rc +++ b/reactos/dll/win32/shell32/lang/pt-BR.rc @@ -594,8 +594,13 @@ BEGIN IDS_SHV_COLUMN9 "Comentrios" IDS_SHV_COLUMN10 "Dono" IDS_SHV_COLUMN11 "Grupo" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "rea de trabalho" diff --git a/reactos/dll/win32/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc index 70b9c18da60..4c3094c5432 100644 --- a/reactos/dll/win32/shell32/lang/pt-PT.rc +++ b/reactos/dll/win32/shell32/lang/pt-PT.rc @@ -594,8 +594,13 @@ BEGIN IDS_SHV_COLUMN9 "Comentrios" IDS_SHV_COLUMN10 "Dono" IDS_SHV_COLUMN11 "Grupo" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Ambiente de trabalho" diff --git a/reactos/dll/win32/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc index d9ec9528dee..72f1bb754b7 100644 --- a/reactos/dll/win32/shell32/lang/ru-RU.rc +++ b/reactos/dll/win32/shell32/lang/ru-RU.rc @@ -591,8 +591,13 @@ BEGIN IDS_SHV_COLUMN9 "" IDS_SHV_COLUMN10 "" IDS_SHV_COLUMN11 "" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM " " IDS_SHV_COLUMN_DELDATE " " + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP " " diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc index c26c7f9f376..802ac355577 100644 --- a/reactos/dll/win32/shell32/lang/sk-SK.rc +++ b/reactos/dll/win32/shell32/lang/sk-SK.rc @@ -598,8 +598,13 @@ BEGIN IDS_SHV_COLUMN9 "Poznmky" //Comments IDS_SHV_COLUMN10 "Vlastnk" IDS_SHV_COLUMN11 "Skupina" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Pvod" //Pvodn umiestnenie IDS_SHV_COLUMN_DELDATE "Odstrnen" //Dtum zmazania + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Pracovn plocha" diff --git a/reactos/dll/win32/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc index 7233f2b842e..63b80b1c380 100644 --- a/reactos/dll/win32/shell32/lang/sl-SI.rc +++ b/reactos/dll/win32/shell32/lang/sl-SI.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc index 97e9daa5883..c9da3be1074 100644 --- a/reactos/dll/win32/shell32/lang/sv-SE.rc +++ b/reactos/dll/win32/shell32/lang/sv-SE.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc index f236f2f25b7..21454bb057b 100644 --- a/reactos/dll/win32/shell32/lang/tr-TR.rc +++ b/reactos/dll/win32/shell32/lang/tr-TR.rc @@ -592,8 +592,13 @@ BEGIN IDS_SHV_COLUMN9 "Aklamalar" IDS_SHV_COLUMN10 "Sahip" IDS_SHV_COLUMN11 "Grup" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "zgn konum" IDS_SHV_COLUMN_DELDATE "Silinme tarihi" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Masast" diff --git a/reactos/dll/win32/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc index a6db6508e25..0139ea37be4 100644 --- a/reactos/dll/win32/shell32/lang/uk-UA.rc +++ b/reactos/dll/win32/shell32/lang/uk-UA.rc @@ -593,8 +593,13 @@ BEGIN IDS_SHV_COLUMN9 "" IDS_SHV_COLUMN10 "" IDS_SHV_COLUMN11 "" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM " " IDS_SHV_COLUMN_DELDATE " " + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP " " diff --git a/reactos/dll/win32/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc index 9972007aedf..23869ddc10e 100644 --- a/reactos/dll/win32/shell32/lang/zh-CN.rc +++ b/reactos/dll/win32/shell32/lang/zh-CN.rc @@ -581,8 +581,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "" diff --git a/reactos/dll/win32/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc index 0cb39c12550..cdc6ad2e378 100644 --- a/reactos/dll/win32/shell32/lang/zh-TW.rc +++ b/reactos/dll/win32/shell32/lang/zh-TW.rc @@ -593,8 +593,13 @@ BEGIN IDS_SHV_COLUMN9 "Comments" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN12 "Filename" + IDS_SHV_COLUMN13 "Category" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_FONTTYPE "Fonttype" + IDS_SHV_COLUMN_WORKGROUP "Workgroup" + IDS_SHV_NETWORKLOCATION "Network Location" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/reactos/dll/win32/shell32/shfldr_fonts.c b/reactos/dll/win32/shell32/shfldr_fonts.c index bfe43e957e3..8539a508a47 100644 --- a/reactos/dll/win32/shell32/shfldr_fonts.c +++ b/reactos/dll/win32/shell32/shfldr_fonts.c @@ -72,11 +72,19 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2; #define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) static shvheader FontsSFHeader[] = { - {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, - {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10} + {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN_FONTTYPE , SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN2, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN12, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15} }; -#define FontsSHELLVIEWCOLUMNS 2 +#define COLUMN_NAME 0 +#define COLUMN_TYPE 1 +#define COLUMN_SIZE 2 +#define COLUMN_FILENAME 3 + + +#define FontsSHELLVIEWCOLUMNS (4) /************************************************************************** * ISF_Fonts_Constructor @@ -516,6 +524,27 @@ static HRESULT WINAPI ISF_Fonts_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) { IGenericSFImpl *This = (IGenericSFImpl *)iface; + WCHAR buffer[MAX_PATH] = {0}; + HRESULT hr = E_FAIL; + + TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, psd); + + if (iColumn >= FontsSHELLVIEWCOLUMNS) + return E_FAIL; + + psd->fmt = FontsSFHeader[iColumn].fmt; + psd->cxChar = FontsSFHeader[iColumn].cxChar; + if (pidl == NULL) + { + psd->str.uType = STRRET_WSTR; + if (LoadStringW(shell32_hInstance, FontsSFHeader[iColumn].colnameid, buffer, MAX_PATH)) + hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + + return hr; + } + + if (iColumn == COLUMN_NAME) + return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str); FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); diff --git a/reactos/dll/win32/shell32/shfldr_netplaces.c b/reactos/dll/win32/shell32/shfldr_netplaces.c index 1216341d8ee..adf27f33fb6 100644 --- a/reactos/dll/win32/shell32/shfldr_netplaces.c +++ b/reactos/dll/win32/shell32/shfldr_netplaces.c @@ -45,6 +45,7 @@ #include "wine/debug.h" #include "debughlp.h" #include "shfldr.h" +#include "shlwapi.h" WINE_DEFAULT_DEBUG_CHANNEL (shell); @@ -73,11 +74,18 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2; #define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) static shvheader NetworkPlacesSFHeader[] = { - {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, - {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10} + {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN13, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, + {IDS_SHV_COLUMN_WORKGROUP, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_NETWORKLOCATION, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15} }; -#define NETWORKPLACESSHELLVIEWCOLUMNS 2 +#define COLUMN_NAME 0 +#define COLUMN_CATEGORY 1 +#define COLUMN_WORKGROUP 2 +#define COLUMN_NETLOCATION 3 + +#define NETWORKPLACESSHELLVIEWCOLUMNS 4 /************************************************************************** * ISF_NetworkPlaces_Constructor @@ -209,11 +217,11 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnEnumObjects (IShellFolder2 * iface, TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); + *ppEnumIDList = NULL; //IEnumIDList_Constructor(); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - - return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; + return S_FALSE; + // return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; } /************************************************************************** @@ -517,6 +525,25 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) { IGenericSFImpl *This = (IGenericSFImpl *)iface; + WCHAR buffer[MAX_PATH] = {0}; + HRESULT hr = E_FAIL; + + if (iColumn >= NETWORKPLACESSHELLVIEWCOLUMNS) + return E_FAIL; + + psd->fmt = NetworkPlacesSFHeader[iColumn].fmt; + psd->cxChar = NetworkPlacesSFHeader[iColumn].cxChar; + if (pidl == NULL) + { + psd->str.uType = STRRET_WSTR; + if (LoadStringW(shell32_hInstance, NetworkPlacesSFHeader[iColumn].colnameid, buffer, MAX_PATH)) + hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + + return hr; + } + + if (iColumn == COLUMN_NAME) + return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str); FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h index e93a0798928..7adea1d815e 100644 --- a/reactos/dll/win32/shell32/shresdef.h +++ b/reactos/dll/win32/shell32/shresdef.h @@ -145,6 +145,11 @@ #define IDS_FILE_FOLDER 307 #define IDS_CREATELINK 308 #define IDS_INSTALLNEWFONT 309 +#define IDS_SHV_COLUMN_FONTTYPE 310 +#define IDS_SHV_COLUMN12 311 +#define IDS_SHV_COLUMN13 312 +#define IDS_SHV_COLUMN_WORKGROUP 313 +#define IDS_SHV_NETWORKLOCATION 314 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964