From 4951d0ca46fe38681d7fa17d22d732fb4361a557 Mon Sep 17 00:00:00 2001
From: cidoku <git@cidoku.net>
Date: Thu, 20 Feb 2025 18:54:54 -0300
Subject: [PATCH] moved  directory names to constants file + about window

---
 AO2XP.py                  |  20 ++++++++++++++++----
 AO2XPbase/icons/about.png | Bin 0 -> 3211 bytes
 AOsocket.py               |   2 +-
 buttons.py                |   5 +----
 charselect.py             |   4 +---
 constants.py              |   3 +++
 gameview.py               |  17 ++++++-----------
 mainmenu.py               |  16 ++--------------
 options.py                |  22 +++++++++++++++-------
 updater.py                |   2 +-
 10 files changed, 46 insertions(+), 45 deletions(-)
 create mode 100644 AO2XPbase/icons/about.png
 create mode 100644 constants.py

diff --git a/AO2XP.py b/AO2XP.py
index bd8aeba..19df460 100644
--- a/AO2XP.py
+++ b/AO2XP.py
@@ -8,6 +8,7 @@ from PyQt4 import QtGui, QtCore
 
 import audio as AUDIO
 import ini
+from constants import *
 
 __builtin__.audio = AUDIO
 del AUDIO
@@ -44,9 +45,10 @@ class gamewindow(QtGui.QMainWindow):
         self.center()
         self.setWindowTitle("AO2XP")
         self.setWindowIcon(QtGui.QIcon("AO2XP.ico"))
-        self.setWindowFlags(QtCore.Qt.WindowMinimizeButtonHint)
+        self.setWindowFlags(QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowMinimizeButtonHint | QtCore.Qt.WindowCloseButtonHint)
         
-        self.settingsgui = options.Settings()
+        self.settingsgui = options.Settings(self)
+        self.aboutgui = self.aboutBox()
     
     def center(self):
         frameGm = self.frameGeometry()
@@ -68,6 +70,16 @@ class gamewindow(QtGui.QMainWindow):
     
     def showSettings(self):
         self.settingsgui.showSettings()
+        
+    def aboutBox(self):
+        box = QtGui.QMessageBox()
+        box.setText("AO2XP %s\nRunning on %s %s %s (Python %s)\n\n2019-2025 headshot / cidoku" % (GAME_VERSION, platform.system(), platform.release(), platform.machine(), platform.python_version()))
+        box.setWindowTitle("About AO2XP")
+        box.setStandardButtons(QtGui.QMessageBox.Close)
+        box.setWindowIcon(QtGui.QIcon("AO2XP.ico"))
+        box.setIconPixmap(QtGui.QPixmap(AO2XPpath + "icons/about.png"))
+        box.button(QtGui.QMessageBox.Close).setText('Take that!')
+        return box
 
 if not debugmode:
     # Vanilla downloader
@@ -102,8 +114,8 @@ def handler(msg_type, msg_string):
 QtCore.qInstallMsgHandler(handler)
 
 audio.init()
-shit = gamewindow()
-shit.show()
+game = gamewindow()
+game.show()
 returnc = app.exec_()
 audio.free()
 sys.exit(returnc)
diff --git a/AO2XPbase/icons/about.png b/AO2XPbase/icons/about.png
new file mode 100644
index 0000000000000000000000000000000000000000..88e6c66674bbd326be85c1dbe60e226c01b749c9
GIT binary patch
literal 3211
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

literal 0
HcmV?d00001

diff --git a/AOsocket.py b/AOsocket.py
index 8b60e23..8407d57 100644
--- a/AOsocket.py
+++ b/AOsocket.py
@@ -3,7 +3,7 @@ import platform
 
 import websocket
 
-from game_version import *
+from constants import *
 
 
 class AOtcpSocket(object):
diff --git a/buttons.py b/buttons.py
index ea03cc5..99110c5 100644
--- a/buttons.py
+++ b/buttons.py
@@ -1,9 +1,6 @@
 from PyQt4 import QtCore, QtGui
 import os
-
-AOpath = "base/"
-AO2XPpath = "AO2XPbase/"
-#AOpath = "I:/aovanilla1.7.5/client/base/"
+from constants import *
 
 class AOToggleButton(QtGui.QLabel):
 	pressed = False
diff --git a/charselect.py b/charselect.py
index e37496c..33ae82f 100644
--- a/charselect.py
+++ b/charselect.py
@@ -3,9 +3,7 @@ import socket, thread, time
 from os.path import exists
 from functools import partial
 from buttons import PixmapButton
