Skip to content

Commit b41046b

Browse files
[Improve] Added plus button support in keystroke action
1 parent ab7e166 commit b41046b

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

Framework/Built_In_Automation/Desktop/Windows/BuiltInFunctions.py

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,7 +1743,7 @@ def Keystroke_For_Element(data_set):
17431743
left = left.strip().lower()
17441744
if "action" in mid.lower():
17451745
if left == "keystroke keys":
1746-
keystroke_value = right.lower() # Store keystroke
1746+
keystroke_value = right.strip().lower() # Store keystroke
17471747
elif left == "keystroke chars":
17481748
keystroke_char = right
17491749
if "parameter"in mid.lower():
@@ -1776,14 +1776,21 @@ def Keystroke_For_Element(data_set):
17761776
keystroke_value, count = keystroke_value.split(",")
17771777
count = int(count.strip())
17781778
keys = keystroke_value.split("+")
1779-
keys = [x.strip() for x in keys]
1779+
for i in range(len(keys)):
1780+
keys[i] = keys[i].strip()
1781+
if keys[i] == "plus":
1782+
keys[i] = "+"
1783+
elif keys[i] == "minus":
1784+
keys[i] = "-"
1785+
elif keys[i] == "comma":
1786+
keys[i] = ","
17801787

17811788
for i in range(count):
17821789
gui.hotkey(*keys) # Send keypress (as individual values using the asterisk)
17831790
CommonUtil.ExecLog(sModuleInfo, "Successfully entered keystroke", 1)
17841791
return "passed"
17851792

1786-
elif method_name=='autoit':
1793+
elif method_name == 'autoit':
17871794
try:
17881795
if keystroke_char != "":
17891796
autoit.send(keystroke_char)
@@ -1794,26 +1801,31 @@ def Keystroke_For_Element(data_set):
17941801
return CommonUtil.Exception_Handler(sys.exc_info(), None, errMsg)
17951802

17961803
count = 1
1797-
keystroke_value = keystroke_value
17981804
if "," in keystroke_value:
17991805
keystroke_value, count = keystroke_value.split(",")
18001806
count = int(count.strip())
18011807
keys = keystroke_value.split("+")
1802-
keys = [x.strip() for x in keys]
1808+
for i in range(len(keys)):
1809+
keys[i] = keys[i].strip()
1810+
if keys[i] == "plus":
1811+
keys[i] = "+"
1812+
elif keys[i] == "minus":
1813+
keys[i] = "-"
1814+
elif keys[i] == "comma":
1815+
keys[i] = ","
18031816

18041817
send_key = ""
18051818
for i in range(len(keys)):
18061819
if i == len(keys)-1:
18071820
send_key += '{' + keys[i] + ' ' + str(count) + '}'
18081821
else:
1809-
upper = keys[i].upper()
1810-
if upper == 'SHIFT':
1822+
if keys[i] == 'shift':
18111823
send_key += '+'
1812-
elif upper == 'CTRL':
1824+
elif keys[i] == 'ctrl':
18131825
send_key += '^'
1814-
elif upper == 'ALT':
1826+
elif keys[i] == 'alt':
18151827
send_key += '!'
1816-
elif upper == 'WIN':
1828+
elif keys[i] == 'win':
18171829
send_key += '#'
18181830
# print(send_key)
18191831
autoit.send(send_key)

0 commit comments

Comments
 (0)