From 57d99fef8e0bb761ec395f1f9e4a3db493043f36 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Tue, 7 Jul 2015 12:51:45 +0000 Subject: [PATCH] [DEVMGR] Start to fixup and merge the resources. English only at the moment svn path=/trunk/; revision=68373 --- reactos/dll/win32/devmgr_new/CMakeLists.txt | 14 +- reactos/dll/win32/devmgr_new/api.c | 0 .../win32/devmgr_new/devmgmt/lang/tr-TR.rc | 98 ---------- reactos/dll/win32/devmgr_new/devmgr.rc | 8 +- reactos/dll/win32/devmgr_new/lang/en-US.rc | 82 +++++++++ .../dll/win32/devmgr_new/properties/stubs.c | 20 +-- reactos/dll/win32/devmgr_new/resource.h | 170 ++++++++++++++---- .../{devmgmt/res => resources}/computer.ico | Bin .../dll/win32/devmgr_new/resources/devmgr.ico | Bin 8038 -> 0 bytes .../{devmgmt/res => resources}/root.bmp | Bin .../{devmgmt/res => resources}/toolbar.bmp | Bin 11 files changed, 237 insertions(+), 155 deletions(-) create mode 100644 reactos/dll/win32/devmgr_new/api.c delete mode 100644 reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc rename reactos/dll/win32/devmgr_new/{devmgmt/res => resources}/computer.ico (100%) delete mode 100644 reactos/dll/win32/devmgr_new/resources/devmgr.ico rename reactos/dll/win32/devmgr_new/{devmgmt/res => resources}/root.bmp (100%) rename reactos/dll/win32/devmgr_new/{devmgmt/res => resources}/toolbar.bmp (100%) diff --git a/reactos/dll/win32/devmgr_new/CMakeLists.txt b/reactos/dll/win32/devmgr_new/CMakeLists.txt index bdc3f79f687..c8e865467fd 100644 --- a/reactos/dll/win32/devmgr_new/CMakeLists.txt +++ b/reactos/dll/win32/devmgr_new/CMakeLists.txt @@ -1,18 +1,18 @@ spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB) -set_cpp(WITH_RTTI WITH_STL) +set_cpp(WITH_RTTI WITH_RUNTIME) include_directories(${REACTOS_SOURCE_DIR}/lib/atl) list(APPEND SOURCE precomp.h - Properties/advprop.c - Properties/devprblm.c - Properties/hwpage.c - Properties/hwresource.c - Properties/misc.c - Properties/stubs.c + properties/advprop.c + properties/devprblm.c + properties/hwpage.c + properties/hwresource.c + properties/misc.c + properties/stubs.c devmgmt/ClassNode.cpp devmgmt/DeviceNode.cpp devmgmt/DeviceView.cpp diff --git a/reactos/dll/win32/devmgr_new/api.c b/reactos/dll/win32/devmgr_new/api.c new file mode 100644 index 00000000000..e69de29bb2d diff --git a/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc b/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc deleted file mode 100644 index 3fd8f361f71..00000000000 --- a/reactos/dll/win32/devmgr_new/devmgmt/lang/tr-TR.rc +++ /dev/null @@ -1,98 +0,0 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */ - -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT - -IDR_MAINMENU MENU -BEGIN - POPUP "&Kütük" - BEGIN - MENUITEM "&Çıkış", IDC_EXIT - END - POPUP "&Eylem" - BEGIN - MENUITEM "&Sürücü Yazılmını Şimdikileştir..." IDC_UPDATE_DRV - MENUITEM "&Etkinleştir" IDC_ENABLE_DRV - MENUITEM "E&dilginleştir" IDC_DISABLE_DRV - MENUITEM "&Kaldır" IDC_UNINSTALL_DRV - MENUITEM SEPARATOR - MENUITEM "D&onanım Değişiklikleri İçin Tara" IDC_SCAN_HARDWARE - MENUITEM "Do&nanım Ekle" IDC_ADD_HARDWARE, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Husûsiyetler", IDC_PROPERTIES - END - POPUP "&Görünüm" - BEGIN - MENUITEM "&Türe Göre Aygıtlar", IDC_DEVBYTYPE - MENUITEM "&Bağlantıya Göre Aygıtlar", IDC_DEVBYCONN - MENUITEM "T&üre Göre Kaynaklar", IDC_RESBYTYPE, GRAYED - MENUITEM "B&ağlantıya Göre Kaynaklar", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Gizli Aygıtları Göster", IDC_SHOWHIDDEN - END - POPUP "&Yardım" - BEGIN - MENUITEM "&Üzerine", IDC_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "&Sürücü Yazılmını Şimdikileştir..." IDC_UPDATE_DRV - MENUITEM "&Etkinleştir" IDC_ENABLE_DRV - MENUITEM "E&dilginleştir" IDC_DISABLE_DRV - MENUITEM "&Kaldır" IDC_UNINSTALL_DRV - MENUITEM SEPARATOR - MENUITEM "D&onanım Değişiklikleri İçin Tara" IDC_SCAN_HARDWARE - MENUITEM "Do&nanım Ekle" IDC_ADD_HARDWARE, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Husûsiyetler", IDC_PROPERTIES - END -END - -#define IDS_HINT_PROPERTIES 20001 -#define IDS_HINT_SCAN 20002 -#define IDS_HINT_ENABLE 20003 -#define IDS_HINT_DISABLE 20004 -#define IDS_HINT_UPDATE 20005 -#define IDS_HINT_UNINSTALL 20006 - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROPERTIES "Husûsiyetler" - IDS_TOOLTIP_SCAN "Donanım Değişiklikleri İçin Tara" - IDS_TOOLTIP_ENABLE "Etkinleştir" - IDS_TOOLTIP_DISABLE "Edilginleştir" - IDS_TOOLTIP_UPDATE "Sürücü Yazılmını Şimdikileştir" - IDS_TOOLTIP_UNINSTALL "Kaldır" -END - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "Aygıt Yöneticisi" - IDS_HINT_BLANK " " - IDS_HINT_PROPERTIES " Şimdiki seçilen için husûsiyet penceresini açar." - IDS_HINT_SCAN " Yeni ya da değiştirilmiş tak ve çalıştır aygıtları için tarar." - IDS_HINT_ENABLE " Seçili aygıtı etkinleştirir." - IDS_HINT_DISABLE " Seçili aygıtı edilginleştirir." - IDS_HINT_UPDATE " Seçili aygıt için Sürücü Yazılımını Şimdikileştir yardımcısını başlatır." - IDS_HINT_UNINSTALL " Seçili aygıt için sürücüyü kaldırır." - IDS_HINT_ADD " Bilgisayara eski (Tak ve Çalıştır olmayan) bir aygıt ekler." - IDS_HINT_ABOUT " Aygıt Yöneticisi üzerine." - IDS_HINT_EXIT " İzlenceden çıkar." - - IDS_HINT_DEV_BY_TYPE " Donanım türüne göre aygıtları görüntüler." - IDS_HINT_DEV_BY_CONN " Bağlantıya göre aygıtları görüntüler." - IDS_HINT_RES_BY_TYPE " Türe göre kaynakları görüntüler." - IDS_HINT_RES_BY_CONN " Bağlantı türüne göre kaynakları görüntüler." - IDS_HINT_SHOW_HIDDEN " Eski aygıtları ve artık kurulu olmayacak aygıtları görüntüler." - - IDS_HINT_SYS_RESTORE " Bu pencereyi düzgülük boyutlarına döndürür." - IDS_HINT_SYS_MOVE " Bu pencereyi devindirir." - IDS_HINT_SYS_SIZE " Bu pencereyi yeniden boyutlandırır." - IDS_HINT_SYS_MINIMIZE " Bu pencereyi bir simgeye küçültür." - IDS_HINT_SYS_MAXIMIZE " Bu pencereyi, bu görüntülüğü kaplatana dek genişletir." - IDS_HINT_SYS_CLOSE " Bu pencereyi kapatır." -END diff --git a/reactos/dll/win32/devmgr_new/devmgr.rc b/reactos/dll/win32/devmgr_new/devmgr.rc index e4b18a835b5..87ac13d3f49 100644 --- a/reactos/dll/win32/devmgr_new/devmgr.rc +++ b/reactos/dll/win32/devmgr_new/devmgr.rc @@ -12,10 +12,16 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll" #include -IDI_DEVMGR ICON "resources/devmgr.ico" +IDI_MAIN_ICON ICON "resources/computer.ico" +IDB_ROOT_IMAGE BITMAP "resources/root.bmp" + +/* main toolbar icons */ +IDB_TOOLBAR BITMAP DISCARDABLE "resources/toolbar.bmp" #include +#define LANGUAGE_EN_US + /* UTF-8 */ #pragma code_page(65001) diff --git a/reactos/dll/win32/devmgr_new/lang/en-US.rc b/reactos/dll/win32/devmgr_new/lang/en-US.rc index f34f4ecbe16..5bd1998509b 100644 --- a/reactos/dll/win32/devmgr_new/lang/en-US.rc +++ b/reactos/dll/win32/devmgr_new/lang/en-US.rc @@ -235,3 +235,85 @@ BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END + + +/* + This code relates to the device manager GUI + */ + +IDR_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit", IDC_EXIT + END + MENUITEM "Action" IDC_ACTIONMENU + POPUP "View" + BEGIN + MENUITEM "Devices by type", IDC_DEVBYTYPE + MENUITEM "Devices by connection", IDC_DEVBYCONN + MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + END + POPUP "Help" + BEGIN + MENUITEM "About", IDC_ABOUT + END +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" +END +STRINGTABLE DISCARDABLE +BEGIN + IDS_MENU_UPDATE "Update driver software..." + IDS_MENU_ENABLE "Enable" + IDS_MENU_DISABLE "Disable" + IDS_MENU_UNINSTALL "Uninstall" + IDS_MENU_SCAN "Scan for hardware changes" + IDS_MENU_ADD "Add hardware" + IDS_MENU_PROPERTIES "Properties" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROPERTIES "Properties" + IDS_TOOLTIP_SCAN "Scan for hardware changes" + IDS_TOOLTIP_ENABLE "Enable" + IDS_TOOLTIP_DISABLE "Disable" + IDS_TOOLTIP_UPDATE "Update Driver Software" + IDS_TOOLTIP_UNINSTALL "Uninstall" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Device Manager" + IDS_HINT_BLANK " " + IDS_HINT_PROPERTIES " Open property dialog for the current selection." + IDS_HINT_SCAN " Scan for changed or new plug and play devices." + IDS_HINT_ENABLE " Enables the selected device." + IDS_HINT_DISABLE " Disables the selected device." + IDS_HINT_UPDATE " Launches the Update Driver Software wizard for the selected device." + IDS_HINT_UNINSTALL " Uninstalls the driver for the selected device." + IDS_HINT_ADD " Adds a legacy (non-Plug and Play) device to the computer." + IDS_HINT_ABOUT " About ReactOS Device Manager." + IDS_HINT_EXIT " Exits the program." + + IDS_HINT_DEV_BY_TYPE " Displays devices by hardware type." + IDS_HINT_DEV_BY_CONN " Displays devices by connection." + IDS_HINT_RES_BY_TYPE " Displays resources by type." + IDS_HINT_RES_BY_CONN " Displays resources by connection type." + IDS_HINT_SHOW_HIDDEN " Displays legacy devices and devices that are no longer installed." + + IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_MOVE " Moves this window." + IDS_HINT_SYS_SIZE " Resizes this window." + IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." + IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." + IDS_HINT_SYS_CLOSE " Closes this window." +END diff --git a/reactos/dll/win32/devmgr_new/properties/stubs.c b/reactos/dll/win32/devmgr_new/properties/stubs.c index 7594f85c53f..3c5f58b413d 100644 --- a/reactos/dll/win32/devmgr_new/properties/stubs.c +++ b/reactos/dll/win32/devmgr_new/properties/stubs.c @@ -81,16 +81,16 @@ DeviceManager_ExecuteA(HWND hWndParent, * * @unimplemented */ -BOOL -WINAPI -DeviceManager_ExecuteW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpMachineName, - int nCmdShow) -{ - UNIMPLEMENTED; - return FALSE; -} +//BOOL +//WINAPI +//DeviceManager_ExecuteW(HWND hWndParent, +// HINSTANCE hInst, +// LPCWSTR lpMachineName, +// int nCmdShow) +//{ +// UNIMPLEMENTED; +// return FALSE; +//} /*************************************************************************** diff --git a/reactos/dll/win32/devmgr_new/resource.h b/reactos/dll/win32/devmgr_new/resource.h index fcf480d3c1c..bf4afbf101b 100644 --- a/reactos/dll/win32/devmgr_new/resource.h +++ b/reactos/dll/win32/devmgr_new/resource.h @@ -1,46 +1,98 @@ #pragma once -#define IDI_DEVMGR 100 +#define IDC_STATIC -1 -#define IDD_HARDWARE 100 -#define IDD_DEVICEGENERAL 101 -#define IDD_DEVICEDRIVER 102 -#define IDD_DEVICERESOURCES 103 -#define IDD_DRIVERDETAILS 104 -#define IDD_DEVICEDETAILS 105 -#define IDD_DEVICEPOWER 106 +#define IDS_APPNAME 10 -#define IDC_DEVICON 0x57B -#define IDC_DEVNAME 0x57C -#define IDC_DEVTYPE 0x57D -#define IDC_DEVMANUFACTURER 0x57E -#define IDC_DEVLOCATION 0x57F -#define IDC_DEVSTATUSGROUP 0x580 -#define IDC_DEVSTATUS 0x581 -#define IDC_DEVUSAGE 0x582 -#define IDC_DEVICES 0x583 -#define IDC_LV_DEVICES 0x584 -#define IDC_PROPERTIESGROUP 0x585 -#define IDC_MANUFACTURER 0x587 -#define IDC_LOCATION 0x588 -#define IDC_STATUS 0x586 -#define IDC_TROUBLESHOOT 0x589 -#define IDC_PROPERTIES 0x58A -#define IDC_DEVUSAGELABEL 0x58B -#define IDC_DEVPROBLEM 0x58C -#define IDC_DRVPROVIDER 0x58D -#define IDC_DRVDATE 0x58E -#define IDC_DRVVERSION 0x58F -#define IDC_DIGITALSIGNER 0x590 -#define IDC_DRIVERDETAILS 0x591 -#define IDC_DRIVERFILES 0x592 -#define IDC_FILEPROVIDER 0x593 -#define IDC_FILEVERSION 0x594 -#define IDC_FILECOPYRIGHT 0x595 -#define IDC_DETAILSPROPNAME 0x596 -#define IDC_DETAILSPROPVALUE 0x597 -#define IDC_UPDATEDRIVER 0x598 -#define IDC_DRIVERRESOURCES 0x599 +#define IDI_MAIN_ICON 20 +#define IDB_ROOT_IMAGE 21 +#define IDB_TOOLBAR 22 + +/* windows */ +#define IDC_TREEVIEW 30 +#define IDC_TOOLBAR 31 +#define IDC_STATUSBAR 32 +#define IDR_MAINMENU 33 +#define IDR_POPUP 34 + +/* Actions */ +#define IDC_PROPERTIES 40 +#define IDC_SCAN_HARDWARE 41 +#define IDC_ENABLE_DRV 42 +#define IDC_DISABLE_DRV 43 +#define IDC_UPDATE_DRV 44 +#define IDC_UNINSTALL_DRV 45 +#define IDC_ADD_HARDWARE 46 + +/* Menu items */ +#define IDC_ACTIONMENU 50 +#define IDC_ABOUT 51 +#define IDC_EXIT 52 + + +/* view menu */ +#define IDC_DEVBYTYPE 60 +#define IDC_DEVBYCONN 61 +#define IDC_RESBYTYPE 62 +#define IDC_RESBYCONN 63 +#define IDC_SHOWHIDDEN 64 + + +/* tooltips */ +#define IDS_TOOLTIP_PROPERTIES 70 +#define IDS_TOOLTIP_SCAN 71 +#define IDS_TOOLTIP_ENABLE 72 +#define IDS_TOOLTIP_DISABLE 73 +#define IDS_TOOLTIP_UPDATE 74 +#define IDS_TOOLTIP_UNINSTALL 75 + +/* General strings */ +#define IDS_CONFIRM_DISABLE 80 + +/* Menu strings */ +#define IDS_MENU_UPDATE 90 +#define IDS_MENU_ENABLE 91 +#define IDS_MENU_DISABLE 92 +#define IDS_MENU_UNINSTALL 93 +#define IDS_MENU_SCAN 94 +#define IDS_MENU_ADD 95 +#define IDS_MENU_PROPERTIES 96 + + +/* menu hints */ +#define IDS_HINT_BLANK 100 +#define IDS_HINT_PROPERTIES 101 +#define IDS_HINT_SCAN 102 +#define IDS_HINT_ENABLE 103 +#define IDS_HINT_DISABLE 104 +#define IDS_HINT_UPDATE 105 +#define IDS_HINT_UNINSTALL 106 +#define IDS_HINT_ADD 107 +#define IDS_HINT_ABOUT 108 +#define IDS_HINT_EXIT 109 + +#define IDS_HINT_DEV_BY_TYPE 120 +#define IDS_HINT_DEV_BY_CONN 121 +#define IDS_HINT_RES_BY_TYPE 123 +#define IDS_HINT_RES_BY_CONN 124 +#define IDS_HINT_SHOW_HIDDEN 125 + +/* system menu hints */ +#define IDS_HINT_SYS_RESTORE 130 +#define IDS_HINT_SYS_MOVE 131 +#define IDS_HINT_SYS_SIZE 132 +#define IDS_HINT_SYS_MINIMIZE 133 +#define IDS_HINT_SYS_MAXIMIZE 134 +#define IDS_HINT_SYS_CLOSE 135 + + + + + + + + +#define IDI_DEVMGR 255 #define IDS_NAME 0x100 #define IDS_TYPE 0x101 @@ -154,3 +206,43 @@ #define IDS_PROP_CURRENTPOWERSTATE 0x315 #define IDS_PROP_POWERCAPABILITIES 0x316 #define IDS_PROP_POWERSTATEMAPPINGS 0x317 + +#define IDD_HARDWARE 0x400 +#define IDD_DEVICEGENERAL 0x401 +#define IDD_DEVICEDRIVER 0x402 +#define IDD_DEVICERESOURCES 0x403 +#define IDD_DRIVERDETAILS 0x404 +#define IDD_DEVICEDETAILS 0x405 +#define IDD_DEVICEPOWER 0x406 + +#define IDC_DEVICON 0x57B +#define IDC_DEVNAME 0x57C +#define IDC_DEVTYPE 0x57D +#define IDC_DEVMANUFACTURER 0x57E +#define IDC_DEVLOCATION 0x57F +#define IDC_DEVSTATUSGROUP 0x580 +#define IDC_DEVSTATUS 0x581 +#define IDC_DEVUSAGE 0x582 +#define IDC_DEVICES 0x583 +#define IDC_LV_DEVICES 0x584 +#define IDC_PROPERTIESGROUP 0x585 +#define IDC_MANUFACTURER 0x587 +#define IDC_LOCATION 0x588 +#define IDC_STATUS 0x586 +#define IDC_TROUBLESHOOT 0x589 +#define IDC_PROPERTIES2 0x58A +#define IDC_DEVUSAGELABEL 0x58B +#define IDC_DEVPROBLEM 0x58C +#define IDC_DRVPROVIDER 0x58D +#define IDC_DRVDATE 0x58E +#define IDC_DRVVERSION 0x58F +#define IDC_DIGITALSIGNER 0x590 +#define IDC_DRIVERDETAILS 0x591 +#define IDC_DRIVERFILES 0x592 +#define IDC_FILEPROVIDER 0x593 +#define IDC_FILEVERSION 0x594 +#define IDC_FILECOPYRIGHT 0x595 +#define IDC_DETAILSPROPNAME 0x596 +#define IDC_DETAILSPROPVALUE 0x597 +#define IDC_UPDATEDRIVER 0x598 +#define IDC_DRIVERRESOURCES 0x599 diff --git a/reactos/dll/win32/devmgr_new/devmgmt/res/computer.ico b/reactos/dll/win32/devmgr_new/resources/computer.ico similarity index 100% rename from reactos/dll/win32/devmgr_new/devmgmt/res/computer.ico rename to reactos/dll/win32/devmgr_new/resources/computer.ico diff --git a/reactos/dll/win32/devmgr_new/resources/devmgr.ico b/reactos/dll/win32/devmgr_new/resources/devmgr.ico deleted file mode 100644 index beb28a65a33482a867435d3cc444eace440daeae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8038 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 diff --git a/reactos/dll/win32/devmgr_new/devmgmt/res/root.bmp b/reactos/dll/win32/devmgr_new/resources/root.bmp similarity index 100% rename from reactos/dll/win32/devmgr_new/devmgmt/res/root.bmp rename to reactos/dll/win32/devmgr_new/resources/root.bmp diff --git a/reactos/dll/win32/devmgr_new/devmgmt/res/toolbar.bmp b/reactos/dll/win32/devmgr_new/resources/toolbar.bmp similarity index 100% rename from reactos/dll/win32/devmgr_new/devmgmt/res/toolbar.bmp rename to reactos/dll/win32/devmgr_new/resources/toolbar.bmp -- 2.17.1