Show maps and mods differently if they are installed

Added a label containing an icon to show the installed maps and mods as such Fixes #702
FAForever · Jan 27, 2018 · a158873 · a158873
1 parent 24ecf01
commit a158873
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 42 deletions.
diff --git a/src/icomoon/Downlord's FAF Client.json b/src/icomoon/Downlord's FAF Client.json
@@ -1,8 +1,8 @@
 {
   "metadata": {
     "name": "Downlord's FAF Client",
-    "lastOpened": 1491321436220,
-    "created": 1491321416349
+    "lastOpened": 0,
+    "created": 1516379212804
   },
   "iconSets": [
     {
@@ -16483,7 +16483,10 @@
           "ligatures": "folder-download, directory5",
           "name": "folder-download",
           "id": 51,
-          "order": 0
+          "order": 109,
+          "prevSize": 32,
+          "code": 59699,
+          "tempChar": ""
         },
         {
           "ligatures": "folder-upload, directory6",
@@ -28447,7 +28450,7 @@
           "order": 90,
           "prevSize": 32,
           "code": 59726,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "ligatures": "stopwatch, time5",
@@ -28456,7 +28459,7 @@
           "order": 86,
           "prevSize": 32,
           "code": 59730,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "ligatures": "wrench, tool",
@@ -28465,7 +28468,7 @@
           "order": 87,
           "prevSize": 32,
           "code": 59497,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "ligatures": "plus, add",
@@ -28474,7 +28477,7 @@
           "order": 81,
           "prevSize": 32,
           "code": 59914,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "ligatures": "arrow-left2, left4",
@@ -28483,7 +28486,7 @@
           "order": 85,
           "prevSize": 32,
           "code": 59968,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 80,
@@ -28492,7 +28495,7 @@
           "prevSize": 32,
           "code": 58825,
           "name": "cancel",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 55,
@@ -28501,7 +28504,7 @@
           "prevSize": 32,
           "code": 57546,
           "name": "chat_bubble",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 65,
@@ -28510,7 +28513,7 @@
           "prevSize": 32,
           "code": 58826,
           "name": "check",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 79,
@@ -28519,7 +28522,7 @@
           "prevSize": 32,
           "code": 58829,
           "name": "close",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 26,
@@ -28528,7 +28531,7 @@
           "prevSize": 32,
           "code": 57345,
           "name": "error_outline",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 19,
@@ -28537,7 +28540,7 @@
           "prevSize": 32,
           "code": 58054,
           "name": "file_upload",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 0,
@@ -28555,7 +28558,7 @@
           "prevSize": 32,
           "code": 59387,
           "name": "people",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 24,
@@ -28564,7 +28567,7 @@
           "prevSize": 32,
           "code": 59535,
           "name": "info_outline",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 32,
@@ -28573,7 +28576,7 @@
           "prevSize": 32,
           "code": 58702,
           "name": "local_offer",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 46,
@@ -28582,7 +28585,7 @@
           "prevSize": 32,
           "code": 58919,
           "name": "sync",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 61,
@@ -28591,7 +28594,7 @@
           "prevSize": 32,
           "code": 58715,
           "name": "map",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 21,
@@ -28600,7 +28603,7 @@
           "prevSize": 32,
           "code": 58834,
           "name": "menu",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 30,
@@ -28609,7 +28612,7 @@
           "prevSize": 32,
           "code": 59381,
           "name": "notifications_none",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 64,
@@ -28618,7 +28621,7 @@
           "prevSize": 32,
           "code": 59389,
           "name": "person",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 58,
@@ -28627,7 +28630,7 @@
           "prevSize": 32,
           "code": 57399,
           "name": "play_arrow",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 51,
@@ -28636,7 +28639,7 @@
           "prevSize": 32,
           "code": 57401,
           "name": "play_circle_outline",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 38,
@@ -28645,7 +28648,7 @@
           "prevSize": 32,
           "code": 59564,
           "name": "power_settings_new",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 25,
@@ -28654,7 +28657,7 @@
           "prevSize": 32,
           "code": 57346,
           "name": "warning",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 18,
@@ -28663,7 +28666,7 @@
           "prevSize": 32,
           "code": 59574,
           "name": "search",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 31,
@@ -28672,7 +28675,7 @@
           "prevSize": 32,
           "code": 59576,
           "name": "settings",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 23,
@@ -28681,7 +28684,7 @@
           "prevSize": 32,
           "code": 59612,
           "name": "thumb_up",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 43,
@@ -28690,7 +28693,7 @@
           "prevSize": 32,
           "code": 59619,
           "name": "trending_down",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 44,
@@ -28699,7 +28702,7 @@
           "prevSize": 32,
           "code": 59621,
           "name": "trending_up",
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "ligatures": "enlarge2, expand2",
@@ -28708,51 +28711,52 @@
           "order": 77,
           "prevSize": 32,
           "code": 59787,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 92,
           "id": 3,
           "name": "SCAeonLogo_Recreated",
           "prevSize": 32,
           "code": 59648,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 72,
           "id": 2,
           "name": "SCCybranLogo_Recreated",
           "prevSize": 32,
           "code": 59650,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 73,
           "id": 1,
           "name": "SCSeraphimLogo_Recreated",
           "prevSize": 32,
           "code": 59651,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 74,
           "id": 0,
           "name": "SCUEFLogo_Recreated",
           "prevSize": 32,
           "code": 59652,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 91,
           "id": 0,
           "name": "FAF-Logo",
           "prevSize": 32,
           "code": 59649,
-          "tempChar": ""
+          "tempChar": ""
         }
       ],
       "prevSize": 28,
-      "id": 1
+      "id": 1,
+      "invisible": false
     }
   ],
   "preferences": {
@@ -28786,7 +28790,8 @@
       "png": true,
       "useClassSelector": true,
       "color": 0,
-      "bgColor": 16777215
+      "bgColor": 16777215,
+      "classSelector": ".icon"
     },
     "historySize": 100,
     "showLiga": true,

diff --git a/src/main/java/com/faforever/client/map/MapBean.java b/src/main/java/com/faforever/client/map/MapBean.java
@@ -216,6 +216,11 @@ public int compareTo(@NotNull MapBean o) {
     return getDisplayName().compareTo(o.getDisplayName());
   }
 
+  @Override
+  public boolean equals(@NotNull Object o) {
+    return o instanceof MapBean && ((MapBean) o).compareTo(this)==0;
+  }
+
   public String getDisplayName() {
     return displayName.get();
   }