From 99aa327318ab00f2049cfcefadd353c3a4e06bf7 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 25 Jan 2017 19:50:49 +0100 Subject: loading characters now works with overlay --- aoapplication.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'aoapplication.cpp') diff --git a/aoapplication.cpp b/aoapplication.cpp index 70aeb152..bf734343 100644 --- a/aoapplication.cpp +++ b/aoapplication.cpp @@ -100,3 +100,10 @@ void AOApplication::add_favorite_server(int p_server) write_to_serverlist_txt(server_line); } + +void AOApplication::loading_cancelled() +{ + destruct_courtroom(); + + w_lobby->hide_loading_overlay(); +} -- cgit From b4b533b72492da38381ad2fbb6c5aad99e30f110 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 26 Jan 2017 00:23:53 +0100 Subject: finished legacy loading process --- aoapplication.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'aoapplication.cpp') diff --git a/aoapplication.cpp b/aoapplication.cpp index bf734343..5388fc01 100644 --- a/aoapplication.cpp +++ b/aoapplication.cpp @@ -54,9 +54,6 @@ void AOApplication::construct_courtroom() w_courtroom = new Courtroom(this); courtroom_constructed = true; - - //D3BUG - w_courtroom->show(); } void AOApplication::destruct_courtroom() -- cgit From 9682087667e2de26e14406efde960b8c7f0c3c98 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Fri, 27 Jan 2017 01:17:33 +0100 Subject: implemented ooc chat and cleaned up some old headers --- aoapplication.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'aoapplication.cpp') diff --git a/aoapplication.cpp b/aoapplication.cpp index 5388fc01..f0576eea 100644 --- a/aoapplication.cpp +++ b/aoapplication.cpp @@ -1,11 +1,12 @@ -#include +#include "aoapplication.h" #include "lobby.h" #include "courtroom.h" #include "networkmanager.h" -#include "text_file_functions.h" -#include "aoapplication.h" +#include +#include +#include AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv) { @@ -29,6 +30,11 @@ void AOApplication::construct_lobby() w_lobby = new Lobby(this); lobby_constructed = true; + QRect screenGeometry = QApplication::desktop()->screenGeometry(); + int x = (screenGeometry.width()-w_lobby->width()) / 2; + int y = (screenGeometry.height()-w_lobby->height()) / 2; + w_lobby->move(x, y); + w_lobby->show(); } @@ -54,6 +60,11 @@ void AOApplication::construct_courtroom() w_courtroom = new Courtroom(this); courtroom_constructed = true; + + QRect screenGeometry = QApplication::desktop()->screenGeometry(); + int x = (screenGeometry.width()-w_courtroom->width()) / 2; + int y = (screenGeometry.height()-w_courtroom->height()) / 2; + w_courtroom->move(x, y); } void AOApplication::destruct_courtroom() -- cgit