Rename getTextFromClipboard to pasteTextFromClipboard

Signed-off-by: Ben Chamberland <[email protected]>

Author: chxmberland

src/bin/imgtools/rvio/UICommands.cpp

@@ -279,7 +279,7 @@ void initUICommands(MuLangContext* context)
                                       new Param(c, "doEncode", "bool", Value(true)), 
                                       End),
 
-                         new Function(c, "getTextFromClipboard", getTextFromClipboard, None,
+                         new Function(c, "pasteTextFromClipboard", pasteTextFromClipboard, None,
                                       Return, "string",
                                       End),
 
@@ -470,7 +470,7 @@ NODE_DECLARATION(putUrlOnClipboard, void)
 {
 }
 
-NODE_DECLARAION(getTextFromClipboard, Mu::Pointer)
+NODE_DECLARAION(pasteTextFromClipboard, Mu::Pointer)
 {
     NODE_RETURN(0); // Will represent a string
 }

src/bin/imgtools/rvio/UICommands.h

@@ -50,7 +50,7 @@ NODE_DECLARATION(httpGet, void);
 NODE_DECLARATION(httpPost, void);
 NODE_DECLARATION(sessionFromUrl, void);
 NODE_DECLARATION(putUrlOnClipboard, void);
-NODE_DECLARATION(getTextFromClipboard, Mu::Pointer);
+NODE_DECLARATION(pasteTextFromClipboard, Mu::Pointer);
 NODE_DECLARATION(myNetworkPort, int);
 NODE_DECLARATION(encodePassword, Mu::Pointer);
 NODE_DECLARATION(decodePassword, Mu::Pointer);

src/lib/app/RvCommon/MuUICommands.cpp

@@ -491,7 +491,7 @@ void initUICommands()
                                       new Param(c, "doEncode", "bool", Value(true)),
                                       End),
 
-                         new Function(c, "getTextFromClipboard", getTextFromClipboard, None,
+                         new Function(c, "pasteTextFromClipboard", pasteTextFromClipboard, None,
                                       Return, "string",
                                       End),
 
@@ -2042,9 +2042,9 @@ NODE_IMPLEMENTATION(sessionFromUrl, void)
     RvApp()->sessionFromUrl(url->c_str());
 }
 
-NODE_IMPLEMENTATION(getTextFromClipboard, Pointer) {
+NODE_IMPLEMENTATION(pasteTextFromClipboard, Pointer) {
     const StringType* stype = static_cast<const StringType*>(NODE_THIS.type());
-    std::string s = RvApp()->getTextFromClipboard(); // Getting text from the clipboard
+    std::string s = RvApp()->pasteTextFromClipboard(); // Getting text from the clipboard
     Mu::Pointer p = stype->allocate(s.c_str());
     NODE_RETURN(p);
 }

src/lib/app/RvCommon/RvApplication.cpp

@@ -1450,7 +1450,7 @@ RvApplication::putUrlOnClipboard(string url, string title, bool doEncode)
 }
 
 std::string
-RvApplication::getTextFromClipboard()
+RvApplication::pasteTextFromClipboard()
 {
     QString text;
     QClipboard *clipboard = QApplication::clipboard();

src/lib/app/RvCommon/RvCommon/MuUICommands.h

@@ -61,7 +61,7 @@ NODE_DECLARATION(httpPutString, void);
 NODE_DECLARATION(httpPutData, void);
 NODE_DECLARATION(sessionFromUrl, void);
 NODE_DECLARATION(putUrlOnClipboard, void);
-NODE_DECLARATION(getTextFromClipboard, Mu::Pointer);
+NODE_DECLARATION(pasteTextFromClipboard, Mu::Pointer);
 NODE_DECLARATION(myNetworkPort, int);
 NODE_DECLARATION(myNetworkHost, Mu::Pointer);
 NODE_DECLARATION(encodePassword, Mu::Pointer);

src/lib/app/RvCommon/RvCommon/RvApplication.h

@@ -100,7 +100,7 @@ class RvApplication : public QObject, public RvConsoleApplication
     static void parseURL (const char *s, std::vector<char *> &av);
     static void sessionFromUrl (std::string url);
     static void putUrlOnClipboard (std::string url, std::string title, bool doEncode=true);
-    static std::string getTextFromClipboard ();
+    static std::string pasteTextFromClipboard ();
     static std::string encodeCommandLineURL (int argc, char *argv[]);
     static std::string bakeCommandLineURL (int argc, char *argv[]);
     static void initializeQSettings (std::string altPath);

src/lib/app/mu_rvui/commands.mud

@@ -1727,7 +1727,7 @@ networkAccessManager "Returns Qt network access manager object"
 //javascriptMuExport "Export Mu eval() call as a javascript Object in the given WebFrame"
 sessionFromUrl "Create a session from a (possibly baked) rvlink URL"
 putUrlOnClipboard "Copy a URL on the system clipboard"
-getTextFromClipboard "Get the text sitting in your clipboard"
+pasteTextFromClipboard "Get the text sitting in your clipboard"
 myNetworkPort "Returns the currently set port number for networking"
 myNetworkHost "Returns the name of the host RV is running on for purposes of networking"
 encodePassword "-"

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

@@ -622,16 +622,17 @@ class: AnnotateMinorMode : MinorMode
         populateAnnotationList();
     }
 
-    method: getTextFromClipboard (void; Event event)
+    method: pasteTextFromClipboard (void; Event event)
     {
         // Getting text directly from the users clipboard
-        let text = commands.getTextFromClipboard();
+        let text = commands.pasteTextFromClipboard();
 
         if (text == "") {
             print("WARNING: Clipboard is empty");
 
         } else {
             _textPlacementMode = true;
+            _textBuffer.pop_back();
 
             for (int i = 0; i < text.size(); i++)
                 _textBuffer.push_back(text[i]);
@@ -2170,7 +2171,7 @@ class: AnnotateMinorMode : MinorMode
                           ("key-down--alt--backspace", backwardsKillWord, ""),
                           ("key-down--shift--backspace", backwardsKillWord, ""),
                           ("key-down--control--backspace", backwardsKillWord, ""),
-                          ("key-down--meta--v", getTextFromClipboard, ""), // Paste from clipboard
+                          ("key-down--meta--v", pasteTextFromClipboard, ""), // Paste from clipboard
                           ("key-down--meta--a", killLine, ""),
                           ("key-down--alt--a", killLine, ""),
                           ("key-down--space", insertChar, ""),