Added option to Game Settings to select game client. Version bump to

0.27

Author: nwestfal

ChangeLog

@@ -106,3 +106,9 @@ Changes
 
 0.2.6	Updated certificate chain to new SSL certificates after recent update (22.0.1 or possibly 22) update
 		by SSG broke authentication using the old certs.
+
+0.2.7	Added option in Game Settings to select which game client to use.
+		The choices are 32-bit, 32-bit Legacy ("Awesomium"), and 64-bit.  The 32-bit
+		Legacy Awesomium client is recommended for Linux users.  Game client override
+		code that checked TurbineLauncher.exe.config has been removed since it is no
+		longer needed with this option.

PyLotRO.iss

@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{EB42F98E-B61B-4EE7-AF06-CAAF8D1825A3}
 AppName=PyLotRO
-AppVerName=PyLotRO 0.2.6
+AppVerName=PyLotRO 0.2.7
 AppPublisher=AJackson
 AppPublisherURL=http://www.lotrolinux.com
 AppSupportURL=http://www.lotrolinux.com

PyLotROLauncher/Information.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-Version = "0.2.6"
+Version = "0.2.7"
 Description = "LOTRO/DDO Launcher"
 Author = "Alan Jackson"
 Email = "ajackson@bcs.org.uk"

PyLotROLauncher/MainWindow.py

@@ -224,11 +224,13 @@ def actionPatchSelected(self):
 	def actionOptionsSelected(self):
 		winSettings = SettingsWindow(self.winMain, self.settings.hiResEnabled, self.settings.app,
 			self.settings.wineProg, self.settings.wineDebug, self.settings.patchClient,
-			self.settings.winePrefix, self.settings.gameDir, self.valHomeDir, self.osType, self.rootDir)
+			self.settings.winePrefix, self.settings.gameDir, self.valHomeDir, self.osType, self.rootDir,
+                        self.settings.gameClientIdx)
 
 		self.hideWinMain()
 		if winSettings.Run() == QtGui.QDialog.Accepted:
 			self.settings.hiResEnabled = winSettings.getHiRes()
+			self.settings.gameClientIdx = winSettings.getGameClientIdx()
 			self.settings.app = winSettings.getApp()
 			self.settings.patchClient = winSettings.getPatchClient()
 			self.settings.gameDir = winSettings.getGameDir()
@@ -252,6 +254,7 @@ def actionWizardSelected(self):
 			self.settings.usingDND = winWizard.getUsingDND()
 			self.settings.usingTest = winWizard.getUsingTest()
 			self.settings.hiResEnabled = winWizard.getHiRes()
+			self.settings.gameClientIdx = winSettings.getGameClientIdx()
 			self.settings.app = winWizard.getApp()
 			self.settings.wineProg = winWizard.getProg()
 			self.settings.wineDebug = winWizard.getDebug()
@@ -387,7 +390,16 @@ def AuthAccount(self):
 			self.AddLog(self.account.messError)
 
 	def LaunchGame(self):
