|
@@ -20,9 +20,17 @@ SettingsWidget::SettingsWidget(QSettings* settings, PatchDownloader* patch_downl
|
|
|
setStatusToBlock(i, E_ERROR);
|
|
|
|
|
|
combobox_scrolling_disabler = new SettingsWidgetPrivate::ComboboxScrollingDisabler();
|
|
|
+ scroller = new SettingsWidgetPrivate::SettingsTabsScroller({ui->sub_entry_1,
|
|
|
+ ui->sub_entry_2,
|
|
|
+ ui->sub_entry_3,
|
|
|
+ ui->sub_entry_4
|
|
|
+ },
|
|
|
+ ui->content_scroll_area
|
|
|
+ );
|
|
|
|
|
|
ui->lotro_base_language_combobox->installEventFilter(combobox_scrolling_disabler);
|
|
|
ui->interface_scale_combobox->installEventFilter(combobox_scrolling_disabler);
|
|
|
+// ui->content_scroll_area->verticalScrollBar()->installEventFilter(scroller);
|
|
|
|
|
|
connect(patch_downloader, &PatchDownloader::checkForUpdatesStarted, this, &SettingsWidget::handleCheckForUpdatesStarted, Qt::QueuedConnection);
|
|
|
connect(patch_downloader, &PatchDownloader::checkForUpdatesFinished, this, &SettingsWidget::handleCheckForUpdatesFinished, Qt::QueuedConnection);
|
|
@@ -33,28 +41,27 @@ SettingsWidget::SettingsWidget(QSettings* settings, PatchDownloader* patch_downl
|
|
|
SettingsWidget::~SettingsWidget()
|
|
|
{
|
|
|
delete combobox_scrolling_disabler;
|
|
|
+ delete scroller;
|
|
|
delete ui;
|
|
|
}
|
|
|
|
|
|
void SettingsWidget::updateFontsSizes()
|
|
|
{
|
|
|
ui->frame_title->setFont(trajan_10pt);
|
|
|
- ui->group_label_1->setFont(trajan_8pt);
|
|
|
- ui->group_label_2->setFont(trajan_8pt);
|
|
|
- ui->group_label_3->setFont(trajan_8pt);
|
|
|
- ui->group_label_4->setFont(trajan_8pt);
|
|
|
+ ui->group_label_1->setFont(trajan_9pt);
|
|
|
+ ui->group_label_2->setFont(trajan_9pt);
|
|
|
+ ui->group_label_3->setFont(trajan_9pt);
|
|
|
|
|
|
ui->sub_entry_1_title->setFont(garamond_11pt);
|
|
|
ui->sub_entry_2_title->setFont(garamond_11pt);
|
|
|
ui->sub_entry_3_title->setFont(garamond_11pt);
|
|
|
- ui->sub_entry_4_title->setFont(garamond_11pt);
|
|
|
|
|
|
ui->backup_create_button->setFont(trajan_8pt);
|
|
|
ui->backup_restore_button->setFont(trajan_8pt);
|
|
|
ui->backup_remove_button->setFont(trajan_8pt);
|
|
|
- ui->reinstall_rusification_button->setFont(trajan_8pt);
|
|
|
|
|
|
- ui->patch_apply_button->setFont(trajan_11pt);
|
|
|
+ ui->apply_button_entry_1->setFont(trajan_11pt);
|
|
|
+ ui->apply_button_entry_2->setFont(trajan_11pt);
|
|
|
|
|
|
ui->game_folder_label->setFont(crimson_11pt);
|
|
|
ui->game_folder_path->setFont(crimson_11pt);
|
|
@@ -62,9 +69,9 @@ void SettingsWidget::updateFontsSizes()
|
|
|
ui->lotro_base_language_combobox->setFont(crimson_11pt);
|
|
|
ui->lotro_base_language_combobox->insertItem(ui->lotro_base_language_combobox->count(), ""); // is needed to invoke elements resize
|
|
|
ui->lotro_base_language_combobox->removeItem(ui->lotro_base_language_combobox->count() - 1);
|
|
|
-
|
|
|
ui->skiprawdownload_checkbox->setFont(crimson_11pt);
|
|
|
ui->nosplashscreen_checkbox->setFont(crimson_11pt);
|
|
|
+
|
|
|
ui->backup_status_label->setFont(crimson_11pt);
|
|
|
ui->backup_status_value->setFont(crimson_11pt);
|
|
|
ui->backup_creation_time_label->setFont(crimson_11pt);
|
|
@@ -73,7 +80,6 @@ void SettingsWidget::updateFontsSizes()
|
|
|
ui->backup_path_value->setFont(crimson_11pt);
|
|
|
|
|
|
ui->patch_emotes_checkbox->setFont(crimson_11pt);
|
|
|
- ui->patch_fonts_checkbox->setFont(crimson_11pt);
|
|
|
ui->patch_items_checkbox->setFont(crimson_11pt);
|
|
|
ui->patch_loadscreens_checkbox->setFont(crimson_11pt);
|
|
|
ui->patch_maps_checkbox->setFont(crimson_11pt);
|
|
@@ -82,9 +88,9 @@ void SettingsWidget::updateFontsSizes()
|
|
|
ui->patch_video_checkbox->setFont(crimson_11pt);
|
|
|
ui->patch_texts_checkbox->setFont(crimson_11pt);
|
|
|
|
|
|
- ui->micropatch_checkbox->setFont(crimson_11pt);
|
|
|
- ui->interface_scale_label->setFont(crimson_11pt);
|
|
|
- ui->interface_scale_combobox->setFont(crimson_11pt);
|
|
|
+ ui->micropatch_checkbox->setFont(crimson_12pt);
|
|
|
+ ui->interface_scale_label->setFont(crimson_12pt);
|
|
|
+ ui->interface_scale_combobox->setFont(crimson_12pt);
|
|
|
ui->interface_scale_combobox->insertItem(ui->interface_scale_combobox->count(), "250%"); // is needed to invoke elements resize
|
|
|
ui->interface_scale_combobox->removeItem(ui->interface_scale_combobox->count() - 1);
|
|
|
|
|
@@ -118,20 +124,23 @@ void SettingsWidget::resizeEvent(QResizeEvent *event)
|
|
|
ui->frame_title->resize(QSize(201, 21) * coefficient);
|
|
|
ui->checkpoints_list->move(QPoint(25, 70) * coefficient);
|
|
|
ui->checkpoints_list->resize(QSize(265, 321) * coefficient);
|
|
|
+
|
|
|
ui->content_scroll_area->move(QPoint(310, 0) * coefficient);
|
|
|
ui->content_scroll_area->resize(QSize(671, 521) * coefficient);
|
|
|
+ ui->content_widget->setMinimumWidth(650 * coefficient);
|
|
|
|
|
|
ui->group_status_icon_1->setMinimumSize(QSize(25, 25) * coefficient);
|
|
|
ui->group_status_icon_2->setMinimumSize(QSize(25, 25) * coefficient);
|
|
|
ui->group_status_icon_3->setMinimumSize(QSize(25, 25) * coefficient);
|
|
|
- ui->group_status_icon_4->setMinimumSize(QSize(25, 25) * coefficient);
|
|
|
|
|
|
ui->change_folder_button->setMinimumSize(QSize(36, 32) * coefficient);
|
|
|
|
|
|
ui->patch_texts_icon->setMinimumSize(QSize(80, 80) * coefficient);
|
|
|
ui->patch_graphics_icon->setMinimumSize(QSize(80, 80) * coefficient);
|
|
|
ui->patch_sounds_icon->setMinimumSize(QSize(80, 80) * coefficient);
|
|
|
- ui->patch_apply_button->setMinimumHeight(double(55) * coefficient);
|
|
|
+
|
|
|
+ ui->apply_button_entry_1->setMinimumHeight(double(55) * coefficient);
|
|
|
+ ui->apply_button_entry_2->setMinimumHeight(double(55) * coefficient);
|
|
|
}
|
|
|
|
|
|
void SettingsWidget::handleLotroManagerStarted(QString process_name, QVector<QVariant> data)
|