mirror of
https://github.com/reactos/reactos.git
synced 2024-10-06 17:35:07 +00:00
display 'not yet implemented' messages for printers, network and RAS; disable address&command bar
svn path=/trunk/; revision=8306
This commit is contained in:
parent
9dacfa1b68
commit
765c5f4797
|
@ -186,6 +186,7 @@ MainFrame::MainFrame(HWND hwnd)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _DEBUG
|
||||||
// address & command bar
|
// address & command bar
|
||||||
WindowCanvas canvas(hwnd);
|
WindowCanvas canvas(hwnd);
|
||||||
RECT rect = {0, 0, 0, 0};
|
RECT rect = {0, 0, 0, 0};
|
||||||
|
@ -199,6 +200,7 @@ MainFrame::MainFrame(HWND hwnd)
|
||||||
_hcommandedit = CreateWindow(TEXT("EDIT"), TEXT("> Command"), WS_CHILD|WS_VISIBLE, 0, 0, 0, rect.bottom,
|
_hcommandedit = CreateWindow(TEXT("EDIT"), TEXT("> Command"), WS_CHILD|WS_VISIBLE, 0, 0, 0, rect.bottom,
|
||||||
hwnd, (HMENU)IDW_ADDRESSBAR, g_Globals._hInstance, 0);
|
hwnd, (HMENU)IDW_ADDRESSBAR, g_Globals._hInstance, 0);
|
||||||
SetWindowFont(_hcommandedit, hfont, FALSE);
|
SetWindowFont(_hcommandedit, hfont, FALSE);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* CreateStatusWindow does not accept WS_BORDER
|
/* CreateStatusWindow does not accept WS_BORDER
|
||||||
_hstatusbar = CreateWindowEx(WS_EX_NOPARENTNOTIFY, STATUSCLASSNAME, 0,
|
_hstatusbar = CreateWindowEx(WS_EX_NOPARENTNOTIFY, STATUSCLASSNAME, 0,
|
||||||
|
|
|
@ -1592,7 +1592,11 @@ int StartMenuHandler::Command(int id, int code)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_PRINTERS:
|
case IDC_PRINTERS:
|
||||||
|
#ifdef _ROS_ // to be removed when printer folder will be implemented
|
||||||
|
MessageBox(0, TEXT("printer folder not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK);
|
||||||
|
#else
|
||||||
CreateSubmenu(id, CSIDL_PRINTERS, CSIDL_PRINTHOOD, ResString(IDS_PRINTERS));
|
CreateSubmenu(id, CSIDL_PRINTERS, CSIDL_PRINTHOOD, ResString(IDS_PRINTERS));
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_CONTROL_PANEL:
|
case IDC_CONTROL_PANEL:
|
||||||
|
@ -1605,14 +1609,22 @@ int StartMenuHandler::Command(int id, int code)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_CONNECTIONS:
|
case IDC_CONNECTIONS:
|
||||||
|
#ifdef _ROS_ // to be removed when RAS will be implemented
|
||||||
|
MessageBox(0, TEXT("RAS folder not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK);
|
||||||
|
#else
|
||||||
CreateSubmenu(id, CSIDL_CONNECTIONS, ResString(IDS_CONNECTIONS));
|
CreateSubmenu(id, CSIDL_CONNECTIONS, ResString(IDS_CONNECTIONS));
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
// browse menu
|
// browse menu
|
||||||
|
|
||||||
case IDC_NETWORK:
|
case IDC_NETWORK:
|
||||||
|
#ifdef _ROS_ // to be removed when network will be implemented
|
||||||
|
MessageBox(0, TEXT("network not yet implemented"), ResString(IDS_TITLE), MB_OK);
|
||||||
|
#else
|
||||||
CreateSubmenu(id, CSIDL_NETWORK, ResString(IDS_NETWORK));
|
CreateSubmenu(id, CSIDL_NETWORK, ResString(IDS_NETWORK));
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_DRIVES:
|
case IDC_DRIVES:
|
||||||
|
@ -1723,8 +1735,13 @@ void SettingsMenu::AddEntries()
|
||||||
#endif
|
#endif
|
||||||
AddButton(ResString(IDS_CONTROL_PANEL), ICID_CONFIG, false, IDC_CONTROL_PANEL);
|
AddButton(ResString(IDS_CONTROL_PANEL), ICID_CONFIG, false, IDC_CONTROL_PANEL);
|
||||||
|
|
||||||
|
#ifdef _ROS_ // to be removed when printer/network will be implemented
|
||||||
|
AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS);
|
||||||
|
AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS);
|
||||||
|
#else
|
||||||
AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, true, IDC_PRINTERS);
|
AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, true, IDC_PRINTERS);
|
||||||
AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, true, IDC_CONNECTIONS);
|
AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, true, IDC_CONNECTIONS);
|
||||||
|
#endif
|
||||||
AddButton(ResString(IDS_ADMIN), ICID_CONFIG, true, IDC_ADMIN);
|
AddButton(ResString(IDS_ADMIN), ICID_CONFIG, true, IDC_ADMIN);
|
||||||
|
|
||||||
#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
|
#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
|
||||||
|
@ -1742,7 +1759,11 @@ void BrowseMenu::AddEntries()
|
||||||
#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
|
#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
|
||||||
if (!g_Globals._SHRestricted || !SHRestricted(REST_NONETHOOD)) // or REST_NOENTIRENETWORK ?
|
if (!g_Globals._SHRestricted || !SHRestricted(REST_NONETHOOD)) // or REST_NOENTIRENETWORK ?
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef _ROS_ // to be removed when printer/network will be implemented
|
||||||
|
AddButton(ResString(IDS_NETWORK), ICID_NETWORK, false, IDC_NETWORK);
|
||||||
|
#else
|
||||||
AddButton(ResString(IDS_NETWORK), ICID_NETWORK, true, IDC_NETWORK);
|
AddButton(ResString(IDS_NETWORK), ICID_NETWORK, true, IDC_NETWORK);
|
||||||
|
#endif
|
||||||
|
|
||||||
AddButton(ResString(IDS_DRIVES), ICID_FOLDER, true, IDC_DRIVES);
|
AddButton(ResString(IDS_DRIVES), ICID_FOLDER, true, IDC_DRIVES);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue