From 726b381ea715631953d843596176faac72083fa3 Mon Sep 17 00:00:00 2001 From: Chris Bessent Date: Tue, 2 Mar 2021 03:36:50 -0700 Subject: Add scrollbars to some settings tabs to reduce minimum size The previous minimum size was around 450 x 560px. At a DPI scaling of 200%, this means 900 x 1120px which extends off the typical 1080p screen. Why is someone using 200% scaling on a 1080p screen? I have no clue. Now, the minimum size is around 450 x 410px for 900 x 820 px at 200% scaling. Which works for anything short of a 1376 x 768 screen at 200% scaling which I just don't really care about. --- src/settingsdialog.ui | 2076 +++++++++++++++++++------------------ src/settingsdialoggeneral.cpp | 4 + src/settingsdialognexus.cpp | 4 + src/settingsdialogworkarounds.cpp | 4 + 4 files changed, 1097 insertions(+), 991 deletions(-) (limited to 'src') diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui index 3ea7b735..44114391 100644 --- a/src/settingsdialog.ui +++ b/src/settingsdialog.ui @@ -7,7 +7,7 @@ 0 0 820 - 651 + 592 @@ -23,296 +23,312 @@ General - - - - - Qt::Vertical + + + + + QFrame::NoFrame - - - 0 - 0 - + + QFrame::Plain - - - - - - - 0 - 200 - + + true - - - 0 - - - 0 + + + + 0 + 0 + 778 + 501 + - - 0 - - - 0 + + true - - - - Download List - - - - - - Show meta information instead of file names in the download list. - - - Show meta information instead of file names in the download list. - - - Show meta information - - - - - - - Make the download list more compact. - - - Make the download list more compact. - - - Compact list - - - - - - - Automatically hide downloads after successful installation. - - - Automatically hide downloads after successful installation. - - - Hide downloads after installation - - - - - - - - - - Updates - - - - - - Check for Mod Organizer updates on Github on startup. - - - Check for Mod Organizer updates on Github on startup. - - - Check for updates - - - - - - - Update to non-stable releases. - - - Update to non-stable releases. - - - Update to beta versions - - - - - - - - - - Miscellaneous - - - - 9 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Language - - 9 + + + 9 + + + 9 + + + 9 + + + 9 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + The language of the user interface. + + + The language of the user interface. + + + + + + + https://discord.gg/NRGqdt5suP + + + <a href="https://discord.gg/NRGqdt5suP">Help translate Mod Organizer on Discord</a> + + + true + + + + + + + + + + Download List - - 9 + + + + + Show meta information instead of file names in the download list. + + + Show meta information instead of file names in the download list. + + + Show meta information + + + + + + + Make the download list more compact. + + + Make the download list more compact. + + + Compact list + + + + + + + Automatically hide downloads after successful installation. + + + Automatically hide downloads after successful installation. + + + Hide downloads after installation + + + + + + + + + + Updates - - 9 + + + + + Check for Mod Organizer updates on Github on startup. + + + Check for Mod Organizer updates on Github on startup. + + + Check for updates + + + + + + + Update to non-stable releases. + + + Update to non-stable releases. + + + Update to beta versions + + + + + + + + + + Miscellaneous - - - - Dialogs will always be centered on the main window, but will remember their size. - - - Dialogs will always be centered on the main window, but will remember their size. - - - Always center dialogs - - - - - - - Show confirmation when changing instance - - - - - - - Whether double-clicking on a file opens the preview window or launches the program associated with it. This applies to the Data tab as well as the Conflicts and Filetree tabs in the mod info window. - - - Open previews on double-click - - - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 16777215 - 16777215 - - - - Reset all choices made in dialogs. - - - Reset all choices made in dialogs. - - - Reset Dialog Choices - - - - - - - Modify the categories available to arrange your mods. - - - Modify the categories available to arrange your mods. - - - Configure Mod Categories - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Language - - - - 9 - - - 9 - - - 9 - - - 9 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - The language of the user interface. - - - The language of the user interface. - - - - - - - https://discord.gg/NRGqdt5suP - - - <a href="https://discord.gg/NRGqdt5suP">Help translate Mod Organizer on Discord</a> - - - true - - - - + + + 9 + + + 9 + + + 9 + + + 9 + + + + + Dialogs will always be centered on the main window, but will remember their size. + + + Dialogs will always be centered on the main window, but will remember their size. + + + Always center dialogs + + + + + + + Show confirmation when changing instance + + + + + + + Whether double-clicking on a file opens the preview window or launches the program associated with it. This applies to the Data tab as well as the Conflicts and Filetree tabs in the mod info window. + + + Open previews on double-click + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 16777215 + 16777215 + + + + Reset all choices made in dialogs. + + + Reset all choices made in dialogs. + + + Reset Dialog Choices + + + + + + + Modify the categories available to arrange your mods. + + + Modify the categories available to arrange your mods. + + + Configure Mod Categories + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + @@ -968,389 +984,433 @@ If you disable this feature, MO will only display official DLCs this way. Please Nexus - + - - - - 0 - - - 0 - - - 0 + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + + + 0 + 0 + 778 + 501 + - - 0 + + true - - - - Nexus Account - - - - 10 - - - - - User ID: - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - id - - - - - - - Name: - - - - - - - name - - - - - - - Account: - - - - - - - account - - - - - - - - - - Statistics - - - - 10 - - - - - Daily requests: - - - - - - - daily requests - - - - - - - Hourly requests: - - - - - - - hourly requests - - - - - - - - - - - - - Nexus Connection - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Connect to Nexus - - - - - - - Manually enter the API key and try to login - - - Enter API Key Manually - - - - - - - Clear the stored Nexus API key and force reauthorization. - - - Disconnect from Nexus - - - - :/MO/gui/edit_clear:/MO/gui/edit_clear - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QAbstractScrollArea::AdjustToContents - - - - - - - - - - - - - Options - - - - 9 - - - 9 - - - 9 - - - 9 - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Endorsement Integration - - - true - - - + + + 0 + + + 0 + + + 0 + + + 0 + + + - - - Tracked Integration - - - true - + + + Nexus Account + + + + 10 + + + + + User ID: + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + id + + + + + + + Name: + + + + + + + name + + + + + + + Account: + + + + + + + account + + + + - - - <html><head/><body><p>By default, a counter is displayed in the bottom right corner. This informs the user of their remaining API requests. The Nexus API becomes unusable once these API requests run out. Checking this option will hide that counter.</p></body></html> - - - <html><head/><body><p>By default, a counter is displayed in the bottom right corner. This informs the user of their remaining API requests. The Nexus API becomes unusable once these API requests run out. Checking this option will hide that counter.</p></body></html> - - - Hide API Request Counter - + + + Statistics + + + + 10 + + + + + Daily requests: + + + + + + + daily requests + + + + + + + Hourly requests: + + + + + + + hourly requests + + + + - - - - - - - 0 - - - 0 - - - 0 + + + + + Nexus Connection - - 0 + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Connect to Nexus + + + + + + + Manually enter the API key and try to login + + + Enter API Key Manually + + + + + + + Clear the stored Nexus API key and force reauthorization. + + + Disconnect from Nexus + + + + :/MO/gui/edit_clear:/MO/gui/edit_clear + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QAbstractScrollArea::AdjustToContents + + + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + Options - - - - Associate with "Download with manager" links - - - - - - - Remove cache and cookies. - - - Clear Cache - - - - - - - - - - - - - Servers - - - - 4 - - - 9 - - - 9 - - - 9 - - - 9 - - - - - - - Known Servers (updated on download) + + + 9 - - - - - - QAbstractItemView::DragDrop + + 9 - - Qt::MoveAction + + 9 - - - - - - - - - - Preferred Servers (Drag & Drop) + + 9 - - - - - - QAbstractItemView::DragDrop + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Endorsement Integration + + + true + + + + + + + Tracked Integration + + + true + + + + + + + <html><head/><body><p>By default, a counter is displayed in the bottom right corner. This informs the user of their remaining API requests. The Nexus API becomes unusable once these API requests run out. Checking this option will hide that counter.</p></body></html> + + + <html><head/><body><p>By default, a counter is displayed in the bottom right corner. This informs the user of their remaining API requests. The Nexus API becomes unusable once these API requests run out. Checking this option will hide that counter.</p></body></html> + + + Hide API Request Counter + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Associate with "Download with manager" links + + + + + + + Remove cache and cookies. + + + Clear Cache + + + + + + + + + + + + + Servers + + + + 4 - - Qt::MoveAction + + 9 - - - - - + + 9 + + + 9 + + + 9 + + + + + + + Known Servers (updated on download) + + + + + + + QAbstractItemView::DragDrop + + + Qt::MoveAction + + + + + + + + + + + Preferred Servers (Drag & Drop) + + + + + + + QAbstractItemView::DragDrop + + + Qt::MoveAction + + + + + + + + + + @@ -1396,7 +1456,7 @@ If you disable this feature, MO will only display official DLCs this way. Please Qt::Horizontal - + 0 @@ -1561,160 +1621,196 @@ If you disable this feature, MO will only display official DLCs this way. Please - - - No plugin found. - - - Qt::AlignCenter - - - - - - - - - - - - - 0 - 1 - - - - Blacklisted Plugins (use <del> to remove): - - - - - - - - - - - - - - Workarounds - - - - - - Options - - - - 9 - - - 9 - - - 9 - - - 9 - - - - - If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on) - - - If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on) -Uncheck this if you want to use Mod Organizer with total conversions (like Nehrim) but be aware that the game will crash if required files are not enabled. - - - Force-enable game files - - - true - - - - - - - Enable parsing of Archives. This is an Experimental Feature. Has negative effects on performance and known incorrectness. - - - <html><head/><body><p>By default, MO will parse archive files (BSA, BA2) to calculate conflicts between the contents of the archive files and other loose files. This process has a noticeable cost in performance.</p><p>This feature should not be confused with the archive management feature offered by MO1. MO2 will only show conflicts with archives and will NOT load them into the game or program.</p><p>If you disable this feature, MO will only display conflicts between loose files.</p></body></html> - - - Enable archives parsing (experimental) - - - true - - - - - - - Disable this to prevent the GUI from being locked when running an executable. This may result in abnormal behavior. - - - Disable this to prevent the GUI from being locked when running an executable. This may result in abnormal behavior. - - - Lock GUI when running executable - - - true - - - - + + + No plugin found. + + + Qt::AlignCenter + + + + + + + + + + + + + 0 + 1 + + + + Blacklisted Plugins (use <del> to remove): + + + + + + + + + + + + Workarounds + + - - - Steam + + + QFrame::NoFrame - - - - - - - - Password - - - - - - - QLineEdit::Password - - - - - - - Username - - - - - - - Steam App ID - - - - - - - The Steam AppID for your game - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + QFrame::Plain + + + true + + + + + 0 + 0 + 778 + 482 + + + + true + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Options + + + + 9 + + + 9 + + + 9 + + + 9 + + + + + If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on) + + + If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on) +Uncheck this if you want to use Mod Organizer with total conversions (like Nehrim) but be aware that the game will crash if required files are not enabled. + + + Force-enable game files + + + true + + + + + + + Enable parsing of Archives. This is an Experimental Feature. Has negative effects on performance and known incorrectness. + + + <html><head/><body><p>By default, MO will parse archive files (BSA, BA2) to calculate conflicts between the contents of the archive files and other loose files. This process has a noticeable cost in performance.</p><p>This feature should not be confused with the archive management feature offered by MO1. MO2 will only show conflicts with archives and will NOT load them into the game or program.</p><p>If you disable this feature, MO will only display conflicts between loose files.</p></body></html> + + + Enable archives parsing (experimental) + + + true + + + + + + + Disable this to prevent the GUI from being locked when running an executable. This may result in abnormal behavior. + + + Disable this to prevent the GUI from being locked when running an executable. This may result in abnormal behavior. + + + Lock GUI when running executable + + + true + + + + + + + + + + Steam + + + + + + + + + Password + + + + + + + QLineEdit::Password + + + + + + + Username + + + + + + + Steam App ID + + + + + + + The Steam AppID for your game + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> @@ -1726,203 +1822,207 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">3. right-click on the newly created shortcut on your desktop and select </span><span style=" font-size:8pt; font-weight:600;">Properties</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">4. in the URL-field you should see something like this: </span><span style=" font-size:8pt; font-style:italic;">steam://rungameid/22380</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">22380 is the id you're looking for.</span></p></body></html> - - - - - - - - - - - 0 - 100 - - - - Network - - - - - - Disable automatic internet features - - - Disable automatic internet features. This does not affect features that are explicitly invoked by the user (like checking mods for updates, endorsing, opening the web browser) - - - Offline Mode - - - - - - - Use a proxy for network connections. - - - Use a proxy for network connections. This uses the system-wide settings which can be configured in Internet Explorer. Please note that MO will start up a few seconds slower on some systems when using a proxy. - - - Use System HTTP Proxy - - - - - - - - 0 - - - 0 - - - 0 + + + + + + + + + + + 0 + 100 + - - 0 + + Network - - - - Use "%1" as a placeholder for the URL. - - - Use "%1" as a placeholder for the URL. - - - Use "%1" as a placeholder for the URL. - - - Custom browser - - - - - - - Use "%1" as a placeholder for the URL. - - - Use "%1" as a placeholder for the URL. - - - Use "%1" as a placeholder for the URL. - - - - - - - ... - - - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Resets the window geometries for all windows. This can be useful if a window becomes too small or too large, if a column becomes too thin or too wide, and in similar situations. - - - Resets the window geometries for all windows. This can be useful if a window becomes too small or too large, if a column becomes too thin or too wide, and in similar situations. - - - Reset Window Geometries - - - - - - - Add executables to the blacklist to prevent them from + + + + + Disable automatic internet features + + + Disable automatic internet features. This does not affect features that are explicitly invoked by the user (like checking mods for updates, endorsing, opening the web browser) + + + Offline Mode + + + + + + + Use a proxy for network connections. + + + Use a proxy for network connections. This uses the system-wide settings which can be configured in Internet Explorer. Please note that MO will start up a few seconds slower on some systems when using a proxy. + + + Use System HTTP Proxy + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Use "%1" as a placeholder for the URL. + + + Use "%1" as a placeholder for the URL. + + + Use "%1" as a placeholder for the URL. + + + Custom browser + + + + + + + Use "%1" as a placeholder for the URL. + + + Use "%1" as a placeholder for the URL. + + + Use "%1" as a placeholder for the URL. + + + + + + + ... + + + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Resets the window geometries for all windows. This can be useful if a window becomes too small or too large, if a column becomes too thin or too wide, and in similar situations. + + + Resets the window geometries for all windows. This can be useful if a window becomes too small or too large, if a column becomes too thin or too wide, and in similar situations. + + + Reset Window Geometries + + + + + + + Add executables to the blacklist to prevent them from accessing the virtual file system. This is useful to prevent unintended programs from being hooked. Hooking unintended programs may affect the execution of these programs or the programs you are intentionally running. - - - Add executables to the blacklist to prevent them from accessing the virtual file system. This is useful to prevent unintended programs from being hooked. Hooking unintended programs may affect the execution of these programs or the programs you are intentionally running. - - - Executables Blacklist - - - false - - - - - - - For Skyrim, this can be used instead of Archive Invalidation. It should make AI redundant for all Profiles. + + + Add executables to the blacklist to prevent them from accessing the virtual file system. This is useful to prevent unintended programs from being hooked. Hooking unintended programs may affect the execution of these programs or the programs you are intentionally running. + + + Executables Blacklist + + + false + + + + + + + For Skyrim, this can be used instead of Archive Invalidation. It should make AI redundant for all Profiles. For the other games this is not a sufficient replacement for AI! - - - For Skyrim, this can be used instead of Archive Invalidation. It should make AI redundant for all Profiles. + + + For Skyrim, this can be used instead of Archive Invalidation. It should make AI redundant for all Profiles. For the other games this is not a sufficient replacement for AI! - - - Back-date BSAs - - - - :/MO/gui/resources/emblem-readonly.png:/MO/gui/resources/emblem-readonly.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + Back-date BSAs + + + + :/MO/gui/resources/emblem-readonly.png:/MO/gui/resources/emblem-readonly.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -2122,12 +2222,6 @@ For the other games this is not a sufficient replacement for AI! browseOverwriteDirBtn managedGameDirEdit browseGameDirBtn - nexusConnect - nexusManualKey - nexusDisconnect - nexusLog - knownServersList - preferredServersList pluginSettingsList lockGUIBox diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp index 30039575..08fe759f 100644 --- a/src/settingsdialoggeneral.cpp +++ b/src/settingsdialoggeneral.cpp @@ -15,6 +15,10 @@ GeneralSettingsTab::GeneralSettingsTab(Settings& s, SettingsDialog& d) addLanguages(); selectLanguage(); + // Set scrollarea to transparent + ui->generalScrollArea->setStyleSheet("QScrollArea { background-color: transparent; }"); + ui->generalScrollAreaWidgetContents->setStyleSheet("background-color: transparent;"); + // download list ui->compactBox->setChecked(settings().interface().compactDownloads()); ui->showMetaBox->setChecked(settings().interface().metaDownloads()); diff --git a/src/settingsdialognexus.cpp b/src/settingsdialognexus.cpp index 364c6aa7..13c1467e 100644 --- a/src/settingsdialognexus.cpp +++ b/src/settingsdialognexus.cpp @@ -295,6 +295,10 @@ void NexusConnectionUI::updateState() NexusSettingsTab::NexusSettingsTab(Settings& s, SettingsDialog& d) : SettingsTab(s, d) { + // Set scrollarea to transparent + ui->nexusScrollArea->setStyleSheet("QScrollArea { background-color: transparent; }"); + ui->nexusScrollAreaWidgetContents->setStyleSheet("background-color: transparent;"); + ui->endorsementBox->setChecked(settings().nexus().endorsementIntegration()); ui->trackedBox->setChecked(settings().nexus().trackedIntegration()); ui->hideAPICounterBox->setChecked(settings().interface().hideAPICounter()); diff --git a/src/settingsdialogworkarounds.cpp b/src/settingsdialogworkarounds.cpp index 17b2259b..b742a8fe 100644 --- a/src/settingsdialogworkarounds.cpp +++ b/src/settingsdialogworkarounds.cpp @@ -8,6 +8,10 @@ WorkaroundsSettingsTab::WorkaroundsSettingsTab(Settings& s, SettingsDialog& d) : SettingsTab(s, d) { + // Set scrollarea to transparent + ui->workaroundScrollArea->setStyleSheet("QScrollArea { background-color: transparent; }"); + ui->workaroundScrollAreaWidgetContents->setStyleSheet("background-color: transparent;"); + // options ui->forceEnableBox->setChecked(settings().game().forceEnableCoreFiles()); ui->lockGUIBox->setChecked(settings().interface().lockGUI()); -- cgit v1.3.1