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

started adding spacing to evidence

Browse Source
This commit is contained in:
OmniTroid 2017-04-05 15:16:25 +02:00
parent 2dfdf351ef
commit 86b4faa0d4
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
courtroom.cpp
View File

@ -182,7 +182,9 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_evidence_button = new AOButton(this, ao_app);
ui_evidence = new AOImage(this, ao_app);
construct_evidence();
construct_char_select();
connect(keepalive_timer, SIGNAL(timeout()), this, SLOT(ping_server()));
@ -249,12 +251,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
connect(ui_evidence_button, SIGNAL(clicked()), this, SLOT(on_evidence_button_clicked()));
construct_char_select();
set_widgets();
construct_evidence();
set_char_select();
}

1
courtroom.h
View File

@ -295,6 +295,7 @@ private:
AOButton *ui_evidence_button;
AOImage *ui_evidence;
QLabel *ui_evidence_name;
QWidget *ui_evidence_buttons;
QVector<AOEvidenceButton*> ui_evidence_list;
AOImage *ui_evidence_left;
AOImage *ui_evidence_right;

20
evidence.cpp
View File

@ -4,6 +4,26 @@
void Courtroom::construct_evidence()
{
ui_evidence = new AOImage(this, ao_app);
ui_evidence_buttons = new QWidget(ui_evidence);
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;
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};