@@ -18,13 +18,19 @@ if not defined ECCE_TMPDIR set "ECCE_TMPDIR=%TEMP:\=/%"
 set ECCE_SESSION_LIVENESS=lease
 rem Where the user keeps their work is asked once, at the first start (#240):
 rem the exit status 3 is "Quit" in that window; any other failure goes on.
-if not defined ECCE_NO_FIRST_START if exist "%ECCE_ROOT%\python\python3w.exe" (
+rem ECCE_SWITCHED_LOCAL: the Organizer starts this again after the login
+rem window's "Use this computer instead"; that start is local and not asked.
+if not defined ECCE_NO_FIRST_START if not defined ECCE_SWITCHED_LOCAL if exist "%ECCE_ROOT%\python\python3w.exe" (
   start /wait "" "%ECCE_ROOT%\python\python3w.exe" "%ECCE_ROOT%\bin\ecce-first-start"
   if errorlevel 3 if not errorlevel 4 exit /b 0
 )
 rem A server given by the installation, or chosen in that window, makes this a
 rem -remote session (what ecce-session-lib.sh does on the other systems).
 set "ECCE_SERVER_SESSION="
+if defined ECCE_SWITCHED_LOCAL (
+  set "ECCE_SWITCHED_LOCAL="
+  goto local
+)
 if defined ECCE_LOCAL_DATA goto local
 if defined ECCE_REMOTE_SERVER set "ECCE_SERVER_SESSION=1"
 if exist "%ECCE_ROOT%\siteconfig\RemoteServer\DataServers" set "ECCE_SERVER_SESSION=1"
 
@@ -5918,7 +5918,7 @@ void Builder::addPropertyPanel(PropertyPanel *panel, const string& name)
     //  MO Diagram opened by itself on every calculation that had
     //  orbital energies.
     static const set<string> defaultShown = {
-      "Calculation Summary", "Energies", "MOs"
+      "Calculation Summary", "Energies"
     };
     bool show = defaultShown.find(name) != defaultShown.end();
     if (p_panelMode == PANELS_DETAIL) {
 
@@ -54,8 +54,9 @@ const char *MODE_NAMES[] = { "classic", "stacked", "accordion", "detail" };
 
 //  What opens first when a layout shows one panel and the user has not
 //  chosen: the data people came for, not the summary the header repeats.
+//  Not the MOs: that panel draws orbitals and is opened when wanted.
 const char *DEFAULT_PANEL_ORDER[] = {
-  "MOs", "Vibrational Frequencies", "Energies", "Calculation Summary"
+  "Energies", "Vibrational Frequencies", "Calculation Summary"
 };
 
 
 
@@ -14,6 +14,7 @@
 
 #include <wx/combo.h>
 
+#include <wx/wupdlock.h>
 #include "util/Ecce.H"
 #include "util/BrowserHelp.H"
 #include "wxgui/WxHelpViewer.H"
@@ -530,6 +531,9 @@ void CalcEd::setContext(const string& url, const string& codeName)
   }
 
   if (doit) {
+    // Filling the fields relays the window out several times; show only
+    // the result.
+    wxWindowUpdateLocker freeze(this);
     freeContext();
     bool msgFlag = p_iCalc != (ICalculation*)0;
     p_iCalc = givenCalc;
@@ -2496,6 +2500,9 @@ void CalcEd::populateSummaryField(const string& summaryType)
   sizer->Clear(true);
   sizer->Layout();
   sizer->SetSizeHints(this);
+  // A gap between label and value: a long label ("SCF Conv. Algorithm")
+  // otherwise runs into its value.
+  sizer->SetHGap(FromDIP(8));
 
   if (p_code && p_GUIValues) {
     SummaryIterator *it = p_code->getSummaryIterator(summaryType);
 
@@ -560,8 +560,10 @@ void WxLauncherGUI::CreateControls()
     ewxStaticText* itemStaticText84 = new ewxStaticText( itemPanel3, wxID_STATIC, _("Remote Machine Access"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer82->Add(itemStaticText84, 0, wxALIGN_TOP|wxTOP, 3);
 
-    ewxStaticLine* itemStaticLine85 = new ewxStaticLine( itemPanel3, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxDOUBLE_BORDER );
-    itemBoxSizer82->Add(itemStaticLine85, 1, wxGROW|wxLEFT|wxRIGHT|wxTOP, 3);
+    // Centred, not grown: stretched to the heading's height, MSW draws the
+    // line as a grey bar.
+    ewxStaticLine* itemStaticLine85 = new ewxStaticLine( itemPanel3, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    itemBoxSizer82->Add(itemStaticLine85, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 3);
 
     ewxPanel* itemPanel86 = new ewxPanel( itemPanel3, ID_PANEL_WXLAUNCHER_6, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL );
     itemBoxSizer4->Add(itemPanel86, 0, wxGROW, 3);
 
@@ -24,6 +24,7 @@
 
 #include <fstream>
 #include <memory>
+#include <algorithm>
 #include <sstream>
 #include <iostream>
 using std::cerr;
@@ -88,6 +89,7 @@ static std::string s_registerMessage;
 #include "comm/RunMgmt.H"
 
 #include "wxgui/ewxProgressDialog.H"
+#include <wx/wupdlock.h>
 #include "wxgui/EcceTool.H"
 #include "wxgui/ewxWindowUtils.H"
 #include "wxgui/ewxBitmap.H"
@@ -409,6 +411,11 @@ bool CalcMgr::Create( wxWindow* parent, wxWindowID id, const wxString& caption,
  * new <parent url> <type>
  *                 File > New with resource type <type> (gromacs_md_study,
  *                 gromacs_md_energy) in <parent>, as the New menu makes it
+ * counts          broker notices, the updates made for them and their
+ *                 batches since the last counts
+ * newprompt <parent url> <code>
+ *                 File > New <code> Calculation with the name prompt,
+ *                 answered OK after 1.5 s
  * contextmenu <url> right-click <url> in the tree; the New submenu's items
  */
 void CalcMgr::runTestCommand(const string& line)
@@ -646,6 +653,44 @@ void CalcMgr::runTestCommand(const string& line)
     } else if (command == "tail-close") {
       if (p_testTail) p_testTail->Close();
       outcome = "ok";
+    } else if (command == "counts") {
+      // Broker notices received, tree/summary updates made for them, and
+      // the batches they came in, since the last "counts".
+      outcome = "notices=" + std::to_string(p_testNotices) +
+                " applied=" + std::to_string(p_testApplied) +
+                " batches=" + std::to_string(p_testBatches);
+      p_testNotices = p_testApplied = p_testBatches = 0;
+    } else if (command == "newprompt") {
+      // "newprompt PARENT-URL CODE": File > New <code> Calculation with the
+      // name prompt, as the menu does it (disabler included); the prompt is
+      // answered OK after 1.5 s.
+      std::istringstream args(calcName);
+      string parentUrl, code;
+      args >> parentUrl >> code;
+      ResourceType *rt = ResourceDescriptor::getResourceDescriptor()
+          .getResourceType("virtual_document", "ecceCalculation", code);
+      WxResourceTreeItemData *parentNode = findNode(EcceURL(parentUrl),
+                                                    true, true);
+      if (!rt || !parentNode) {
+        outcome = !rt ? "no resource type " + code : "no parent node";
+      } else {
+        wxTimer answer;
+        answer.Bind(wxEVT_TIMER, [](wxTimerEvent&) {
+          for (wxWindowList::compatibility_iterator n =
+                 wxTopLevelWindows.GetFirst(); n; n = n->GetNext()) {
+            wxDialog *d = dynamic_cast<wxDialog*>(n->GetData());
+            if (d && d->IsModal()) d->EndModal(wxID_OK);
+          }
+        });
+        answer.StartOnce(1500);
+        bool ask = GetMenuBar()->IsChecked(wxID_ASKFORNAME);
+        GetMenuBar()->Check(wxID_ASKFORNAME, true);
+        startDisabler();
+        createResource(rt, parentNode, false);
+        stopDisabler();
+        GetMenuBar()->Check(wxID_ASKFORNAME, ask);
+        outcome = "ok";
+      }
     } else if (command == "start") {
       // "start TOOL [URL]": what a tool button does (startApp), e.g.
       // "start CalculationEditor <calc url>".
@@ -5213,7 +5258,18 @@ void CalcMgr::createResource(ResourceType * resType,
         infoStr = invalidMsg + infoStr;
       ewxTextEntryDialog dialog(this, infoStr, "New " + name + " Name",
                                 name, wxOK | wxCANCEL);
-      if (dialog.ShowModal() == wxID_OK) {
+      // The dialog disables the windows itself.  Left disabled by
+      // startDisabler(), the Organizer cannot take the activation back when
+      // the dialog closes, and on MSW the window behind it (another
+      // program) comes to the front.
+      const bool paused = p_disabler != 0;
+      if (paused) {
+        delete p_disabler;
+        p_disabler = 0;
+      }
+      const int answer = dialog.ShowModal();
+      if (paused) p_disabler = new wxWindowDisabler;
+      if (answer == wxID_OK) {
         name = dialog.GetValue();
         if (resType->isValidResourceName(name))
           break;
@@ -5441,6 +5497,44 @@ void CalcMgr::updateUrl(const EcceURL & url)
 }
 
 
+void CalcMgr::queueUpdate(UpdateKind kind, const EcceURL & url)
+{
+  p_testNotices++;
+  std::pair<UpdateKind, string> item(kind, url.toString());
+  // A repeated change notice adds nothing; additions and removals keep
+  // their order, only an immediate repeat is dropped.
+  bool dup = kind == UPDATE_CHANGED
+    ? std::find(p_queuedUpdates.begin(), p_queuedUpdates.end(), item) !=
+        p_queuedUpdates.end()
+    : !p_queuedUpdates.empty() && p_queuedUpdates.back() == item;
+  if (!dup) p_queuedUpdates.push_back(item);
+  if (!p_updateTimer) {
+    p_updateTimer = new wxTimer(this);
+    Bind(wxEVT_TIMER, [this](wxTimerEvent&) { applyQueuedUpdates(); },
+         p_updateTimer->GetId());
+  }
+  // The notices of one Save arrive within a few ms of each other.
+  if (!p_updateTimer->IsRunning()) p_updateTimer->StartOnce(150);
+}
+
+
+void CalcMgr::applyQueuedUpdates()
+{
+  std::vector<std::pair<UpdateKind, string> > todo;
+  todo.swap(p_queuedUpdates);
+  if (todo.empty()) return;
+  p_testBatches++;
+  wxWindowUpdateLocker freeze(this);
+  for (size_t i = 0; i < todo.size(); i++) {
+    p_testApplied++;
+    EcceURL url(todo[i].second);
+    if (todo[i].first == UPDATE_ADDED) updateAddNode(url);
+    else if (todo[i].first == UPDATE_REMOVED) updateRemoveNode(url);
+    else updateUrl(url);
+  }
+}
+
+
 /**
  * Refresh the context panel and tree ctrl when the resource associated with
  * the URL got added
 
@@ -8,6 +8,9 @@
 #define _CALCMGR_H_
 
 #include <wx/weakref.h>
+#include <wx/timer.h>
+#include <utility>
+#include <vector>
 #include "wxgui/WxTailWindow.H"
 #include <wx/frame.h>
 #include <wx/toolbar.h>
@@ -262,6 +265,11 @@ public:
   void updateUrl(const EcceURL & url);
   void updateAddNode(const EcceURL & url);
   void updateRemoveNode(const EcceURL & url);
+  // The broker's ecce_url_* notices.  One Save or Launch sends several in a
+  // row, and each rebuilt the tree and the summary (a visible flicker on
+  // MSW); they are collected and applied together under one Freeze.
+  enum UpdateKind { UPDATE_CHANGED, UPDATE_ADDED, UPDATE_REMOVED };
+  void queueUpdate(UpdateKind kind, const EcceURL & url);
   void setMessage(const string & message,
                   WxFeedback::Severity severity=WxFeedback::WARNING,
                   bool clear = false);
@@ -498,6 +506,12 @@ protected:
   //  Set by the "new" test command: createResource reports its error
   //  here instead of in a modal dialog.
   string *p_testCreateError = 0;
+
+  void applyQueuedUpdates();
+  std::vector<std::pair<UpdateKind, string> > p_queuedUpdates;
+  wxTimer *p_updateTimer = 0;
+  // For the "counts" test command.
+  int p_testNotices = 0, p_testApplied = 0, p_testBatches = 0;
 };
 
 
 
@@ -34,9 +34,43 @@
 #include "wxgui/WxJMSSubscriber.H"
 #include "wxgui/WxState.H"
 
+#include "wxgui/WxDavAuth.H"
+
 #include "CalcMgrApp.H"
 #include "CalcMgr.H"
 
+#ifdef __WXMSW__
+#include <windows.h>
+#include <stdlib.h>
+#include "util/Ecce.H"
+
+// The login window's "Use this computer instead": this start was set up for
+// the server, so ecce.cmd runs again, once, for a local session and without
+// the first-start question (ECCE_SWITCHED_LOCAL), as `ecce` does on Linux.
+static void restartInLocalMode()
+{
+  const char *root = getenv("ECCE_ROOT");
+  string script = (root && *root ? string(root) : string(Ecce::ecceHome())) +
+                  "/ecce.cmd";
+  for (const char *v : {"ECCE_REMOTE_SERVER", "ECCE_REMOTE_DIR",
+                        "ECCE_SERVER_SESSION", "ECCE_SESSION_ID"})
+    _putenv_s(v, "");
+  _putenv_s("ECCE_SWITCHED_LOCAL", "1");
+  const char *comspec = getenv("COMSPEC");
+  string line = "\"" + string(comspec && *comspec ? comspec : "cmd.exe") +
+                "\" /d /c \"\"" + script + "\"\"";
+  STARTUPINFOA si;
+  PROCESS_INFORMATION pi;
+  memset(&si, 0, sizeof(si));
+  si.cb = sizeof(si);
+  if (CreateProcessA(NULL, &line[0], 0, 0, FALSE, CREATE_NO_WINDOW, 0, 0,
+                     &si, &pi)) {
+    CloseHandle(pi.hThread);
+    CloseHandle(pi.hProcess);
+  }
+}
+#endif
+
 
 IMPLEMENT_APP(CalcMgrApp)
 
@@ -68,6 +102,10 @@ string CalcMgrApp::getName() const
 bool CalcMgrApp::OnInit()
 {
   ewxApp::OnInit();
+#ifdef __WXMSW__
+  // No gateway here: the Organizer has the session's login window.
+  WxDavAuth::setRestartsOnSwitch(true);
+#endif
 
   if (argc>2 && strcmp(argv[1].ToStdString().c_str(),"-pipe")==0) {
     AuthCache::getCache().pipeIn(argv[2].ToStdString());
@@ -160,7 +198,9 @@ void CalcMgrApp::openUrlWhenReady(const string& url, int tries)
 
 int CalcMgrApp::OnExit()
 {
-  //  cerr << "Enter CalcMgrApp::OnExit()\n";
+#ifdef __WXMSW__
+  if (WxDavAuth::switchedToLocal()) restartInLocalMode();
+#endif
   return 0;
 }
 
@@ -239,21 +279,21 @@ void CalcMgrApp::msgRenameMCB(JMSMessage& msg)
 void CalcMgrApp::msgURLCreatedMCB(JMSMessage& msg)
 {
   EcceURL url(msg.getProperty("url"));
-  p_calcMgr->updateAddNode(url);
+  p_calcMgr->queueUpdate(CalcMgr::UPDATE_ADDED, url);
 }
 
 
 void CalcMgrApp::msgURLRemovedMCB(JMSMessage& msg)
 {
   EcceURL url(msg.getProperty("url"));
-  p_calcMgr->updateRemoveNode(url);
+  p_calcMgr->queueUpdate(CalcMgr::UPDATE_REMOVED, url);
 }
 
 
 void CalcMgrApp::msgChangedMCB(JMSMessage& msg)
 {
   EcceURL url(msg.getProperty("url"));
-  p_calcMgr->updateUrl(url);
+  p_calcMgr->queueUpdate(CalcMgr::UPDATE_CHANGED, url);
 }
 
 
 
@@ -130,6 +130,10 @@ void CalculationContextPanel::refresh()
   p_properties->findValue(VDoc::getEcceNamespace() + ":annotation", annotation);
   annotationCtrl->SetValue(annotation);
 
+  // New values (a longer formula after a Save) need their columns widened.
+  Layout();
+  FitInside();
+
   // get the thumbnail and replace the builder button icon
   // variables to get the jpeg thumbnail resource
   SFile *thumbnail = TempStorage::getTempFile();
 
@@ -122,8 +122,8 @@ bool ChemistryTask::fragment(Fragment* frag)
 
       // empiricalFormula property
       results[0].name = VDoc::getEcceNamespace() + ":empiricalFormula";
-      frag->generateEmpiricalFormula();
-      results[0].value = frag->formula();
+      // The Hill formula, as the Calculation Editor shows it.
+      results[0].value = frag->generateEmpiricalFormula();
 
       // charge property
       results[1].name = VDoc::getEcceNamespace() + ":charge";