Commit f3166e56 authored by whitlocb's avatar whitlocb

Merge Mac fixes from the RC into the trunk.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16713 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0eae2eec
......@@ -281,6 +281,8 @@ QvisSetupHostProfilesAndConfigWindow::installConfigFile(const QString& srcFilena
// Creation: Thu Aug 11 17:48:10 PDT 2011
//
// Modifications:
// Brad Whitlock, Fri Nov 11 09:52:13 PST 2011
// Prevent copying of "closed" profiles when we did not ask for them.
//
// ****************************************************************************
......@@ -303,11 +305,16 @@ QvisSetupHostProfilesAndConfigWindow::performSetup()
srcHostProfileDirName,
QString("host_") + it->shortName + QString("_*.xml"));
QStringList srcConfigFilenameList = srcHostProfileDir.entryList();
bool closed = it->shortName.contains("closed");
for (int i = 0; i < srcConfigFilenameList.size(); ++ i)
{
const QString &thisProfile = srcConfigFilenameList.at(i);
if(!closed && thisProfile.contains("closed"))
continue;
installConfigFile(
srcHostProfileDirName + "/" + srcConfigFilenameList.at(i),
hostsInstallDirectory + "/" + srcConfigFilenameList.at(i));
srcHostProfileDirName + "/" + thisProfile,
hostsInstallDirectory + "/" + thisProfile);
}
}
}
......
......@@ -187,7 +187,11 @@ WindowMetrics::CalculateScreen(QWidget *win,
else
rect = qApp->desktop()->availableGeometry();
screenX = rect.x();
#ifdef Q_WS_MACX
screenY = 0;
#else
screenY = rect.y();
#endif
screenW = rect.width();
screenH = rect.height();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment