ui: improve commands text and icons (#159)

moshfeu · Sep 21, 2024 · c54edbc · c54edbc
1 parent 1139722
commit c54edbc
Showing 1 changed file with 46 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -261,118 +261,120 @@
         {
           "command": "foldersCompare.copyToCompared",
           "when": "view == foldersCompareAppServiceOnlyA",
-          "group": "1_folderCompares_actions@1"
+          "group": "inline"
         },
         {
           "command": "foldersCompare.copyToMy",
           "when": "view == foldersCompareAppServiceOnlyB",
-          "group": "1_folderCompares_actions@1"
+          "group": "inline"
         },
         {
           "command": "foldersCompare.deleteFile",
-          "when": "view == foldersCompareAppServiceOnlyA || view == foldersCompareAppServiceOnlyB"
+          "when": "view == foldersCompareAppServiceOnlyA || view == foldersCompareAppServiceOnlyB",
+          "group": "inline"
         },
         {
-          "command": "foldersCompare.takeMyFile",
-          "when": "view == foldersCompareAppService",
-          "group": "1_folderCompares_actions@1"
+          "command": "foldersCompare.takeComparedFile",
+          "when": "view == foldersCompareAppService && viewItem == file",
+          "group": "inline@1"
         },
         {
-          "command": "foldersCompare.dismissDifference",
+          "command": "foldersCompare.takeMyFile",
           "when": "view == foldersCompareAppService && viewItem == file",
-          "group": "inline"
+          "group": "inline@2"
         },
         {
-          "command": "foldersCompare.takeComparedFile",
-          "when": "view == foldersCompareAppService",
-          "group": "1_folderCompares_actions@2"
+          "command": "foldersCompare.dismissDifference",
+          "when": "view == foldersCompareAppService && viewItem == file",
+          "group": "inline@3"
         }
       ]
     },
     "commands": [
       {
         "title": "Pick from recent compares",
         "command": "foldersCompare.pickFromRecentCompares",
-        "icon": {
-          "dark": "resources/dark/history.svg",
-          "light": "resources/light/history.svg"
-        },
+        "icon": "$(history)",
         "category": "CompareFolders"
       },
       {
-        "title": "Compare Folders: Clear recent compares",
-        "command": "foldersCompare.clearRecentCompares"
+        "title": "Clear Recent Compares",
+        "command": "foldersCompare.clearRecentCompares",
+        "category": "CompareFolders"
       },
       {
-        "title": "Copy to compared folder",
-        "command": "foldersCompare.copyToCompared"
+        "title": "Copy to Compared Folder",
+        "command": "foldersCompare.copyToCompared",
+        "icon": "$(files)"
       },
       {
-        "title": "Copy to my folder",
-        "command": "foldersCompare.copyToMy"
+        "title": "Copy to My Folder",
+        "command": "foldersCompare.copyToMy",
+        "icon": "$(files)"
       },
       {
-        "title": "Delete",
-        "command": "foldersCompare.deleteFile"
+        "title": "Delete File",
+        "command": "foldersCompare.deleteFile",
+        "icon": "$(trash)"
       },
       {
         "title": "Dismiss Difference",
         "command": "foldersCompare.dismissDifference",
         "icon": "$(close)"
       },
       {
-        "title": "Take my file",
-        "command": "foldersCompare.takeMyFile"
+        "title": "Take My File",
+        "command": "foldersCompare.takeMyFile",
+        "icon": "$(debug-step-back)"
       },
       {
-        "title": "Take compared file",
-        "command": "foldersCompare.takeComparedFile"
+        "title": "Take Compared File",
+        "command": "foldersCompare.takeComparedFile",
+        "icon": "$(debug-step-over)"
       },
       {
-        "title": "Choose Folders And Compare",
-        "command": "foldersCompare.chooseFoldersAndCompare"
+        "title": "Choose Folders and Compare",
+        "command": "foldersCompare.chooseFoldersAndCompare",
+        "category": "CompareFolders"
       },
       {
-        "title": "Compare Folders: Compare a folder against workspace",
-        "command": "foldersCompare.compareFoldersAgainstWorkspace"
+        "title": "Compare a Folder Against Workspace",
+        "command": "foldersCompare.compareFoldersAgainstWorkspace",
+        "category": "CompareFolders"
       },
       {
-        "title": "Compare Folders: Choose 2 folders and compare",
-        "command": "foldersCompare.compareFoldersAgainstEachOther"
+        "title": "Choose 2 Folders and Compare",
+        "command": "foldersCompare.compareFoldersAgainstEachOther",
+        "category": "CompareFolders"
       },
       {
         "title": "Refresh",
         "command": "foldersCompare.refresh",
-        "icon": {
-          "light": "resources/light/refresh.svg",
-          "dark": "resources/dark/refresh.svg"
-        },
+        "icon": "$(refresh)",
         "category": "CompareFolders"
       },
       {
         "title": "Swap Sides",
         "command": "foldersCompare.swap",
-        "icon": {
-          "light": "resources/light/swap.svg",
-          "dark": "resources/dark/swap.svg"
-        },
+        "icon": "$(arrow-swap)",
         "category": "CompareFolders"
       },
       {
-        "title": "View as list",
+        "title": "View as List",
         "command": "foldersCompare.viewAsList",
         "icon": "$(list-selection)",
         "category": "CompareFolders"
       },
       {
-        "title": "View as tree",
+        "title": "View as Tree",
         "command": "foldersCompare.viewAsTree",
         "icon": "$(list-tree)",
         "category": "CompareFolders"
       },
       {
         "command": "foldersCompare.compareSelectedFolders",
-        "title": "[Compare Folders] Compare selected folders"
+        "title": "[Compare Folders] Compare selected folders",
+        "category": "CompareFolders"
       }
     ],
     "viewsContainers": {