From 5ad86d2f504bfa16a3da7e5fa60e684d324cf7f7 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 9 Dec 2006 17:29:00 +0000
Subject: [PATCH] Add conference paper item type

---
 chrome/content/zotero/xpcom/itemTreeView.js   |   1 +
 chrome/locale/en-US/zotero/zotero.properties  |   2 ++
 .../zotero/treeitem-conferencePaper.png       | Bin 0 -> 880 bytes
 system.sql                                    |  26 +++++++++++++++++-
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 chrome/skin/default/zotero/treeitem-conferencePaper.png

diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index 866440af8..183fc7eca 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -368,6 +368,7 @@ Zotero.ItemTreeView.prototype.getImageSrc = function(row, col)
 			case 'book':
 			case 'bookSection':
 			case 'computerProgram':
+			case 'conferencePaper':
 			case 'email':
 			case 'film':
 			case 'forumPost':
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 36a9c8123..22ec3cd13 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -84,6 +84,7 @@ itemTypes.tvBroadcast			= TV Broadcast
 itemTypes.radioBroadcast		= Radio Broadcast
 itemTypes.podcast				= Podcast
 itemTypes.computerProgram		= Computer Program
+itemTypes.conferencePaper		= Conference Paper
 
 itemFields.itemType			= Type
 itemFields.title        		= Title
@@ -159,6 +160,7 @@ itemFields.audioFileType		= File Type
 itemFields.version				= Version
 itemFields.system				= System
 itemFields.company				= Company
+itemFields.conferenceName		= Conference Name
 
 creatorTypes.author				= Author
 creatorTypes.contributor		= Contributor
diff --git a/chrome/skin/default/zotero/treeitem-conferencePaper.png b/chrome/skin/default/zotero/treeitem-conferencePaper.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b2705595276033c80e05ae0e10ac24e12a5ff88
GIT binary patch
literal 880
zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#0!c(cRCwBA
z{Qv(y10y4&3<Cp$I1n>4;0LdO_z_UgKbQbO05O0J00QHmKYxDs{rmUdKY#xG$A*9W
z`0;=0)TtAJY88N(38W8%0RjkSfEh^hmoH!bfBpLP|F>`7!1Sk2pZ>pp|Nj50SFgZ^
zJb(WD|Mcn8Q49eHAQqtW89^ohDJEuSW(FoECWe3i{(<Q~zkf4a-#3{-k!cIV)Bk)7
zA0$f{Vq;_TK<d)c()xkg9smRoNHYkV0&O@6(s=y%aR#7k7=Hcw#qj?59R{u6{R|R9
ztPBi)KQP?;Zo^;{zJP(1or{5mg~c4G?=(OFu^@*K$T8N|*6^^ovHL!QC`SMTFP8$t
z&+qpc#GhYgc=zHSgSfm7Tn|71VHj}c%o&CsUq1t#|BK<ty&nu_vI-315>gCY{7MW5
z&;Mtz;1)%R7JvX^L60ZSf8QC-ub#y4`_pHJuY9}==f0^heERa9fe{!cw*{FP1Yh4~
z5ET)Js|N@m6a#*K`@(Qy*<=P$VIc+{Sy6@ux1KV5`~Q~Vm^3fL*S}vFWaU*DHk@6<
z@chkVxE_E2LNNdo^2$0I43-vp44f?g8D75o$*}wSc7|_K{}|YQ{A0NH@iqhJx6cf!
zcXz|}00a;dvH`3dTnq=Fi8FkAdY$3xyH^bFp5A5H{z!n~#e>%jpI&}qcy#p@gDR5|
zgN&{pTn|71!Cmm_>u-j6TOKp;n?^FM;<?B0=<ZVn5piz@9-;pXsy}`)_}fbY!{I*z
z4=XnVGYi7u009JN?O!#Yf$tYD!&}W5hRdHt8NLfMFkFAjz@RSko8i;B$qdisof()|
zSQ*sS)lmW+Ab{Xra1y)0Ap7eg!>L0L8UDQe$-w;i2Lm(X4~7R9&M>%0U1iWzkw@12
z51Ll~0|XEYhycd_KW2l(pK=0^*~Cx1W&Hl?KR8=5{{F|HDEOH{#59!QKPx8#6EK~C
za^l~=f4>2x|AGtw2p~pic9w-^XC?;X07&yIpx(y-0R{m3b5AEe=`Gs;0000<MNUMn
GLSTZ&NR2)K

literal 0
HcmV?d00001

diff --git a/system.sql b/system.sql
index 0ee5f7aab..07ac522ef 100644
--- a/system.sql
+++ b/system.sql
@@ -1,4 +1,4 @@
--- 7
+-- 8
 
 -- This file creates system tables that can be safely wiped and reinitialized
 -- at any time, as long as existing ids are preserved.
@@ -152,6 +152,7 @@ INSERT INTO itemTypes VALUES (29,'tvBroadcast',NULL,1);
 INSERT INTO itemTypes VALUES (30,'radioBroadcast',NULL,1);
 INSERT INTO itemTypes VALUES (31,'podcast',NULL,1);
 INSERT INTO itemTypes VALUES (32,'computerProgram',NULL,1);
+INSERT INTO itemTypes VALUES (33,'conferencePaper',NULL,1);
 
 INSERT INTO fields VALUES (1,'url',NULL);
 INSERT INTO fields VALUES (2,'rights',NULL);
@@ -218,6 +219,7 @@ INSERT INTO fields VALUES (80,'audioFileType',NULL);
 INSERT INTO fields VALUES (81,'version',NULL);
 INSERT INTO fields VALUES (82,'system',NULL);
 INSERT INTO fields VALUES (83,'company',NULL);
+INSERT INTO fields VALUES (84,'conferenceName',NULL);
 
 INSERT INTO itemTypeFields VALUES (2, 3, NULL, 1);
 INSERT INTO itemTypeFields VALUES (2, 30, NULL, 2);
@@ -572,6 +574,23 @@ INSERT INTO itemTypeFields VALUES (32, 2, NULL, 10);
 INSERT INTO itemTypeFields VALUES (32, 1, NULL, 11);
 INSERT INTO itemTypeFields VALUES (32, 27, NULL, 12);
 INSERT INTO itemTypeFields VALUES (32, 22, NULL, 13);
+INSERT INTO itemTypeFields VALUES (33, 14, NULL, 1);
+INSERT INTO itemTypeFields VALUES (33, 84, NULL, 2);
+INSERT INTO itemTypeFields VALUES (33, 7, NULL, 3);
+INSERT INTO itemTypeFields VALUES (33, 8, NULL, 4);
+INSERT INTO itemTypeFields VALUES (33, 4, NULL, 5);
+INSERT INTO itemTypeFields VALUES (33, 10, NULL, 6);
+INSERT INTO itemTypeFields VALUES (33, 3, NULL, 7);
+INSERT INTO itemTypeFields VALUES (33, 26, NULL, 8);
+INSERT INTO itemTypeFields VALUES (33, 11, NULL, 9);
+INSERT INTO itemTypeFields VALUES (33, 18, NULL, 10);
+INSERT INTO itemTypeFields VALUES (33, 19, NULL, 11);
+INSERT INTO itemTypeFields VALUES (33, 62, NULL, 12);
+INSERT INTO itemTypeFields VALUES (33, 2, NULL, 13);
+INSERT INTO itemTypeFields VALUES (33, 1, NULL, 14);
+INSERT INTO itemTypeFields VALUES (33, 27, NULL, 15);
+INSERT INTO itemTypeFields VALUES (33, 22, NULL, 16);
+
 
 INSERT INTO creatorTypes VALUES(1, "author");
 INSERT INTO creatorTypes VALUES(2, "contributor");
@@ -701,6 +720,11 @@ INSERT INTO itemTypeCreatorTypes VALUES(31,2,0);
 INSERT INTO itemTypeCreatorTypes VALUES(31,25,0);
 INSERT INTO itemTypeCreatorTypes VALUES(32,21,1);
 INSERT INTO itemTypeCreatorTypes VALUES(32,2,0);
+INSERT INTO itemTypeCreatorTypes VALUES(33, 1, 1);
+INSERT INTO itemTypeCreatorTypes VALUES(33, 2, 0);
+INSERT INTO itemTypeCreatorTypes VALUES(33, 3, 0);
+INSERT INTO itemTypeCreatorTypes VALUES(33, 4, 0);
+INSERT INTO itemTypeCreatorTypes VALUES(33, 5, 0);
 
 
     INSERT INTO "fileTypes" VALUES(1, 'webpage');