hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Revamp resource embedding (#7241)

Browse Source
This commit is contained in:
Dominic Clark
2024-05-12 17:38:14 +01:00
committed by GitHub
parent 6d100d1bba
commit 95e5f97150
8 changed files with 106 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Eq/EqControlsDialog.cpp
View File

@@ -123,10 +123,10 @@ EqControlsDialog::EqControlsDialog( EqControls *controls ) :
activeButton->setCheckable(true);
activeButton->setModel( m_parameterWidget->getBandModels( i )->active );
QString iconActiveFileName = "bandLabel" + QString::number(i+1);
QString iconInactiveFileName = "bandLabel" + QString::number(i+1) + "off";
activeButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( iconActiveFileName.toLatin1() ) );
activeButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( iconInactiveFileName.toLatin1() ) );
const auto iconActiveFileName = "bandLabel" + std::to_string(i + 1);
const auto iconInactiveFileName = iconActiveFileName + "off";
activeButton->setActiveGraphic(PLUGIN_NAME::getIconPixmap(iconActiveFileName));
activeButton->setInactiveGraphic(PLUGIN_NAME::getIconPixmap(iconInactiveFileName));
activeButton->move( distance - 2, 276 );
activeButton->setModel( m_parameterWidget->getBandModels( i )->active );

6
plugins/Eq/EqCurve.cpp
View File

@@ -185,9 +185,9 @@ QPainterPath EqHandle::getCurvePath()
void EqHandle::loadPixmap()
{
QString fileName = "handle" + QString::number(m_numb+1);
if ( !isActiveHandle() ) { fileName = fileName + "inactive"; }
m_circlePixmap = PLUGIN_NAME::getIconPixmap( fileName.toLatin1() );
auto fileName = "handle" + std::to_string(m_numb + 1);
if (!isActiveHandle()) { fileName += "inactive"; }
m_circlePixmap = PLUGIN_NAME::getIconPixmap(fileName);
}
bool EqHandle::mousePressed() const

3
plugins/LOMM/LOMMControlDialog.h
View File

@@ -86,7 +86,8 @@ public:
return spinBox;
}
PixmapButton* createPixmapButton(const QString& text, QWidget* parent, int x, int y, BoolModel* model, const QString& activeIcon, const QString& inactiveIcon, const QString& tooltip)
PixmapButton* createPixmapButton(const QString& text, QWidget* parent, int x, int y, BoolModel* model,
std::string_view activeIcon, std::string_view inactiveIcon, const QString& tooltip)
{
PixmapButton* button = new PixmapButton(parent, text);
button->move(x, y);