-
-AOpath = "base/"
-AO2XPpath = "AO2XPbase/"
+from constants import *
 
 def get_option(section, value, default=""):
     tempini = ConfigParser()
diff --git a/constants.py b/constants.py
new file mode 100644
index 0000000..10b69c3
--- /dev/null
+++ b/constants.py
@@ -0,0 +1,3 @@
+GAME_VERSION = "2.8.0"
+AOpath = "base/"
+AO2XPpath = "AO2XPbase/"
\ No newline at end of file
diff --git a/gameview.py b/gameview.py
index b0f6f7d..aa54b34 100644
--- a/gameview.py
+++ b/gameview.py
@@ -1,6 +1,7 @@
 import thread, time, os, buttons, urllib, charselect, ini, random
 from os.path import exists, basename
 from ConfigParserEdit import ConfigParser
+from constants import *
 
 from pybass_constants import *
 from PyQt4 import QtGui, QtCore
@@ -11,10 +12,6 @@ from urllib2 import Request, urlopen
 import AOsocket
 import images
 
-AOpath = "base/"
-AO2XPpath = "AO2XPbase/"
-#AOpath = 'I:/aovanilla1.7.5/client/base/'
-
 DESK_MOD = 1
 PREANIM = 2
 CHARNAME = 3
@@ -2903,7 +2900,7 @@ class gui(QtGui.QWidget):
                     self.specialstream = 2
                 if (musl.startswith("https") and error == 2) or self.specialstream:
                     print "[audio] Downloading music with urllib2"
-                    self.download_thread = DownloadThread(self, mus)
+                    self.download_thread = music_download_thread(self, mus)
                     self.download_thread.finished_signal.connect(self.playDownloadedMusic)
                     self.download_thread.start()
 
@@ -3572,12 +3569,12 @@ class TCP_Thread(QtCore.QThread):
                         except:
                             pass
 
-class DownloadThread(QtCore.QThread):
+class music_download_thread(QtCore.QThread):
     # Part of the evil HTTPS music download hack for XP systems
     finished_signal = QtCore.pyqtSignal(int)
 
     def __init__(self, caller, url):
-        super(DownloadThread, self).__init__()
+        super(music_download_thread, self).__init__()
         self.caller = caller
         self.url = url
 
