Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Needed to pass TabContron info to the RO info panel, also added Volian Laptop name to connection string logic

Browse Source
This commit is contained in:
John Jenko 2009-08-24 16:29:39 +00:00
parent d28cbd3933
commit eba37a8a10
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -82,18 +82,20 @@ namespace VEPROMS
{ {
InitializeComponent(); InitializeComponent();
#if (DEBUG) #if (DEBUG)
//use local data //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 else
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_LOCAL"; VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_LOCAL";
#else #else
// use server data (default) // use server data (default)
//VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS"; // - 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 == "laptop") else if (Environment.MachineName == "DELL-D430")
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_LOCAL"; VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_LOCAL";
else
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS";
#endif #endif
// set the color of the ribbon // set the color of the ribbon
@ -776,6 +778,7 @@ namespace VEPROMS
displayRO.Mydvi = SelectedDVI; displayRO.Mydvi = SelectedDVI;
displayRO.MyROFST = SelectedROFst; displayRO.MyROFST = SelectedROFst;
displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB; displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB;
displayRO.TabControl = tc;
displayRO.ProgressBar = bottomProgBar; displayRO.ProgressBar = bottomProgBar;
} }