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

Resize mode patch (#1019)

Browse Source 
* Fix transformation mode for layers

Resolve #997

* always use smooth transform resampling for stretched images

* Used fixed frame size

* Implemented resize mode changes

Resolve #999

* Added alias to pixel resize mode

* Added user option

---------

Co-authored-by: in1tiate <32779090+in1tiate@users.noreply.github.com>
This commit is contained in:
Leifa 2024-07-13 15:31:51 +02:00 committed by GitHub
parent a09712cc4d
commit 23077d0291
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 456 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

733
data/ui/options_dialog.ui
View File

@ -39,73 +39,45 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-555</y>
<y>-385</y>
<width>394</width>
<height>872</height>
<height>878</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="24" column="1">
<widget class="QCheckBox" name="stickysounds_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="30" column="0">
<widget class="QLabel" name="category_stop_lbl">
<item row="0" column="0">
<widget class="QLabel" name="theme_label">
<property name="toolTip">
<string>Stop music when double-clicking a category. If this is disabled, use the right-click context menu to stop music.</string>
<string>Sets the theme used in-game. If the new theme changes the lobby's look as well, you'll need to reload the Lobby for the changes to take effect, such as by joining a server and leaving it.</string>
</property>
<property name="text">
<string>Stop Music w/ Category:</string>
</property>
</widget>
</item>
<item row="31" column="1">
<widget class="QCheckBox" name="sfx_on_idle_cb">
<property name="text">
<string/>
<string>Theme:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="theme_combobox"/>
</item>
<item row="19" column="0">
<widget class="QLabel" name="scaling_label">
<item row="1" column="0">
<widget class="QLabel" name="subtheme_label">
<property name="toolTip">
<string>Sets the default scaling method, if there is not one already defined specifically for the character.</string>
<string>Sets a 'subtheme', which will stack on top of the current theme and replace anything it can. Keep it at 'server' to let the server decide. Keep it at 'default' to keep it unchanging.</string>
</property>
<property name="text">
<string>Scaling:</string>
<string>Subtheme:</string>
</property>
</widget>
</item>
<item row="27" column="0">
<widget class="QLabel" name="customchat_lbl">
<property name="toolTip">
<string>Turn this on to allow characters to define their own custom chat box designs.</string>
</property>
<property name="text">
<string>Custom Chatboxes:</string>
</property>
</widget>
<item row="1" column="1">
<widget class="QComboBox" name="subtheme_combobox"/>
</item>
<item row="21" column="0">
<widget class="QLabel" name="effects_lbl">
<item row="2" column="1">
<widget class="QPushButton" name="theme_reload_button">
<property name="toolTip">
<string>Allows screen effects. Disable this if you have concerns or issues with photosensitivity and/or seizures.</string>
<string>Refresh the theme and update all of the ui elements to match.</string>
</property>
<property name="text">
<string>Allow Effects:</string>
</property>
</widget>
</item>
<item row="17" column="1">
<widget class="QCheckBox" name="discord_cb">
<property name="text">
<string/>
<string>Reload Theme</string>
</property>
</widget>
</item>
@ -119,13 +91,70 @@
</property>
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="ms_lbl">
<item row="4" column="0">
<widget class="QLabel" name="theme_scaling_factor_lbl">
<property name="toolTip">
<string>Overrides the base URL to retrieve server information from.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The factor by which to scale the size of the UI&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Alternate Server List:</string>
<string>UI Scaling Factor</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="theme_scaling_factor_sb">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>8</number>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="animated_theme_lbl">
<property name="toolTip">
<string>If ticked, themes will be allowed to have animated elements.</string>
</property>
<property name="text">
<string>Animated Theme:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="animated_theme_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QFrame" name="theme_log_divider">
<property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="stay_time_lbl">
<property name="toolTip">
<string>Minimum amount of time (in miliseconds) an IC message must stay on screen before the next IC message is shown, acting as a 'queue'. Set to 0 to disable this behavior.</string>
</property>
<property name="text">
<string>Text Stay Time:</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QSpinBox" name="stay_time_spinbox">
<property name="suffix">
<string> ms</string>
</property>
<property name="maximum">
<number>10000</number>
</property>
</widget>
</item>
@ -136,6 +165,23 @@
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QCheckBox" name="instant_objection_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="text_crawl_lbl">
<property name="toolTip">
<string>Amount of time (in miliseconds) spent on each letter when the in-character text is being displayed.</string>
</property>
<property name="text">
<string>Text crawl:</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QSpinBox" name="text_crawl_spinbox">
<property name="suffix">
@ -146,32 +192,6 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="theme_label">
<property name="toolTip">
<string>Sets the theme used in-game. If the new theme changes the lobby's look as well, you'll need to reload the Lobby for the changes to take effect, such as by joining a server and leaving it.</string>
</property>
<property name="text">
<string>Theme:</string>
</property>
</widget>
</item>
<item row="18" column="1">
<widget class="QComboBox" name="language_combobox"/>
</item>
<item row="16" column="1">
<widget class="QLineEdit" name="ms_textbox"/>
</item>
<item row="22" column="0">
<widget class="QLabel" name="framenetwork_lbl">
<property name="toolTip">
<string>Send screen-shaking, flashes and sounds as defined in the char.ini over the network. Only works for servers that support this functionality.</string>
</property>
<property name="text">
<string>Network Frame Effects:</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="chat_ratelimit_lbl">
<property name="text">
@ -192,195 +212,13 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="animated_theme_lbl">
<property name="toolTip">
<string>If ticked, themes will be allowed to have animated elements.</string>
<item row="11" column="1">
<widget class="QFrame" name="log_names_divider">
<property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
<property name="text">
<string>Animated Theme:</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="text_crawl_lbl">
<property name="toolTip">
<string>Amount of time (in miliseconds) spent on each letter when the in-character text is being displayed.</string>
</property>
<property name="text">
<string>Text crawl:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="theme_reload_button">
<property name="toolTip">
<string>Refresh the theme and update all of the ui elements to match.</string>
</property>
<property name="text">
<string>Reload Theme</string>
</property>
</widget>
</item>
<item row="19" column="1">
<widget class="QComboBox" name="scaling_combobox"/>
</item>
<item row="23" column="1">
<widget class="QCheckBox" name="colorlog_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="default_showname_lbl">
<property name="toolTip">
<string>Your showname will be automatically set to this value when you join a server.</string>
</property>
<property name="text">
<string>Default showname:</string>
</property>
</widget>
</item>
<item row="29" column="1">
<widget class="QCheckBox" name="continuous_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="subtheme_combobox"/>
</item>
<item row="28" column="0">
<widget class="QLabel" name="sticker_lbl">
<property name="toolTip">
<string>Turn this on to allow characters to define their own stickers (unique images that show up over the chatbox - like avatars or shownames).</string>
</property>
<property name="text">
<string>Stickers:</string>
</property>
</widget>
</item>
<item row="26" column="0">
<widget class="QLabel" name="stickypres_lbl">
<property name="toolTip">
<string>Turn this on to prevent preanimation checkbox from clearing after playing the emote.</string>
</property>
<property name="text">
<string>Sticky Preanims:</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QSpinBox" name="stay_time_spinbox">
<property name="suffix">
<string> ms</string>
</property>
<property name="maximum">
<number>10000</number>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="showname_lbl">
<property name="toolTip">
<string>Gives the default value for the in-game 'Custom shownames' tickbox, which in turn determines whether the client should display custom in-character names.</string>
</property>
<property name="text">
<string>Custom shownames:</string>
</property>
</widget>
</item>
<item row="25" column="0">
<widget class="QLabel" name="stickyeffects_lbl">
<property name="toolTip">
<string>Turn this on to prevent the effects dropdown from clearing the effect after playing it.</string>
</property>
<property name="text">
<string>Sticky Effects:</string>
</property>
</widget>
</item>
<item row="28" column="1">
<widget class="QCheckBox" name="sticker_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="stay_time_lbl">
<property name="toolTip">
<string>Minimum amount of time (in miliseconds) an IC message must stay on screen before the next IC message is shown, acting as a 'queue'. Set to 0 to disable this behavior.</string>
</property>
<property name="text">
<string>Text Stay Time:</string>
</property>
</widget>
</item>
<item row="18" column="0">
<widget class="QLabel" name="language_label">
<property name="toolTip">
<string>Sets the language if you don't want to use your system language.</string>
</property>
<property name="text">
<string>Language:</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QCheckBox" name="instant_objection_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="26" column="1">
<widget class="QCheckBox" name="stickypres_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QCheckBox" name="showname_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="22" column="1">
<widget class="QCheckBox" name="framenetwork_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="31" column="0">
<widget class="QLabel" name="sfx_on_idle_lbl">
<property name="toolTip">
<string>If the SFX dropdown has an SFX selected, send the custom SFX alongside the message even if Preanim is OFF.</string>
</property>
<property name="text">
<string>Always Send SFX:</string>
</property>
</widget>
</item>
<item row="24" column="0">
<widget class="QLabel" name="stickysounds_lbl">
<property name="toolTip">
<string>Turn this on to prevent the sound dropdown from clearing the sound after playing it.</string>
</property>
<property name="text">
<string>Sticky Sounds:</string>
</property>
</widget>
</item>
<item row="20" column="1">
<widget class="QCheckBox" name="shake_cb">
<property name="text">
<string/>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
@ -394,71 +232,37 @@
</property>
</widget>
</item>
<item row="20" column="0">
<widget class="QLabel" name="shake_lbl">
<property name="toolTip">
<string>Allows screenshaking. Disable this if you have concerns or issues with photosensitivity and/or seizures.</string>
</property>
<property name="text">
<string>Allow Screenshake:</string>
<item row="12" column="1">
<widget class="QLineEdit" name="username_textbox">
<property name="maxLength">
<number>30</number>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="animated_theme_cb">
<item row="13" column="0">
<widget class="QLabel" name="showname_lbl">
<property name="toolTip">
<string>Gives the default value for the in-game 'Custom shownames' tickbox, which in turn determines whether the client should display custom in-character names.</string>
</property>
<property name="text">
<string>Custom shownames:</string>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QCheckBox" name="showname_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="17" column="0">
<widget class="QLabel" name="discord_lbl">
<item row="14" column="0">
<widget class="QLabel" name="default_showname_lbl">
<property name="toolTip">
<string>Allows others on Discord to see what server you are in, what character are you playing, and how long you have been playing for.</string>
<string>Your showname will be automatically set to this value when you join a server.</string>
</property>
<property name="text">
<string>Discord:</string>
</property>
</widget>
</item>
<item row="23" column="0">
<widget class="QLabel" name="colorlog_lbl">
<property name="toolTip">
<string>Use the markup colors in the server IC chatlog.</string>
</property>
<property name="text">
<string>Colors in IC Log:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="subtheme_label">
<property name="toolTip">
<string>Sets a 'subtheme', which will stack on top of the current theme and replace anything it can. Keep it at 'server' to let the server decide. Keep it at 'default' to keep it unchanging.</string>
</property>
<property name="text">
<string>Subtheme:</string>
</property>
</widget>
</item>
<item row="21" column="1">
<widget class="QCheckBox" name="effects_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="30" column="1">
<widget class="QCheckBox" name="category_stop_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="27" column="1">
<widget class="QCheckBox" name="customchat_cb">
<property name="text">
<string/>
<string>Default showname:</string>
</property>
</widget>
</item>
@ -475,13 +279,141 @@
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QFrame" name="theme_log_divider">
<property name="frameShape">
<enum>QFrame::HLine</enum>
<item row="16" column="0">
<widget class="QLabel" name="ms_lbl">
<property name="toolTip">
<string>Overrides the base URL to retrieve server information from.</string>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<property name="text">
<string>Alternate Server List:</string>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="QLineEdit" name="ms_textbox"/>
</item>
<item row="17" column="0">
<widget class="QLabel" name="discord_lbl">
<property name="toolTip">
<string>Allows others on Discord to see what server you are in, what character are you playing, and how long you have been playing for.</string>
</property>
<property name="text">
<string>Discord:</string>
</property>
</widget>
</item>
<item row="17" column="1">
<widget class="QCheckBox" name="discord_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="18" column="0">
<widget class="QLabel" name="language_label">
<property name="toolTip">
<string>Sets the language if you don't want to use your system language.</string>
</property>
<property name="text">
<string>Language:</string>
</property>
</widget>
</item>
<item row="18" column="1">
<widget class="QComboBox" name="language_combobox"/>
</item>
<item row="20" column="0">
<widget class="QLabel" name="shake_lbl">
<property name="toolTip">
<string>Allows screenshaking. Disable this if you have concerns or issues with photosensitivity and/or seizures.</string>
</property>
<property name="text">
<string>Allow Screenshake:</string>
</property>
</widget>
</item>
<item row="20" column="1">
<widget class="QCheckBox" name="shake_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="21" column="0">
<widget class="QLabel" name="effects_lbl">
<property name="toolTip">
<string>Allows screen effects. Disable this if you have concerns or issues with photosensitivity and/or seizures.</string>
</property>
<property name="text">
<string>Allow Effects:</string>
</property>
</widget>
</item>
<item row="21" column="1">
<widget class="QCheckBox" name="effects_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="22" column="0">
<widget class="QLabel" name="framenetwork_lbl">
<property name="toolTip">
<string>Send screen-shaking, flashes and sounds as defined in the char.ini over the network. Only works for servers that support this functionality.</string>
</property>
<property name="text">
<string>Network Frame Effects:</string>
</property>
</widget>
</item>
<item row="22" column="1">
<widget class="QCheckBox" name="framenetwork_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="23" column="0">
<widget class="QLabel" name="colorlog_lbl">
<property name="toolTip">
<string>Use the markup colors in the server IC chatlog.</string>
</property>
<property name="text">
<string>Colors in IC Log:</string>
</property>
</widget>
</item>
<item row="23" column="1">
<widget class="QCheckBox" name="colorlog_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="24" column="0">
<widget class="QLabel" name="stickysounds_lbl">
<property name="toolTip">
<string>Turn this on to prevent the sound dropdown from clearing the sound after playing it.</string>
</property>
<property name="text">
<string>Sticky Sounds:</string>
</property>
</widget>
</item>
<item row="24" column="1">
<widget class="QCheckBox" name="stickysounds_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="25" column="0">
<widget class="QLabel" name="stickyeffects_lbl">
<property name="toolTip">
<string>Turn this on to prevent the effects dropdown from clearing the effect after playing it.</string>
</property>
<property name="text">
<string>Sticky Effects:</string>
</property>
</widget>
</item>
@ -492,28 +424,52 @@
</property>
</widget>
</item>
<item row="32" column="0">
<widget class="QLabel" name="evidence_double_click_lbl">
<item row="26" column="0">
<widget class="QLabel" name="stickypres_lbl">
<property name="toolTip">
<string>If ticked, Evidence needs a double-click to view rather than a single click.</string>
<string>Turn this on to prevent preanimation checkbox from clearing after playing the emote.</string>
</property>
<property name="text">
<string>Evidence Double Click:</string>
<string>Sticky Preanims:</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QFrame" name="log_names_divider">
<property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<item row="26" column="1">
<widget class="QCheckBox" name="stickypres_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="32" column="1">
<widget class="QCheckBox" name="evidence_double_click_cb">
<item row="27" column="0">
<widget class="QLabel" name="customchat_lbl">
<property name="toolTip">
<string>Turn this on to allow characters to define their own custom chat box designs.</string>
</property>
<property name="text">
<string>Custom Chatboxes:</string>
</property>
</widget>
</item>
<item row="27" column="1">
<widget class="QCheckBox" name="customchat_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="28" column="0">
<widget class="QLabel" name="sticker_lbl">
<property name="toolTip">
<string>Turn this on to allow characters to define their own stickers (unique images that show up over the chatbox - like avatars or shownames).</string>
</property>
<property name="text">
<string>Stickers:</string>
</property>
</widget>
</item>
<item row="28" column="1">
<widget class="QCheckBox" name="sticker_cb">
<property name="text">
<string/>
</property>
@ -529,30 +485,61 @@
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QLineEdit" name="username_textbox">
<property name="maxLength">
<number>30</number>
<item row="29" column="1">
<widget class="QCheckBox" name="continuous_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="theme_scaling_factor_sb">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>8</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="theme_scaling_factor_lbl">
<item row="30" column="0">
<widget class="QLabel" name="category_stop_lbl">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The factor by which to scale the size of the UI&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Stop music when double-clicking a category. If this is disabled, use the right-click context menu to stop music.</string>
</property>
<property name="text">
<string>UI Scaling Factor</string>
<string>Stop Music w/ Category:</string>
</property>
</widget>
</item>
<item row="30" column="1">
<widget class="QCheckBox" name="category_stop_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="31" column="0">
<widget class="QLabel" name="sfx_on_idle_lbl">
<property name="toolTip">
<string>If the SFX dropdown has an SFX selected, send the custom SFX alongside the message even if Preanim is OFF.</string>
</property>
<property name="text">
<string>Always Send SFX:</string>
</property>
</widget>
</item>
<item row="31" column="1">
<widget class="QCheckBox" name="sfx_on_idle_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="32" column="0">
<widget class="QLabel" name="evidence_double_click_lbl">
<property name="toolTip">
<string>If ticked, Evidence needs a double-click to view rather than a single click.</string>
</property>
<property name="text">
<string>Evidence Double Click:</string>
</property>
</widget>
</item>
<item row="32" column="1">
<widget class="QCheckBox" name="evidence_double_click_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
@ -573,14 +560,14 @@
</property>
</widget>
</item>
<item row="34" column="1">
<item row="35" column="1">
<widget class="QCheckBox" name="restoreposition_cb">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="34" column="0">
<item row="35" column="0">
<widget class="QLabel" name="restoreposition_lbl">
<property name="toolTip">
<string>If ticked, some windows restore their last known position where they were closed.</string>
@ -590,6 +577,38 @@
</property>
</widget>
</item>
<item row="19" column="0">
<widget class="QLabel" name="resize_lbl">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The scaling algorithm to be used when upscaling or downscaling images.&lt;/p&gt;&lt;p&gt;Automatic: The image will be scaled based on the image's predetermined scaling algorithm.&lt;br/&gt;Pixelated: The image will be scaled using a nearest neighbor algorithm.&lt;br/&gt;Smooth: The image will be scaled using a bilinear algorithm.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Image Scaling</string>
</property>
</widget>
</item>
<item row="19" column="1">
<widget class="QComboBox" name="resize_combobox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The scaling algorithm to be used when upscaling or downscaling images.&lt;/p&gt;&lt;p&gt;Automatic: The image will be scaled based on the image's predetermined scaling algorithm.&lt;br/&gt;Pixelated: The image will be scaled using a nearest neighbor algorithm.&lt;br/&gt;Smooth: The image will be scaled using a bilinear algorithm.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<item>
<property name="text">
<string>Automatic</string>
</property>
</item>
<item>
<property name="text">
<string>Pixelated</string>
</property>
</item>
<item>
<property name="text">
<string>Smooth</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</widget>
@ -944,7 +963,7 @@ Use this when you have added an asset that takes precedence over another existin
<item row="2" column="0">
<widget class="QLabel" name="log_newline_lbl">
<property name="toolTip">
<string>If ticked, new messages will appear separated, with the message coming on the next line after the name.
<string>If ticked, new messages will appear separated, with the message coming on the next line after the name.
When unticked, it displays it as 'name: message'.</string>
</property>
<property name="text">
@ -962,7 +981,7 @@ When unticked, it displays it as 'name: message'.</string>
<item row="3" column="0">
<widget class="QLabel" name="log_margin_lbl">
<property name="toolTip">
<string>The distance in pixels between each entry in the IC log.
<string>The distance in pixels between each entry in the IC log.
Default: 0.</string>
</property>
<property name="text">

28
src/animationlayer.cpp
View File

@ -168,9 +168,9 @@ void AnimationLayer::setFlipped(bool enabled)
m_flipped = enabled;
}
void AnimationLayer::setTransformationMode(Qt::TransformationMode mode)
void AnimationLayer::setResizeMode(RESIZE_MODE mode)
{
m_transformation_mode_hint = mode;
m_resize_mode = mode;
}
void AnimationLayer::setMinimumDurationPerFrame(int duration)
@ -229,7 +229,7 @@ void AnimationLayer::calculateFrameGeometry()
{
m_mask_rect = QRect();
m_scaled_frame_size = QSize();
m_transformation_mode = m_transformation_mode_hint;
m_transformation_mode = Qt::SmoothTransformation;
QSize widget_size = size();
if (!widget_size.isValid() || !m_frame_size.isValid())
@ -240,7 +240,6 @@ void AnimationLayer::calculateFrameGeometry()
if (m_stretch_to_fit)
{
m_scaled_frame_size = widget_size;
m_transformation_mode = Qt::SmoothTransformation;
}
else
{
@ -253,11 +252,20 @@ void AnimationLayer::calculateFrameGeometry()
double scale = double(widget_size.height()) / double(m_scaled_frame_size.height());
m_scaled_frame_size *= scale;
if (m_frame_size.height() < widget_size.height())
{
m_transformation_mode = Qt::FastTransformation;
}
}
if (m_transformation_mode_hint == Qt::FastTransformation)
if (m_resize_mode == PIXEL_RESIZE_MODE)
{
m_transformation_mode = widget_size.height() < m_frame_size.height() ? Qt::SmoothTransformation : Qt::FastTransformation;
m_transformation_mode = Qt::FastTransformation;
}
else if (m_resize_mode == SMOOTH_RESIZE_MODE)
{
m_transformation_mode = Qt::SmoothTransformation;
}
displayCurrentFrame();
@ -451,7 +459,7 @@ void CharacterAnimationLayer::loadCharacterEmote(QString character, QString file
setFileName(file_path);
setPlayOnce(play_once);
setTransformationMode(ao_app->get_scaling(ao_app->get_emote_property(character, fileName, "scaling")));
setResizeMode(ao_app->get_scaling(ao_app->get_emote_property(character, fileName, "scaling")));
setStretchToFit(ao_app->get_emote_property(character, fileName, "stretch").startsWith("true"));
if (synchronize_frame && previous_frame_count == frameCount())
{
@ -600,7 +608,7 @@ void BackgroundAnimationLayer::loadAndPlayAnimation(QString fileName)
}
VPath design_path = ao_app->get_background_path("design.ini");
setTransformationMode(ao_app->get_scaling(ao_app->read_design_ini("scaling", design_path)));
setResizeMode(ao_app->get_scaling(ao_app->read_design_ini("scaling", design_path)));
setStretchToFit(ao_app->read_design_ini("stretch", design_path).startsWith("true"));
if (is_different_file)
@ -621,7 +629,7 @@ void SplashAnimationLayer::loadAndPlayAnimation(QString p_filename, QString p_ch
{
QString file_path = ao_app->get_image(p_filename, Options::getInstance().theme(), Options::getInstance().subTheme(), ao_app->default_theme, p_miscname, p_charname, "placeholder");
setFileName(file_path);
setTransformationMode(ao_app->get_misc_scaling(p_miscname));
setResizeMode(ao_app->get_misc_scaling(p_miscname));
startPlayback();
}
@ -688,7 +696,7 @@ void StickerAnimationLayer::loadAndPlayAnimation(QString fileName)
QString file_path = ao_app->get_image("sticker/" + fileName, Options::getInstance().theme(), Options::getInstance().subTheme(), ao_app->default_theme, misc_file);
setFileName(file_path);
setTransformationMode(ao_app->get_misc_scaling(misc_file));
setResizeMode(ao_app->get_misc_scaling(misc_file));
startPlayback();
}
} // namespace kal

5
src/animationlayer.h
View File

@ -1,6 +1,7 @@
#pragma once
#include "animationloader.h"
#include "datatypes.h"
#include <QBitmap>
#include <QDebug>
@ -68,7 +69,7 @@ public:
void setStretchToFit(bool enabled);
void setResetCacheWhenStopped(bool enabled);
void setFlipped(bool enabled);
void setTransformationMode(Qt::TransformationMode mode);
void setResizeMode(RESIZE_MODE mode);
void setMinimumDurationPerFrame(int duration);
void setMaximumDurationPerFrame(int duration);
@ -92,7 +93,7 @@ private:
bool m_flipped = false;
int m_minimum_duration = 0;
int m_maximum_duration = 0;
Qt::TransformationMode m_transformation_mode_hint = Qt::FastTransformation;
RESIZE_MODE m_resize_mode = AUTO_RESIZE_MODE;
Qt::TransformationMode m_transformation_mode = Qt::FastTransformation;
AnimationLoader *m_loader = nullptr;
QSize m_frame_size;

4
src/aoapplication.h
View File

@ -307,10 +307,10 @@ public:
QString get_emote_property(QString p_char, QString p_emote, QString p_property);
// Return a transformation mode from a string ("smooth" for smooth, anything else for fast)
Qt::TransformationMode get_scaling(QString p_scaling);
RESIZE_MODE get_scaling(QString p_scaling);
// Returns the scaling type for p_miscname
Qt::TransformationMode get_misc_scaling(QString p_miscname);
RESIZE_MODE get_misc_scaling(QString p_miscname);
// ======
// These are all casing-related settings.

6
src/courtroom.cpp
View File

@ -159,7 +159,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app)
ui_music_list->setObjectName("ui_music_list");
ui_music_display = new kal::InterfaceAnimationLayer(ao_app, this);
ui_music_display->setTransformationMode(Qt::SmoothTransformation);
ui_music_display->setResizeMode(SMOOTH_RESIZE_MODE);
ui_music_display->setAttribute(Qt::WA_TransparentForMouseEvents);
ui_music_display->setObjectName("ui_music_display");
@ -3152,8 +3152,8 @@ void Courtroom::do_effect(QString fx_path, QString fx_sound, QString p_char, QSt
{
return;
}
ui_vp_effect->setTransformationMode(ao_app->get_scaling(ao_app->get_effect_property(fx_path, p_char, p_folder, "scaling")));
ui_vp_effect->setStretchToFit(ao_app->get_effect_property(fx_path, p_char, p_folder, "stretch").startsWith("true"));
ui_vp_effect->setResizeMode(ao_app->get_scaling(ao_app->get_effect_property(fx_path, p_char, p_folder, "scaling")));
ui_vp_effect->setFlipped(ao_app->get_effect_property(fx_path, p_char, p_folder, "respect_flip").startsWith("true") && m_chatmessage[FLIP].toInt() == 1);
bool looping = ao_app->get_effect_property(fx_path, p_char, p_folder, "loop").startsWith("true");
@ -4221,7 +4221,7 @@ void Courtroom::chat_tick()
f_char = m_chatmessage[CHAR_NAME];
f_custom_theme = ao_app->get_chat(f_char);
}
ui_vp_chat_arrow->setTransformationMode(ao_app->get_misc_scaling(f_custom_theme));
ui_vp_chat_arrow->setResizeMode(ao_app->get_misc_scaling(f_custom_theme));
ui_vp_chat_arrow->loadAndPlayAnimation("chat_arrow", f_custom_theme); // Chat stopped being processed, indicate that.
QString f_message_filtered = filter_ic_text(f_message, true, -1, m_chatmessage[TEXT_COLOR].toInt());
if (Options::getInstance().customChatboxEnabled())

7
src/datatypes.h
View File

@ -99,6 +99,13 @@ enum MUSIC_EFFECT
SYNC_POS = 4
};
enum RESIZE_MODE
{
AUTO_RESIZE_MODE,
PIXEL_RESIZE_MODE,
SMOOTH_RESIZE_MODE,
};
class PlayerData
{
public:

20
src/options.cpp
View File

@ -550,16 +550,6 @@ void Options::setAnimatedThemeEnabled(bool value)
config.setValue("animated_theme", value);
}
QString Options::defaultScalingMode() const
{
return config.value("default_scaling", "fast").toString();
}
void Options::setDefaultScalingMode(QString value)
{
config.setValue("default_scaling", value);
}
QStringList Options::mountPaths() const
{
return config.value("mount_paths").value<QStringList>();
@ -620,6 +610,16 @@ void Options::setLanguage(QString value)
config.setValue("language", value);
}
RESIZE_MODE Options::resizeMode() const
{
return RESIZE_MODE(config.value("resize_mode", AUTO_RESIZE_MODE).toInt());
}
void Options::setResizeMode(RESIZE_MODE value)
{
config.setValue("resize_mode", value);
}
QStringList Options::callwords() const
{
QStringList l_callwords = config.value("callwords", QStringList{}).toStringList();

9
src/options.h
View File

@ -1,5 +1,6 @@
#pragma once
#include "datatypes.h"
#include "network/serverinfo.h"
#include <QCoreApplication>
@ -224,10 +225,6 @@ public:
bool animatedThemeEnabled() const;
void setAnimatedThemeEnabled(bool value);
// Get the default scaling method
QString defaultScalingMode() const;
void setDefaultScalingMode(QString value);
// Get a list of custom mount paths
QStringList mountPaths() const;
void setMountPaths(QStringList value);
@ -252,6 +249,10 @@ public:
QString language() const;
void setLanguage(QString value);
// The scaling algorithm to use on images.
RESIZE_MODE resizeMode() const;
void setResizeMode(RESIZE_MODE value);
// Callwords notify the user when the word/words are used in a game message.
QStringList callwords() const;
void setCallwords(QStringList value);

31
src/text_file_functions.cpp
View File

@ -175,18 +175,22 @@ QString AOApplication::read_design_ini(QString p_identifier, QString p_design_pa
return "";
}
Qt::TransformationMode AOApplication::get_scaling(QString p_scaling)
RESIZE_MODE AOApplication::get_scaling(QString p_scaling)
{
if (p_scaling.isEmpty())
RESIZE_MODE mode = Options::getInstance().resizeMode();
if (mode == AUTO_RESIZE_MODE)
{
p_scaling = Options::getInstance().defaultScalingMode();
if (p_scaling == "smooth")
{
mode = SMOOTH_RESIZE_MODE;
}
else if (p_scaling == "pixel" || p_scaling == "fast")
{
mode = PIXEL_RESIZE_MODE;
}
}
if (p_scaling == "smooth")
{
return Qt::SmoothTransformation;
}
return Qt::FastTransformation;
return mode;
}
QPoint AOApplication::get_button_spacing(QString p_identifier, QString p_file)
@ -536,7 +540,7 @@ QString AOApplication::get_emote_property(QString p_char, QString p_emote, QStri
return f_result;
}
Qt::TransformationMode AOApplication::get_misc_scaling(QString p_miscname)
RESIZE_MODE AOApplication::get_misc_scaling(QString p_miscname)
{
if (p_miscname != "")
{
@ -545,12 +549,11 @@ Qt::TransformationMode AOApplication::get_misc_scaling(QString p_miscname)
{
misc_transform_mode = read_design_ini("scaling", get_misc_path(p_miscname, "config.ini"));
}
if (misc_transform_mode == "smooth")
{
return Qt::SmoothTransformation;
}
return get_scaling(misc_transform_mode);
}
return Qt::FastTransformation;
return AUTO_RESIZE_MODE;
}
QString AOApplication::get_category(QString p_char)

22
src/widgets/aooptionsdialog.cpp
View File

@ -111,12 +111,24 @@ void AOOptionsDialog::setWidgetData(QComboBox *widget, const QString &value)
qWarning() << "value" << value << "not found for widget" << widget->objectName();
}
template <>
void AOOptionsDialog::setWidgetData(QComboBox *widget, const RESIZE_MODE &value)
{
widget->setCurrentIndex(value);
}
template <>
QString AOOptionsDialog::widgetData(QComboBox *widget) const
{
return widget->currentData().toString();
}
template <>
RESIZE_MODE AOOptionsDialog::widgetData(QComboBox *widget) const
{
return RESIZE_MODE(widget->currentIndex());
}
template <>
void AOOptionsDialog::setWidgetData(QGroupBox *widget, const bool &value)
{
@ -344,7 +356,7 @@ void AOOptionsDialog::setupUI()
FROM_UI(QLineEdit, ms_textbox);
FROM_UI(QCheckBox, discord_cb);
FROM_UI(QComboBox, language_combobox);
FROM_UI(QComboBox, scaling_combobox);
FROM_UI(QComboBox, resize_combobox);
FROM_UI(QCheckBox, shake_cb);
FROM_UI(QCheckBox, effects_cb);
FROM_UI(QCheckBox, framenetwork_cb);
@ -382,13 +394,7 @@ void AOOptionsDialog::setupUI()
ui_language_combobox->addItem("日本語", "jp");
ui_language_combobox->addItem("Русский", "ru");
registerOption<QComboBox, QString>("scaling_combobox", &Options::defaultScalingMode, &Options::setDefaultScalingMode);
// Populate scaling dropdown. This is necessary as we need the user data
// embeeded into the entry.
ui_scaling_combobox->addItem(tr("Pixel"), "fast");
ui_scaling_combobox->addItem(tr("Smooth"), "smooth");
registerOption<QComboBox, RESIZE_MODE>("resize_combobox", &Options::resizeMode, &Options::setResizeMode);
registerOption<QCheckBox, bool>("shake_cb", &Options::shakeEnabled, &Options::setShakeEnabled);
registerOption<QCheckBox, bool>("effects_cb", &Options::effectsEnabled, &Options::setEffectsEnabled);
registerOption<QCheckBox, bool>("framenetwork_cb", &Options::networkedFrameSfxEnabled, &Options::setNetworkedFrameSfxEnabled);

3
src/widgets/aooptionsdialog.h
View File

@ -63,8 +63,7 @@ private:
QCheckBox *ui_discord_cb;
QLabel *ui_language_label;
QComboBox *ui_language_combobox;
QLabel *ui_scaling_label;
QComboBox *ui_scaling_combobox;
QComboBox *ui_resize_combobox;
QCheckBox *ui_shake_cb;
QCheckBox *ui_effects_cb;
QCheckBox *ui_framenetwork_cb;