This commit is contained in:
death-claw
2023-09-03 14:04:50 +01:00
committed by GitHub
parent 4163f2a53f
commit a362a3fa7f
3 changed files with 26 additions and 10 deletions
@@ -10,7 +10,7 @@ import me.mnlr.vripper.event.EventBus
import me.mnlr.vripper.model.LogModel import me.mnlr.vripper.model.LogModel
import tornadofx.* import tornadofx.*
class LogTableView : View("Log") { class LogTableView : View() {
private val logController: LogController by inject() private val logController: LogController by inject()
private val eventBus: EventBus by di() private val eventBus: EventBus by di()
@@ -20,6 +20,13 @@ class LogTableView : View("Log") {
var items: ObservableList<LogModel> = FXCollections.observableArrayList() var items: ObservableList<LogModel> = FXCollections.observableArrayList()
init { init {
titleProperty.bind(items.sizeProperty.map {
if (it.toLong() > 0) {
"Log (${it.toLong()})"
} else {
"Log"
}
})
items.addAll(logController.findAll()) items.addAll(logController.findAll())
eventBus.flux() eventBus.flux()
@@ -14,7 +14,7 @@ import me.mnlr.vripper.utils.Shell32
import tornadofx.* import tornadofx.*
class PostsTableView : View("Download") { class PostsTableView : View() {
private val postController: PostController by inject() private val postController: PostController by inject()
private val eventBus: EventBus by di() private val eventBus: EventBus by di()
@@ -23,6 +23,13 @@ class PostsTableView : View("Download") {
private var items: ObservableList<PostModel> = FXCollections.observableArrayList() private var items: ObservableList<PostModel> = FXCollections.observableArrayList()
init { init {
titleProperty.bind(items.sizeProperty.map {
if (it.toLong() > 0) {
"Download (${it.toLong()})"
} else {
"Download"
}
})
items.addAll(postController.findAllPosts()) items.addAll(postController.findAllPosts())
eventBus.flux().filter { eventBus.flux().filter {
@@ -8,10 +8,9 @@ import me.mnlr.vripper.controller.ThreadController
import me.mnlr.vripper.event.Event import me.mnlr.vripper.event.Event
import me.mnlr.vripper.event.EventBus import me.mnlr.vripper.event.EventBus
import me.mnlr.vripper.model.ThreadModel import me.mnlr.vripper.model.ThreadModel
import me.mnlr.vripper.view.main.MainView
import tornadofx.* import tornadofx.*
class ThreadTableView : View("Threads") { class ThreadTableView : View() {
private val threadController: ThreadController by inject() private val threadController: ThreadController by inject()
private val eventBus: EventBus by di() private val eventBus: EventBus by di()
@@ -21,6 +20,13 @@ class ThreadTableView : View("Threads") {
private var items: ObservableList<ThreadModel> = FXCollections.observableArrayList() private var items: ObservableList<ThreadModel> = FXCollections.observableArrayList()
init { init {
titleProperty.bind(items.sizeProperty.map {
if (it.toLong() > 0) {
"Threads (${it.toLong()})"
} else {
"Threads"
}
})
items.addAll(threadController.findAll()) items.addAll(threadController.findAll())
eventBus.flux() eventBus.flux()
@@ -38,11 +44,6 @@ class ThreadTableView : View("Threads") {
} }
} else { } else {
items.add(it) items.add(it)
runLater {
find<MainView>().root.selectionModel.select(1)
tableView.selectionModel.clearSelection()
tableView.selectionModel.select(it)
}
} }
} }
} }
@@ -54,6 +55,7 @@ class ThreadTableView : View("Threads") {
Event.Kind.THREAD_CLEAR -> { Event.Kind.THREAD_CLEAR -> {
tableView.items.clear() tableView.items.clear()
} }
else -> {} else -> {}
} }
} }
@@ -96,7 +98,7 @@ class ThreadTableView : View("Threads") {
contextMenu.items.addAll(selectItem, SeparatorMenuItem(), deleteItem) contextMenu.items.addAll(selectItem, SeparatorMenuItem(), deleteItem)
tableRow.contextMenuProperty().bind(tableRow.emptyProperty() tableRow.contextMenuProperty().bind(tableRow.emptyProperty()
.map { empty -> if (empty) null else contextMenu }) .map { empty -> if (empty) null else contextMenu })
tableRow tableRow
} }
column("URL", ThreadModel::linkProperty) { column("URL", ThreadModel::linkProperty) {