Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#54-Subheader component #61

Merged
merged 21 commits into from
Feb 2, 2024
Merged

#54-Subheader component #61

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a554623
#54-Subheader-Component creation
tGiech22 Jan 25, 2024
d7816ac
#54-Subheader-Component saving changes and cleaning branch
tGiech22 Jan 26, 2024
075b28a
Merge branch 'Subheader-Component' of https://github.com/Northeastern…
tGiech22 Jan 26, 2024
d73a1e5
#54-Subheader-Component
tGiech22 Jan 26, 2024
69789e3
#54 changed color of ValueText
tGiech22 Jan 30, 2024
2a62138
#54 reverting ValueText back to original form
tGiech22 Jan 30, 2024
7d3e154
removed NERO.qmlproject.qtds file
tGiech22 Jan 30, 2024
92e7db2
#54 reverting change to CMakeLists
tGiech22 Jan 30, 2024
a55518d
Reverting back to original commit
tGiech22 Jan 31, 2024
0a78fa4
#54 changing Label Text color
tGiech22 Jan 31, 2024
e108ca4
Reverting changes back to original
tGiech22 Jan 31, 2024
f7eb8d3
Revert "Reverting back to original commit"
tGiech22 Jan 31, 2024
9d1412b
Revert "#54 reverting change to CMakeLists"
tGiech22 Jan 31, 2024
89b5ff4
Revert "removed NERO.qmlproject.qtds file"
tGiech22 Jan 31, 2024
45d3e0a
Revert "#54 reverting ValueText back to original form"
tGiech22 Jan 31, 2024
8266fbc
Revert "#54 changed color of ValueText"
tGiech22 Jan 31, 2024
c434e2b
Revert "#54-Subheader-Component"
tGiech22 Jan 31, 2024
14ba575
Revert "#54-Subheader-Component saving changes and cleaning branch"
tGiech22 Jan 31, 2024
f292267
Revert "#54-Subheader-Component creation"
tGiech22 Jan 31, 2024
d752f0e
#54 changing color of LabelText
tGiech22 Jan 31, 2024
dcd55a9
#54 forgot the hashtags for the color
tGiech22 Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions NERODesign/NERO.qmlproject.qtds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtDesignStudio 4.3.1, 2023-10-28T11:46:57. -->
<!-- Written by QtDesignStudio 4.2.0, 2024-01-25T18:01:26. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{3cfc90f2-223d-425b-80aa-55ae979292b1}</value>
<value type="QByteArray">{64c75cf8-384b-4c61-8c48-dd4da0f7a4c8}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
Expand Down Expand Up @@ -61,8 +61,8 @@
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dont include this file

<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.5.2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.5.2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.5.1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.5.1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{63f87550-2541-4163-9631-08b7fea781da}</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
Expand Down
4 changes: 3 additions & 1 deletion NERODevelopment/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ set(PROJECT_SOURCES

find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Network Mqtt)

qt_add_executable(NEROApp ${PROJECT_SOURCES})
qt_add_executable(NEROApp ${PROJECT_SOURCES}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this change


)

qt_add_resources(NEROApp "configuration"
PREFIX "/"
Expand Down
26 changes: 26 additions & 0 deletions NERODevelopment/content/SubheaderComponent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import QtQuick 2.15
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete entire file

import QtQuick.Controls 2.15

Item {
width: 200
height: 40
property string InputText: "CHARGE STATE"
Peyton-McKee marked this conversation as resolved.
Show resolved Hide resolved
property FontLoader applicationFont: FontLoader {
Peyton-McKee marked this conversation as resolved.
Show resolved Hide resolved
source: "Roboto-Black.ttf"
}

Text {
id: text1
x: 0
Peyton-McKee marked this conversation as resolved.
Show resolved Hide resolved
y: 0
width: parent.width
height: parent.height
color: "#bfbfbf"
text: InputText
font.pixelSize: 24
font.family: applicationFont
font.bold: true
}


}
Loading