[ros-diffs] [janderwald] 35157: * implement retrieving column names for nethood & font shell folder * make column names mui aware
janderwald at svn.reactos.org
janderwald at svn.reactos.org
Thu Aug 7 10:55:35 CEST 2008
Author: janderwald
Date: Thu Aug 7 03:55:34 2008
New Revision: 35157
URL: http://svn.reactos.org/svn/reactos?rev=35157&view=rev
Log:
* implement retrieving column names for nethood & font shell folder
* make column names mui aware
Modified:
trunk/reactos/dll/win32/shell32/lang/bg-BG.rc
trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc
trunk/reactos/dll/win32/shell32/lang/da-DK.rc
trunk/reactos/dll/win32/shell32/lang/de-DE.rc
trunk/reactos/dll/win32/shell32/lang/el-GR.rc
trunk/reactos/dll/win32/shell32/lang/en-GB.rc
trunk/reactos/dll/win32/shell32/lang/en-US.rc
trunk/reactos/dll/win32/shell32/lang/es-ES.rc
trunk/reactos/dll/win32/shell32/lang/fi-FI.rc
trunk/reactos/dll/win32/shell32/lang/fr-FR.rc
trunk/reactos/dll/win32/shell32/lang/hu-HU.rc
trunk/reactos/dll/win32/shell32/lang/it-IT.rc
trunk/reactos/dll/win32/shell32/lang/ja-JP.rc
trunk/reactos/dll/win32/shell32/lang/ko-KR.rc
trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
trunk/reactos/dll/win32/shell32/lang/no-NO.rc
trunk/reactos/dll/win32/shell32/lang/pl-PL.rc
trunk/reactos/dll/win32/shell32/lang/pt-BR.rc
trunk/reactos/dll/win32/shell32/lang/pt-PT.rc
trunk/reactos/dll/win32/shell32/lang/ru-RU.rc
trunk/reactos/dll/win32/shell32/lang/sk-SK.rc
trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
trunk/reactos/dll/win32/shell32/lang/tr-TR.rc
trunk/reactos/dll/win32/shell32/lang/uk-UA.rc
trunk/reactos/dll/win32/shell32/lang/zh-CN.rc
trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
trunk/reactos/dll/win32/shell32/shfldr_fonts.c
trunk/reactos/dll/win32/shell32/shfldr_netplaces.c
trunk/reactos/dll/win32/shell32/shresdef.h
Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-BG.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -595,8 +595,13 @@
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 "Ðàáîòíà ïëîù"
Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-ES.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -594,8 +594,13 @@
IDS_SHV_COLUMN9 "Komentáø"
IDS_SHV_COLUMN10 "Vlastník"
IDS_SHV_COLUMN11 "Skupina"
+ IDS_SHV_COLUMN12 "Filename"
+ IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Pùvodní umístìní"
IDS_SHV_COLUMN_DELDATE "Odstranìno"
+ IDS_SHV_COLUMN_FONTTYPE "Fonttype"
+ IDS_SHV_COLUMN_WORKGROUP "Workgroup"
+ IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Plocha"
Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-DK.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-DE.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -594,8 +594,13 @@
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 "Gelöscht am"
+ IDS_SHV_COLUMN_FONTTYPE "Schriftartentyp"
+ IDS_SHV_COLUMN_WORKGROUP "Arbeitsgruppe"
+ IDS_SHV_NETWORKLOCATION "Netzwerkstandort"
/* special folders */
IDS_DESKTOP "Desktop"
Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-GR.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
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 "ÅðéöÜíåéá åñãáóßáò"
Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-GB.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-US.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -593,8 +593,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-ES.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -594,8 +594,13 @@
IDS_SHV_COLUMN9 "Comentarios"
IDS_SHV_COLUMN10 "Propietario"
IDS_SHV_COLUMN11 "Grupo"
+ IDS_SHV_COLUMN12 "Filename"
+ IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Ubicación original"
IDS_SHV_COLUMN_DELDATE "Fecha de eliminación"
+ IDS_SHV_COLUMN_FONTTYPE "Fonttype"
+ IDS_SHV_COLUMN_WORKGROUP "Workgroup"
+ IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Escritorio"
Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-FI.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
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 "Työpöytä"
Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-FR.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -596,8 +596,13 @@
IDS_SHV_COLUMN9 "Commentaires"
IDS_SHV_COLUMN10 "Propriétaire"
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"
Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-HU.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -595,8 +595,13 @@
IDS_SHV_COLUMN9 "Megjegyzések"
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"
Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-IT.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -593,8 +593,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-JP.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
IDS_SHV_COLUMN9 "ƒRƒƒ“ƒg"
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 "ƒfƒXƒNƒgƒbƒv"
Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-KR.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-NL.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-NO.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -571,8 +571,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-PL.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -598,8 +598,13 @@
IDS_SHV_COLUMN9 "Komentarz"
IDS_SHV_COLUMN10 "W³aœciciel"
IDS_SHV_COLUMN11 "Grupa"
+ IDS_SHV_COLUMN12 "Filename"
+ IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Lokacja oryginalna"
IDS_SHV_COLUMN_DELDATE "Data usuniêcia"
+ IDS_SHV_COLUMN_FONTTYPE "Fonttype"
+ IDS_SHV_COLUMN_WORKGROUP "Workgroup"
+ IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Pulpit"
Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-BR.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -594,8 +594,13 @@
IDS_SHV_COLUMN9 "Comentários"
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"
Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-PT.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -594,8 +594,13 @@
IDS_SHV_COLUMN9 "Comentários"
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"
Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-RU.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -591,8 +591,13 @@
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 "Ðàáî÷èé ñòîë"
Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-SK.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -598,8 +598,13 @@
IDS_SHV_COLUMN9 "Poznámky" //Comments
IDS_SHV_COLUMN10 "Vlastník"
IDS_SHV_COLUMN11 "Skupina"
+ IDS_SHV_COLUMN12 "Filename"
+ IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Pôvod" //Pôvodné umiestnenie
IDS_SHV_COLUMN_DELDATE "Odstránený" //Dátum zmazania
+ IDS_SHV_COLUMN_FONTTYPE "Fonttype"
+ IDS_SHV_COLUMN_WORKGROUP "Workgroup"
+ IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Pracovná plocha"
Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-SI.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-SE.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-TR.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -592,8 +592,13 @@
IDS_SHV_COLUMN9 "Açýklamalar"
IDS_SHV_COLUMN10 "Sahip"
IDS_SHV_COLUMN11 "Grup"
+ IDS_SHV_COLUMN12 "Filename"
+ IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Özgün 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 "Masaüstü"
Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-UA.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -593,8 +593,13 @@
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 "Ðîáî÷èé ñò³ë"
Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-CN.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -581,8 +581,13 @@
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 "×ÀÃæ"
Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-TW.rc?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -593,8 +593,13 @@
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"
Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_fonts.c?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -72,11 +72,19 @@
#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 @@
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);
Modified: trunk/reactos/dll/win32/shell32/shfldr_netplaces.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_netplaces.c?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_netplaces.c [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -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 @@
#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 @@
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 @@
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);
Modified: trunk/reactos/dll/win32/shell32/shresdef.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef.h?rev=35157&r1=35156&r2=35157&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Thu Aug 7 03:55:34 2008
@@ -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
More information about the Ros-diffs
mailing list