[SHELL32]

- CDefView: Implement updating the status bar . Based on patch by Barrett Karish CORE-10300 svn path=/trunk/; revision=69468
2024-06-21 13:31:38 +00:00 · 2015-10-09 00:27:34 +00:00 · 2015-10-09 00:27:34 +00:00 · 203f452b02
parent 3a23a2677a
commit 203f452b02
33 changed files with 88 additions and 0 deletions
--- a/reactos/dll/win32/shell32/CDefView.cpp
+++ b/reactos/dll/win32/shell32/CDefView.cpp
@ -125,6 +125,7 @@ class CDefView :
        HRESULT IncludeObject(PCUITEMID_CHILD pidl);
        HRESULT OnDefaultCommand();
        HRESULT OnStateChange(UINT uFlags);
+        void UpdateStatusbar();
        void CheckToolbar();
        void SetStyle(DWORD dwAdd, DWORD dwRemove);
        BOOL CreateList();
@ -469,6 +470,26 @@ void CDefView::CheckToolbar()
    }
 }

+void CDefView::UpdateStatusbar()
+{
+    WCHAR szFormat[MAX_PATH] = {0};
+    WCHAR szObjects[MAX_PATH] = {0};
+    UINT cSelectedItems;
+
+    cSelectedItems = m_ListView.GetSelectedCount();
+    if (cSelectedItems)
+    {
+        LoadStringW(shell32_hInstance, IDS_OBJECTS_SELECTED, szFormat, _countof(szFormat));
+        StringCchPrintfW(szObjects, MAX_PATH, szFormat, cSelectedItems);
+    }
+    else
+    {
+        LoadStringW(shell32_hInstance, IDS_OBJECTS, szFormat, _countof(szFormat));
+        StringCchPrintfW(szObjects, MAX_PATH, szFormat, m_ListView.GetItemCount());
+    }
+    m_pShellBrowser->SetStatusTextSB(szObjects);
+}
+
 /**********************************************************
 *
 * ##### helperfunctions for initializing the view #####
@ -1071,6 +1092,8 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl

    m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_SHELLVIEW));

+    UpdateStatusbar();
+
    return S_OK;
 }

@ -1822,6 +1845,7 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
        case LVN_ITEMCHANGED:
            TRACE("-- LVN_ITEMCHANGED %p\n", this);
            OnStateChange(CDBOSC_SELCHANGE);  /* the browser will get the IDataObject now */
+            UpdateStatusbar();
            break;

        case LVN_BEGINDRAG:
--- a/reactos/dll/win32/shell32/lang/bg-BG.rc
+++ b/reactos/dll/win32/shell32/lang/bg-BG.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/ca-ES.rc
+++ b/reactos/dll/win32/shell32/lang/ca-ES.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/cs-CZ.rc
+++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc
@ -824,4 +824,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Popis:"

    IDS_MENU_EMPTY "(Prázdné)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/da-DK.rc
+++ b/reactos/dll/win32/shell32/lang/da-DK.rc
@ -824,4 +824,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/de-DE.rc
+++ b/reactos/dll/win32/shell32/lang/de-DE.rc
@ -819,4 +819,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Beschreibung:"

    IDS_MENU_EMPTY "(Leer)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/el-GR.rc
+++ b/reactos/dll/win32/shell32/lang/el-GR.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/en-GB.rc
+++ b/reactos/dll/win32/shell32/lang/en-GB.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/en-US.rc
+++ b/reactos/dll/win32/shell32/lang/en-US.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/es-ES.rc
+++ b/reactos/dll/win32/shell32/lang/es-ES.rc
@ -819,4 +819,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Descripción:"

    IDS_MENU_EMPTY "(Vacío)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/fi-FI.rc
+++ b/reactos/dll/win32/shell32/lang/fi-FI.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/fr-FR.rc
+++ b/reactos/dll/win32/shell32/lang/fr-FR.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description :"

    IDS_MENU_EMPTY "(Vide)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/he-IL.rc
+++ b/reactos/dll/win32/shell32/lang/he-IL.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/hu-HU.rc
+++ b/reactos/dll/win32/shell32/lang/hu-HU.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/it-IT.rc
+++ b/reactos/dll/win32/shell32/lang/it-IT.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Descrizione:"

    IDS_MENU_EMPTY "(Vuoto)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/ja-JP.rc
+++ b/reactos/dll/win32/shell32/lang/ja-JP.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/ko-KR.rc
+++ b/reactos/dll/win32/shell32/lang/ko-KR.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/nl-NL.rc
+++ b/reactos/dll/win32/shell32/lang/nl-NL.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/no-NO.rc
+++ b/reactos/dll/win32/shell32/lang/no-NO.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/pl-PL.rc
+++ b/reactos/dll/win32/shell32/lang/pl-PL.rc
@ -822,4 +822,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Opis:"

    IDS_MENU_EMPTY "(Puste)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/pt-BR.rc
+++ b/reactos/dll/win32/shell32/lang/pt-BR.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Descrição:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/pt-PT.rc
+++ b/reactos/dll/win32/shell32/lang/pt-PT.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/ro-RO.rc
+++ b/reactos/dll/win32/shell32/lang/ro-RO.rc
@ -820,4 +820,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Descriere:"

    IDS_MENU_EMPTY "(Gol)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/ru-RU.rc
+++ b/reactos/dll/win32/shell32/lang/ru-RU.rc
@ -820,4 +820,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Описание:"

    IDS_MENU_EMPTY "(пусто)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/sk-SK.rc
+++ b/reactos/dll/win32/shell32/lang/sk-SK.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/sl-SI.rc
+++ b/reactos/dll/win32/shell32/lang/sl-SI.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/sq-AL.rc
+++ b/reactos/dll/win32/shell32/lang/sq-AL.rc
@ -822,4 +822,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Përshkrimi:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/sv-SE.rc
+++ b/reactos/dll/win32/shell32/lang/sv-SE.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/tr-TR.rc
+++ b/reactos/dll/win32/shell32/lang/tr-TR.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Açıklama:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/uk-UA.rc
+++ b/reactos/dll/win32/shell32/lang/uk-UA.rc
@ -818,4 +818,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/zh-CN.rc
+++ b/reactos/dll/win32/shell32/lang/zh-CN.rc
@ -825,4 +825,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "描述："

    IDS_MENU_EMPTY "(空)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/lang/zh-TW.rc
+++ b/reactos/dll/win32/shell32/lang/zh-TW.rc
@ -826,4 +826,6 @@ BEGIN
    IDS_EXE_DESCRIPTION "Description:"

    IDS_MENU_EMPTY "(Empty)"
+    IDS_OBJECTS "%d Objects"
+    IDS_OBJECTS_SELECTED "%d Objects Selected"
 END
--- a/reactos/dll/win32/shell32/shresdef.h
+++ b/reactos/dll/win32/shell32/shresdef.h
@ -225,6 +225,8 @@
 #define IDS_MYCOMPUTER             9216
 #define IDS_PERSONAL               9227
 #define IDS_NETWORKPLACE           9217
+#define IDS_OBJECTS                6466
+#define IDS_OBJECTS_SELECTED       6477

 /* Dialogs */