Skip to content

Commit 91a40ab

Browse files
k1-801CalcProgrammer1
k1-801
authored and
CalcProgrammer1
committed
Improved About page
1 parent 4ea1d9a commit 91a40ab

File tree

4 files changed

+176
-69
lines changed

4 files changed

+176
-69
lines changed

‎qt/OpenRGBDialog/OpenRGBDialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ void OpenRGBDialog::AddSoftwareInfoPage()
759759
/*-----------------------------------------------------*\
760760
| Create the tab label |
761761
\*-----------------------------------------------------*/
762-
TabLabel* SoftwareTabLabel = new TabLabel(OpenRGBFont::info, tr("Software"), (char *)"Software", (char *)context);
762+
TabLabel* SoftwareTabLabel = new TabLabel(OpenRGBFont::info, tr("About OpenRGB"), (char *)"About OpenRGB", (char *)context);
763763

764764
ui->InformationTabBar->tabBar()->setTabButton(ui->InformationTabBar->tabBar()->count() - 1, QTabBar::LeftSide, SoftwareTabLabel);
765765
}

‎qt/OpenRGBSoftwareInfoPage/OpenRGBSoftwareInfoPage.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
#include "OpenRGBPluginInterface.h"
1212
#include "NetworkProtocol.h"
1313

14+
#include "ui_OpenRGBSoftwareInfoPage.h"
15+
#include <QSysInfo>
16+
1417
using namespace Ui;
1518

1619
OpenRGBSoftwareInfoPage::OpenRGBSoftwareInfoPage(QWidget *parent) :
@@ -26,6 +29,7 @@ OpenRGBSoftwareInfoPage::OpenRGBSoftwareInfoPage(QWidget *parent) :
2629
ui->GitCommitIDValue->setText(GIT_COMMIT_ID);
2730
ui->GitCommitDateValue->setText(GIT_COMMIT_DATE);
2831
ui->GitBranchValue->setText(GIT_BRANCH);
32+
ui->OsVersionValue->setText(QSysInfo::prettyProductName());
2933
}
3034

3135
OpenRGBSoftwareInfoPage::~OpenRGBSoftwareInfoPage()

‎qt/OpenRGBSoftwareInfoPage/OpenRGBSoftwareInfoPage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
#pragma once
1111

1212
#include <QFrame>
13-
#include "ui_OpenRGBSoftwareInfoPage.h"
1413

1514
namespace Ui
1615
{
1716
class OpenRGBSoftwareInfoPage;
17+
class OpenRGBSoftwareInfoPageUi;
1818
}
1919

2020
class Ui::OpenRGBSoftwareInfoPage : public QFrame

‎qt/OpenRGBSoftwareInfoPage/OpenRGBSoftwareInfoPage.ui

