8000 Drop cursor on ESC by IKhonakhbeeva · Pull Request #1553 · trikset/trik-studio · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Drop cursor on ESC #1553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2022
Merged

Drop cursor on ESC #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb207f4
Drop cursor on ESC
IKhonakhbeeva Jul 8, 2022
231b983
Fix build and add message for updating QT IFW
IKhonakhbeeva Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,18 @@ jobs:
git config --global core.autocrlf true

- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3
with:
dir: C:\
version: ${{matrix.qt-version}}
arch: win32_mingw${{matrix.mingw-short-version}}
modules: 'qtscript'
tools: 'tools_ifw,4.3.0,qt.tools.ifw.43 tools_mingw,${{matrix.mingw-version}}.0,qt.tools.win32_mingw${{matrix.mingw-short-version}}0'
tools: 'tools_ifw,4.4.0,qt.tools.ifw.44 tools_mingw,${{matrix.mingw-version}}.0,qt.tools.win32_mingw${{matrix.mingw-short-version}}0'
extra: '--external 7z'

- name: Check Qt IFW
run : test ! -d "${IQTA_TOOLS}/QtInstallerFramework" && echo "Use QT IFW version:" && aqt list-tool windows desktop tools_ifw && exit 1 || echo "QT IFW is okey"

# After Qt install action, that spoils pythonLocation variable
- name: Set up Python ${{matrix.python-version}}
uses: actions/setup-python@v2
Expand Down Expand Up @@ -195,7 +198,7 @@ jobs:
- name: Build installer
run: |
cd $GITHUB_WORKSPACE/installer
./build-trik-studio.sh "${Qt5_Dir}/bin" "${IQTA_TOOLS}/QtInstallerFramework/4.3/bin" "${{ env.BUILD_DIR }}"
./build-trik-studio.sh "${Qt5_Dir}/bin" "${IQTA_TOOLS}/QtInstallerFramework/4.4/bin" "${{ env.BUILD_DIR }}"

- name: Push installer
uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion plugins/robots/common/twoDModel/src/engine/view/parts/palette.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Palette::Palette(QWidget *parent)
mToolBar->setOrientation(Qt::Vertical);
layout->addWidget(mToolBar);

mCursorAction->setShortcuts({QKeySequence(Qt::Key_N), QKeySequence(Qt::Key_1)});
mCursorAction->setShortcuts({QKeySequence(Qt::Key_N), QKeySequence(Qt::Key_1), QKeySequence(Qt::Key_Escape)});
mCursorAction->setCheckable(true);
registerTool(mCursorAction.data());
}
Expand Down
0