Start to fixup and merge the resources. English only at the moment

svn path=/trunk/; revision=68373
This commit is contained in:
Ged Murphy 2015-07-07 12:51:45 +00:00
parent 52f4de88b2
commit 57d99fef8e
11 changed files with 237 additions and 155 deletions

View file

@ -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

View file

View file

@ -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

View file

@ -12,10 +12,16 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#define REACTOS_STR_ORIGINAL_FILENAME "devmgr.dll"
#include <reactos/version.rc>
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 <reactos/manifest_dll.rc>
#define LANGUAGE_EN_US
/* UTF-8 */
#pragma code_page(65001)

View file

@ -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

View file

@ -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;
//}
/***************************************************************************

View file

@ -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

View file

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

View file

Before

Width:  |  Height:  |  Size: 822 B

After

Width:  |  Height:  |  Size: 822 B

View file

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB