changed emote icon image priority
This commit is contained in:
		
							parent
							
								
									fd6a9a2f9d
								
							
						
					
					
						commit
						274d12ed26
					
				@ -14,31 +14,11 @@ AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x
 | 
				
			|||||||
  connect(this, SIGNAL(clicked()), this, SLOT(on_clicked()));
 | 
					  connect(this, SIGNAL(clicked()), this, SLOT(on_clicked()));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
void AOEmoteButton::set_on(QString p_char, int p_emote)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  //+1 because programmatical emotes start on 0, while filesystem ones start on 1
 | 
					 | 
				
			||||||
  QString emotion_number = QString::number(p_emote + 1);
 | 
					 | 
				
			||||||
  QString image_path = ao_app->get_character_path(p_char) + "emotions/button" + emotion_number + "_on.png";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if (file_exists(image_path))
 | 
					 | 
				
			||||||
  {
 | 
					 | 
				
			||||||
    this->setText("");
 | 
					 | 
				
			||||||
    this->setStyleSheet("border-image:url(\"" + image_path + "\")");
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
  else
 | 
					 | 
				
			||||||
  {
 | 
					 | 
				
			||||||
    this->setText(ao_app->get_emote_comment(p_char, p_emote));
 | 
					 | 
				
			||||||
    this->setStyleSheet("border-image:url(\"\")");
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
*/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void AOEmoteButton::set_image(QString p_char, int p_emote, QString suffix)
 | 
					void AOEmoteButton::set_image(QString p_char, int p_emote, QString suffix)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  QString emotion_number = QString::number(p_emote + 1);
 | 
					  QString emotion_number = QString::number(p_emote + 1);
 | 
				
			||||||
  QString image_path = ao_app->get_character_path(p_char) + "emotions/button" + emotion_number + suffix;
 | 
					  QString image_path = ao_app->get_character_path(p_char) + "emotions/ao2/button" + emotion_number + suffix;
 | 
				
			||||||
  QString alt_path = ao_app->get_character_path(p_char) + "emotions/ao2/button" + emotion_number + suffix;
 | 
					  QString alt_path = ao_app->get_character_path(p_char) + "emotions/button" + emotion_number + suffix;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (file_exists(image_path))
 | 
					  if (file_exists(image_path))
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user