# HG changeset patch # User madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09 # Date 1337770705 0 # Node ID 08c83fa555a539bf013f55dd41e5536af2e3aecf # Parent a4e2eaf9cad900ae05be73dcbd10ebec61a511d2 Updated the popup strings diff -r a4e2eaf9cad9 -r 08c83fa555a5 Localisation.lua --- a/Localisation.lua Wed May 23 08:26:07 2012 +0000 +++ b/Localisation.lua Wed May 23 10:58:25 2012 +0000 @@ -368,7 +368,14 @@ MouseRow6Name="Hat Bottom", MouseRow9Name="Button 1", MouseRowBName="Button 3", - MouseRowAName="Back Button" + MouseRowAName="Back Button", + MouseRow12Name="Thumb Anticlockwise", + MouseRow13Name="Thumb Clockwise", + MouseRow11Name="Button 3", + MouseRow10Name="Back Button", + BindingFrameHeaderText="Please press the appropriate button", + BindingFrameExitButton="Close", + CurrentBinding="Current Binding", }, ["frFR"] = { CyborgButtonTitle="Bouton Cyborg", diff -r a4e2eaf9cad9 -r 08c83fa555a5 OptionPage.xml --- a/OptionPage.xml Wed May 23 08:26:07 2012 +0000 +++ b/OptionPage.xml Wed May 23 10:58:25 2012 +0000 @@ -575,7 +575,7 @@ - + @@ -587,7 +587,7 @@ - + @@ -597,7 +597,7 @@ - + @@ -606,16 +606,7 @@ - - - - - - - - - - + @@ -636,7 +627,7 @@ - - diff -r a4e2eaf9cad9 -r 08c83fa555a5 OptionView.lua --- a/OptionView.lua Wed May 23 08:26:07 2012 +0000 +++ b/OptionView.lua Wed May 23 10:58:25 2012 +0000 @@ -30,7 +30,17 @@ local lastButton = nil function BindButton(name) - lastButton = name; + lastButton = name + local index = GetButtonIndex(name) + local mode = 1 + while(index > 13) do + mode = mode + 1 + index = index - 13 + end + local buttonStr = StringTable[("MouseRow"..index.."Name")] + + getglobal("BindingFrameButtonName"):SetText(buttonStr.." Mode "..mode) + getglobal("BindingFrameKey"):SetText(StringTable["CurrentBinding"].." "..WowCommands[GetButtonIndex(lastButton)]) BindingFrame:Show() end @@ -184,27 +194,4 @@ SetNewKeybind(keyPressed) ---~ if keyPressed then ---~ BindPadCore.keyPressed = keyPressed ---~ local oldAction = GetBindingAction(keyPressed) ---~ ---~ local keyText = BindPadCore.GetBindingText(keyPressed, "KEY_"); ---~ if oldAction~="" and oldAction ~= BindPadCore.selectedSlot.action then ---~ if StaticPopupDialogs["BINDPAD_CONFIRM_BINDING"] == nil then ---~ StaticPopupDialogs["BINDPAD_CONFIRM_BINDING"] = { ---~ button1 = YES, ---~ button2 = NO, ---~ timeout = 0, ---~ hideOnEscape = 1, ---~ OnAccept = BindPadBindFrame_SetBindKey, ---~ OnCancel = BindPadBindFrame_Update, ---~ whileDead = 1 ---~ } ---~ end ---~ StaticPopupDialogs["BINDPAD_CONFIRM_BINDING"].text = format(BINDPAD_TEXT_CONFIRM_BINDING, keyText, oldAction, keyText, BindPadCore.selectedSlot.action); ---~ StaticPopup_Show("BINDPAD_CONFIRM_BINDING") ---~ else ---~ BindPadBindFrame_SetBindKey(); ---~ end ---~ end end