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

added evidence spacing

Browse Source
This commit is contained in:
OmniTroid 2017-04-05 23:05:02 +02:00
parent 86b4faa0d4
commit e03869a572
3 changed files with 42 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
charselect.cpp
View File

@ -24,6 +24,7 @@ void Courtroom::construct_char_select()
ui_char_select_right = new AOButton(ui_char_select_background, ao_app);
ui_spectator = new AOButton(ui_char_select_background, ao_app);
ui_spectator->setText("Spectator");
QPoint f_spacing = ao_app->get_button_spacing("char_button_spacing", "courtroom_design.ini");

19
courtroom.cpp
View File

@ -167,7 +167,6 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
if (ao_app->yellow_text_enabled)
ui_text_color->addItem("Yellow");
ui_music_slider = new QSlider(Qt::Horizontal, this);
ui_music_slider->setRange(0, 100);
ui_music_slider->setValue(ao_app->get_default_music());
@ -484,6 +483,23 @@ void Courtroom::set_widgets()
set_size_and_pos(ui_evidence, "evidence_background");
ui_evidence->set_image("evidencebackground.png");
set_size_and_pos(ui_evidence_name, "evidence_name");
set_size_and_pos(ui_evidence_buttons, "evidence_buttons");
set_size_and_pos(ui_evidence_left, "evidence_left");
ui_evidence_left->set_image("arrow_left.png");
set_size_and_pos(ui_evidence_right, "evidence_right");
ui_evidence_right->set_image("arrow_right.png");
set_size_and_pos(ui_evidence_overlay, "evidence_overlay");
ui_evidence_overlay->set_image("evidenceoverlay.png");
set_size_and_pos(ui_evidence_x, "evidence_x");
set_size_and_pos(ui_evidence_description, "evidence_description");
ui_selector->set_image("char_selector.png");
ui_selector->hide();
@ -501,7 +517,6 @@ void Courtroom::set_widgets()
ui_char_select_right->set_image("arrow_right.png");
set_size_and_pos(ui_spectator, "spectator");
ui_spectator->setText("Spectator");
}
void Courtroom::set_fonts()

78
evidence.cpp
View File

@ -6,15 +6,32 @@ void Courtroom::construct_evidence()
{
ui_evidence = new AOImage(this, ao_app);
ui_evidence_name = new QLabel(ui_evidence);
ui_evidence_name->setAlignment(Qt::AlignCenter);
ui_evidence_name->setFont(QFont("Arial", 14, QFont::Bold));
ui_evidence_name->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: rgba(255, 128, 0, 255);");
ui_evidence_buttons = new QWidget(ui_evidence);
ui_evidence_left = new AOImage(ui_evidence, ao_app);
ui_evidence_right = new AOImage(ui_evidence, ao_app);
ui_evidence_overlay = new AOImage(ui_evidence, ao_app);
ui_evidence_x = new AOButton(ui_evidence_overlay, ao_app);
ui_evidence_x->setText("X");
ui_evidence_description = new QPlainTextEdit(ui_evidence_overlay);
ui_evidence_description->setReadOnly(true);
ui_evidence_description->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: white;");
set_size_and_pos(ui_evidence, "evidence_background");
set_size_and_pos(ui_evidence_buttons, "evidence_buttons");
QPoint f_spacing = ao_app->get_button_spacing("evidence_button_spacing", "courtroom_design.ini");
//Todo: finish refactoring this
/*
const int button_width = 60;
int x_spacing = f_spacing.x();
int x_mod_count = 0;
@ -22,29 +39,18 @@ void Courtroom::construct_evidence()
const int button_height = 60;
int y_spacing = f_spacing.y();
int y_mod_count = 0;
*/
//constructing evidence button grid
const int base_x_pos{28};
const int base_y_pos{27};
const int x_modifier{72};
int x_mod_count{0};
const int y_modifier{73};
int y_mod_count{0};
evidence_columns = ui_evidence->width() / x_modifier;
evidence_rows = ui_evidence->height() / y_modifier;
evidence_columns = ((ui_evidence->width() - button_width) / (x_spacing + button_width)) + 1;
evidence_rows = ((ui_evidence->height() - button_height) / (y_spacing + button_height)) + 1;
max_evidence_on_page = evidence_columns * evidence_rows;
for (int n = 0 ; n < max_evidence_on_page ; ++n)
{
int x_pos = base_x_pos + (x_modifier * x_mod_count);
int y_pos = base_y_pos + (y_modifier * y_mod_count);
int x_pos = (button_width + x_spacing) * x_mod_count;
int y_pos = (button_height + y_spacing) * y_mod_count;
AOEvidenceButton *f_evidence = new AOEvidenceButton(ui_evidence, ao_app, x_pos, y_pos);
AOEvidenceButton *f_evidence = new AOEvidenceButton(ui_evidence_button, ao_app, x_pos, y_pos);
ui_evidence_list.append(f_evidence);
@ -62,42 +68,6 @@ void Courtroom::construct_evidence()
}
}
ui_evidence_name = new QLabel(ui_evidence);
ui_evidence_left = new AOImage(ui_evidence, ao_app);
ui_evidence_right = new AOImage(ui_evidence, ao_app);
ui_evidence_overlay = new AOImage(ui_evidence, ao_app);
ui_evidence_x = new AOButton(ui_evidence_overlay, ao_app);
ui_evidence_description = new QPlainTextEdit(ui_evidence_overlay);
set_size_and_pos(ui_evidence_name, "evidence_name");
ui_evidence_name->setAlignment(Qt::AlignCenter);
ui_evidence_name->setFont(QFont("Arial", 14, QFont::Bold));
ui_evidence_name->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: rgba(255, 128, 0, 255);");
set_size_and_pos(ui_evidence_left, "evidence_left");
ui_evidence_left->set_image("arrow_left.png");
set_size_and_pos(ui_evidence_right, "evidence_right");
ui_evidence_right->set_image("arrow_right.png");
set_size_and_pos(ui_evidence_overlay, "evidence_overlay");
ui_evidence_overlay->set_image("evidenceoverlay.png");
set_size_and_pos(ui_evidence_x, "evidence_x");
ui_evidence_x->setText("X");
set_size_and_pos(ui_evidence_description, "evidence_description");
ui_evidence_description->setReadOnly(true);
ui_evidence_description->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: white;");
connect(ui_evidence_x, SIGNAL(clicked()), this, SLOT(on_evidence_x_clicked()));
ui_evidence->hide();
}