File tree Expand file tree Collapse file tree 8 files changed +58
-12
lines changed
Expand file tree Collapse file tree 8 files changed +58
-12
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,8 @@ set(SRC_INC
2222 include /ColorPicker.hxx
2323 include /DualSenseInfo.hxx
2424 include /DualSenseList.hxx
25- include /DualSenseEntryWidget.hxx
25+ include /DualSenseListHeader.hxx
26+ include /DualSenseListEntry.hxx
2627)
2728
2829set (SRC
@@ -33,7 +34,8 @@ set(SRC
3334 src/MainWindow.cxx
3435 src/ColorPicker.cxx
3536 src/DualSenseList.cxx
36- src/DualSenseEntryWidget.cxx
37+ src/DualSenseListHeader.cxx
38+ src/DualSenseListEntry.cxx
3739 DualSense4Windows.exe.manifest
3840 DeclareDPIAware.manifest
3941)
Original file line number Diff line number Diff line change 77
88
99#include " Core.hxx"
10- #include " DualSenseEntryWidget.hxx"
10+ #include " DualSenseListEntry.hxx"
11+ #include " DualSenseListHeader.hxx"
1112
1213namespace BrokenBytes ::DualSense4Windows::UI {
1314 class DualSenseList : public QWidget {
@@ -17,6 +18,7 @@ namespace BrokenBytes::DualSense4Windows::UI {
1718
1819 private:
1920 std::unique_ptr<QVBoxLayout> _layout;
20- std::vector<std::unique_ptr<DualSenseEntryWidget>> _entries;
21+ std::unique_ptr<DualSenseListHeader> _header;
22+ std::vector<std::unique_ptr<DualSenseListEntry>> _entries;
2123 };
2224}
Original file line number Diff line number Diff line change 66#include < QtWidgets/QLabel>
77
88namespace BrokenBytes ::DualSense4Windows::UI {
9- class DualSenseEntryWidget : public QWidget {
9+ class DualSenseListEntry : public QWidget {
1010 public:
11- DualSenseEntryWidget ();
12- DualSenseEntryWidget (std::string name, bool state, float battery);
11+ DualSenseListEntry ();
12+ DualSenseListEntry (std::string name, bool state, float battery);
1313
1414 private:
1515 std::unique_ptr<QHBoxLayout> _layout;
Original file line number Diff line number Diff line change 1+ #pragma once
2+
3+ #include < QtWidgets/QWidget>
4+ #include < QtWidgets/QHBoxLayout>
5+ #include < QtWidgets/QPushButton>
6+ #include < QtWidgets/QLabel>
7+
8+ namespace BrokenBytes ::DualSense4Windows::UI {
9+ class DualSenseListHeader : public QWidget {
10+ public:
11+ DualSenseListHeader (QWidget* parent);
12+
13+ private:
14+ std::unique_ptr<QHBoxLayout> _layout;
15+ std::unique_ptr<QLabel> _id;
16+ std::unique_ptr<QLabel> _state;
17+ std::unique_ptr<QLabel> _battery;
18+ std::unique_ptr<QLabel> _profile;
19+ };
20+ }
Original file line number Diff line number Diff line change 1313#include " Core.hxx"
1414
1515#include " DualSense.hxx"
16- #include " DualSenseEntryWidget.hxx"
1716#include " DualSenseList.hxx"
1817#include " Window.hxx"
1918
Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ namespace BrokenBytes::DualSense4Windows::UI {
44
55 DualSenseList::DualSenseList (QWidget* parent) : QWidget(parent) {
66 _layout = std::make_unique<QVBoxLayout>(this );
7+ _header = std::make_unique<DualSenseListHeader>(this );
8+ _layout->addWidget (_header.get ());
79 }
810
911 void DualSenseList::Refresh (std::vector<char *>& list) {
@@ -14,7 +16,7 @@ namespace BrokenBytes::DualSense4Windows::UI {
1416 _entries.shrink_to_fit ();
1517 for (auto & item: list) {
1618 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 ();
1820 _layout->addWidget (ptr);
1921 }
2022 }
Original file line number Diff line number Diff line change 1- #include " DualSenseEntryWidget .hxx"
1+ #include " DualSenseListEntry .hxx"
22
33namespace BrokenBytes ::DualSense4Windows::UI {
4- DualSenseEntryWidget::DualSenseEntryWidget () {
4+ DualSenseListEntry::DualSenseListEntry () {
55 _layout = std::make_unique<QHBoxLayout>(this );
66 _icon = std::make_unique<QPushButton>(this );
77 _text = std::make_unique<QLabel>(this );
@@ -11,7 +11,7 @@ namespace BrokenBytes::DualSense4Windows::UI {
1111 _layout->addWidget (_state.get ());
1212 }
1313
14- DualSenseEntryWidget::DualSenseEntryWidget (std::string name, bool state, float battery) : DualSenseEntryWidget () {
14+ DualSenseListEntry::DualSenseListEntry (std::string name, bool state, float battery) : DualSenseListEntry () {
1515 _text->setText (name.c_str ());
1616 }
1717
Original file line number Diff line number Diff line change 1+ #include " DualSenseListHeader.hxx"
2+
3+ namespace BrokenBytes ::DualSense4Windows::UI {
4+ DualSenseListHeader::DualSenseListHeader (QWidget* parent) : QWidget(parent) {
5+ _layout = std::make_unique<QHBoxLayout>(this );
6+ _id = std::make_unique<QLabel>(this );
7+ _state = std::make_unique<QLabel>(this );
8+ _battery = std::make_unique<QLabel>(this );
9+ _profile = std::make_unique<QLabel>(this );
10+
11+ _id->setText (" ID" );
12+ _state->setText (" State" );
13+ _battery->setText (" Battery" );
14+ _profile->setText (" Profile" );
15+
16+ _layout->addWidget (_id.get ());
17+ _layout->addWidget (_state.get ());
18+ _layout->addWidget (_battery.get ());
19+ _layout->addWidget (_profile.get ());
20+ }
21+ }
You can’t perform that action at this time.
0 commit comments