Icons update, new hashmark in hashmarks.misc

pinnaculum · Nov 24, 2018 · e831329 · e831329
1 parent 26c81eb
commit e831329
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 5 deletions.
diff --git a/galacteek/core/ipfsmarks.py b/galacteek/core/ipfsmarks.py
@@ -260,11 +260,15 @@ def insertMark(self, mark, category):
 
         # Handle IPFSHashMark or tuple
         if isinstance(mark, IPFSHashMark):
+            if mark.path in sec[marksKey]:
+                return False
             sec[marksKey].update(mark)
             self.markAdded.emit(mark.path, mark.markData)
         else:
             try:
                 mPath, mData = mark
+                if mPath in sec[marksKey]:
+                    return False
                 sec[marksKey][mPath] = mData
                 self.markAdded.emit(mPath, mData)
             except Exception:

diff --git a/galacteek/hashmarks/default/hashmarks.misc.json b/galacteek/hashmarks/default/hashmarks.misc.json
@@ -2,7 +2,22 @@
     "ipfsmarks": {
         "categories": {
             "computers": {
-                "_marks": {},
+                "_marks": {
+                    "/ipfs/QmVDWmkM87NfR85WE1LvfwfJLRcMEtfNnCBiCJQRePP7Ly": {
+                        "metadata": {
+                            "title": "A Declaration of the Independence of Cyberspace",
+                            "description": "",
+                            "datasize": 5708,
+                            "cumulativesize": 5711,
+                            "numlinks": 0
+                        },
+                        "datecreated": "2018-11-24T23:48:06.309057",
+                        "tscreated": 1543099686,
+                        "comment": "",
+                        "share": false,
+                        "tags": []
+                    }
+                },
                 "atari": {
                     "_marks": {
                         "/ipfs/QmbKxNNCxBox7Cmv3jiUZbiG3zpzmtnYzVUuKHxfAjvpyH": {

diff --git a/galacteek/templates/ipfssearch.html b/galacteek/templates/ipfssearch.html
@@ -7,10 +7,10 @@
                 <a href="ipfs:{{ hit['path'] }}">{{ hit['title'] }}</a>
                 (Size {{ hit['size'] }})
 
-                <a href="ipfs:{{ hit['path'] }}#hashmark"><img src=":/share/icons/hashmarks.png" width="16" height="16"/></a>
+                <a href="ipfs:{{ hit['path'] }}#hashmark"><img src=":/share/icons/star-navy.png" width="16" height="16"/></a>
 
 {% if hit['type'] == 'directory' %}
-                <a href="ipfs:{{ hit['path'] }}#explore"><img src=":/share/icons/folder-open.png" width="16" height="16"/></a>
+                <a href="ipfs:{{ hit['path'] }}#explore"><img src=":/share/icons/folder-open-black.png" width="16" height="16"/></a>
 {% endif %}
 
             </p>

diff --git a/galacteek/ui/browsertab.ui b/galacteek/ui/browsertab.ui
@@ -114,7 +114,7 @@
            </property>
            <property name="maximumSize">
             <size>
-             <width>54</width>
+             <width>48</width>
              <height>16777215</height>
             </size>
            </property>
@@ -140,7 +140,7 @@
            </property>
            <property name="maximumSize">
             <size>
-             <width>54</width>
+             <width>48</width>
              <height>16777215</height>
             </size>
            </property>

diff --git a/galacteek/ui/galacteek.qrc b/galacteek/ui/galacteek.qrc
@@ -1,6 +1,9 @@
 <RCC>
   <qresource>
+    <file>../../share/icons/star-navy.png</file>
+    <file>../../share/icons/folder-open-black.png</file>
     <file>../../share/icons/window.png</file>
+    <file>../../share/icons/hashmark-add.png</file>
     <file>../../share/icons/ipld.png</file>
     <file>../../share/icons/settings.png</file>
     <file>../../share/icons/stroke-cube.png</file>

diff --git a/share/icons/folder-open-black.png b/share/icons/folder-open-black.png
diff --git a/share/icons/left-arrow.png b/share/icons/left-arrow.png
diff --git a/share/icons/right-arrow.png b/share/icons/right-arrow.png
diff --git a/share/icons/star-navy.png b/share/icons/star-navy.png