Lines changed: 170 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>699</width>
10-
<height>312</height>
9+
<width>502</width>
10+
<height>434</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -23,7 +23,7 @@
2323
<enum>QFrame::Sunken</enum>
2424
</property>
2525
<layout class="QGridLayout" name="gridLayout" columnstretch="0">
26-
<item row="0" column="0">
26+
<item row="2" column="0">
2727
<widget class="QFrame" name="SoftwareInfoFrame">
2828
<property name="autoFillBackground">
2929
<bool>true</bool>
@@ -35,31 +35,24 @@
3535
<enum>QFrame::Sunken</enum>
3636
</property>
3737
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
38-
<item row="2" column="1">
39-
<widget class="QLabel" name="PluginAPIVersionValue">
38+
<item row="6" column="1">
39+
<widget class="QLabel" name="BuildDateValue">
4040
<property name="text">
41-
<string notr="true">Plugin API Version Value</string>
41+
<string notr="true">Build Date Value</string>
4242
</property>
4343
</widget>
4444
</item>
45-
<item row="6" column="1">
45+
<item row="8" column="1">
4646
<widget class="QLabel" name="GitCommitDateValue">
4747
<property name="text">
4848
<string notr="true">Git Commit Date Value</string>
4949
</property>
5050
</widget>
5151
</item>
52-
<item row="6" column="0">
53-
<widget class="QLabel" name="GitCommitDateLabel">
54-
<property name="text">
55-
<string>Git Commit Date:</string>
56-
</property>
57-
</widget>
58-
</item>
59-
<item row="9" column="1">
60-
<widget class="QLabel" name="WebsiteLinkValue">
52+
<item row="10" column="1">
53+
<widget class="QLabel" name="GitlabLinkValue">
6154
<property name="text">
62-
<string>&lt;a href=&quot;https://openrgb.org&quot;&gt;https://openrgb.org&lt;/a&gt;</string>
55+
<string>&lt;a href=&quot;https://gitlab.com/CalcProgrammer1/OpenRGB&quot;&gt;https://gitlab.com/CalcProgrammer1/OpenRGB&lt;/a&gt;</string>
6356
</property>
6457
<property name="textFormat">
6558
<enum>Qt::RichText</enum>
@@ -69,76 +62,96 @@
6962
</property>
7063
</widget>
7164
</item>
72-
<item row="0" column="1">
73-
<widget class="QLabel" name="VersionValue">
65+
<item row="2" column="0">
66+
<widget class="QLabel" name="SDKVersionLabel">
7467
<property name="text">
75-
<string notr="true">Version Value</string>
68+
<string>SDK Version:</string>
7669
</property>
7770
</widget>
7871
</item>
79-
<item row="3" column="0">
80-
<widget class="QLabel" name="QtVersionLabel">
72+
<item row="12" column="0">
73+
<spacer name="verticalSpacer">
74+
<property name="orientation">
75+
<enum>Qt::Vertical</enum>
76+
</property>
77+
<property name="sizeHint" stdset="0">
78+
<size>
79+
<width>20</width>
80+
<height>40</height>
81+
</size>
82+
</property>
83+
</spacer>
84+
</item>
85+
<item row="11" column="0">
86+
<widget class="QLabel" name="WebsiteLinkLabel">
8187
<property name="text">
82-
<string>Qt Version:</string>
88+
<string>Website:</string>
8389
</property>
8490
</widget>
8591
</item>
86-
<item row="4" column="1">
87-
<widget class="QLabel" name="BuildDateValue">
92+
<item row="6" column="0">
93+
<widget class="QLabel" name="BuildDateLabel">
8894
<property name="text">
89-
<string notr="true">Build Date Value</string>
95+
<string>Build Date:</string>
9096
</property>
9197
</widget>
9298
</item>
9399
<item row="7" column="0">
94-
<widget class="QLabel" name="GitBranchLabel">
100+
<widget class="QLabel" name="GitCommitIDLabel">
95101
<property name="text">
96-
<string>Git Branch:</string>
102+
<string>Git Commit ID:</string>
97103
</property>
98104
</widget>
99105
</item>
100-
<item row="2" column="0">
101-
<widget class="QLabel" name="PluginAPIVersionLabel">
106+
<item row="8" column="0">
107+
<widget class="QLabel" name="GitCommitDateLabel">
102108
<property name="text">
103-
<string>Plugin API Version:</string>
109+
<string>Git Commit Date:</string>
104110
</property>
105111
</widget>
106112
</item>
107-
<item row="4" column="0">
108-
<widget class="QLabel" name="BuildDateLabel">
113+
<item row="4" column="1">
114+
<widget class="QLabel" name="QtVersionValue">
109115
<property name="text">
110-
<string>Build Date:</string>
116+
<string>Qt Version Value</string>
111117
</property>
112118
</widget>
113119
</item>
114-
<item row="8" column="1">
115-
<widget class="QLabel" name="GitlabLinkValue">
120+
<item row="10" column="0">
121+
<widget class="QLabel" name="GitlabLinkLabel">
116122
<property name="text">
117-
<string>&lt;a href=&quot;https://gitlab.com/CalcProgrammer1/OpenRGB&quot;&gt;https://gitlab.com/CalcProgrammer1/OpenRGB&lt;/a&gt;</string>
118-
</property>
119-
<property name="textFormat">
120-
<enum>Qt::RichText</enum>
121-
</property>
122-
<property name="openExternalLinks">
123-
<bool>true</bool>
123+
<string>GitLab:</string>
124124
</property>
125125
</widget>
126126
</item>
127-
<item row="7" column="1">
127+
<item row="9" column="1">
128128
<widget class="QLabel" name="GitBranchValue">
129129
<property name="text">
130130
<string notr="true">Git Branch Value</string>
131131
</property>
132132
</widget>
133133
</item>
134-
<item row="1" column="1">
135-
<widget class="QLabel" name="SDKVersionValue">
134+
<item row="11" column="1">
135+
<widget class="QLabel" name="WebsiteLinkValue">
136136
<property name="text">
137-
<string notr="true">SDK Version Value</string>
137+
<string>&lt;a href=&quot;https://openrgb.org&quot;&gt;https://openrgb.org&lt;/a&gt;</string>
138+
</property>
139+
<property name="textFormat">
140+
<enum>Qt::RichText</enum>
141+
</property>
142+
<property name="openExternalLinks">
143+
<bool>true</bool>
138144
</property>
139145
</widget>
140146
</item>
141-
<item row="5" column="1">
147+
<item row="3" column="1">
148+
<widget class="QLabel" name="PluginAPIVersionValue">
149+
<property name="text">
150+
<string notr="true">Plugin API Version Value</string>
151+
</property>
152+
</widget>
153+
</item>
154+
<item row="7" column="1">
142155
<widget class="QLabel" name="GitCommitIDValue">
143156
<property name="text">
144157
<string notr="true">Git Commit ID Value</string>
@@ -148,53 +161,143 @@
148161
</property>
149162
</widget>
150163
</item>
151-
<item row="5" column="0">
152-
<widget class="QLabel" name="GitCommitIDLabel">
164+
<item row="3" column="0">
165+
<widget class="QLabel" name="PluginAPIVersionLabel">
153166
<property name="text">
154-
<string>Git Commit ID:</string>
167+
<string>Plugin API Version:</string>
155168
</property>
156169
</widget>
157170
</item>
158-
<item row="8" column="0">
159-
<widget class="QLabel" name="GitlabLinkLabel">
171+
<item row="9" column="0">
172+
<widget class="QLabel" name="GitBranchLabel">
160173
<property name="text">
161-
<string>GitLab:</string>
174+
<string>Git Branch:</string>
162175
</property>
163176
</widget>
164177
</item>
165-
<item row="0" column="0">
166-
<widget class="QLabel" name="VersionLabel">
178+
<item row="2" column="1">
179+
<widget class="QLabel" name="SDKVersionValue">
167180
<property name="text">
168-
<string>Version:</string>
181+
<string notr="true">SDK Version Value</string>
169182
</property>
170183
</widget>
171184
</item>
172-
<item row="9" column="0">
173-
<widget class="QLabel" name="WebsiteLinkLabel">
185+
<item row="4" column="0">
186+
<widget class="QLabel" name="QtVersionLabel">
174187
<property name="text">
175-
<string>Website:</string>
188+
<string>Qt Version:</string>
176189
</property>
177190
</widget>
178191
</item>
179-
<item row="1" column="0">
180-
<widget class="QLabel" name="SDKVersionLabel">
192+
<item row="5" column="0">
193+
<widget class="QLabel" name="OsVersionLabel">
181194
<property name="text">
182-
<string>SDK Version:</string>
195+
<string>OS Version:</string>
183196
</property>
184197
</widget>
185198
</item>
186-
<item row="3" column="1">
187-
<widget class="QLabel" name="QtVersionValue">
199+
<item row="5" column="1">
200+
<widget class="QLabel" name="OsVersionValue">
188201
<property name="text">
189-
<string>Qt Version Value</string>
202+
<string>OS Version Value</string>
190203
</property>
191204
</widget>
192205
</item>
193206
</layout>
194207
</widget>
195208
</item>
209+
<item row="0" column="0">
210+
<layout class="QGridLayout" name="gridLayout_3">
211+
<item row="1" column="1">
212+
<widget class="QLabel" name="VersionLabel">
213+
<property name="text">
214+
<string>Version:</string>
215+
</property>
216+
</widget>
217+
</item>
218+
<item row="2" column="2">
219+
<widget class="QLabel" name="LicenseValue">
220+
<property name="text">
221+
<string>GNU General Public License, version 2</string>
222+
</property>
223+
</widget>
224+
</item>
225+
<item row="1" column="2">
226+
<widget class="QLabel" name="VersionValue">
227+
<property name="text">
228+
<string notr="true">Version Value</string>
229+
</property>
230+
</widget>
231+
</item>
232+
<item row="2" column="1">
233+
<widget class="QLabel" name="LicenseLabel">
234+
<property name="text">
235+
<string>License:</string>
236+
</property>
237+
</widget>
238+
</item>
239+
<item row="0" column="0" rowspan="5">
240+
<widget class="QLabel" name="IconLabel">
241+
<property name="minimumSize">
242+
<size>
243+
<width>128</width>
244+
<height>128</height>
245+
</size>
246+
</property>
247+
<property name="text">
248+
<string/>
249+
</property>
250+
<property name="pixmap">
251+
<pixmap resource="../resources.qrc">:/org.openrgb.OpenRGB.png</pixmap>
252+
</property>
253+
<property name="scaledContents">
254+
<bool>false</bool>
255+
</property>
256+
<property name="alignment">
257+
<set>Qt::AlignCenter</set>
258+
</property>
259+
</widget>
260+
</item>
261+
<item row="3" column="1">
262+
<widget class="QLabel" name="CopyrightLabel">
263+
<property name="text">
264+
<string>Copyright:</string>
265+
</property>
266+
</widget>
267+
</item>
268+
<item row="3" column="2">
269+
<widget class="QLabel" name="CopyrightValue">
270+
<property name="text">
271+
<string>Adam Honse, OpenRGB Team</string>
272+
</property>
273+
</widget>
274+
</item>
275+
<item row="2" column="3">
276+
<spacer name="horizontalSpacer">
277+
<property name="orientation">
278+
<enum>Qt::Horizontal</enum>
279+
</property>
280+
<property name="sizeHint" stdset="0">
281+
<size>
282+
<width>40</width>
283+
<height>20</height>
284+
</size>
285+
</property>
286+
</spacer>
287+
</item>
288+
<item row="0" column="1" colspan="3">
289+
<widget class="QLabel" name="ProjectDescriptionLabel">
290+
<property name="text">
291+
<string>&lt;b&gt;OpenRGB&lt;/b&gt;, an open-source RGB control utility</string>
292+
</property>
293+
</widget>
294+
</item>
295+
</layout>
296+
</item>
196297
</layout>
197298
</widget>
198-
<resources/>
299+
<resources>
300+
<include location="../resources.qrc"/>
301+
</resources>
199302
<connections/>
200303
</ui>

0 commit comments

Comments
 (0)