[ros-diffs] [khornicek] 54164: [EXPLORER] Make the Network connections start menu item open the net connections folder. Trim a misleading message.
khornicek at svn.reactos.org
khornicek at svn.reactos.org
Sun Oct 16 16:12:56 UTC 2011
Author: khornicek
Date: Sun Oct 16 16:12:55 2011
New Revision: 54164
URL: http://svn.reactos.org/svn/reactos?rev=54164&view=rev
Log:
[EXPLORER]
Make the Network connections start menu item open the net connections folder. Trim a misleading message.
Modified:
trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp
Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp?rev=54164&r1=54163&r2=54164&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Sun Oct 16 16:12:55 2011
@@ -2039,26 +2039,29 @@
#endif
break;
- case IDC_CONNECTIONS:
+ case IDC_CONNECTIONS:{
+ CloseStartMenu(id);
#ifndef ROSSHELL
-#ifdef __REACTOS__ // 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));
- //CloseStartMenu(id);
- //MainFrame::Create(SpecialFolderPath(CSIDL_CONNECTIONS, _hwnd), OWM_PIDL);
-#endif
+#ifndef _NO_MDI
+ XMLPos explorer_options = g_Globals.get_cfg("general/explorer");
+ bool mdi = XMLBool(explorer_options, "mdi", true);
+
+ if (mdi)
+ MDIMainFrame::Create(SHELLPATH_NET_CONNECTIONS, 0);
+ else
+#endif
+ SDIMainFrame::Create(SHELLPATH_NET_CONNECTIONS, 0);
#else
launch_file(_hwnd, SHELLPATH_NET_CONNECTIONS);
#endif
- break;
+ break;}
// browse menu
case IDC_NETWORK:
#ifdef __REACTOS__ ///@todo to be removed when network browsing will be implemented in shell namespace
- MessageBox(0, TEXT("network not yet implemented"), ResString(IDS_TITLE), MB_OK);
+ MessageBox(0, TEXT("not yet implemented"), ResString(IDS_TITLE), MB_OK);
#else
CreateSubmenu(id, CSIDL_NETWORK, ResString(IDS_NETWORK));
#endif
@@ -2192,13 +2195,14 @@
{
super::AddEntries();
-#if defined(ROSSHELL) || defined(__REACTOS__) // __REACTOS__ to be removed when printer/network will be implemented
+#if defined(ROSSHELL) || defined(__REACTOS__) // __REACTOS__ to be removed when printers will be implemented
//TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS_MENU);
- AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS);
#else
//TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, true, IDC_PRINTERS_MENU);
+#endif
+
AddButton(ResString(IDS_CONNECTIONS), ICID_NETCONNS, false, IDC_CONNECTIONS);
-#endif
+
AddButton(ResString(IDS_ADMIN), ICID_ADMIN, true, IDC_ADMIN);
#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
More information about the Ros-diffs
mailing list