mirror of
https://github.com/janishutz/BiogasControllerApp.git
synced 2025-11-25 13:54:24 +00:00
Start reworking design
This commit is contained in:
@@ -1,3 +0,0 @@
|
||||
from gui.popups.popups import *
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from kivy.uix.screenmanager import Screen
|
||||
from kivymd.uix.screen import MDScreen
|
||||
from kivy.lang import Builder
|
||||
|
||||
|
||||
class CreditsScreen(Screen):
|
||||
class CreditsScreen(MDScreen):
|
||||
pass
|
||||
|
||||
Builder.load_file('./gui/credits/credits.kv')
|
||||
|
||||
@@ -1,40 +1,36 @@
|
||||
<HomeScreen>:
|
||||
name: "home"
|
||||
canvas.before:
|
||||
Color:
|
||||
rgba: (20,20,20,0.2)
|
||||
Rectangle:
|
||||
size: self.size
|
||||
pos: self.pos
|
||||
GridLayout:
|
||||
cols:1
|
||||
Label:
|
||||
MDLabel:
|
||||
text: "BiogasanlageControllerApp"
|
||||
font_size: 50
|
||||
color: (0, 113, 0, 1)
|
||||
bold:True
|
||||
italic:True
|
||||
halign: 'center'
|
||||
valign: 'center'
|
||||
bold: True
|
||||
italic: True
|
||||
theme_text_color: 'Secondary'
|
||||
FloatLayout:
|
||||
GridLayout:
|
||||
cols: 2
|
||||
size_hint: 0.8, 0.8
|
||||
pos_hint: {"x": 0.1, "y": 0.1}
|
||||
Button:
|
||||
MDRaisedButton:
|
||||
style: "outlined"
|
||||
on_release: root.start()
|
||||
text: "Start"
|
||||
background_color: (0, 0, 0, 0.6)
|
||||
font_size: 30
|
||||
on_release:
|
||||
root.start()
|
||||
Button:
|
||||
text: "Quit"
|
||||
background_color: (0, 0, 0, 0.6)
|
||||
font_size: 30
|
||||
on_release:
|
||||
root.quit()
|
||||
Label:
|
||||
MDLabel:
|
||||
text: "You are running version V3.0.1"
|
||||
font_size: 13
|
||||
pos_hint: {"y": -0.45, "x":0.05}
|
||||
pos_hint: {"y": -0.45, "x":0}
|
||||
halign: 'center'
|
||||
Button:
|
||||
text: "About"
|
||||
font_size: 13
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
from kivy.uix.screenmanager import Screen
|
||||
from kivymd.app import MDApp
|
||||
from kivymd.uix.screen import MDScreen
|
||||
from kivy.lang import Builder
|
||||
from gui.popups.popups import DualRowPopup, QuitPopup, TwoActionPopup
|
||||
from lib.com import ComSuperClass
|
||||
@@ -21,7 +22,7 @@ information = {
|
||||
|
||||
|
||||
# This is the launch screen, i.e. what you see when you start up the app
|
||||
class HomeScreen(Screen):
|
||||
class HomeScreen(MDScreen):
|
||||
def __init__(self, com: ComSuperClass, **kw):
|
||||
self._com = com;
|
||||
super().__init__(**kw)
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
from ctypes import ArgumentError
|
||||
from time import time
|
||||
from types import prepare_class
|
||||
from typing import List, override
|
||||
from kivy.uix.screenmanager import Screen
|
||||
from kivymd.uix.screen import MDScreen
|
||||
from kivy.lang import Builder
|
||||
from gui.popups.popups import SingleRowPopup, TwoActionPopup, empty_func
|
||||
from kivy.clock import Clock, ClockEvent
|
||||
@@ -96,7 +95,7 @@ class ReaderThread(threading.Thread):
|
||||
# │ Main App Screen │
|
||||
# ╰────────────────────────────────────────────────╯
|
||||
# This is the main screen, where you can read out data
|
||||
class MainScreen(Screen):
|
||||
class MainScreen(MDScreen):
|
||||
_event: ClockEvent
|
||||
|
||||
# The constructor if this class takes a Com object to share one between all screens
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
<ProgramScreen>:
|
||||
name: "program"
|
||||
on_enter: self.config_loader = root.load_config()
|
||||
canvas.before:
|
||||
Color:
|
||||
rgba: (10,10,10,0.1)
|
||||
Rectangle:
|
||||
size: self.size
|
||||
pos: self.pos
|
||||
md_bg_color: app.theme_cls.primary_color
|
||||
FloatLayout:
|
||||
Label:
|
||||
text: "Configuration"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from typing import List
|
||||
from kivy.uix.screenmanager import Screen
|
||||
from kivymd.uix.screen import MDScreen
|
||||
from kivy.lang import Builder
|
||||
from lib.decoder import Decoder
|
||||
from lib.instructions import Instructions
|
||||
@@ -13,7 +13,7 @@ from kivy.clock import Clock
|
||||
name_map = ["a", "b", "c", "t"]
|
||||
|
||||
|
||||
class ProgramScreen(Screen):
|
||||
class ProgramScreen(MDScreen):
|
||||
def __init__(self, com: ComSuperClass, **kw):
|
||||
self._com = com
|
||||
self._instructions = Instructions(com)
|
||||
|
||||
Reference in New Issue
Block a user