github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 18:40:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename package name again

Browse Source
This commit is contained in:
ryoii 2020-03-28 22:31:43 +08:00
parent ea4057c0f3
commit 27cb975c62
8 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiGraphical.kt
View File

@ -11,11 +11,10 @@ package net.mamoe.mirai.console.graphical
import net.mamoe.mirai.console.MiraiConsole import net.mamoe.mirai.console.MiraiConsole
import net.mamoe.mirai.console.graphical.controller.MiraiGraphicalUIController import net.mamoe.mirai.console.graphical.controller.MiraiGraphicalUIController
import net.mamoe.mirai.console.graphical.styleSheet.PrimaryStyleSheet import net.mamoe.mirai.console.graphical.stylesheet.PrimaryStyleSheet
import net.mamoe.mirai.console.graphical.view.Decorator import net.mamoe.mirai.console.graphical.view.Decorator
import tornadofx.App import tornadofx.App
import tornadofx.find import tornadofx.find
import tornadofx.launch
//object MiraiGraphicalLoader { //object MiraiGraphicalLoader {
// @JvmStatic // @JvmStatic

2
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/BaseStyleSheet.kt
View File

@ -1,4 +1,4 @@
package net.mamoe.mirai.console.graphical.styleSheet package net.mamoe.mirai.console.graphical.stylesheet
import javafx.scene.layout.BackgroundRepeat import javafx.scene.layout.BackgroundRepeat
import javafx.scene.paint.Color import javafx.scene.paint.Color

2
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/LoginViewStyleSheet.kt
View File

@ -1,4 +1,4 @@
package net.mamoe.mirai.console.graphical.styleSheet package net.mamoe.mirai.console.graphical.stylesheet
import javafx.scene.Cursor import javafx.scene.Cursor
import javafx.scene.effect.BlurType import javafx.scene.effect.BlurType

2
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PluginViewStyleSheet.kt
View File

@ -1,4 +1,4 @@
package net.mamoe.mirai.console.graphical.styleSheet package net.mamoe.mirai.console.graphical.stylesheet
import javafx.geometry.Pos import javafx.geometry.Pos
import javafx.scene.paint.Color import javafx.scene.paint.Color

5
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PrimaryStyleSheet.kt
View File

@ -1,4 +1,4 @@
package net.mamoe.mirai.console.graphical.styleSheet package net.mamoe.mirai.console.graphical.stylesheet
import javafx.scene.Cursor import javafx.scene.Cursor
import javafx.scene.text.FontWeight import javafx.scene.text.FontWeight
@ -55,9 +55,6 @@ class PrimaryStyleSheet : BaseStyleSheet() {
} }
} }
textField {
}
} }
} }

2
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/LoginView.kt
View File

@ -5,7 +5,7 @@ import javafx.geometry.Pos
import javafx.scene.image.Image import javafx.scene.image.Image
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import net.mamoe.mirai.console.graphical.controller.MiraiGraphicalUIController import net.mamoe.mirai.console.graphical.controller.MiraiGraphicalUIController
import net.mamoe.mirai.console.graphical.styleSheet.LoginViewStyleSheet import net.mamoe.mirai.console.graphical.stylesheet.LoginViewStyleSheet
import net.mamoe.mirai.console.graphical.util.jfxButton import net.mamoe.mirai.console.graphical.util.jfxButton
import net.mamoe.mirai.console.graphical.util.jfxPasswordfield import net.mamoe.mirai.console.graphical.util.jfxPasswordfield
import net.mamoe.mirai.console.graphical.util.jfxTextfield import net.mamoe.mirai.console.graphical.util.jfxTextfield

2
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsView.kt
View File

@ -3,7 +3,7 @@ package net.mamoe.mirai.console.graphical.view
import com.jfoenix.controls.JFXTreeTableColumn import com.jfoenix.controls.JFXTreeTableColumn
import net.mamoe.mirai.console.graphical.controller.MiraiGraphicalUIController import net.mamoe.mirai.console.graphical.controller.MiraiGraphicalUIController
import net.mamoe.mirai.console.graphical.model.PluginModel import net.mamoe.mirai.console.graphical.model.PluginModel
import net.mamoe.mirai.console.graphical.styleSheet.PluginViewStyleSheet import net.mamoe.mirai.console.graphical.stylesheet.PluginViewStyleSheet
import net.mamoe.mirai.console.graphical.util.jfxTreeTableView import net.mamoe.mirai.console.graphical.util.jfxTreeTableView
import tornadofx.View import tornadofx.View
import tornadofx.addStylesheet import tornadofx.addStylesheet

35
mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt
View File

@ -65,6 +65,26 @@ class PrimaryView : View() {
} }
} }
} }
}
center = vbox {
jfxTabPane {
fitToParentHeight()
tabClosingPolicy = TabPane.TabClosingPolicy.ALL_TABS
logTab("Main", controller.mainLog, closeable = false)
fixedTab("Plugins").content = find<PluginsView>().root
fixedTab("Settings").content = find<SettingsView>().root
fixedTab("Login").content = find<LoginView>().root
mainTabPane = this
}
// command input // command input
textfield { textfield {
@ -80,21 +100,6 @@ class PrimaryView : View() {
} }
} }
} }
center = jfxTabPane {
tabClosingPolicy = TabPane.TabClosingPolicy.ALL_TABS
logTab("Main", controller.mainLog, closeable = false)
fixedTab("Plugins").content = find<PluginsView>().root
fixedTab("Settings").content = find<SettingsView>().root
fixedTab("Login").content = find<LoginView>().root
mainTabPane = this
}
} }
fun Tab.select() = apply { fun Tab.select() = apply {