Merge branch 'master' into reconnection-button

Author: WisoAltred

.github/workflows/build.yml

@@ -139,13 +139,13 @@ jobs:
         run: |
           curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
           unzip -d bass -o bass.zip
-          cp ./bass/bass.h ./lib
+          cp ./bass/c/bass.h ./lib
           cp ./bass/libs/x86_64/libbass.so ./lib/
           cp ./bass/libs/x86_64/libbass.so ./bin/
 
           curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
           unzip -d bass -o bassopus.zip
-          cp ./bass/bassopus.h ./lib
+          cp ./bass/c/bassopus.h ./lib
           cp ./bass/libs/x86_64/libbassopus.so ./lib/
           cp ./bass/libs/x86_64/libbassopus.so ./bin/
 
@@ -187,13 +187,16 @@ jobs:
           cd ${{ github.workspace }}/bin
           mkdir ./imageformats
           cp ../qtapng/plugins/imageformats/libqapng.so ./imageformats
-          cp ../scripts/launch.sh .
+          cp ../data/logo-client.png ./icon.png
           cp ../README_LINUX.md .
-          chmod +x launch.sh
+          cp ../scripts/DYNAMIC_INSTALL.sh ./INSTALL.sh
+          chmod +x INSTALL.sh
           chmod +x Attorney_Online
 
+          patchelf --add-rpath . Attorney_Online
+
           cd ..
-          tar --transform='flags=r;s|bin|Attorney_Online|' -cvf Attorney_Online-Dynamic.tar bin
+          tar --transform='flags=r;s|bin|Attorney Online|' -cvf Attorney_Online-Dynamic.tar bin
 
       - name: Create AppImage
         shell: bash
@@ -214,17 +217,23 @@ jobs:
           cp scripts/Attorney_Online.desktop AppDir/usr/share/applications
           cp data/logo-client.png AppDir/Attorney_Online.png
 
+          GIT_SHORT_SHA="${GITHUB_SHA::8}"
           QTDIR=${QT_ROOT_DIR} ./appimagetool deploy AppDir/usr/share/applications/Attorney_Online.desktop
-          ARCH=x86_64 VERSION=2.11 ./appimagetool AppDir
+          ARCH=x86_64 VERSION=${GIT_SHORT_SHA} ./appimagetool AppDir
 
+      - name: Deploy AppImage
+        shell: bash
+        run: |
           mkdir bin-appimage
           cp -r bin/base bin-appimage
+          cp data/logo-client.png bin-appimage/icon.png
           cp README_LINUX.md bin-appimage
+          cp scripts/APPIMAGE_INSTALL.sh bin-appimage/INSTALL.sh
           cp Attorney_Online-*-x86_64.AppImage bin-appimage
+          chmod +x bin-appimage/INSTALL.sh
           chmod +x bin-appimage/Attorney_Online-*-x86_64.AppImage
 
