From 9bb049f7d130c1bcf8c99ab3e6965e7076bc74bc Mon Sep 17 00:00:00 2001
From: cidoku <git@cidoku.net>
Date: Thu, 9 Oct 2025 16:37:45 -0300
Subject: [PATCH] add music item from gui + option to edit music.ini with
 default editor

---
 AO2XPbase/icons/script_edit.png | Bin 0 -> 880 bytes
 gameview.py                     |  34 +++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 AO2XPbase/icons/script_edit.png

diff --git a/AO2XPbase/icons/script_edit.png b/AO2XPbase/icons/script_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4d31ce282f378e5b94cd40680d283842229e491
GIT binary patch
literal 880
zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#0!c(cR5;5`
z&`oGuRT#$c|2g;GnNDUh6Z1KSI&n<ZS`8(ER$?uJwN#9Br5h{a%7q{XU5H)UZiPZY
z7cIE35jPf!t=6U}k_5DBO|5p?ktQ*d=EKQkGT(R3x#wONNo*c?m+y~<M+89tz?)y?
z_5-ILY1=Ve*FJUaqkW%-=a+yAunHKU2o!+Nfh#tf@jdV9y~)_{`_FZ;JvHSg>dH?P
zU9(eZs5A|8t5v?eTRRMlZU=heApt;c-QWm;Ex@uN>_}2!i6teD1%o>y^d_S1XRa-N
zEVlrobv$Z==R-vaN*dOiP;xh}(13rd27nL8<{3^$d8*UtvbO>4tszOR2{qRsrN9O(
z3#0`W0!x4o2vg>#nIhNcON;jbrFs$(i&Dd*-VBg3z>*-1z>;7Qu%r9~e~*90+noc{
zCV%7=ogDig@RaK7i93|s01qGl%Lrt!v3<PqHSKHHhzz_=B0b3Z?Bg`9oPA?kgJxec
z5hk-@5E3LC&k|^<TqfoGN$k-BtliBJ5{lM%l2}J7VFSE);&Q~cWGL)NlrcyGARqw3
zwJFl}FC@}OXfAz8s73J4^lh}O3T~tNj0EtSsw*r&ZjM9%0*F*5*d?x#=zj@!@eIN#
z;>23f)kR;ImtNTS&iSm|tlwheV@t5403k8+mq?kbBz7Iez4s~7(WvsntW4bC^upoW
zL+_1G1IUA;W1XH-C-(17v0M(ATQQWfmq_ZL>3(tqwR{#U6woa9k)QmX+`va<s@*eN
z+u25`L%_&ynOTYr8)xAgULDBe`MoUNJk0~$A>6fx$W7fs9{PlZoQqK^zXeF6_0Y=)
zo``&Le1wy)J;oj`vgg^i2<IlrUYKI~yEX27e}jqk4~Vq&QmNK4S{Lp&(0X=xwZysc
z3~jLp*_k}*uZyJj9;B2naPQ^}&mX_QgQ0%HHsseT7_Aq!05N#%R3|VB^Z_0HxsykR
z(p_TT?zEUw(cpY;NVrZ1@o0p$cng2r$z_3K*U!ECE5Lud99fJ~sSd9I0000<MNUMn
GLSTY(8JXz-

literal 0
HcmV?d00001

diff --git a/gameview.py b/gameview.py
index 69f0b56..8f46f92 100644
--- a/gameview.py
+++ b/gameview.py
@@ -1,4 +1,4 @@
-import thread, time, os, urllib, random, re , platform
+import thread, time, os, urllib, random, re , platform, subprocess
 import charselect, ini, AOsocket, images, packets, demo, buttons
 
 from os.path import exists, basename
@@ -1365,7 +1365,6 @@ class GUI(QtGui.QWidget):
         self.actMusicAdd = QtGui.QAction(QtGui.QIcon(AO2XPpath + "icons/" + "add.png"), "&Add new entry", self.tabMusic)
         self.actMusicAdd.triggered.connect(self.onActMusicAddTriggered)
         self.actMusicAdd.setVisible(False)
-        self.actMusicAdd.setDisabled(True)
         self.actMusicEdit = QtGui.QAction(QtGui.QIcon(AO2XPpath + "icons/" + "edit.png"), "&Edit selected entry", self.tabMusic)
         self.actMusicEdit.triggered.connect(self.onActMusicEditTriggered)
         self.actMusicEdit.setVisible(False)
@@ -1374,6 +1373,9 @@ class GUI(QtGui.QWidget):
         self.actMusicDelete.triggered.connect(self.onActMusicDeleteTriggered)
         self.actMusicDelete.setVisible(False)
         self.actMusicDelete.setDisabled(True)
+        self.actMusicEditExternal = QtGui.QAction(QtGui.QIcon(AO2XPpath + "icons/" + "script_edit.png"), "Edit list in e&xternal editor", self.tabMusic)
+        self.actMusicEditExternal.triggered.connect(self.onActMusicEditExternalTriggered)
+        self.actMusicEditExternal.setVisible(False)
         self.actMusicRefresh = QtGui.QAction(QtGui.QIcon(AO2XPpath + "icons/" + "arrow_refresh.png"), "&Refresh list", self.tabMusic)
         self.actMusicRefresh.triggered.connect(self.onActMusicRefreshTriggered)
         self.actMusicRefresh.setVisible(False)
@@ -1389,6 +1391,7 @@ class GUI(QtGui.QWidget):
         self.mnuMusicOptions.addAction(self.actMusicAdd)
         self.mnuMusicOptions.addAction(self.actMusicEdit)
         self.mnuMusicOptions.addAction(self.actMusicDelete)
+        self.mnuMusicOptions.addAction(self.actMusicEditExternal)
         self.mnuMusicOptions.addAction(self.actMusicRefresh)
         self.mnuMusicOptions.addSeparator()
         self.mnuMusicOptions.addAction(self.actMusicSwitchToPrivate)
@@ -1881,7 +1884,6 @@ class GUI(QtGui.QWidget):
 
     def onMusicItemClicked(self, item):
         self.actMusicCopy.setDisabled(False)
-        # self.actMusicAdd.setDisabled(False)
         # self.actMusicEdit.setDisabled(False)
         # self.actMusicDelete.setDisabled(False)
     
@@ -1895,9 +1897,8 @@ class GUI(QtGui.QWidget):
     def onMusicSearch(self, text):
         self.musicItems.clear()
         self.actMusicCopy.setDisabled(True)
-        # self.actMusicAdd.setDisabled(True)
-        # self.actMusicEdit.setDisabled(True)
-        # self.actMusicDelete.setDisabled(True)
+        self.actMusicEdit.setDisabled(True)
+        self.actMusicDelete.setDisabled(True)
         
         _musicList = self.musicListPrivate if self.privateMusicSelected else self.musicList
         
@@ -1921,16 +1922,22 @@ class GUI(QtGui.QWidget):
         _item = self.musicItems.item(choice)
         self.musicItems.setCurrentItem(_item)
         self.actMusicCopy.setDisabled(False)
-        # self.actMusicAdd.setDisabled(False)
         # self.actMusicEdit.setDisabled(False)
         # self.actMusicDelete.setDisabled(False)
         self.onMusicItemDoubleClicked(_item)
         
     def onActMusicCopyTriggered(self):
         QtGui.QApplication.clipboard().setText(self.musicItems.currentItem().text())
-        
+    
     def onActMusicAddTriggered(self):
-        pass
+        title, ok = QtGui.QInputDialog.getText(self, "Add new song", "Please enter a title for the song.")
+        if title and ok:
+            title.replace("=", "")
+            url, ok = QtGui.QInputDialog.getText(self, "Add new song", "Please enter an URL for the song.")
+            if url and ok:
+                with open(AO2XPpath + "music.ini", "ab") as f:
+                    f.write(("\n" + title + " = " + url).toUtf8())
+        self.onActMusicRefreshTriggered()
         
     def onActMusicEditTriggered(self):
         pass
@@ -1938,12 +1945,20 @@ class GUI(QtGui.QWidget):
     def onActMusicDeleteTriggered(self):
         pass
         
+    def onActMusicEditExternalTriggered(self):
+        path = AO2XPpath + "music.ini"
+        if platform.system() == 'Windows':
+            os.startfile(path)
+        else:
+            subprocess.call(('xdg-open', path))
+        
     def onActMusicRefreshTriggered(self, init=False):
         if exists(AO2XPpath + "music.ini"):
             self.musicListPrivate = ini.sectionless_ini_to_dict(AO2XPpath + "music.ini", QtCore.QString)
         if not init:
             self.musicItems.clear()
             self.loadAllMusic()
+            print self.musicListPrivate
         
     def onActMusicSwitchTriggered(self):
         self.privateMusicSelected = not self.privateMusicSelected
@@ -1952,6 +1967,7 @@ class GUI(QtGui.QWidget):
         self.actMusicAdd.setVisible(self.privateMusicSelected)
         self.actMusicEdit.setVisible(self.privateMusicSelected)
         self.actMusicDelete.setVisible(self.privateMusicSelected)
+        self.actMusicEditExternal.setVisible(self.privateMusicSelected)
         self.actMusicRefresh.setVisible(self.privateMusicSelected)
         self.actMusicSwitchToGlobal.setVisible(self.privateMusicSelected)
         self.actMusicSwitchToPrivate.setVisible(not self.privateMusicSelected)