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

doubleclick to join a server

Browse Source
This commit is contained in:
stonedDiscord 2019-08-20 18:35:42 +02:00
parent 177c56e2b8
commit 5807410b1d
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/lobby.h
View File

@ -75,6 +75,8 @@ private:
QProgressBar *ui_progress_bar; QProgressBar *ui_progress_bar;
AOButton *ui_cancel; AOButton *ui_cancel;
QModelIndex last_model;
void set_size_and_pos(QWidget *p_widget, QString p_identifier); void set_size_and_pos(QWidget *p_widget, QString p_identifier);
private slots: private slots:
@ -89,6 +91,7 @@ private slots:
void on_connect_released(); void on_connect_released();
void on_about_clicked(); void on_about_clicked();
void on_server_list_clicked(QModelIndex p_model); void on_server_list_clicked(QModelIndex p_model);
void on_server_list_doubleclicked(QModelIndex p_model);
void on_chatfield_return_pressed(); void on_chatfield_return_pressed();
}; };

13
src/lobby.cpp
View File

@ -47,6 +47,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
connect(ui_connect, SIGNAL(released()), this, SLOT(on_connect_released())); connect(ui_connect, SIGNAL(released()), this, SLOT(on_connect_released()));
connect(ui_about, SIGNAL(clicked()), this, SLOT(on_about_clicked())); connect(ui_about, SIGNAL(clicked()), this, SLOT(on_about_clicked()));
connect(ui_server_list, SIGNAL(clicked(QModelIndex)), this, SLOT(on_server_list_clicked(QModelIndex))); connect(ui_server_list, SIGNAL(clicked(QModelIndex)), this, SLOT(on_server_list_clicked(QModelIndex)));
connect(ui_server_list, SIGNAL(activated(QModelIndex)), this, SLOT(on_server_list_doubleclicked(QModelIndex)));
connect(ui_chatmessage, SIGNAL(returnPressed()), this, SLOT(on_chatfield_return_pressed())); connect(ui_chatmessage, SIGNAL(returnPressed()), this, SLOT(on_chatfield_return_pressed()));
connect(ui_cancel, SIGNAL(clicked()), ao_app, SLOT(loading_cancelled())); connect(ui_cancel, SIGNAL(clicked()), ao_app, SLOT(loading_cancelled()));
@ -282,9 +283,13 @@ void Lobby::on_about_clicked()
QMessageBox::about(this, "About", msg); QMessageBox::about(this, "About", msg);
} }
//clicked on an item in the serverlist
void Lobby::on_server_list_clicked(QModelIndex p_model) void Lobby::on_server_list_clicked(QModelIndex p_model)
{ {
if (p_model != last_model)
{
server_type f_server; server_type f_server;
last_model = p_model;
int n_server = p_model.row(); int n_server = p_model.row();
if (n_server < 0) if (n_server < 0)
@ -318,6 +323,14 @@ void Lobby::on_server_list_clicked(QModelIndex p_model)
ui_connect->setEnabled(false); ui_connect->setEnabled(false);
ao_app->net_manager->connect_to_server(f_server); ao_app->net_manager->connect_to_server(f_server);
}
}
//doubleclicked on an item in the serverlist so we'll connect right away
void Lobby::on_server_list_doubleclicked(QModelIndex p_model)
{
on_server_list_clicked(p_model);
on_connect_released();
} }
void Lobby::on_chatfield_return_pressed() void Lobby::on_chatfield_return_pressed()