Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed legacy for char icons

Browse Source
This commit is contained in:
David Skoland 2018-11-16 01:02:55 +01:00
parent 051c8975ec
commit 11c2f258eb
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aoapplication.h
View File

@ -98,16 +98,17 @@ public:
//implementation in path_functions.cpp //implementation in path_functions.cpp
QString get_base_path(); QString get_base_path();
QString get_data_path(); QString get_data_path();
QString get_theme_path(); QString get_theme_path(QString p_file);
QString get_default_theme_path(); QString get_default_theme_path(QString p_file);
QString get_character_path(QString p_character); QString get_character_path(QString p_character, QString p_file);
QString get_character_emotions_path(QString p_character, QString p_file);
QString get_demothings_path(); QString get_demothings_path();
QString get_sounds_path(); QString get_sounds_path();
QString get_music_path(QString p_song); QString get_music_path(QString p_song);
QString get_background_path(); QString get_background_path();
QString get_default_background_path(); QString get_default_background_path();
QString get_evidence_path(); QString get_evidence_path();
QString get_case_sensitive_path(QString p_dir, QString p_file); QString get_case_sensitive_path(QString p_file);
////// Functions for reading and writing files ////// ////// Functions for reading and writing files //////
// Implementations file_functions.cpp // Implementations file_functions.cpp

10
aocharbutton.cpp
View File

@ -50,20 +50,12 @@ void AOCharButton::set_passworded()
void AOCharButton::set_image(QString p_character) void AOCharButton::set_image(QString p_character)
{ {
QString image_path = ao_app->get_character_path(p_character) + "char_icon.png"; QString image_path = ao_app->get_character_path(p_character, "char_icon.png");
QString legacy_path = ao_app->get_demothings_path() + p_character.toLower() + "_char_icon.png";
QString alt_path = ao_app->get_demothings_path() + p_character.toLower() + "_off.png";
this->setText(""); this->setText("");
if (file_exists(image_path)) if (file_exists(image_path))
this->setStyleSheet("border-image:url(\"" + image_path + "\")"); this->setStyleSheet("border-image:url(\"" + image_path + "\")");
else if (file_exists(legacy_path))
{
this->setStyleSheet("border-image:url(\"" + legacy_path + "\")");
//ninja optimization
QFile::copy(legacy_path, image_path);
}
else else
{ {
this->setStyleSheet("border-image:url()"); this->setStyleSheet("border-image:url()");

2
courtroom.h
View File

@ -102,7 +102,7 @@ public:
//implementations in path_functions.cpp //implementations in path_functions.cpp
QString get_background_path(); QString get_background_path();
QString get_default_background_path(); QString get_default_background_path(QString p_file);
//cid = character id, returns the cid of the currently selected character //cid = character id, returns the cid of the currently selected character
int get_cid() {return m_cid;} int get_cid() {return m_cid;}