aboutsummaryrefslogtreecommitdiff
path: root/src/text_file_functions.cpp
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2020-03-31 18:12:15 +0300
committerCrystalwarrior <varsash@gmail.com>2020-03-31 18:12:15 +0300
commit8007b1d1b95d476821a6b2616c09824e54911ea9 (patch)
treef4c1bf47ba6fa72e044f12888d89bfce56b59351 /src/text_file_functions.cpp
parent7816c8ab234e185e5eb3410761aee3ca60e0f354 (diff)
Add courtroom_design.ini partial parsing for misc/ folder (only chat_arrow and showname atm)
Initialize chat arrow n stuff this is still pretty gay because you can't ignore size and set pos or something like that
Diffstat (limited to 'src/text_file_functions.cpp')
-rw-r--r--src/text_file_functions.cpp26
1 files changed, 18 insertions, 8 deletions
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index c3948123..d9867094 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -264,11 +264,12 @@ QPoint AOApplication::get_button_spacing(QString p_identifier, QString p_file)
return return_value;
}
-pos_size_type AOApplication::get_element_dimensions(QString p_identifier, QString p_file)
+pos_size_type AOApplication::get_element_dimensions(QString p_identifier, QString p_file, QString p_char)
{
+ QString char_ini_path = get_base_path() + "misc/" + get_chat(p_char) + "/" + p_file;
QString design_ini_path = get_theme_path(p_file);
QString default_path = get_default_theme_path(p_file);
- QString f_result = read_design_ini(p_identifier, design_ini_path);
+ QString f_result = read_design_ini(p_identifier, char_ini_path);
pos_size_type return_value;
@@ -279,10 +280,14 @@ pos_size_type AOApplication::get_element_dimensions(QString p_identifier, QStrin
if (f_result == "")
{
- f_result = read_design_ini(p_identifier, default_path);
-
+ f_result = read_design_ini(p_identifier, design_ini_path);
if (f_result == "")
- return return_value;
+ {
+ f_result = read_design_ini(p_identifier, default_path);
+
+ if (f_result == "")
+ return return_value;
+ }
}
QStringList sub_line_elements = f_result.split(",");
@@ -297,13 +302,18 @@ pos_size_type AOApplication::get_element_dimensions(QString p_identifier, QStrin
return return_value;
}
-QString AOApplication::get_design_element(QString p_identifier, QString p_file)
+QString AOApplication::get_design_element(QString p_identifier, QString p_file, QString p_char)
{
+ QString char_ini_path = get_base_path() + "misc/" + get_chat(p_char) + "/" + p_file;
QString design_ini_path = get_theme_path(p_file);
- QString f_result = read_design_ini(p_identifier, design_ini_path);
QString default_path = get_default_theme_path(p_file);
+ QString f_result = read_design_ini(p_identifier, char_ini_path);
if (f_result == "")
- f_result = read_design_ini(p_identifier, default_path);
+ {
+ f_result = read_design_ini(p_identifier, design_ini_path);
+ if (f_result == "")
+ f_result = read_design_ini(p_identifier, default_path);
+ }
return f_result;
}
QString AOApplication::get_font_name(QString p_identifier, QString p_file)