@@ -3586,8 +3583,8 @@ class DownloadThread(QtCore.QThread):
 
     def download(self, url):
         headers = {
-            'User-Agent': 'AO2XP',
-            'Accept': 'audio/mpeg, audio/x-mpeg, audio/x-mpeg-3, audio/mpeg3, */*',
+            'User-Agent': "AO2XP %s" % (GAME_VERSION),
+            'Accept': '*/*',
             'Accept-Encoding': 'gzip, deflate',
             'Accept-Language': 'en-US,en;q=0.9',
             'Connection': 'keep-alive',
@@ -3613,8 +3610,6 @@ class DownloadThread(QtCore.QThread):
                     break
                 stream += chunk
                 bytes_downloaded += len(chunk)
-                #progress = int((bytes_downloaded / float(file_length)) * 100)
-                #print "[debug] progress: %d%%" % progress
 
             self.caller.stream = create_string_buffer(stream)
             self.finished_signal.emit(file_length)
\ No newline at end of file
diff --git a/mainmenu.py b/mainmenu.py
index 7a4e44f..e8f4756 100644
--- a/mainmenu.py
+++ b/mainmenu.py
@@ -7,11 +7,7 @@ from PyQt4 import QtGui, QtCore
 import hardware
 import AOsocket
 import ini
-from game_version import *
-
-AOpath = "base/"
-AO2XPpath = "AO2XPbase/"
-#AOpath = "I:/aovanilla1.7.5/client/base/"
+from constants import *
 
 def decode_ao_str(text):
     return text.replace("<percent>", "%").replace("<pound>", "#").replace("<num>", "#").replace("<and>", "&").replace("<dollar>", "$")
@@ -74,15 +70,10 @@ class lobby(QtGui.QWidget):
         self.connectingimg.setPixmap(self.pix_connecting)
         self.connectingimg.hide()
         
-        self.clientver = QtGui.QLabel(self)
-        self.clientver.setText('AO2XP %s by Headshot' % GAME_VERSION)
-        self.clientver.resize(self.clientver.sizeHint())
-        self.clientver.move(self.pix_lobby.size().width() - self.clientver.size().width(), 0)
-    
         self.settingsbtn = QtGui.QPushButton(self)
         self.settingsbtn.setText("Settings")
         self.settingsbtn.resize(self.settingsbtn.sizeHint())
-        self.settingsbtn.move(self.clientver.x() - self.settingsbtn.size().width() - 8, 0)
+        self.settingsbtn.move(self.pix_lobby.size().width() - self.settingsbtn.size().width(), 0)
         self.settingsbtn.clicked.connect(self.onSettingsClicked)
         
         self.btn_public = PicButton(self.pix_btn_public, self)
@@ -308,7 +299,6 @@ class lobby(QtGui.QWidget):
         self.serverlist.hide()
         self.onlineplayers.hide()
         self.serverinfo.hide()
-        self.clientver.hide()
         self.settingsbtn.hide()
         self.aoserverinfo.tcp.send('askchaa#%')
 
@@ -324,7 +314,6 @@ class lobby(QtGui.QWidget):
         self.serverlist.show()
         self.onlineplayers.show()
         self.serverinfo.show()
-        self.clientver.show()
         self.settingsbtn.show()
 
     def onClicked_serverlist(self, item):
@@ -652,4 +641,3 @@ class AOServerInfo(QtCore.QThread):
                     if not pid in playerlist:
                         playerlist[pid] = []
                     playerlist[pid].append(network[2].decode('utf-8'))
-                    
\ No newline at end of file
diff --git a/options.py b/options.py
index d67d784..ae48a62 100644
--- a/options.py
+++ b/options.py
@@ -7,21 +7,22 @@ try:
 except: pass
 
 from PyQt4 import QtGui, QtCore
+from constants import *
 
 import ini
 
-AOpath = "base/"
-AO2XPpath = "AO2XPbase/"
-#AOpath = "I:\\aovanilla1.7.5\\client\\base\\"
-
 class Settings(QtGui.QDialog):
-    def __init__(self):
+    def __init__(self, parent):
         super(Settings, self).__init__()
         self.setModal(True)
+        self.gamewindow = parent
+        self.parent = parent
         
         self.inifile = ConfigParser()
-        self.setWindowTitle("Settings")
+        self.setWindowTitle("AO2XP Settings")
         self.setFixedSize(480, 512)
+        self.setWindowIcon(QtGui.QIcon("AO2XP.ico"))
+        self.setWindowFlags(QtCore.Qt.WindowCloseButtonHint)
         self.hide()
         
         main_layout = QtGui.QVBoxLayout(self)
@@ -48,6 +49,9 @@ class Settings(QtGui.QDialog):
         self.cancelbtn = QtGui.QPushButton()
         self.cancelbtn.setText("Cancel")
         self.cancelbtn.clicked.connect(self.onCancelClicked)
+        self.aboutbtn = QtGui.QPushButton()
+        self.aboutbtn.setText("About...")
+        self.aboutbtn.clicked.connect(self.onAboutClicked)
         
         separators = []
         for i in range(5):
@@ -198,6 +202,7 @@ class Settings(QtGui.QDialog):
         
         save_layout.addWidget(self.savebtn, 100, QtCore.Qt.AlignRight)
         save_layout.addWidget(self.cancelbtn, 0, QtCore.Qt.AlignRight)
+        save_layout.addWidget(self.aboutbtn, 0, QtCore.Qt.AlignLeft)
         main_layout.addWidget(self.tabs)
         main_layout.addLayout(save_layout)
         
@@ -290,6 +295,9 @@ class Settings(QtGui.QDialog):
     
     def onCancelClicked(self):
         self.hide()
+        
+    def onAboutClicked(self):
+        self.gamewindow.aboutgui.exec_()
 
     def onUpdateClicked(self):
         import updater
@@ -303,4 +311,4 @@ class Settings(QtGui.QDialog):
     def onReloadAudio(self):
         audio.free()
         audio.init()
-        print "reloaded audio"
\ No newline at end of file
+        print "[audio] Reloaded audio system"
\ No newline at end of file
diff --git a/updater.py b/updater.py
index 4ec10cb..7051abc 100644
--- a/updater.py
+++ b/updater.py
@@ -6,7 +6,7 @@ except: pass
 
 from PyQt4 import QtGui, QtCore
 
-from game_version import *
+from constants import *
 
 returncode = -1
 assetfile = {