Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
deskscreen
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kowis-projects
deskscreen
Commits
d7bc09a3
Commit
d7bc09a3
authored
May 23, 2019
by
David
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding the Corelogicish branding
parent
366460d7
Pipeline
#7
failed with stages
in 1 minute and 56 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
53 additions
and
36 deletions
+53
-36
src/main/kotlin/is/kow/deskscreen/ticker/TickerView.kt
src/main/kotlin/is/kow/deskscreen/ticker/TickerView.kt
+1
-2
src/main/kotlin/is/kow/deskscreen/views/DefaultView.kt
src/main/kotlin/is/kow/deskscreen/views/DefaultView.kt
+10
-9
src/main/kotlin/is/kow/deskscreen/views/NamePlateView.kt
src/main/kotlin/is/kow/deskscreen/views/NamePlateView.kt
+36
-22
src/main/resources/application.conf
src/main/resources/application.conf
+6
-3
src/main/resources/corelogic/core-logic-hex.png
src/main/resources/corelogic/core-logic-hex.png
+0
-0
No files found.
src/main/kotlin/is/kow/deskscreen/ticker/TickerView.kt
View file @
d7bc09a3
...
...
@@ -159,8 +159,7 @@ class TickerView : View() {
val
entries
=
listOf
(
currentTime
,
cpuTemp
,
quittinTime
cpuTemp
)
entries
.
forEach
{
...
...
src/main/kotlin/is/kow/deskscreen/views/DefaultView.kt
View file @
d7bc09a3
...
...
@@ -12,15 +12,15 @@ import mu.KotlinLogging
import
tornadofx.*
class
DefaultView
:
View
()
{
val
logger
=
KotlinLogging
.
logger
{}
private
val
logger
=
KotlinLogging
.
logger
{}
val
mainDotsView
:
MainDotsView
by
inject
()
val
tickerView
:
TickerView
by
inject
()
val
namePlateView
:
NamePlateView
by
inject
()
val
jiraView
:
JiraView
by
inject
()
val
temperatureView
:
TemperatureView
by
inject
()
val
displayController
:
DisplayController
by
inject
()
val
transitionsController
:
TransitionsController
by
inject
()
private
val
mainDotsView
:
MainDotsView
by
inject
()
private
val
tickerView
:
TickerView
by
inject
()
private
val
namePlateView
:
NamePlateView
by
inject
()
private
val
jiraView
:
JiraView
by
inject
()
private
val
temperatureView
:
TemperatureView
by
inject
()
private
val
displayController
:
DisplayController
by
inject
()
private
val
transitionsController
:
TransitionsController
by
inject
()
override
val
root
=
borderpane
{
...
...
@@ -28,7 +28,8 @@ class DefaultView : View() {
top
=
namePlateView
.
root
center
=
vbox
{
this
.
add
(
jiraView
.
root
)
//TODO: cat view
//this.add(jiraView.root)
}
bottom
=
tickerView
.
root
...
...
src/main/kotlin/is/kow/deskscreen/views/NamePlateView.kt
View file @
d7bc09a3
...
...
@@ -21,31 +21,41 @@ class NamePlateView : View() {
override
val
root
=
borderpane
{
style
{
//Need a core logic gradient
backgroundColor
+=
LinearGradient
(
0.0
,
0.0
,
0.0
,
100.0
,
false
,
CycleMethod
.
NO_CYCLE
,
Stop
(
0.5
,
c
(
"black"
)),
Stop
(
1.0
,
c
(
"
304CB2
"
))
Stop
(
1.0
,
c
(
"
007faa
"
))
)
}
center
=
vbox
{
alignment
=
Pos
.
TOP_LEFT
label
(
"David Kowis"
)
{
style
{
Styles
.
marcellus100px
?.
let
{
font
=
it
hbox
{
imageview
(
"/corelogic/core-logic-hex.png"
){
style
{
paddingTop
=
5
paddingLeft
=
5
}
}
label
(
"David Kowis"
)
{
style
{
paddingLeft
=
5
Styles
.
marcellus100px
?.
let
{
font
=
it
}
fontSize
=
80
.
px
}
fontSize
=
100
.
px
}
}
label
(
"
Senior Software
Developer"
)
{
label
(
"Developer"
)
{
useMaxWidth
=
true
style
{
fontSize
=
20
.
px
paddingLeft
=
8
paddingBottom
=
10
paddingTop
=
10
backgroundColor
+=
c
(
"
304CB2
"
)
backgroundColor
+=
c
(
"
007faa
"
)
Styles
.
pressStart2p15px
?.
let
{
font
=
it
...
...
@@ -66,19 +76,23 @@ class NamePlateView : View() {
right
=
temperatureView
.
root
}
bottom
=
hbox
{
style
{
backgroundColor
+=
c
(
"304CB2"
)
}
imageview
(
"/swa/092014_design_Bar_OOH-Bleed_SWA-scaled.png"
)
{
style
{
paddingLeft
=
6
}
//fitHeight = 30.0
useMaxWidth
=
true
//fitWidth = 800.0 - 125
isPreserveRatio
=
true
}
}
// bottom = hbox {
// style {
// backgroundColor += c("007faa")
// }
//
// imageview("/corelogic/short-core-logic.png") {
//
// }
//// imageview("/swa/092014_design_Bar_OOH-Bleed_SWA-scaled.png") {
//// style {
//// paddingLeft = 6
//// }
//// //fitHeight = 30.0
//// useMaxWidth = true
//// //fitWidth = 800.0 - 125
//// isPreserveRatio = true
//// }
// }
}
}
src/main/resources/application.conf
View file @
d7bc09a3
screen
{
power
{
on
=
"0
6
:00"
on
=
"0
8
:00"
off
=
"19:00"
offDays
= [
"Saturday"
,
"Sunday"
]
offDelay
=
5
}
}
//
Corelogic
location
//
32
.
926524
, -
96
.
985659
weather
{
latitude
=
32
.
8421770
longitude
= -
96
.
8667960
latitude
=
32
.
926524
longitude
= -
96
.
985659
darkSkyApiKey
= ${?
DARK_SKY_API_KEY
}
retryDelaySeconds
=
30
}
...
...
src/main/resources/corelogic/core-logic-hex.png
0 → 100644
View file @
d7bc09a3
4.43 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment