From cd4dd3bd92664c7ba0abfc2fe17a8e52403916ea Mon Sep 17 00:00:00 2001 From: David Norton Date: Mon, 31 Jul 2006 20:35:22 +0000 Subject: [PATCH] Closes #148, Files should display a different icon for each type (file & snapshot, linked & unlinked) Clicking a file or note in the rightmost pane displays it in the middle pane. --- .../chromeFiles/content/scholar/itemPane.js | 23 +++++++++++++++--- .../content/scholar/itemTreeView.js | 23 +++++++++++++++++- .../default/scholar/item-files-snapshot.png | Bin 739 -> 0 bytes .../skin/default/scholar/overlay.css | 18 +++----------- .../default/scholar/treeitem-file-file.png | Bin 0 -> 294 bytes ...-files-link.png => treeitem-file-link.png} | Bin .../scholar/treeitem-file-snapshot.png | Bin 0 -> 635 bytes ...eb-link.png => treeitem-file-web-link.png} | Bin 8 files changed, 46 insertions(+), 18 deletions(-) delete mode 100755 chrome/chromeFiles/skin/default/scholar/item-files-snapshot.png create mode 100755 chrome/chromeFiles/skin/default/scholar/treeitem-file-file.png rename chrome/chromeFiles/skin/default/scholar/{item-files-link.png => treeitem-file-link.png} (100%) create mode 100755 chrome/chromeFiles/skin/default/scholar/treeitem-file-snapshot.png rename chrome/chromeFiles/skin/default/scholar/{item-files-web-link.png => treeitem-file-web-link.png} (100%) diff --git a/chrome/chromeFiles/content/scholar/itemPane.js b/chrome/chromeFiles/content/scholar/itemPane.js index 80cf305d1a..f35fc6afa3 100644 --- a/chrome/chromeFiles/content/scholar/itemPane.js +++ b/chrome/chromeFiles/content/scholar/itemPane.js @@ -142,7 +142,7 @@ ScholarItemPane = new function() label.setAttribute('crop','end'); var box = document.createElement('box'); - box.setAttribute('onclick',"ScholarPane.openNoteWindow("+notes[i].getID()+");"); + box.setAttribute('onclick',"ScholarPane.selectItem("+notes[i].getID()+");"); box.setAttribute('class','clicky'); box.appendChild(icon); box.appendChild(label); @@ -174,7 +174,24 @@ ScholarItemPane = new function() for(var i = 0; i < files.length; i++) { var icon = document.createElement('image'); - icon.setAttribute('src','chrome://scholar/skin/treeitem-file.png'); + var linkMode = files[i].getFileLinkMode(); + if(linkMode == Scholar.Files.LINK_MODE_IMPORTED_FILE) + { + itemType = "-file"; + } + else if(linkMode == Scholar.Files.LINK_MODE_LINKED_FILE) + { + itemType = "-link"; + } + else if(linkMode == Scholar.Files.LINK_MODE_IMPORTED_URL) + { + itemType = "-snapshot"; + } + else if(linkMode == Scholar.Files.LINK_MODE_LINKED_URL) + { + itemType = "-web-link"; + } + icon.setAttribute('src','chrome://scholar/skin/treeitem-file'+itemType+'.png'); var label = document.createElement('label'); label.setAttribute('value',files[i].getField('title')); @@ -182,7 +199,7 @@ ScholarItemPane = new function() label.setAttribute('crop','end'); var box = document.createElement('box'); -// box.setAttribute('onclick',"window.open('"+files[i].getFileURL()+"')"); + box.setAttribute('onclick',"ScholarPane.selectItem('"+files[i].getID()+"')"); box.setAttribute('class','clicky'); box.appendChild(icon); box.appendChild(label); diff --git a/chrome/chromeFiles/content/scholar/itemTreeView.js b/chrome/chromeFiles/content/scholar/itemTreeView.js index 0cfa33dc00..3face4f9ba 100644 --- a/chrome/chromeFiles/content/scholar/itemTreeView.js +++ b/chrome/chromeFiles/content/scholar/itemTreeView.js @@ -198,7 +198,28 @@ Scholar.ItemTreeView.prototype.getImageSrc = function(row, col) { if(col.id == 'title') { - var itemType = Scholar.ItemTypes.getName(this._getItemAtRow(row).getType()); + var item = this._getItemAtRow(row); + var itemType = Scholar.ItemTypes.getName(item.getType()); + if(itemType == 'file') + { + var linkMode = item.ref.getFileLinkMode(); + if(linkMode == Scholar.Files.LINK_MODE_IMPORTED_FILE) + { + itemType = itemType + "-file"; + } + else if(linkMode == Scholar.Files.LINK_MODE_LINKED_FILE) + { + itemType = itemType + "-link"; + } + else if(linkMode == Scholar.Files.LINK_MODE_IMPORTED_URL) + { + itemType = itemType + "-snapshot"; + } + else if(linkMode == Scholar.Files.LINK_MODE_LINKED_URL) + { + itemType = itemType + "-web-link"; + } + } return "chrome://scholar/skin/treeitem-"+itemType+".png"; } diff --git a/chrome/chromeFiles/skin/default/scholar/item-files-snapshot.png b/chrome/chromeFiles/skin/default/scholar/item-files-snapshot.png deleted file mode 100755 index d5bfa0719bc3a2ce4fc529403f0acd6b6057c956..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 739 zcmV<90v!E`P)BG67=JY6c|L1R-#TR>fC$3^Y%QEnYO1xHsf)+GU`3F<{J0kR(;pbF3)zyg$H+idfnl-wl5Wkh!vUH z4Z32YP=l_}1rZd1W_D&^$A($A+&a0e&P?xx0!ctY2}*<#p+qPVN*B(YzvAWXa*%bzq z7Fz41LKILT(GWohi9|LgIzSZBhb*Zf6R6O}WYQ4GOi&71s9lmll0x6;8&ILOl$j(c z0Z1T(6Tg09{?wd{moFHNN6PS?$|e>1MxSJ(0Z7o2)J-Zv|>acY@f`(Y@g7GwsEj5NLQo+q|HsxQ5}XSX_d@*^A9ZT9=A{W~j+$GyI1 zc4oqTHx@1FlRjw4XWyPN5i2~l_F3@aBk!0yu^aoRDvXy}8@HCjUVQUsuSH4$T5|r< zzZOn^?Wfa6y|Q($Hx4{ws+)wX6-HP4zo!S?4KJ@7PG@G3G{CjXs(p*kIrj6rHs7_y z+=<-=Q62s9FuWa^X~WKgJIAAZJR&XBB002ovPDHLkV1jCMPILeO diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css index 1bca80244d..d9dff0cd7d 100644 --- a/chrome/chromeFiles/skin/default/scholar/overlay.css +++ b/chrome/chromeFiles/skin/default/scholar/overlay.css @@ -96,27 +96,22 @@ #tb-item-files-file { - list-style-image: url('chrome://scholar/skin/item-files-add.png'); + list-style-image: url('chrome://scholar/skin/treeitem-file-file.png'); } #tb-item-files-link { - list-style-image: url('chrome://scholar/skin/item-files-link.png'); + list-style-image: url('chrome://scholar/skin/treeitem-file-link.png'); } #tb-item-files-snapshot { - list-style-image: url('chrome://scholar/skin/item-files-snapshot.png'); + list-style-image: url('chrome://scholar/skin/treeitem-file-snapshot.png'); } #tb-item-files-web-link { - list-style-image: url('chrome://scholar/skin/item-files-web-link.png'); -} - -#tb-item-menu -{ - list-style-image: url('chrome://scholar/skin/cog.png'); + list-style-image: url('chrome://scholar/skin/treeitem-file-web-link.png'); } #tb-fullscreen @@ -156,11 +151,6 @@ margin-left: 5px; } -#scholar-view-item tabpanels -{ - padding: 8px 0px 0px 0px; -} - #scholar-splitter { border-top: none; diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-file-file.png b/chrome/chromeFiles/skin/default/scholar/treeitem-file-file.png new file mode 100755 index 0000000000000000000000000000000000000000..8b8b1ca0000bc8fa8d0379926736029f8fabe364 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-&H;pyTSqH(@-Vl>|&1p(LP>kg~E zYiz5X^`c$+%8#zC{u)yfe-5 zmgid={Z3k(ERKCKrE7DF;=x4^O+ pzO8rLO8p|Ip=x)jHOtWj`bJBmKdh_V<`47(gQu&X%Q~loCIFbEay|e6 literal 0 HcmV?d00001 diff --git a/chrome/chromeFiles/skin/default/scholar/item-files-link.png b/chrome/chromeFiles/skin/default/scholar/treeitem-file-link.png similarity index 100% rename from chrome/chromeFiles/skin/default/scholar/item-files-link.png rename to chrome/chromeFiles/skin/default/scholar/treeitem-file-link.png diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-file-snapshot.png b/chrome/chromeFiles/skin/default/scholar/treeitem-file-snapshot.png new file mode 100755 index 0000000000000000000000000000000000000000..03ddd799fa0a3aec561c75d4221f195db65d6eb9 GIT binary patch literal 635 zcmV->0)+jEP);68^d)m`eN0o>(5%D`Q(1;j>g@G;xlf`0VBQ`PFY?6)!N&f?*K}$p; zB!U=NBn{eB8${1}&-2_L*HuZp@ZP1@clS@cHp)4iM1ewzw59vko7eMM{e9z|%NNdX z0V;`?KKSzTCvTm5bc{L^CIKLUxc2X{i{ISz$8Sgf{q)1nXTP{`{s?9mQ$4&hPiKC- zY8q7(Y1Xu5iCf33=O4Vy(+|zQ?rW#gkKB0f%}?+6{G*qT22|DQB-73`YzA{N4W^=s zq0kQYcbtFfz zLz)H<&|z(Y4k