Added support for Rich's new PC (MacBook Pro)
Activate form when it opens.
This commit is contained in:
parent
f7c3c07ad0
commit
132619c0ba
@ -151,6 +151,8 @@ namespace VEPROMS
|
|||||||
//use local data (for development/debug mode)
|
//use local data (for development/debug mode)
|
||||||
if (Environment.MachineName == "RMARK-PC")
|
if (Environment.MachineName == "RMARK-PC")
|
||||||
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEBUG";
|
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEBUG";
|
||||||
|
else if (Environment.MachineName == "WINDOWS7-RHM")
|
||||||
|
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEBUG";
|
||||||
else if (Environment.UserName.ToUpper() == "BODINE")
|
else if (Environment.UserName.ToUpper() == "BODINE")
|
||||||
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_BODINE_DEBUG";
|
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_BODINE_DEBUG";
|
||||||
else
|
else
|
||||||
@ -162,6 +164,8 @@ namespace VEPROMS
|
|||||||
// - except for the volian laptop and Rich's Demo version where we need to use local data
|
// - except for the volian laptop and Rich's Demo version where we need to use local data
|
||||||
if (Environment.MachineName == "RMARK-PC")
|
if (Environment.MachineName == "RMARK-PC")
|
||||||
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEMO";
|
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEMO";
|
||||||
|
else if (Environment.MachineName == "WINDOWS7-RHM")
|
||||||
|
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEMO";
|
||||||
else if (Environment.UserName.ToUpper() == "BODINE")
|
else if (Environment.UserName.ToUpper() == "BODINE")
|
||||||
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_BODINE_DEMO";
|
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_BODINE_DEMO";
|
||||||
else
|
else
|
||||||
@ -836,6 +840,7 @@ namespace VEPROMS
|
|||||||
// btnAdmin.Visible = false;
|
// btnAdmin.Visible = false;
|
||||||
StepTabRibbon.PasteNoReturnsSetting = Properties.Settings.Default.PasteNoReturns;
|
StepTabRibbon.PasteNoReturnsSetting = Properties.Settings.Default.PasteNoReturns;
|
||||||
StepTabRibbon.PastePlainTextSetting = Properties.Settings.Default.PastePlainText;
|
StepTabRibbon.PastePlainTextSetting = Properties.Settings.Default.PastePlainText;
|
||||||
|
Activate();
|
||||||
}
|
}
|
||||||
|
|
||||||
void tmrCloseTabItems_Tick(object sender, EventArgs e)
|
void tmrCloseTabItems_Tick(object sender, EventArgs e)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user