jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename DeviceTabHeader to TabLabel, so we can use it for all tabs rather than just device tabs

Browse source
This commit is contained in:
Adam Honse 2021-08-17 19:12:22 -05:00
parent 507cece3cc
commit bbc16a9ae2
7 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
OpenRGB.pro
View file

@ -154,7 +154,6 @@ HEADERS +=
DeviceDetector.h \
filesystem.h \
qt/DetectorTableModel.h \
qt/DeviceTabHeader.h \
qt/OpenRGBClientInfoPage.h \
qt/OpenRGBDeviceInfoPage.h \
qt/OpenRGBDevicePage.h \
@ -179,6 +178,7 @@ HEADERS +=
qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.h \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsPage.h \
qt/TabLabel.h \
serial_port/find_usb_serial_port.h \
serial_port/serial_port.h \
super_io/super_io.h \
@ -468,7 +468,6 @@ SOURCES +=
ResourceManager.cpp \
SettingsManager.cpp \
qt/DetectorTableModel.cpp \
qt/DeviceTabHeader.cpp \
qt/OpenRGBClientInfoPage.cpp \
qt/OpenRGBDeviceInfoPage.cpp \
qt/OpenRGBDevicePage.cpp \
@ -486,6 +485,7 @@ SOURCES +=
qt/OpenRGBSupportedDevicesPage.cpp \
qt/OpenRGBSystemInfoPage.cpp \
qt/OpenRGBZoneResizeDialog.cpp \
qt/TabLabel.cpp \
qt/hsv.cpp \
qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp \
qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.cpp \
@ -806,7 +806,6 @@ RESOURCES +=
qt/resources.qrc
FORMS += \
qt/DeviceTabHeader.ui \
qt/OpenRGBClientInfoPage.ui \
qt/OpenRGBDeviceInfoPage.ui \
qt/OpenRGBDevicePage.ui \
@ -826,6 +825,7 @@ FORMS +=
qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.ui \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.ui \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsPage.ui \
qt/TabLabel.ui \
#-----------------------------------------------------------------------------------------------#
# Windows-specific Configuration #

15
qt/DeviceTabHeader.cpp
View file

@ -1,15 +0,0 @@
#include "DeviceTabHeader.h"
Ui::DeviceTabHeader::DeviceTabHeader(QString icon, QString device_name) :
QWidget(nullptr),
ui(new Ui::DeviceTabHeaderUi)
{
ui->setupUi(this);
ui->device_icon->setText("<img src=':/" + icon + "' height='16' width='16' />");
ui->device_name->setText(device_name);
}
Ui::DeviceTabHeader::~DeviceTabHeader()
{
delete ui;
}

23
qt/DeviceTabHeader.h
View file

@ -1,23 +0,0 @@
#ifndef DEVICETABHEADER_H
#define DEVICETABHEADER_H
#include <QWidget>
#include "ui_DeviceTabHeader.h"
namespace Ui {
class DeviceTabHeader;
}
class Ui::DeviceTabHeader : public QWidget
{
Q_OBJECT
public:
DeviceTabHeader(QString, QString);
~DeviceTabHeader();
private:
Ui::DeviceTabHeaderUi *ui;
};
#endif // DEVICETABHEADER_H

4
qt/OpenRGBDialog2.cpp
View file

@ -5,8 +5,8 @@
#include "OpenRGBServerInfoPage.h"
#include "OpenRGBPluginContainer.h"
#include "OpenRGBProfileSaveDialog.h"
#include "DeviceTabHeader.h"
#include "ResourceManager.h"
#include "TabLabel.h"
#include <QLabel>
#include <QTabBar>
#include <QMessageBox>
@ -918,7 +918,7 @@ void OpenRGBDialog2::UpdateDevicesList()
| text in the tab label. Choose icon based on device |
| type and append device name string. |
\*-----------------------------------------------------*/
DeviceTabHeader* device_tab_header = new DeviceTabHeader(
TabLabel* device_tab_header = new TabLabel(
GetIconString(controllers[controller_idx]->type, IsDarkTheme()),
QString::fromStdString(controllers[controller_idx]->name)
);

15
qt/TabLabel.cpp Normal file
View file

@ -0,0 +1,15 @@
#include "TabLabel.h"
Ui::TabLabel::TabLabel(QString icon, QString name) :
QWidget(nullptr),
ui(new Ui::TabLabelUi)
{
ui->setupUi(this);
ui->icon->setText("<img src=':/" + icon + "' height='16' width='16' />");
ui->name->setText(name);
}
Ui::TabLabel::~TabLabel()
{
delete ui;
}

23
qt/TabLabel.h Normal file
View file

@ -0,0 +1,23 @@
#ifndef TABLABEL_H
#define TABLABEL_H
#include <QWidget>
#include "ui_TabLabel.h"
namespace Ui {
class TabLabel;
}
class Ui::TabLabel : public QWidget
{
Q_OBJECT
public:
TabLabel(QString icon, QString name);
~TabLabel();
private:
Ui::TabLabelUi *ui;
};
#endif // TABLABEL_H

8
qt/DeviceTabHeader.ui → qt/TabLabel.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DeviceTabHeaderUi</class>
<widget class="QWidget" name="DeviceTabHeaderUi">
<class>TabLabelUi</class>
<widget class="QWidget" name="TabLabelUi">
<property name="geometry">
<rect>
<x>0</x>
@ -21,7 +21,7 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="device_icon">
<widget class="QLabel" name="icon">
<property name="minimumSize">
<size>
<width>16</width>
@ -40,7 +40,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="device_name">
<widget class="QLabel" name="name">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>