Merge pull request #966 from AttorneyOnline/coolslide-rebased

[Feature] Courtroom slides + major AOLayer overhaul
AttorneyOnline · May 24, 2024 · 4c56a25 · 4c56a25
2 parents 4b0f7e4 + eb024cb
commit 4c56a25
Show file tree

Hide file tree

Showing 35 changed files with 1,746 additions and 1,284 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,8 +38,10 @@ add_executable(Attorney_Online
   src/aoevidencedisplay.h
   src/aoimage.cpp
   src/aoimage.h
-  src/aolayer.cpp
-  src/aolayer.h
+  src/animationlayer.cpp
+  src/animationlayer.h
+  src/animationloader.h
+  src/animationloader.cpp
   src/aomusicplayer.cpp
   src/aomusicplayer.h
   src/aopacket.cpp

diff --git a/bin/base/misc/default/chatbox.png b/bin/base/misc/default/chatbox.png
diff --git a/bin/base/misc/default/holdit.opus b/bin/base/misc/default/holdit.opus
diff --git a/bin/base/misc/default/holdit_bubble.gif b/bin/base/misc/default/holdit_bubble.gif
diff --git a/bin/base/misc/default/objection.opus b/bin/base/misc/default/objection.opus
diff --git a/bin/base/misc/default/objection_bubble.gif b/bin/base/misc/default/objection_bubble.gif
diff --git a/bin/base/misc/default/takethat.opus b/bin/base/misc/default/takethat.opus
diff --git a/bin/base/misc/default/takethat_bubble.gif b/bin/base/misc/default/takethat_bubble.gif
diff --git a/bin/base/themes b/bin/base/themes
diff --git a/data/ui/options_dialog.ui b/data/ui/options_dialog.ui
@@ -39,9 +39,9 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>0</y>
+            <y>-511</y>
             <width>394</width>
-            <height>858</height>
+            <height>850</height>
            </rect>
           </property>
           <layout class="QFormLayout" name="formLayout">
@@ -556,6 +556,23 @@
              </property>
             </widget>
            </item>
+           <item row="33" column="0">
+            <widget class="QLabel" name="slides_lbl">
+             <property name="toolTip">
+              <string>If ticked, slide animations will play when requested.</string>
+             </property>
+             <property name="text">
+              <string>Slide Animations:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="33" column="1">
+            <widget class="QCheckBox" name="slides_cb">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>