Skip to content

Commit a3b5634

Browse files
committed
Move changes to correct folder
Signed-off-by: Ben Chamberland <[email protected]>
1 parent 0df32a7 commit a3b5634

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

rvcmds.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ RV_BUILD_PARALLELISM="${RV_BUILD_PARALLELISM:-$(python3 -c 'import os; print(os.
7979

8080
# ALIASES: Basic commands
8181

82-
alias rvsetup="SETUPTOOLS_USE_DISTUTILS=${SETUPTOOLS_USE_DISTUTILS} python3 -m pip install --user --upgrade -r ${RV_HOME}/requirements.txt --break-system-packages"
82+
alias rvsetup="SETUPTOOLS_USE_DISTUTILS=${SETUPTOOLS_USE_DISTUTILS} python3 -m pip install --user --upgrade -r ${RV_HOME}/requirements.txt"
8383
alias rvcfg="cmake -B ${RV_BUILD} -G \"${CMAKE_GENERATOR}\" ${CMAKE_WIN_ARCH} -DCMAKE_BUILD_TYPE=Release -DRV_DEPS_QT5_LOCATION=${QT_HOME} -DRV_DEPS_WIN_PERL_ROOT=${WIN_PERL}"
8484
alias rvcfgd="cmake -B ${RV_BUILD} -G \"${CMAKE_GENERATOR}\" ${CMAKE_WIN_ARCH} -DCMAKE_BUILD_TYPE=Debug -DRV_DEPS_QT5_LOCATION=${QT_HOME} -DRV_DEPS_WIN_PERL_ROOT=${WIN_PERL}"
8585
alias rvbuildt="cmake --build ${RV_BUILD} --config Release -v --parallel=${RV_BUILD_PARALLELISM} --target "

src/plugins/rv-packages/annotate/annotate_mode.mu

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,22 @@ class: AnnotateMinorMode : MinorMode
622622
populateAnnotationList();
623623
}
624624

625-
method: getTextFromClipboard(string;)
625+
method: getTextFromClipboard (void; Event event)
626626
{
627+
// Getting text directly from the users clipboard
628+
let text = commands.getTextFromClipboard();
627629

630+
if (text == "") {
631+
print("WARNING: Clipboard is empty");
632+
633+
} else {
634+
_textPlacementMode = true;
635+
636+
for (int i = 0; i < text.size(); i++)
637+
_textBuffer.push_back(text[i]);
638+
639+
setText(_textBuffer);
640+
}
628641
}
629642

630643
//----------------------------------------------------------------------
@@ -1110,12 +1123,6 @@ class: AnnotateMinorMode : MinorMode
11101123
_toolSliderLabel.setText(if d.sliderName eq nil then "Opacity" else d.sliderName);
11111124
}
11121125

1113-
method: getClipboard(string;)
1114-
{
1115-
print("DEBUG: Getting clipboard from Mu file");
1116-
commands.getTextFromClipboard();
1117-
}
1118-
11191126
method: locationChangedSlot (void; Qt.DockWidgetArea area)
11201127
{
11211128
_dockArea = area;
@@ -2159,14 +2166,14 @@ class: AnnotateMinorMode : MinorMode
21592166
("key-down--backspace", backwardDeleteChar, "Back Char"),
21602167
("key-down--delete", backwardDeleteChar, "Back Char"),
21612168
("key-down--control--a", killLine, ""),
2162-
("key-down--meta--backspace", backwardsKillWord, ""),
2169+
//("key-down--meta--backspace", backwardsKillWord, ""),
21632170
("key-down--alt--backspace", backwardsKillWord, ""),
21642171
("key-down--shift--backspace", backwardsKillWord, ""),
2165-
("key-down--control--backspace", backwardsKillWord, ""),
2172+
//("key-down--control--backspace", backwardsKillWord, ""),
2173+
("key-down--meta--backspace", getTextFromClipboard, ""),
21662174
("key-down--meta--a", killLine, ""),
21672175
("key-down--alt--a", killLine, ""),
2168-
// ("key-down--space", insertChar, ""),
2169-
("key-down--space", getClipboard, ""),
2176+
("key-down--space", insertChar, ""),
21702177
("key-down--enter", insertNL, ""),
21712178
("key-down--control--enter", commitText(false,), ""),
21722179
("key-down--meta--enter", commitText(false,), ""),

0 commit comments

Comments
 (0)