Skip to content

Commit

Permalink
Update to v1.3.7 Build 20240812.
Browse files Browse the repository at this point in the history
Signed-off-by: Melvin Li <[email protected]>
  • Loading branch information
Zalafina committed Aug 13, 2024
1 parent a6f6ff1 commit 5db9897
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion QKeyMapper/QKeyMapper.rc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "https://github.com/Zalafina/QKeyMapper"
VALUE "FileDescription", "QKeyMapper v1.3.7 Build 20240810"
VALUE "FileDescription", "QKeyMapper v1.3.7 Build 20240812"
VALUE "FileVersion", "1.3.7.0"
VALUE "InternalName", "QKeyMapper"
VALUE "LegalCopyright", "Copyright (c) 2023, AsukaVoV"
Expand Down
4 changes: 2 additions & 2 deletions QKeyMapper/qkeymapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8295,9 +8295,9 @@ void QKeyMapper::on_addmapdataButton_clicked()
}

QString gamepadselect_string = ui->gamepadSelectComboBox->currentText();
if (currentOriKeyText.startsWith("^Joy-")
if (currentOriKeyText.startsWith("Joy-")
&& false == gamepadselect_string.isEmpty()) {
static QRegularExpression gamepadinfo_regex(R"(^\[(\d)\] (.*?) \[VID=0x([0-9A-F]+)\]\[PID=0x([0-9A-F]+)\](?:\[ViGEM\])$)");
static QRegularExpression gamepadinfo_regex(R"(^\[(\d+)\] (.*?) \[VID=0x([0-9A-F]+)\]\[PID=0x([0-9A-F]+)\](?:\[ViGEM\])?$)");
QRegularExpressionMatch gamepadinfo_match = gamepadinfo_regex.match(gamepadselect_string);
if (gamepadinfo_match.hasMatch()) {
QString player_index_string = gamepadinfo_match.captured(1);
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@

---------------
### 新添加功能列表(根据更新时间降序排列)
* v1.3.7(Build 20240810)
* v1.3.7(Build 20240812)
* 原始按键列表中"Joy-"开头的物理手柄按键可以添加"@" + "0到9" 的数字编号来选择输入手柄的玩家编号(PlayerIndex)来进行区分映射,可支持0到9总共10个玩家编号。不添加"@" + "0到9" 的数字编号则映射来自所有物理手柄的输入。
* 添加"游戏手柄"下拉组合框用于配合"原始按键"列表选择原始按键映射的游戏手柄玩家编号(PlayerIndex),根据所选择的游戏手柄玩家编号(PlayerIndex)在添加"Joy-"开头的原始按键映射时候在后面追加"@+数字编号0~9",例如:"Joy-Key1(A/×)@0"表示0号游戏手柄的(A/×)按键。
* 移除功能 [鼠标点击高亮选择一条映射表项目后,按下键盘"Backspace"键可以删除最后一个"»"或"+"连接的映射按键],映射按键可以通过映射项设定窗口中的"映射按键"编辑框进行修改。
* v1.3.7(Build 20240711)
* "映射按键列表"添加SendText映射,选择SendText后在"文本"单行编辑框中输入文字可以在按下原始按键时向当前前台窗口或指定窗口发送SendText()括号内的字符串。
Expand Down

0 comments on commit 5db9897

Please sign in to comment.