Merge pull request #9 from broken-bytes/dev

broken-bytes · web-flow · commit 87f376e7b28d · 2021-03-17T06:18:14.000+01:00
Merge dev into master
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,8 @@ set(SRC_INC
 	include/ColorPicker.hxx
 	include/DualSenseInfo.hxx
 	include/DualSenseList.hxx
-	include/DualSenseEntryWidget.hxx
+	include/DualSenseListHeader.hxx
+	include/DualSenseListEntry.hxx
 )
 
 set(SRC
@@ -33,7 +34,8 @@ set(SRC
 	src/MainWindow.cxx
 	src/ColorPicker.cxx
 	src/DualSenseList.cxx
-	src/DualSenseEntryWidget.cxx
+	src/DualSenseListHeader.cxx
+	src/DualSenseListEntry.cxx
 	DualSense4Windows.exe.manifest
 	DeclareDPIAware.manifest
 )
diff --git a/include/DualSenseList.hxx b/include/DualSenseList.hxx
@@ -7,7 +7,8 @@
 
 
 #include "Core.hxx"
-#include "DualSenseEntryWidget.hxx"
+#include "DualSenseListEntry.hxx"
+#include "DualSenseListHeader.hxx"
 
 namespace BrokenBytes::DualSense4Windows::UI {
 	class DualSenseList : public QWidget {
@@ -17,6 +18,7 @@ namespace BrokenBytes::DualSense4Windows::UI {
 
 	private:
 		std::unique_ptr<QVBoxLayout> _layout;
-		std::vector<std::unique_ptr<DualSenseEntryWidget>> _entries;
+		std::unique_ptr<DualSenseListHeader> _header;
+		std::vector<std::unique_ptr<DualSenseListEntry>> _entries;
 	};
 }
diff --git a/include/DualSenseListEntry.hxx b/include/DualSenseListEntry.hxx
@@ -6,10 +6,10 @@
 #include <QtWidgets/QLabel>
 
 namespace BrokenBytes::DualSense4Windows::UI {
-	class DualSenseEntryWidget : public QWidget {
+	class DualSenseListEntry : public QWidget {
 	public:
-		DualSenseEntryWidget();
-		DualSenseEntryWidget(std::string name, bool state, float battery);
+		DualSenseListEntry();
+		DualSenseListEntry(std::string name, bool state, float battery);
 
 	private:
 		std::unique_ptr<QHBoxLayout> _layout;
diff --git a/include/DualSenseListHeader.hxx b/include/DualSenseListHeader.hxx
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+
+namespace BrokenBytes::DualSense4Windows::UI {
+	class DualSenseListHeader : public QWidget {
+	public:
+		DualSenseListHeader(QWidget* parent);
+
+	private:
+		std::unique_ptr<QHBoxLayout> _layout;
+		std::unique_ptr<QLabel> _id;
+		std::unique_ptr<QLabel> _state;
+		std::unique_ptr<QLabel> _battery;
+		std::unique_ptr<QLabel> _profile;
+	};
+}
diff --git a/include/MainWindow.hxx b/include/MainWindow.hxx
@@ -13,7 +13,6 @@
 #include "Core.hxx"
 
 #include "DualSense.hxx"
-#include "DualSenseEntryWidget.hxx"
 #include "DualSenseList.hxx"
 #include "Window.hxx"
 
diff --git a/src/DualSenseList.cxx b/src/DualSenseList.cxx
@@ -4,6 +4,8 @@ namespace BrokenBytes::DualSense4Windows::UI {
 
 	DualSenseList::DualSenseList(QWidget* parent) : QWidget(parent) {
 		_layout = std::make_unique<QVBoxLayout>(this);
+		_header = std::make_unique<DualSenseListHeader>(this);
+		_layout->addWidget(_header.get());
 	}
 
 	void DualSenseList::Refresh(std::vector<char*>& list) {
@@ -14,7 +16,7 @@ namespace BrokenBytes::DualSense4Windows::UI {
 		_entries.shrink_to_fit();
 		for(auto& item: list) {
 			auto ptr = 
-				_entries.emplace_back(std::make_unique<DualSenseEntryWidget>(item, false, 0)).get();
+				_entries.emplace_back(std::make_unique<DualSenseListEntry>(item, false, 0)).get();
 			_layout->addWidget(ptr);
 		}
 	}
diff --git a/src/DualSenseListEntry.cxx b/src/DualSenseListEntry.cxx
@@ -1,7 +1,7 @@
-#include "DualSenseEntryWidget.hxx"
+#include "DualSenseListEntry.hxx"
 
 namespace BrokenBytes::DualSense4Windows::UI {
-	DualSenseEntryWidget::DualSenseEntryWidget() {
+	DualSenseListEntry::DualSenseListEntry() {
 		_layout = std::make_unique<QHBoxLayout>(this);
 		_icon = std::make_unique<QPushButton>(this);
 		_text = std::make_unique<QLabel>(this);
@@ -11,7 +11,7 @@ namespace BrokenBytes::DualSense4Windows::UI {
 		_layout->addWidget(_state.get());
 	}
 
-	DualSenseEntryWidget::DualSenseEntryWidget(std::string name, bool state, float battery) : DualSenseEntryWidget() {
+	DualSenseListEntry::DualSenseListEntry(std::string name, bool state, float battery) : DualSenseListEntry() {
 		_text->setText(name.c_str());
 	}
 
diff --git a/src/DualSenseListHeader.cxx b/src/DualSenseListHeader.cxx
@@ -0,0 +1,21 @@
+#include "DualSenseListHeader.hxx"
+
+namespace BrokenBytes::DualSense4Windows::UI {
+	DualSenseListHeader::DualSenseListHeader(QWidget* parent) : QWidget(parent) {
+		_layout = std::make_unique<QHBoxLayout>(this);
+		_id = std::make_unique<QLabel>(this);
+		_state = std::make_unique<QLabel>(this);
+		_battery = std::make_unique<QLabel>(this);
+		_profile = std::make_unique<QLabel>(this);
+
+		_id->setText("ID");
+		_state->setText("State");
+		_battery->setText("Battery");
+		_profile->setText("Profile");
+		
+		_layout->addWidget(_id.get());
+		_layout->addWidget(_state.get());
+		_layout->addWidget(_battery.get());
+		_layout->addWidget(_profile.get());
+	}
+}
diff --git a/test.html b/test.html

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ namespace BrokenBytes::DualSense4Windows::UI {`
`4`	`4`
`5`	`5`	`DualSenseList::DualSenseList(QWidget* parent) : QWidget(parent) {`
`6`	`6`	`_layout = std::make_unique<QVBoxLayout>(this);`
	`7`	`+ _header = std::make_unique<DualSenseListHeader>(this);`
	`8`	`+ _layout->addWidget(_header.get());`
`7`	`9`	`}`
`8`	`10`
`9`	`11`	`void DualSenseList::Refresh(std::vector<char*>& list) {`
`@@ -14,7 +16,7 @@ namespace BrokenBytes::DualSense4Windows::UI {`
`14`	`16`	`_entries.shrink_to_fit();`
`15`	`17`	`for(auto& item: list) {`
`16`	`18`	`auto ptr =`
`17`		`- _entries.emplace_back(std::make_unique<DualSenseEntryWidget>(item, false, 0)).get();`
	`19`	`+ _entries.emplace_back(std::make_unique<DualSenseListEntry>(item, false, 0)).get();`
`18`	`20`	`_layout->addWidget(ptr);`
`19`	`21`	`}`
`20`	`22`	`}`