Add Mainframe theme & fix VT-100 crash

This commit is contained in:
Alex Spataru 2021-12-22 00:52:07 -05:00
parent 1e60912e3d
commit ca47886e95
7 changed files with 79 additions and 11 deletions

View File

@ -82,10 +82,12 @@
<file>icons/warning.svg</file>
<file>icons/widget.svg</file>
<file>images/donate-qr.svg</file>
<file>images/icon.svg</file>
<file>images/icon-window.svg</file>
<file>images/icon.svg</file>
<file>images/shadow.png</file>
<file>images/splash@1x.png</file>
<file>images/splash@2x.png</file>
<file>images/window-shadow.png</file>
<file>messages/Acknowledgements.txt</file>
<file>messages/Welcome_DE.txt</file>
<file>messages/Welcome_EN.txt</file>
@ -131,7 +133,14 @@
<file>qml/Windows/Donate.qml</file>
<file>qml/Windows/JsonEditor.qml</file>
<file>qml/Windows/MainWindow.qml</file>
<file>qml/Windows/MQTTConfiguration.qml</file>
<file>qml/main.qml</file>
<file>themes/1_FlatDark.json</file>
<file>themes/2_FlatLight.json</file>
<file>themes/3_Mainframe.json</file>
<file>themes/4_Classic.json</file>
<file>themes/5_Noir.json</file>
<file>themes/6_MathWorks.json</file>
<file>touchbar/console.png</file>
<file>touchbar/dashboard.png</file>
<file>touchbar/setup.png</file>
@ -160,13 +169,5 @@
<file>window-border/minimize.svg</file>
<file>window-border/restore.svg</file>
<file>window-border/unmaximize.svg</file>
<file>qml/Windows/MQTTConfiguration.qml</file>
<file>images/shadow.png</file>
<file>images/window-shadow.png</file>
<file>themes/1_FlatDark.json</file>
<file>themes/2_FlatLight.json</file>
<file>themes/3_Classic.json</file>
<file>themes/4_Noir.json</file>
<file>themes/5_MathWorks.json</file>
</qresource>
</RCC>

View File

@ -119,9 +119,9 @@ QtWindow.Window {
//
// Titlebar left/right margins for custom controls
//
property alias showMacControls: _title.showMacControls
readonly property real leftTitlebarMargin: Cpp_ThemeManager.customWindowDecorations ? _title.leftMargin : 0
readonly property real rightTitlebarMargin: Cpp_ThemeManager.customWindowDecorations ? _title.rightMargin : 0
property alias showMacControls: _title.showMacControls
//
// Background color of the window & the titlebar

View File

@ -0,0 +1,66 @@
{
"name":"Mainframe",
"author":"Alex Spataru",
"titlebarSeparator":false,
"colors":{
"base":"#686f82",
"link":"#02afed",
"button":"#686f82",
"window":"#686f82",
"text":"#ffffff",
"midlight":"#a8988f",
"highlight":"#4992a6",
"brightText":"#ffffff",
"buttonText":"#ffffff",
"windowText":"#ffffff",
"toolTipBase":"#feffc6",
"toolTipText":"#000000",
"highlightedText":"#ffffff",
"highlightedTextAlternative":"#f1bd92",
"placeholderText":"#666666",
"toolbarGradient1":"#383f52",
"toolbarGradient2":"#383f52",
"menubarText":"#ffffff",
"dialogBackground":"#484f62",
"consoleText":"#ffffff",
"consoleBase":"#383f52",
"consoleButton":"#484f62",
"consoleWindow":"#484f62",
"consoleHighlight":"#ffffff",
"consoleHighlightedText":"#686f82",
"consolePlaceholderText":"#bebebe",
"windowBackground":"#484f62",
"windowGradient1":"#4992a6",
"windowGradient2":"#4992a6",
"alternativeHighlight":"#42b554",
"setupPanelBackground":"#585f72",
"paneWindowBackground":"#484f62",
"ledEnabled":"#26cd40",
"ledDisabled":"#686868",
"csvCheckbox":"#2e895c",
"connectButtonChecked":"#fc5142",
"connectButtonUnchecked":"#2eed5c",
"mqttButton":"#eda870",
"widgetTextPrimary":"#24476a",
"widgetTextSecondary":"#666666",
"widgetWindowBackground":"#484f62",
"widgetWindowBorder":"#b7878d",
"widgetForegroundPrimary":"#f94144",
"widgetForegroundSecondary":"#666666",
"widgetIndicator":"#444444",
"widgetControlBackground":"#666666",
"widgetColors":[
"#1f76b4",
"#ff7f0f",
"#2aa02b",
"#d62628",
"#9467bd",
"#8c564c",
"#e377c1",
"#7f7f7f",
"#bcbd21",
"#19bdcf",
"#1955fe"
]
}
}

View File

@ -42,8 +42,9 @@ Widgets::Terminal::Terminal(QQuickItem *parent)
, m_emulateVt100(false)
, m_copyAvailable(false)
{
// Set widget
// Set widget & configure VT-100 emulator
setWidget(&m_textEdit);
m_escapeCodeHandler.setTextEdit(&m_textEdit);
// Setup default options
setScrollbarWidth(14);