adjusted UI and started adding evidence
This commit is contained in:
parent
8be53e96f7
commit
fd6fbc4b54
@ -124,8 +124,13 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
|
||||
ui_call_mod = new AOButton(this, ao_app);
|
||||
|
||||
ui_pre = new QCheckBox(this);
|
||||
ui_pre->setText("Pre");
|
||||
ui_flip = new QCheckBox(this);
|
||||
ui_flip->setText("Flip");
|
||||
ui_flip->hide();
|
||||
ui_guard = new QCheckBox(this);
|
||||
ui_guard->setText("Guard");
|
||||
ui_guard->hide();
|
||||
|
||||
ui_custom_objection = new AOButton(this, ao_app);
|
||||
ui_realization = new AOButton(this, ao_app);
|
||||
@ -158,6 +163,11 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
|
||||
ui_blip_slider->setRange(0, 100);
|
||||
ui_blip_slider->setValue(50);
|
||||
|
||||
ui_evidence_button = new AOButton(this, ao_app);
|
||||
|
||||
ui_evidence = new AOImage(this, ao_app);
|
||||
ui_evidence->hide();
|
||||
|
||||
/////////////char select widgets under here///////////////
|
||||
|
||||
ui_char_select_background = new AOImage(this, ao_app);
|
||||
@ -266,6 +276,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
|
||||
connect(ui_flip, SIGNAL(clicked()), this, SLOT(on_flip_clicked()));
|
||||
connect(ui_guard, SIGNAL(clicked()), this, SLOT(on_guard_clicked()));
|
||||
|
||||
connect(ui_evidence_button, SIGNAL(clicked()), this, SLOT(on_evidence_button_clicked()));
|
||||
|
||||
connect(ui_back_to_lobby, SIGNAL(clicked()), this, SLOT(on_back_to_lobby_clicked()));
|
||||
|
||||
connect(ui_char_select_left, SIGNAL(clicked()), this, SLOT(on_char_select_left_clicked()));
|
||||
@ -473,12 +485,8 @@ void Courtroom::set_widgets()
|
||||
ui_pre->setText("Pre");
|
||||
|
||||
set_size_and_pos(ui_flip, "flip");
|
||||
ui_flip->setText("Flip");
|
||||
ui_flip->hide();
|
||||
|
||||
set_size_and_pos(ui_guard, "guard");
|
||||
ui_guard->setText("Guard");
|
||||
ui_guard->hide();
|
||||
|
||||
set_size_and_pos(ui_custom_objection, "custom_objection");
|
||||
ui_custom_objection->set_image("custom.png");
|
||||
@ -507,6 +515,12 @@ void Courtroom::set_widgets()
|
||||
set_size_and_pos(ui_sfx_slider, "sfx_slider");
|
||||
set_size_and_pos(ui_blip_slider, "blip_slider");
|
||||
|
||||
set_size_and_pos(ui_evidence_button, "evidence_button");
|
||||
//ui_evidence_button->set_image("evidencebutton.png");
|
||||
|
||||
set_size_and_pos(ui_evidence, "evidence_background");
|
||||
ui_evidence->set_image("evidencebackground.png");
|
||||
|
||||
//char select stuff under here
|
||||
|
||||
ui_char_select_background->set_image("charselect_background.png");
|
||||
@ -1778,6 +1792,18 @@ void Courtroom::on_guard_clicked()
|
||||
ui_ic_chat_message->setFocus();
|
||||
}
|
||||
|
||||
void Courtroom::on_evidence_button_clicked()
|
||||
{
|
||||
if (ui_evidence->isHidden())
|
||||
{
|
||||
ui_evidence->show();
|
||||
}
|
||||
else
|
||||
{
|
||||
ui_evidence->hide();
|
||||
}
|
||||
}
|
||||
|
||||
void Courtroom::char_clicked(int n_char)
|
||||
{
|
||||
int n_real_char = n_char + current_char_page * 90;
|
||||
|
@ -265,6 +265,10 @@ private:
|
||||
|
||||
AOImage *ui_muted;
|
||||
|
||||
AOButton *ui_evidence_button;
|
||||
|
||||
AOImage *ui_evidence;
|
||||
|
||||
AOImage *ui_char_select_background;
|
||||
|
||||
QVector<AOCharButton*> ui_char_button_list;
|
||||
@ -348,6 +352,8 @@ private slots:
|
||||
void on_flip_clicked();
|
||||
void on_guard_clicked();
|
||||
|
||||
void on_evidence_button_clicked();
|
||||
|
||||
void on_back_to_lobby_clicked();
|
||||
|
||||
void on_char_select_left_clicked();
|
||||
|
Loading…
Reference in New Issue
Block a user