Compare commits

...

2 Commits

Author SHA1 Message Date
15cbbb1bac fast fix for calendar bug 2019-06-09 13:03:20 +02:00
08840c4c2b Revert "Fix display of the month at creation date"
This reverts commit 19eb6660e1.
2019-06-09 13:02:26 +02:00
3 changed files with 5 additions and 5 deletions

View File

@ -252,12 +252,12 @@ class RootController : Controller() {
fun deleteTexture(data: Texture) {
val dialogDelete = JFXOkayCancelAlert(
"Löschen",
"Textur wirklich löschen?",
"Textur ${data.name} wirklich löschen?",
"-fx-button-type: RAISED; -fx-background-color: #2b7bbb; -fx-text-fill: #000000;"
)
dialogDelete.okayAction = EventHandler {
mvc.removeTextureFromView(data)
con.deleteTexture(data)
mvc.removeTextureFromView(data)
}
dialogDelete.cancelAction = EventHandler {
// Do nothing

View File

@ -329,4 +329,4 @@ class Connection(val address: InetAddress, val port: Int = 10796) : Closeable {
}
}
}
}

View File

@ -50,11 +50,11 @@ internal data class InternalTexture(
else -> throw ConnectionInvalidJsonException()
},
resolution = Pair(resolution[0], resolution[1]),
addedOn = GregorianCalendar(added_on[0], added_on[1] - 1, added_on[2]),
addedOn = GregorianCalendar(added_on[0], added_on[1], added_on[2]),
textureHash = Sha256(texture_hash)
)
} catch (e: Exception) { // i Know, but no time :[]
throw ConnectionInvalidJsonException()
}
}
}
}