tailoring for windows

This commit is contained in:
OmniTroid 2017-02-13 23:56:23 +01:00
parent d73865cfcd
commit 69c33e4c22
4 changed files with 22 additions and 5 deletions

View File

@ -338,14 +338,17 @@ void Courtroom::set_widgets()
ui_vp_chatbox->hide(); ui_vp_chatbox->hide();
set_size_and_pos(ui_vp_showname, "showname"); set_size_and_pos(ui_vp_showname, "showname");
QFont f = ui_vp_showname->font(); QFont pt_8 = ui_vp_showname->font();
f.setPointSize(8); QFont pt_10 = ui_vp_showname->font();
ui_vp_showname->setFont(f); pt_8.setPointSize(8);
pt_10.setPointSize(10);
ui_vp_showname->setFont(pt_8);
ui_vp_showname->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_vp_showname->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: white;"); "color: white;");
set_size_and_pos(ui_vp_message, "message"); set_size_and_pos(ui_vp_message, "message");
ui_vp_message->setReadOnly(true); ui_vp_message->setReadOnly(true);
ui_vp_message->setFont(pt_10);
ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: white"); "color: white");
@ -364,6 +367,7 @@ void Courtroom::set_widgets()
ui_vp_objection->combo_resize(ui_viewport->width(), ui_viewport->height()); ui_vp_objection->combo_resize(ui_viewport->width(), ui_viewport->height());
set_size_and_pos(ui_ic_chatlog, "ic_chatlog"); set_size_and_pos(ui_ic_chatlog, "ic_chatlog");
ui_ic_chatlog->setFont(pt_10);
ui_ic_chatlog->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_ic_chatlog->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: white;"); "color: white;");
@ -381,7 +385,7 @@ void Courtroom::set_widgets()
set_size_and_pos(ui_music_list, "music_list"); set_size_and_pos(ui_music_list, "music_list");
ui_music_list->setStyleSheet("QListWidget{background-color: rgba(0, 0, 0, 0);}"); ui_music_list->setStyleSheet("QListWidget{background-color: rgba(0, 0, 0, 0);}");
ui_music_list->setFont(f); ui_music_list->setFont(pt_8);
set_size_and_pos(ui_ic_chat_message, "ic_chat_message"); set_size_and_pos(ui_ic_chat_message, "ic_chat_message");
ui_ic_chat_message->setStyleSheet("background-color: rgba(89, 89, 89, 255);"); ui_ic_chat_message->setStyleSheet("background-color: rgba(89, 89, 89, 255);");
@ -649,6 +653,15 @@ void Courtroom::enter_courtroom(int p_cid)
ui_prosecution_plus->hide(); ui_prosecution_plus->hide();
} }
QString char_path = ao_app->get_character_path(current_char);
if (ao_app->custom_objection_enabled &&
file_exists(char_path + "custom.gif") &&
file_exists(char_path + "custom.wav"))
ui_custom_objection->show();
else
ui_custom_objection->hide();
if (ao_app->flipping_enabled) if (ao_app->flipping_enabled)
ui_flip->show(); ui_flip->show();

View File

@ -112,6 +112,7 @@ void Lobby::set_widgets()
ui_loading_text->setFont(QFont("Arial", 20, QFont::Bold)); ui_loading_text->setFont(QFont("Arial", 20, QFont::Bold));
ui_loading_text->setReadOnly(true); ui_loading_text->setReadOnly(true);
ui_loading_text->setAlignment(Qt::AlignCenter); ui_loading_text->setAlignment(Qt::AlignCenter);
ui_loading_text->setFrameStyle(QFrame::NoFrame);
ui_loading_text->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_loading_text->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: rgba(255, 128, 0, 255);"); "color: rgba(255, 128, 0, 255);");
ui_loading_text->append("Loading"); ui_loading_text->append("Loading");

View File

@ -167,7 +167,6 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
QString window_title = "Attorney Online 2"; QString window_title = "Attorney Online 2";
int selected_server = w_lobby->get_selected_server(); int selected_server = w_lobby->get_selected_server();
if (w_lobby->public_servers_selected) if (w_lobby->public_servers_selected)
{ {
if (selected_server >= 0 && selected_server < server_list.size()) if (selected_server >= 0 && selected_server < server_list.size())

View File

@ -1,8 +1,12 @@
#include "aoapplication.h" #include "aoapplication.h"
#include "courtroom.h" #include "courtroom.h"
#ifndef OMNI_WIN_DEBUG
#define OMNI_WIN_DEBUG
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
#endif
QString AOApplication::get_base_path(){ QString AOApplication::get_base_path(){