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

Merge pull request #477 from AttorneyOnline/fix-css

Browse Source 
Fix various bugs
This commit is contained in:
oldmud0 2021-02-28 13:04:44 -06:00 committed by GitHub
commit 5555b699f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/aoapplication.cpp
View File

@ -18,6 +18,7 @@ AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
discord = new AttorneyOnline::Discord(); discord = new AttorneyOnline::Discord();
QObject::connect(net_manager, SIGNAL(ms_connect_finished(bool, bool)), QObject::connect(net_manager, SIGNAL(ms_connect_finished(bool, bool)),
SLOT(ms_connect_finished(bool, bool))); SLOT(ms_connect_finished(bool, bool)));
qApp->setStyleSheet("QFrame {background-color:transparent;} QAbstractItemView {background-color: transparent; color: black;}; QLineEdit {background-color:transparent;}");
} }
AOApplication::~AOApplication() AOApplication::~AOApplication()

1
src/aooptionsdialog.cpp
View File

@ -981,6 +981,7 @@ void AOOptionsDialog::save_pressed()
configini->setValue("stickyeffects", ui_stickyeffects_cb->isChecked()); configini->setValue("stickyeffects", ui_stickyeffects_cb->isChecked());
configini->setValue("stickypres", ui_stickypres_cb->isChecked()); configini->setValue("stickypres", ui_stickypres_cb->isChecked());
configini->setValue("customchat", ui_customchat_cb->isChecked()); configini->setValue("customchat", ui_customchat_cb->isChecked());
configini->setValue("sticker", ui_sticker_cb->isChecked());
configini->setValue("automatic_logging_enabled", ui_log_cb->isChecked()); configini->setValue("automatic_logging_enabled", ui_log_cb->isChecked());
configini->setValue("continuous_playback", ui_continuous_cb->isChecked()); configini->setValue("continuous_playback", ui_continuous_cb->isChecked());
configini->setValue("category_stop", ui_category_stop_cb->isChecked()); configini->setValue("category_stop", ui_category_stop_cb->isChecked());

6
src/courtroom.cpp
View File

@ -1256,9 +1256,12 @@ void Courtroom::set_background(QString p_background, bool display)
ui_vp_evidence_display->reset(); ui_vp_evidence_display->reset();
ui_vp_background->kill(); ui_vp_background->kill();
ui_vp_desk->kill(); ui_vp_desk->kill();
QString f_side = current_side;
if (current_side == "")
f_side = ao_app->get_char_side(current_char);
set_scene( set_scene(
QString::number(ao_app->get_desk_mod(current_char, current_emote)), QString::number(ao_app->get_desk_mod(current_char, current_emote)),
current_side); f_side);
} }
} }
@ -1318,7 +1321,6 @@ void Courtroom::set_pos_dropdown(QStringList pos_dropdowns)
// Unblock the signals so the element can be used for setting pos again // Unblock the signals so the element can be used for setting pos again
ui_pos_dropdown->blockSignals(false); ui_pos_dropdown->blockSignals(false);
// Don't block the signals when setting side
set_side(current_side); set_side(current_side);
} }

6
src/evidence.cpp
View File

@ -256,7 +256,7 @@ void Courtroom::set_evidence_list(QVector<evi_type> &p_evi_list)
else if (compare_evidence_changed( else if (compare_evidence_changed(
old_list.at(current_evidence), old_list.at(current_evidence),
local_evidence_list.at(current_evidence))) { local_evidence_list.at(current_evidence))) {
QMessageBox *msgBox = new QMessageBox(this); QMessageBox *msgBox = new QMessageBox;
msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setText(tr("The piece of evidence you've been editing has changed.")); msgBox->setText(tr("The piece of evidence you've been editing has changed."));
@ -551,7 +551,7 @@ void Courtroom::on_evidence_x_clicked()
evidence_close(); evidence_close();
return; return;
} }
QMessageBox *msgBox = new QMessageBox(this); QMessageBox *msgBox = new QMessageBox;
msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setText(tr("Evidence has been modified.")); msgBox->setText(tr("Evidence has been modified."));
msgBox->setInformativeText(tr("Do you want to save your changes?")); msgBox->setInformativeText(tr("Do you want to save your changes?"));
@ -655,7 +655,7 @@ void Courtroom::on_evidence_transfer_clicked()
private_evidence_list.append(f_evi); private_evidence_list.append(f_evi);
} }
QMessageBox *msgBox = new QMessageBox(this); QMessageBox *msgBox = new QMessageBox;
msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setText(tr("\"%1\" has been transferred.").arg(name)); msgBox->setText(tr("\"%1\" has been transferred.").arg(name));
msgBox->setStandardButtons(QMessageBox::Ok); msgBox->setStandardButtons(QMessageBox::Ok);