Disable new theme test code for now

This commit is contained in:
miruka 2021-01-04 00:45:11 -04:00
parent 71acca2168
commit 1a101d9888
6 changed files with 9 additions and 21 deletions

View File

@ -109,7 +109,8 @@ class Backend:
self.ui_state = UIState(self)
self.history = History(self)
self.theme = Theme(self, self.settings.General.theme)
self.new_theme = NewTheme(self, self.settings.General.new_theme)
# self.new_theme = NewTheme(self, self.settings.General.new_theme)
self.new_theme = NewTheme(self, ".new.py") # TODO
self.clients: Dict[str, MatrixClient] = {}

View File

@ -386,12 +386,12 @@ class Settings(ConfigFile, PCNFile):
)
UserFileChanged(Theme, self.backend.theme.qml_data)
if self and self.General.new_theme != section.General.new_theme:
self.backend.new_theme.stop_watching()
self.backend.new_theme = NewTheme(
self.backend, section.General.new_theme, # type: ignore
)
UserFileChanged(Theme, self.backend.new_theme.qml_data)
# if self and self.General.new_theme != section.General.new_theme:
# self.backend.new_theme.stop_watching()
# self.backend.new_theme = NewTheme(
# self.backend, section.General.new_theme, # type: ignore
# )
# UserFileChanged(Theme, self.backend.new_theme.qml_data)
return (section, save)

View File

@ -28,7 +28,6 @@ class General:
# For Flatpak, it is
# "~/.var/app/io.github.mirukana.mirage/data/mirage/themes".
theme: str = "Midnight.qpl"
new_theme: str = "test.py"
# Interface scale multiplier, e.g. 0.5 makes everything half-size.
zoom: float = 1.0

View File

@ -8,15 +8,10 @@ import QtQuick.Layouts 1.12
Button {
id: button
property Theme ntheme: Theme {
target: button
classes: Class { name: "Button" }
}
readonly property alias iconItem: contentItem.icon
readonly property alias label: contentItem.label
property color backgroundColor: ntheme.data.background
property color backgroundColor: theme.controls.button.background
property color focusLineColor:
Qt.colorEqual(icon.color, theme.icons.colorize) ?
theme.controls.button.focusedBorder :

View File

@ -10,11 +10,6 @@ import "../AutoCompletion"
Rectangle {
id: composer
property Theme ntheme: Theme {
target: composer
classes: Class { name: "Composer" }
}
property UserAutoCompletion userCompletion
property alias eventList: messageArea.eventList

View File

@ -8,8 +8,6 @@ import "../../../Base"
import "../../../Dialogs"
HButton {
ntheme.classes: Class { name: "UploadButton" }
enabled: chat.roomInfo.can_send_messages
icon.name: "upload-file"
toolTip.text: