From 4d1b0517e3d5704b26df7d8a9a492d182d36ea4b Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Wed, 31 Jul 2024 11:55:25 +0200
Subject: V2.11.0 rc1 fixes (#1029)

* Use unix timestamp to transmit ban duration

* Cleanup compiler warning due to narrowing conversion

* Fix preanim not being visible

This is apparently not a feature we want from WebAO :^)

* Bump to RC2

* Use std::chrono instead

* Remove random include and debug call
---
 data/ui/moderator_action_dialog.ui | 57 +++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 20 deletions(-)

(limited to 'data')

diff --git a/data/ui/moderator_action_dialog.ui b/data/ui/moderator_action_dialog.ui
index 723db979..a4290c44 100644
--- a/data/ui/moderator_action_dialog.ui
+++ b/data/ui/moderator_action_dialog.ui
@@ -19,20 +19,10 @@
      <property name="horizontalSpacing">
       <number>6</number>
      </property>
-     <item row="1" column="3">
-      <widget class="QCheckBox" name="permanent">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string>Permanent</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="duration_label">
+     <item row="0" column="0">
+      <widget class="QLabel" name="action_label">
        <property name="text">
-        <string>Duration</string>
+        <string>Action</string>
        </property>
       </widget>
      </item>
@@ -43,15 +33,22 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="action_label">
+     <item row="1" column="0">
+      <widget class="QLabel" name="duration_label">
        <property name="text">
-        <string>Action</string>
+        <string>Duration</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QSpinBox" name="duration_mm">
+       <property name="suffix">
+        <string> Minute(s)</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" colspan="2">
-      <widget class="QSpinBox" name="duration">
+     <item row="1" column="2">
+      <widget class="QSpinBox" name="duration_hh">
        <property name="enabled">
         <bool>true</bool>
        </property>
@@ -59,11 +56,31 @@
         <string> Hour(s)</string>
        </property>
        <property name="minimum">
-        <number>1</number>
+        <number>0</number>
        </property>
        <property name="maximum">
         <number>876000</number>
        </property>
+       <property name="value">
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="duration_dd">
+       <property name="suffix">
+        <string> Day(s)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="permanent">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>Permanent</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -116,7 +133,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
   <connection>
    <sender>permanent</sender>
    <signal>clicked(bool)</signal>
-   <receiver>duration</receiver>
+   <receiver>duration_hh</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-- 
cgit