From ea183a6889ac6527f39166bcbeaf778f39e701b2 Mon Sep 17 00:00:00 2001
From: Dmytro Maslenko <dmaslenko@gmail.com>
Date: Sun, 29 Jan 2023 14:40:09 -0500
Subject: [PATCH] Move 'Copy URL' into main entry context menu

---
 share/translations/keepassxc_en.ts |  8 ++++----
 src/gui/MainWindow.cpp             |  1 +
 src/gui/MainWindow.ui              | 13 ++++---------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index 590fec574..824846331 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -5137,10 +5137,6 @@ Are you sure you want to continue with this file?</source>
         <source>Copy title to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;URL</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Copy URL to clipboard</source>
         <translation type="unfinished"></translation>
@@ -5395,6 +5391,10 @@ We recommend you use the AppImage available on our downloads page.</source>
         <source>XML File…</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copy &amp;URL</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ManageDatabase</name>
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 036408224..92e894e0e 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -128,6 +128,7 @@ MainWindow::MainWindow()
     m_entryContextMenu->setSeparatorsCollapsible(true);
     m_entryContextMenu->addAction(m_ui->actionEntryCopyUsername);
     m_entryContextMenu->addAction(m_ui->actionEntryCopyPassword);
+    m_entryContextMenu->addAction(m_ui->actionEntryCopyURL);
     m_entryContextMenu->addAction(m_ui->menuEntryCopyAttribute->menuAction());
     m_entryContextMenu->addAction(m_ui->menuEntryTotp->menuAction());
     m_entryContextMenu->addAction(m_ui->menuTags->menuAction());
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 60b9d1b80..bbc06c180 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -216,7 +216,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>25</height>
+     <height>22</height>
     </rect>
    </property>
    <property name="contextMenuPolicy">
@@ -247,11 +247,6 @@
      <addaction name="actionExportHtml"/>
      <addaction name="actionExportXML"/>
     </widget>
-    <widget class="QMenu" name="menu_Quit">
-     <property name="title">
-      <string>&amp;Quit</string>
-     </property>
-    </widget>
     <addaction name="actionDatabaseNew"/>
     <addaction name="actionDatabaseOpen"/>
     <addaction name="menuRecentDatabases"/>
@@ -306,7 +301,6 @@
       <string>Copy Att&amp;ribute</string>
      </property>
      <addaction name="actionEntryCopyTitle"/>
-     <addaction name="actionEntryCopyURL"/>
      <addaction name="actionEntryCopyNotes"/>
      <addaction name="separator"/>
     </widget>
@@ -338,6 +332,7 @@
     <addaction name="separator"/>
     <addaction name="actionEntryCopyUsername"/>
     <addaction name="actionEntryCopyPassword"/>
+    <addaction name="actionEntryCopyURL"/>
     <addaction name="menuEntryCopyAttribute"/>
     <addaction name="menuEntryTotp"/>
     <addaction name="menuTags"/>
@@ -818,7 +813,7 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>&amp;URL</string>
+    <string>Copy &amp;URL</string>
    </property>
    <property name="toolTip">
     <string>Copy URL to clipboard</string>
@@ -895,7 +890,7 @@
     <string>Copy &amp;TOTP</string>
    </property>
   </action>
-    <action name="actionEntryCopyPasswordTotp">
+  <action name="actionEntryCopyPasswordTotp">
    <property name="text">
     <string>Copy Password and TOTP</string>
    </property>