-		game = StartGame(self.winMain, self.worldQueueConfig.gameClientFilename,
+		gameClientIdx = int(self.settings.gameClientIdx)
+
+		if gameClientIdx == 0:
+		        gameClientFilename = self.worldQueueConfig.gameClientFilename32
+		elif gameClientIdx == 1:
+		        gameClientFilename = self.worldQueueConfig.gameClientFilenameLegacy
+		elif gameClientIdx == 2:
+		        gameClientFilename = "x64/" + self.worldQueueConfig.gameClientFilename64
+
+		game = StartGame(self.winMain, gameClientFilename,
 			self.worldQueueConfig.gameClientArgTemplate, self.accNumber, self.urlLoginServer,
 			self.account.ticket, self.urlChatServer,
 			self.langConfig.langList[self.uiMain.cboLanguage.currentIndex()].code,

PyLotROLauncher/PyLotROUtils.py

@@ -477,6 +477,9 @@ def CheckRealm(self, useDND, baseDir, osType):
 class WorldQueueConfig:
 	def __init__(self, urlConfigServer, usingDND, baseDir, osType, gameDir):
 		self.gameClientFilename = ""
+		self.gameClientFilename32 = ""
+		self.gameClientFilename64 = ""
+		self.gameClientFilenameLegacy = ""
 		self.gameClientArgTemplate = ""
 		self.crashreceiver = ""
 		self.DefaultUploadThrottleMbps = ""
@@ -515,7 +518,11 @@ def __init__(self, urlConfigServer, usingDND, baseDir, osType, gameDir):
 				for node in nodes:
 					if node.nodeType == node.ELEMENT_NODE:
 						if node.getAttribute("key") == "GameClient.WIN32.Filename":
-							self.gameClientFilename = node.getAttribute("value")
+							self.gameClientFilename32 = node.getAttribute("value")
+						if node.getAttribute("key") == "GameClient.WIN64.Filename":
+							self.gameClientFilename64 = node.getAttribute("value")
+						if node.getAttribute("key") == "GameClient.WIN32Legacy.Filename":
+							self.gameClientFilenameLegacy = node.getAttribute("value")
 						elif node.getAttribute("key") == "GameClient.WIN32.ArgTemplate":
 							self.gameClientArgTemplate = node.getAttribute("value")
 						elif node.getAttribute("key") == "GameClient.Arg.crashreceiver":
@@ -546,21 +553,6 @@ def __init__(self, urlConfigServer, usingDND, baseDir, osType, gameDir):
 							self.worldQueueParam = node.getAttribute("value")
 
 				self.loadSuccess = True
-
-			# check TurbineLauncher.exe.config in gameDir for local game client override
-			tempxml = ""
-			filename = gameDir + '/TurbineLauncher.exe.config'
-			if os.path.exists(filename):
-				infile = uopen(filename, "r", "utf-8")
-				tempxml = infile.read()
-				infile.close()
-				doc = xml.dom.minidom.parseString(tempxml)
-				nodes = doc.getElementsByTagName("appSettings")[0].childNodes
-				for node in nodes:
-					if node.nodeType == node.ELEMENT_NODE:
-						if node.getAttribute("key") == "GameClient.WIN32.Filename":
-							self.gameClientFilename = node.getAttribute("value")
-
 		except:
 			self.loadSuccess = False
 			raise

PyLotROLauncher/Settings.py

@@ -52,6 +52,7 @@ def LoadSettings(self, useGame=None):
 		self.focusAccount = True
 		self.winePrefix = os.environ.get('WINEPREFIX')
 		self.gameDir = ""
+		self.gameClientIdx = 0
 		self.hideWinMain = False
 		success = False
 
@@ -95,6 +96,8 @@ def LoadSettings(self, useGame=None):
 							self.hiResEnabled = True
 						else:
 							self.hiResEnabled = False
+					elif node.nodeName == "Game.Client.Index":
+						self.gameClientIdx = GetText(node.childNodes)
 					elif node.nodeName == "Game.Directory":
 						self.gameDir = GetText(node.childNodes)
 					elif node.nodeName == "Realm":
@@ -191,6 +194,10 @@ def SaveSettings(self, saveAccountDetails):
 		tempNode.appendChild(doc.createTextNode("%s" % (self.gameDir)))
 		gameConfigNode.appendChild(tempNode)
 
+		tempNode = doc.createElementNS(EMPTY_NAMESPACE, "Game.Client.Index")
+		tempNode.appendChild(doc.createTextNode("%s" % (self.gameClientIdx)))
+		gameConfigNode.appendChild(tempNode)
+
 		tempNode = doc.createElementNS(EMPTY_NAMESPACE, "PatchClient")
 		tempNode.appendChild(doc.createTextNode("%s" % (self.patchClient)))
 		gameConfigNode.appendChild(tempNode)

PyLotROLauncher/SettingsWindow.py

@@ -34,7 +34,7 @@
 
 class SettingsWindow:
 	def __init__(self, parent, hiRes, app, wineProg, wineDebug, patchClient, winePrefix,
-		gameDir, homeDir, osType, rootDir):
+		gameDir, homeDir, osType, rootDir, gameClientIdx):
 
 		self.homeDir = homeDir
 		self.osType = osType
@@ -77,6 +77,9 @@ def __init__(self, parent, hiRes, app, wineProg, wineDebug, patchClient, winePre
 		self.uiSettings.txtGameDir.setText(gameDir)
 		self.uiSettings.cboGraphics.addItem("Enabled")
 		self.uiSettings.cboGraphics.addItem("Disabled")
+		self.uiSettings.cboGameClient.addItem("32-bit")
+		self.uiSettings.cboGameClient.addItem("32-bit Legacy (\"Awesomium\")")
+		self.uiSettings.cboGameClient.addItem("64-bit")
 		self.uiSettings.chkAdvanced.setChecked(False)
 		self.uiSettings.txtPatchClient.setText(patchClient)
 		self.uiSettings.txtPatchClient.setEnabled(False)
@@ -102,6 +105,8 @@ def __init__(self, parent, hiRes, app, wineProg, wineDebug, patchClient, winePre
 		else:
 			self.uiSettings.cboGraphics.setCurrentIndex(1)
 
+		self.uiSettings.cboGameClient.setCurrentIndex(int(gameClientIdx))
+
 		QtCore.QObject.connect(self.uiSettings.btnGameDir, QtCore.SIGNAL("clicked()"), self.btnGameDirClicked)
 		QtCore.QObject.connect(self.uiSettings.chkAdvanced, QtCore.SIGNAL("clicked()"), self.chkAdvancedClicked)
 
@@ -203,6 +208,9 @@ def getHiRes(self):
 		else:
 			return False
 
+	def getGameClientIdx(self):
+		return self.uiSettings.cboGameClient.currentIndex()
+
 	def Run(self):
 		return self.winSettings.exec_()