Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #3498. Show missing pixmaps in VeSTige plugin. #3501

Merged
merged 2 commits into from
Apr 28, 2017

Conversation

karmux
Copy link
Contributor

@karmux karmux commented Apr 12, 2017

No description provided.

@karmux karmux changed the base branch from master to stable-1.2 April 12, 2017 17:23
@karmux karmux changed the base branch from stable-1.2 to master April 12, 2017 17:24
@tresf
Copy link
Member

tresf commented Apr 12, 2017

@karmux thanks! I'm going to ask @lukas-w to merge this since he rewrote the resource system.

@lukas-w lukas-w self-assigned this Apr 17, 2017
@@ -259,7 +259,7 @@ void vestigeInstrument::loadFile( const QString & _file )
TextFloat * tf = TextFloat::displayMessage(
tr( "Loading plugin" ),
tr( "Please wait while loading VST-plugin..." ),
PLUGIN_NAME::getIconPixmap( "logo", 24, 24 ), 0 );
embed::getIconPixmap( "logo", 24, 24 ), 0 );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this and other lines loading logo.png should change, as they're about loading the plugin's logo, not a shared resource, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. I reverted logo changes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@lukas-w lukas-w merged commit 2815da2 into LMMS:master Apr 28, 2017
@karmux karmux deleted the 3498_missing_vestige_icons branch April 29, 2017 11:42
tresf pushed a commit to tresf/lmms that referenced this pull request May 10, 2017
liushuyu pushed a commit to liushuyu/lmms that referenced this pull request Jun 3, 2017
liushuyu pushed a commit to liushuyu/lmms that referenced this pull request Jun 19, 2017
PhysSong pushed a commit to PhysSong/lmms that referenced this pull request Jul 7, 2017
PhysSong pushed a commit to PhysSong/lmms that referenced this pull request Jul 7, 2017
PhysSong pushed a commit to PhysSong/lmms that referenced this pull request Jul 7, 2017
PhysSong pushed a commit to PhysSong/lmms that referenced this pull request Jul 7, 2017
@@ -534,7 +534,7 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument,
QPushButton * note_off_all_btn = new QPushButton( tr( "Turn off all "
"notes" ), this );
note_off_all_btn->setGeometry( 20, 160, 200, 24 );
note_off_all_btn->setIcon( embed::getIconPixmap( "state_stop" ) );
note_off_all_btn->setIcon( embed::getIconPixmap( "stop" ) );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part of the fix should be in stable-1.2

sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants