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

added optional pos dropdown

Browse Source
This commit is contained in:
OmniTroid 2017-05-21 21:32:38 +02:00
parent 18afcf9064
commit 145dfa4f7d
3 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aotextedit.cpp
View File

@ -4,7 +4,7 @@ AOTextEdit::AOTextEdit(QWidget *parent) : QPlainTextEdit(parent)
{
this->setReadOnly(true);
connect(this, SIGNAL(returnPressed()), this, SLOT(on_enter_pressed()));
//connect(this, SIGNAL(returnPressed()), this, SLOT(on_enter_pressed()));
}
void AOTextEdit::mouseDoubleClickEvent(QMouseEvent *e)

54
courtroom.cpp
View File

@ -110,16 +110,19 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_music_search = new QLineEdit(this);
ui_music_search->setFrame(false);
//////////emotes//////////////////////
construct_emotes();
ui_emote_left = new AOButton(this, ao_app);
ui_emote_right = new AOButton(this, ao_app);
ui_emote_dropdown = new QComboBox(this);
///////////////////////////////////////
ui_pos_dropdown = new QComboBox(this);
ui_pos_dropdown->addItem("wit");
ui_pos_dropdown->addItem("def");
ui_pos_dropdown->addItem("pro");
ui_pos_dropdown->addItem("jud");
ui_pos_dropdown->addItem("hld");
ui_pos_dropdown->addItem("hlp");
ui_defense_bar = new AOImage(this, ao_app);
ui_prosecution_bar = new AOImage(this, ao_app);
@ -205,6 +208,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
connect(ui_emote_right, SIGNAL(clicked()), this, SLOT(on_emote_right_clicked()));
connect(ui_emote_dropdown, SIGNAL(activated(int)), this, SLOT(on_emote_dropdown_changed(int)));
connect(ui_pos_dropdown, SIGNAL(activated(int)), this, SLOT(on_pos_dropdown_changed(int)));
connect(ui_mute_list, SIGNAL(clicked(QModelIndex)), this, SLOT(on_mute_list_clicked(QModelIndex)));
@ -399,6 +403,7 @@ void Courtroom::set_widgets()
ui_emote_right->set_image("arrow_right.png");
set_size_and_pos(ui_emote_dropdown, "emote_dropdown");
set_size_and_pos(ui_pos_dropdown, "pos_dropdown");
set_size_and_pos(ui_defense_bar, "defense_bar");
ui_defense_bar->set_image("defensebar" + QString::number(defense_bar_state) + ".png");
@ -1593,11 +1598,48 @@ void Courtroom::on_music_search_edited(QString p_text)
list_music();
}
void Courtroom::on_pos_dropdown_changed(int p_index)
{
ui_ic_chat_message->setFocus();
if (p_index < 0 || p_index > 5)
return;
QString f_pos;
switch (p_index)
{
case 0:
f_pos = "wit";
break;
case 1:
f_pos = "def";
break;
case 2:
f_pos = "pro";
break;
case 3:
f_pos = "jud";
break;
case 4:
f_pos = "hld";
break;
case 5:
f_pos = "hlp";
break;
default:
f_pos = "";
}
if (f_pos == "" || ui_ooc_chat_name == "")
return;
ao_app->send_server_packet(new AOPacket("CT#" + ui_ooc_chat_name->text() + "#/pos " + f_pos + "#%"));
}
void Courtroom::on_mute_list_clicked(QModelIndex p_index)
{
qDebug() << "mute_list_clicked";
QListWidgetItem *f_item = ui_mute_list->item(p_index.row());
qDebug() << "item text: " << f_item->text();
QString f_char = f_item->text();
QString real_char;

2
courtroom.h
View File

@ -250,6 +250,7 @@ private:
AOButton *ui_emote_right;
QComboBox *ui_emote_dropdown;
QComboBox *ui_pos_dropdown;
AOImage *ui_defense_bar;
AOImage *ui_prosecution_bar;
@ -369,6 +370,7 @@ private slots:
void on_emote_right_clicked();
void on_emote_dropdown_changed(int p_index);
void on_pos_dropdown_changed(int p_index);
void on_evidence_name_edited();
void on_evidence_clicked(int p_id);