-          tar -cvf Attorney_Online-AppImage.tar bin-appimage/*
-          tar --transform='flags=r;s|bin-appimage|Attorney_Online|' -cvf Attorney_Online-AppImage.tar bin-appimage
+          tar --transform='flags=r;s|bin-appimage|Attorney Online|' -cvf Attorney_Online-AppImage.tar bin-appimage
 
       - name: Upload Dynamic Artifact
         uses: actions/upload-artifact@master

LICENSE.MIT

@@ -75,7 +75,8 @@ The logo (`logo.png` and `logo.ico`) was designed by Lucas Carbí. The character
 
 ## Copyright
 
-The project is dual-licensed; you are free to copy, modify and distribute AO2 under the GPLv3 or the MIT license.
+The project is licensed under the GPLv3 license.
+Code that was released under the MIT/GPLv3 dual-license can be found [here](https://github.com/AttorneyOnline/AO2-Client/tree/last-dual-licensed).
 
 Copyright (c) 2016-2018 OmniTroid
 

README.md

@@ -2,6 +2,8 @@
 
 There are two download options for running on Linux: the **dynamically-linked** build and the **AppImage**. The dynamic build is lighter, but might only run on newer systems. The AppImage is a bit bigger, but should run seamlessly on most systems (anything newer than Ubuntu 22.04 LTS).
 
+Each version also accompanies an `INSTALL.sh` script that will create a desktop file for AO pointing to where the script was ran. This will enable you to run AO from an app launcher. Note that moving AO's folder will require running this script again.
+
 ### AppImage
 
 If you downloaded the **AppImage** version, it should just be plug-and-play. If you run into errors or bugs, contact us in our [Discord server](https://discord.gg/wWvQ3pw) or open an [issue on GitHub](https://github.com/AttorneyOnline/AO2-Client/issues).

README_LINUX.md

@@ -0,0 +1,38 @@
+# License Change Notice
+
+## What Changed
+
+This project was previously dual-licensed under both MIT and GPLv3 licenses.
+The project is now exclusively licensed under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) license.
+
+**Effective for any commit after `4db979187386326df64b9359b8de5e90468f7fc3`, tagged as `last-dual-licensed`, all new contributions and releases are licensed exclusively under GPLv3.**
+
+## Impact on Existing Forks
+
+If you forked this repository when it was available under the MIT license:
+
+### Your Existing Fork
+- **You can continue using your existing fork under the MIT license** for any code that was committed before this license change
+- The MIT license you received for that specific version remains valid and irrevocable
+- You are not required to change the license of your existing fork
+
+### Pulling New Changes
+If you pull new commits from our repository into your MIT-licensed fork:
+
+- **New code from us will be GPLv3-licensed**
+- This creates a mixed-license situation in your repository
+- Any binary built from a mixed tree must comply with GPL v3 for the whole work unless you can isolate the MIT parts as separate, independent modules
+
+### Your Options
+
+1. **Keep your current fork as-is** under MIT license and stop pulling our updates
+2. **Accept the GPLv3 license** and continue receiving updates from upstream
+3. **Fork from the last MIT commit** and maintain your own separate development
+
+## Recommendations
+
+- Review the differences between MIT and GPLv3 licenses to understand the implications
+- Consider whether GPLv3's copyleft requirements are compatible with your project goals
+
+---
+**Note**: This notice does not constitute legal advice. Please consult with qualified legal counsel for advice specific to your situation.

RELICENSE.md

@@ -235,12 +235,12 @@ get_bass() {
             x64/bass.dll:./bin
     elif [[ "$PLATFORM" == "linux" ]]; then
         get_zip https://www.un4seen.com/files/bass24-linux.zip \
-            bass.h:./lib \
+            c/bass.h:./lib \
             libs/x86_64/libbass.so:./lib \
             libs/x86_64/libbass.so:./bin
     elif [[ "$PLATFORM" == "macos" ]]; then
         get_zip https://www.un4seen.com/files/bass24-osx.zip \
-            bass.h:./lib \
+            c/bass.h:./lib \
             libbass.dylib:./lib
     fi
 }
@@ -261,12 +261,12 @@ get_bassopus() {
             x64/bassopus.dll:./bin
     elif [[ "$PLATFORM" == "linux" ]]; then
         get_zip https://www.un4seen.com/files/bassopus24-linux.zip \
-            bassopus.h:./lib \
+            c/bassopus.h:./lib \
             libs/x86_64/libbassopus.so:./lib \
             libs/x86_64/libbassopus.so:./bin
     elif [[ "$PLATFORM" == "macos" ]]; then
         get_zip https://www.un4seen.com/files/bassopus24-osx.zip \
-            bassopus.h:./lib \
+            c/bassopus.h:./lib \
             libbassopus.dylib:./lib
     fi
 }

configure.sh

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="contextMenuPolicy">
-   <enum>Qt::ContextMenuPolicy::NoContextMenu</enum>
+   <enum>Qt::NoContextMenu</enum>
   </property>
   <property name="windowTitle">
    <string>Settings</string>
@@ -20,7 +20,7 @@
    <item>
     <widget class="QTabWidget" name="settings_tabs">
      <property name="focusPolicy">
-      <enum>Qt::FocusPolicy::NoFocus</enum>
+      <enum>Qt::NoFocus</enum>
      </property>
      <property name="currentIndex">
       <number>0</number>
@@ -131,10 +131,7 @@
            <item row="6" column="1">
             <widget class="QFrame" name="theme_log_divider">
              <property name="frameShape">
-              <enum>QFrame::Shape::HLine</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Shadow::Sunken</enum>
+              <enum>QFrame::NoFrame</enum>
              </property>
             </widget>
            </item>
@@ -198,7 +195,7 @@
               <string>Chat Rate Limit:</string>
              </property>
              <property name="textFormat">
-              <enum>Qt::TextFormat::AutoText</enum>
+              <enum>Qt::PlainText</enum>
              </property>
             </widget>
            </item>
@@ -215,10 +212,7 @@
            <item row="11" column="1">
             <widget class="QFrame" name="log_names_divider">
              <property name="frameShape">
-              <enum>QFrame::Shape::HLine</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Shadow::Sunken</enum>
+              <enum>QFrame::NoFrame</enum>
              </property>
             </widget>
            </item>
@@ -272,10 +266,7 @@
            <item row="15" column="1">
             <widget class="QFrame" name="net_divider">
              <property name="frameShape">
-              <enum>QFrame::Shape::HLine</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Shadow::Sunken</enum>
+              <enum>QFrame::NoFrame</enum>
              </property>
             </widget>
            </item>
@@ -611,6 +602,9 @@
            </item>
            <item row="35" column="0">
             <widget class="QLabel" name="playerlist_format_lbl">
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;Set the format for the player list to use.&lt;br&gt;&lt;br&gt;Valid fields are:&lt;br&gt;{id} - Client ID&lt;br&gt;{displayname} - Character display name&lt;br&gt;{character} - Character folder name&lt;br&gt;{username} - Out-of-character name&lt;br&gt;(Note: Some servers may hide out-of-character names.)&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
              <property name="text">
               <string>Playerlist Format:</string>
              </property>
@@ -663,10 +657,7 @@
        <item row="1" column="0" colspan="2">
         <widget class="QFrame" name="audio_volume_divider">
          <property name="frameShape">
-          <enum>QFrame::Shape::HLine</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Shadow::Sunken</enum>
+          <enum>QFrame::NoFrame</enum>
          </property>
         </widget>
        </item>
@@ -693,10 +684,7 @@
        <item row="3" column="0" colspan="2">
         <widget class="QFrame" name="volume_blip_divider">
          <property name="frameShape">
-          <enum>QFrame::Shape::HLine</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Shadow::Sunken</enum>
+          <enum>QFrame::NoFrame</enum>
          </property>
         </widget>
        </item>
@@ -828,9 +816,6 @@
         <layout class="QGridLayout" name="mount_buttons_layout">
          <item row="2" column="5">
           <spacer name="mount_buttons_spacer_2">
-           <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
-           </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
@@ -867,11 +852,8 @@
          </item>
          <item row="2" column="2">
           <spacer name="mount_buttons_spacer">
-           <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
-           </property>
            <property name="sizeType">
-            <enum>QSizePolicy::Policy::Expanding</enum>
+            <enum>QSizePolicy::Fixed</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -1126,10 +1108,7 @@ Default: 0.</string>
        <item>
         <widget class="QFrame" name="privacy_separator">
          <property name="frameShape">
-          <enum>QFrame::Shape::HLine</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Shadow::Sunken</enum>
+          <enum>QFrame::NoFrame</enum>
          </property>
         </widget>
        </item>

data/ui/options_dialog.ui

@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# exit on error
+set -e
+
+# Move to script's directory
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+cd "${SCRIPT_DIR}"
+
+#add .desktop file (which should allow most DE's easy access to the program
+mkdir -p ~/.local/share/applications
+
+# desktop files don't like spaces in the Exec field, we have to replace them with "\s"
+appimage="$(echo Attorney_Online-*-x86_64.AppImage)"
+escaped_exec="$(echo "$(pwd)" | sed 's/ /\\s/g')"/"$appimage"
+
+desktop_file="\
+[Desktop Entry]
+Type=Application
+Name=Attorney Online
+Comment=The courtroom drama simulator
+Path=$(pwd)
+Exec=\"$escaped_exec\"
+Icon=$(pwd)/icon.png"
+
+echo "$desktop_file" > ~/.local/share/applications/'Attorney Online'.desktop
+
+#marking the program as executable
+chmod +x Attorney_Online-*-x86_64.AppImage
+
+#running the executable
+./Attorney_Online-*-x86_64.AppImage

scripts/APPIMAGE_INSTALL.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+
+# exit on error
+set -e
+
+# Move to script's directory
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+cd "${SCRIPT_DIR}"
+
+#add .desktop file (which should allow most DE's easy access to the program
+mkdir -p ~/.local/share/applications
+
+# desktop files don't like spaces in the Exec field, we have to replace them with "\s"
+escaped_exec="$(echo "$(pwd)" | sed 's/ /\\s/g')"/Attorney_Online
+
+desktop_file="\
+[Desktop Entry]
+Type=Application
+Name=Attorney Online
+Comment=The courtroom drama simulator
+Path=$(pwd)
+Exec=\"$escaped_exec\"
+Icon=$(pwd)/icon.png"
+
+echo "$desktop_file" > ~/.local/share/applications/'Attorney Online'.desktop
+
+#running the program
+chmod +x Attorney_Online
+./Attorney_Online