diff options
| author | TheUltimateHacker <[email protected]> | 2015-03-16 09:19:34 -0400 |
|---|---|---|
| committer | TheUltimateHacker <[email protected]> | 2015-03-16 09:19:34 -0400 |
| commit | 93d62dcac2c8ceb10d2f839614ca83c12c5902ee (patch) | |
| tree | 3818e6a48f43c97d0dcd4a52a05b50ee3a33bea0 /ShiftOS/skins.vb | |
| parent | 6278dd2510d692446e2baf0b079850e3e0250f2e (diff) | |
| parent | dda2964b748eafb3ff1105966f8a349069834cc0 (diff) | |
| download | shiftos-93d62dcac2c8ceb10d2f839614ca83c12c5902ee.tar.gz shiftos-93d62dcac2c8ceb10d2f839614ca83c12c5902ee.tar.bz2 shiftos-93d62dcac2c8ceb10d2f839614ca83c12c5902ee.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
ShiftOS/skins.vb
Diffstat (limited to 'ShiftOS/skins.vb')
| -rw-r--r-- | ShiftOS/skins.vb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ShiftOS/skins.vb b/ShiftOS/skins.vb index 8473fdf..e2c4f24 100644 --- a/ShiftOS/skins.vb +++ b/ShiftOS/skins.vb @@ -409,6 +409,7 @@ Module Skins If Not loaddata(109) = "" Then enablebordercorners = loaddata(109) 'for adding extra features, check: + If loaddata(110) = "" Or loaddata(110) = "End of skin data" Then loaddata(110) = enabledraggableicons Else enabledraggableicons = loaddata(110) If loaddata(111) = "" Or loaddata(111) = "End of skin data" Then loaddata(111) = icontextcolor.ToArgb Else icontextcolor = Color.FromArgb(loaddata(111)) If loaddata(112) = "" Or loaddata(112) = "End of skin data" Then loaddata(112) = showicons Else showicons = loaddata(112) @@ -419,11 +420,26 @@ Module Skins If loaddata(117) = "" Then startHeight = 526 Else startHeight = loaddata(117) If loaddata(118) = "" Then startWidth = 320 Else startWidth = loaddata(118) If loaddata(119) = "" Then shutdownstring = "Shut Down ShiftOS" Else shutdownstring = loaddata(119) +<<<<<<< HEAD If loaddata(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(120) If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(121) If loaddata(122) = "" Then usernametextcolor = Color.White Else usernametextcolor = Color.FromArgb(loaddata(122)) If loaddata(123) = "" Then usernamefont = "Trebuchet MS" Else usernamefont = loaddata(123) If loaddata(124) = "" Then usernamefontsize = 12 Else usernamefontsize = loaddata(124) +======= + If loaddata(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(200) + Try + If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(201) + If loaddata(122) = "" Then usernametextcolor = Color.White Else usernametextcolor = Color.FromArgb(loaddata(202)) + If loaddata(123) = "" Then usernamefont = "Trebuchet MS" Else usernamefont = loaddata(203) + If loaddata(124) = "" Then usernamefontsize = 12 Else usernamefontsize = loaddata(204) + Catch + usernametextcolor = Color.White + usernamefont = "Trebuchet MS" + recentIconsHorizontal = False + usernamefontsize = 12 + End Try +>>>>>>> origin/master If loaddata(125) = "" Then usernamefontstyle = FontStyle.Bold Else usernamefontstyle = loaddata(125) If loaddata(126) = "" Then userNamePanelBackgroundColor = Color.Gray Else userNamePanelBackgroundColor = Color.FromArgb(loaddata(126)) If loaddata(127) = "" Then powerPanelBackgroundColor = Color.Gray Else powerPanelBackgroundColor = Color.FromArgb(loaddata(127)) |