reapack

commit 189cba27d16fde8976e848ec8c4520bc669a6e79
parent 7acb82afc48b9f66ced690a669b4badd4d5705a9
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Tue,  7 Jun 2016 16:37:16 -0400

manager: make copy url use the whole selection

Diffstat:
M
src/manager.cpp
 | 
27
++++++++++++---------------
M
src/manager.hpp
 | 
2
+-

2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/manager.cpp b/src/manager.cpp
@@ -83,6 +83,9 @@ void Manager::onCommand(const int id, int)
   case ACTION_REFRESH:
     refreshIndex();
     break;
+  case ACTION_COPYURL:
+    copyUrl();
+    break;
   case ACTION_UNINSTALL:
     uninstall();
     break;
@@ -126,8 +129,6 @@ void Manager::onCommand(const int id, int)
     const int action = id >> 8;
     if(action == ACTION_ABOUT)
       about(id & 0xff);
-    else if(action == ACTION_COPYURL)
-      copyUrl(id & 0xff);
     break;
   }
 }
@@ -157,7 +158,7 @@ void Manager::onContextMenu(HWND target, const int x, const int y)
   menu.addSeparator();
 
   menu.addAction(AUTO_STR("&Refresh"), ACTION_REFRESH);
-  menu.addAction(AUTO_STR("&Copy URL"), index | (ACTION_COPYURL << 8));
+  menu.addAction(AUTO_STR("&Copy URL"), ACTION_COPYURL);
 
   const UINT uninstallAction =
     menu.addAction(AUTO_STR("&Uninstall"), ACTION_UNINSTALL);
@@ -204,14 +205,8 @@ bool Manager::onKeyDown(const int key, const int mods)
     m_list->selectAll();
   else if(mods == (CtrlModifier | ShiftModifier) && key == 'A')
     m_list->unselectAll();
-  else if(mods == CtrlModifier && key == 'C') {
-    vector<string> values;
-
-    for(const int index : m_list->selection(false))
-      values.push_back(getRemote(index).url());
-
-    setClipboard(values);
-  }
+  else if(mods == CtrlModifier && key == 'C')
+    copyUrl();
   else
     return false;
 
@@ -335,12 +330,14 @@ void Manager::about(const int index)
   m_reapack->about(getRemote(index), handle());
 }
 
-void Manager::copyUrl(const int index)
+void Manager::copyUrl()
 {
-  const Remote &remote = getRemote(index);
+  vector<string> values;
+
+  for(const int index : m_list->selection(false))
+    values.push_back(getRemote(index).url());
 
-  if(remote)
-    setClipboard(remote.url());
+  setClipboard(values);
 }
 
 bool Manager::import()
diff --git a/src/manager.hpp b/src/manager.hpp
@@ -53,7 +53,7 @@ private:
   void toggle(boost::optional<bool> &, bool current);
   void refreshIndex();
   void about(int index);
-  void copyUrl(int index);
+  void copyUrl();
   void launchBrowser();
   void options();