forked from metin2/client
remove: OpenID
This commit is contained in:
@ -262,14 +262,10 @@ class LoginWindow(ui.ScriptWindow):
|
||||
else:
|
||||
connectingIP = self.stream.GetConnectAddr()
|
||||
if connectingIP:
|
||||
if app.USE_OPENID and not app.OPENID_TEST :
|
||||
self.__RefreshServerList()
|
||||
self.__OpenServerBoard()
|
||||
else:
|
||||
self.__OpenLoginBoard()
|
||||
if IsFullBackImage():
|
||||
self.GetChild("bg1").Hide()
|
||||
self.GetChild("bg2").Show()
|
||||
self.__OpenLoginBoard()
|
||||
if IsFullBackImage():
|
||||
self.GetChild("bg1").Hide()
|
||||
self.GetChild("bg2").Show()
|
||||
|
||||
else:
|
||||
self.__RefreshServerList()
|
||||
@ -287,13 +283,13 @@ class LoginWindow(ui.ScriptWindow):
|
||||
|
||||
print "---------------------------------------------------------------------------- CLOSE LOGIN WINDOW "
|
||||
#
|
||||
# selectMusic<69><63> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> BGM<47><4D> <20><><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD> <20>ΰ<EFBFBD> <20><> üũ<C3BC>Ѵ<EFBFBD>.
|
||||
# selectMusic<69><63> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> BGM<47><4D> <20><><EFBFBD><EFBFBD>Ƿ<EFBFBD> <20>ΰ<EFBFBD> <20><> üũ<C3BC>Ѵ<EFBFBD>.
|
||||
#
|
||||
if musicInfo.loginMusic != "" and musicInfo.selectMusic != "":
|
||||
snd.FadeOutMusic("BGM/"+musicInfo.loginMusic)
|
||||
|
||||
## NOTE : idEditLine<6E><65> pwdEditLine<6E><65> <20>̺<EFBFBD>Ʈ<EFBFBD><C6AE> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ǿ<EFBFBD><C7BE>־
|
||||
## Event<6E><74> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʱ<EFBFBD>ȭ <20><><EFBFBD>־<EFBFBD><EFBFBD>߸<EFBFBD> <20>մϴ<D5B4> - [levites]
|
||||
## NOTE : idEditLine<6E><65> pwdEditLine<6E><65> <20>̺<EFBFBD>Ʈ<EFBFBD><C6AE> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ǿ<EFBFBD><C7BE>־
|
||||
## Event<6E><74> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʱ<EFBFBD>ȭ <20><><EFBFBD>־<EFBFBD>߸<EFBFBD> <20>մϴ<D5B4> - [levites]
|
||||
self.idEditLine.SetTabEvent(0)
|
||||
self.idEditLine.SetReturnEvent(0)
|
||||
self.pwdEditLine.SetReturnEvent(0)
|
||||
@ -393,11 +389,11 @@ class LoginWindow(ui.ScriptWindow):
|
||||
|
||||
def SetPasswordEditLineFocus(self):
|
||||
if localeInfo.IsEUROPE():
|
||||
if self.idEditLine != None: #0000862: [M2EU] <20>α<EFBFBD><CEB1><EFBFBD>â <20>˾<EFBFBD> <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> None <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
if self.idEditLine != None: #0000862: [M2EU] <20>α<EFBFBD><CEB1><EFBFBD>â <20>˾<EFBFBD> <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> None <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
self.idEditLine.SetText("")
|
||||
self.idEditLine.SetFocus() #0000685: [M2EU] <20><><EFBFBD>̵<EFBFBD>/<2F><><EFBFBD>й<EFBFBD>ȣ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>̵<EFBFBD><CCB5><EFBFBD> <20><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
self.idEditLine.SetFocus() #0000685: [M2EU] <20><><EFBFBD>̵<EFBFBD>/<2F><>й<EFBFBD>ȣ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>̵<EFBFBD><CCB5> <20><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
|
||||
|
||||
if self.pwdEditLine != None: #0000862: [M2EU] <20>α<EFBFBD><CEB1><EFBFBD>â <20>˾<EFBFBD> <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> None <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
if self.pwdEditLine != None: #0000862: [M2EU] <20>α<EFBFBD><CEB1><EFBFBD>â <20>˾<EFBFBD> <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> None <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
self.pwdEditLine.SetText("")
|
||||
else:
|
||||
if self.pwdEditLine != None:
|
||||
@ -455,7 +451,7 @@ class LoginWindow(ui.ScriptWindow):
|
||||
loginFailureMsg = localeInfo.LOGIN_FAILURE_UNKNOWN + error
|
||||
|
||||
|
||||
#0000685: [M2EU] <20><><EFBFBD>̵<EFBFBD>/<2F><><EFBFBD>й<EFBFBD>ȣ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>н<EFBFBD><D0BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
#0000685: [M2EU] <20><><EFBFBD>̵<EFBFBD>/<2F><>й<EFBFBD>ȣ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>н<EFBFBD><D0BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
|
||||
loginFailureFunc=self.loginFailureFuncDict.get(error, self.SetPasswordEditLineFocus)
|
||||
|
||||
if app.loggined:
|
||||
@ -703,18 +699,18 @@ class LoginWindow(ui.ScriptWindow):
|
||||
execfile(loginInfoFileName, loginInfo)
|
||||
except IOError:
|
||||
print(\
|
||||
"<EFBFBD>ڵ<EFBFBD> <20>α<EFBFBD><CEB1><EFBFBD><EFBFBD><EFBFBD> <20>Ͻ÷<CFBD><C3B7><EFBFBD>" + loginInfoFileName + "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ۼ<EFBFBD><DBBC><EFBFBD><EFBFBD>ּ<EFBFBD><D6BC><EFBFBD>\n"\
|
||||
"<EFBFBD>ڵ<EFBFBD> <20>α<EFBFBD><CEB1><EFBFBD><EFBFBD><EFBFBD> <20>Ͻ÷<CFBD><C3B7><EFBFBD>" + loginInfoFileName + "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ۼ<EFBFBD><DBBC><EFBFBD><EFBFBD>ּ<EFBFBD><D6BC><EFBFBD>\n"\
|
||||
"\n"\
|
||||
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n"\
|
||||
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n"\
|
||||
"================================================================\n"\
|
||||
"addr=<3D>ּ<EFBFBD>\n"\
|
||||
"port=<3D><>Ʈ\n"\
|
||||
"id=<3D><><EFBFBD>̵<EFBFBD>\n"\
|
||||
"pwd=<3D><><EFBFBD>й<EFBFBD>ȣ\n"\
|
||||
"slot=ij<><C4B3><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ε<EFBFBD><CEB5><EFBFBD> (<28><><EFBFBD>ų<EFBFBD> -1<≯<EFBFBD> <20>ڵ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>)\n"\
|
||||
"autoLogin=<3D>ڵ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n"
|
||||
"autoSelect=<3D>ڵ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n"
|
||||
"locale=(ymir) LC_Ymir <20>ϰ<EFBFBD><CFB0><EFBFBD> ymir<69><72> <20>۵<EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> korea<65><61> <20>۵<EFBFBD>\n"
|
||||
"addr=<3D>ּ<EFBFBD>\n"\
|
||||
"port=<3D><>Ʈ\n"\
|
||||
"id=<3D><><EFBFBD>̵<EFBFBD>\n"\
|
||||
"pwd=<3D><>й<EFBFBD>ȣ\n"\
|
||||
"slot=ij<><C4B3><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ε<EFBFBD><CEB5><EFBFBD> (<28><><EFBFBD>ų<EFBFBD> -1<≯<EFBFBD> <20>ڵ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>)\n"\
|
||||
"autoLogin=<3D>ڵ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n"
|
||||
"autoSelect=<3D>ڵ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n"
|
||||
"locale=(ymir) LC_Ymir <20>ϰ<EFBFBD><CFB0> ymir<69><72> <20>۵<EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> korea<65><61> <20>۵<EFBFBD>\n"
|
||||
);
|
||||
|
||||
id=loginInfo.get("id", "")
|
||||
@ -738,7 +734,7 @@ class LoginWindow(ui.ScriptWindow):
|
||||
self.__SetServerInfo(locale.CHANNEL_TEST_SERVER)
|
||||
except:
|
||||
import exception
|
||||
exception.Abort("LoginWindow.__LoadLoginInfo - <20><EFBFBD>Ʈ<EFBFBD><C6AE><EFBFBD><EFBFBD> <20>ּҰ<D6BC> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>")
|
||||
exception.Abort("LoginWindow.__LoadLoginInfo - <20><EFBFBD>Ʈ<EFBFBD><C6AE><EFBFBD><EFBFBD> <20>ּҰ<D6BC> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>")
|
||||
|
||||
else:
|
||||
addr=loginInfo.get("addr", "")
|
||||
@ -752,7 +748,7 @@ class LoginWindow(ui.ScriptWindow):
|
||||
net.SetMarkServer(addr, port)
|
||||
|
||||
if locale == "ymir" :
|
||||
net.SetServerInfo("õ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>")
|
||||
net.SetServerInfo("õ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>")
|
||||
self.serverInfo.SetText("Y:"+addr+":"+str(port))
|
||||
else:
|
||||
net.SetServerInfo(addr+":"+str(port))
|
||||
@ -783,7 +779,7 @@ class LoginWindow(ui.ScriptWindow):
|
||||
self.Connect(id, pwd)
|
||||
|
||||
print "=================================================================================="
|
||||
print "<EFBFBD>ڵ<EFBFBD> <20>α<EFBFBD><CEB1><EFBFBD>: %s - %s:%d %s" % (loginInfoFileName, addr, port, id)
|
||||
print "<EFBFBD>ڵ<EFBFBD> <20>α<EFBFBD><CEB1><EFBFBD>: %s - %s:%d %s" % (loginInfoFileName, addr, port, id)
|
||||
print "=================================================================================="
|
||||
|
||||
|
||||
@ -902,9 +898,9 @@ class LoginWindow(ui.ScriptWindow):
|
||||
self.stream.popupWindow.Close()
|
||||
|
||||
# CHINA_MATRIX_CARD_BUG_FIX
|
||||
## A~Z <20><><EFBFBD><EFBFBD> 26 <20>̳<EFBFBD><CCB3><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><EFBFBD>߸<EFBFBD> <20>Ѵ<EFBFBD>.
|
||||
## Python Exception Log <20><><EFBFBD><EFBFBD> <20><> <20>̻<EFBFBD><CCBB><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>־ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
|
||||
## <20>嵥 <20><> <20>ѱ<EFBFBD><D1B1><EFBFBD> <20>α<CEB1><D7BF><EFBFBD> <20>̰<EFBFBD> Ȱ<><C8B0><EFBFBD>Ǵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD><F0B8A3B0><EFBFBD>
|
||||
## A~Z <20><><EFBFBD><EFBFBD> 26 <20>̳<EFBFBD><CCB3><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>־<EFBFBD>߸<EFBFBD> <20>Ѵ<EFBFBD>.
|
||||
## Python Exception Log <20><><EFBFBD><EFBFBD> <20><> <20>̻<EFBFBD><CCBB><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>־ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
|
||||
## <20>嵥 <20><> <20>ѱ<EFBFBD><D1B1><EFBFBD> <20>α<CEB1><D7BF><EFBFBD> <20>̰<EFBFBD> Ȱ<><C8B0>Ǵ<EFBFBD><C7B4><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD><F0B8A3B0><EFBFBD>
|
||||
row1 = min(30, row1)
|
||||
row2 = min(30, row2)
|
||||
row3 = min(30, row3)
|
||||
@ -1031,7 +1027,7 @@ class LoginWindow(ui.ScriptWindow):
|
||||
if channelIndex >= 0:
|
||||
self.channelList.SelectItem(channelIndex)
|
||||
|
||||
## Show/Hide <20>ڵ忡 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>־ <20>ӽ<EFBFBD> - [levites]
|
||||
## Show/Hide <20>ڵ忡 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>־ <20>ӽ<EFBFBD> - [levites]
|
||||
self.serverBoard.SetPosition(self.xServerBoard, self.yServerBoard)
|
||||
self.serverBoard.Show()
|
||||
self.connectBoard.Hide()
|
||||
@ -1265,7 +1261,7 @@ class LoginWindow(ui.ScriptWindow):
|
||||
self.PopupNotifyMessage(localeInfo.CHANNEL_SELECT_CHANNEL)
|
||||
return
|
||||
|
||||
# <20><><EFBFBD>°<EFBFBD> FULL <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
|
||||
# <20><><EFBFBD>°<EFBFBD> FULL <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
|
||||
if state == serverInfo.STATE_DICT[3]:
|
||||
self.PopupNotifyMessage(localeInfo.CHANNEL_NOTIFY_FULL)
|
||||
return
|
||||
@ -1277,9 +1273,9 @@ class LoginWindow(ui.ScriptWindow):
|
||||
channelName = serverInfo.REGION_DICT[regionID][serverID]["channel"][channelID]["name"]
|
||||
addrKey = serverInfo.REGION_DICT[regionID][serverID]["channel"][channelID]["key"]
|
||||
|
||||
if "õ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>" == serverName:
|
||||
if "õ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>" == serverName:
|
||||
app.ForceSetLocale("ymir", "locale/ymir")
|
||||
elif "<EFBFBD>赵 <20><><EFBFBD><EFBFBD>" == serverName:
|
||||
elif "<EFBFBD>赵 <20><><EFBFBD><EFBFBD>" == serverName:
|
||||
app.ForceSetLocale("we_korea", "locale/we_korea")
|
||||
|
||||
except:
|
||||
@ -1294,7 +1290,7 @@ class LoginWindow(ui.ScriptWindow):
|
||||
tcp_port = serverInfo.REGION_DICT[regionID][serverID]["channel"][channelID]["tcp_port"]
|
||||
except:
|
||||
import exception
|
||||
exception.Abort("LoginWindow.__OnClickSelectServerButton - <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>")
|
||||
exception.Abort("LoginWindow.__OnClickSelectServerButton - <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>")
|
||||
|
||||
try:
|
||||
account_ip = serverInfo.REGION_AUTH_SERVER_DICT[regionID][serverID]["ip"]
|
||||
@ -1314,19 +1310,10 @@ class LoginWindow(ui.ScriptWindow):
|
||||
|
||||
except:
|
||||
import exception
|
||||
exception.Abort("LoginWindow.__OnClickSelectServerButton - <20><>ũ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>")
|
||||
exception.Abort("LoginWindow.__OnClickSelectServerButton - <20><>ũ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>")
|
||||
|
||||
|
||||
if app.USE_OPENID and not app.OPENID_TEST :
|
||||
## 2012.07.19 OpenID : <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
# ä<><C3A4> <20><><EFBFBD><EFBFBD> ȭ<>鿡<EFBFBD><E9BFA1> "Ȯ<><C8AE>"(SelectServerButton) <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
|
||||
# <20>α<EFBFBD><CEB1><EFBFBD> ȭ<><C8AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>Ѿ<D1BE><EEB0A1> <20>ʰ<EFBFBD> <20>ٷ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> OpenID <20><><EFBFBD><EFBFBD>Ű<EFBFBD><C5B0> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
|
||||
self.stream.SetConnectInfo(ip, tcp_port, account_ip, account_port)
|
||||
self.Connect(0, 0)
|
||||
else :
|
||||
self.stream.SetConnectInfo(ip, tcp_port, account_ip, account_port)
|
||||
self.__OpenLoginBoard()
|
||||
|
||||
self.stream.SetConnectInfo(ip, tcp_port, account_ip, account_port)
|
||||
self.__OpenLoginBoard()
|
||||
|
||||
def __OnClickSelectConnectButton(self):
|
||||
if IsFullBackImage():
|
||||
|
||||
Reference in New Issue
Block a user