From d826160abfe5e3ea5e96b7c4a3fc27e5ceca52ff Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Mon, 20 Feb 2006 22:06:38 +0000
Subject: [PATCH] Fonts collector will now default collection to same folder as
 script (Set to "?script" on config.dat)

Originally committed to SVN as r82.
---
 core/changelog.txt          |   1 +
 core/fonts_collector.cpp    |  14 ++++++++++++--
 core/options.cpp            |   2 +-
 docs/feature comparison.xls | Bin 29696 -> 29696 bytes
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/changelog.txt b/core/changelog.txt
index 796edd137..f573ac708 100644
--- a/core/changelog.txt
+++ b/core/changelog.txt
@@ -30,6 +30,7 @@ Please visit http://aegisub.net to download latest version
 - Fixed bug related to tag cycling, which would reset grid, move video and force a refresh of everything (slow, and could undo uncommited changes) (AMZ)
 - Fixed some bugs related to inserting overrides via the buttons over the edit box (AMZ)
 - Implemented Redo (AMZ)
+- Fonts collector will now default collection to same folder as script (Set to "?script" on config.dat) (AMZ)
 
 
 = 1.09 beta - 2006.01.16 ===========================
diff --git a/core/fonts_collector.cpp b/core/fonts_collector.cpp
index 4b59511b4..a81167735 100644
--- a/core/fonts_collector.cpp
+++ b/core/fonts_collector.cpp
@@ -56,7 +56,12 @@ DialogFontsCollector::DialogFontsCollector(wxWindow *parent)
 : wxDialog(parent,-1,_("Fonts Collector"),wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
 	// Destination box
-	DestBox = new wxTextCtrl(this,-1,Options.AsText(_T("Fonts Collector Destination")),wxDefaultPosition,wxSize(250,20),0);
+	wxString dest = Options.AsText(_T("Fonts Collector Destination"));
+	if (dest == _T("?script")) {
+		wxFileName filename(AssFile::top->filename);
+		dest = filename.GetPath();
+	}
+	DestBox = new wxTextCtrl(this,-1,dest,wxDefaultPosition,wxSize(250,20),0);
 	BrowseButton = new wxButton(this,BROWSE_BUTTON,_("&Browse..."));
 	wxSizer *DestBottomSizer = new wxBoxSizer(wxHORIZONTAL);
 	wxStaticText *DestLabel = new wxStaticText(this,-1,_("Choose the folder where the fonts will be collected to.\nIt will be created if it doesn't exist."));
@@ -153,7 +158,12 @@ void DialogFontsCollector::OnStart(wxCommandEvent &event) {
 		worker->Run();
 
 		// Set options
-		Options.SetText(_T("Fonts Collector Destination"),foldername);
+		wxString dest = foldername;
+		wxFileName filename(AssFile::top->filename);
+		if (filename.GetPath() == dest) {
+			dest = _T("?script");
+		}
+		Options.SetText(_T("Fonts Collector Destination"),dest);
 		Options.Save();
 
 		// Set buttons
diff --git a/core/options.cpp b/core/options.cpp
index dbf295fa1..caf9ff284 100644
--- a/core/options.cpp
+++ b/core/options.cpp
@@ -118,7 +118,7 @@ void OptionsManager::LoadDefaults() {
 
 	SetBool(_T("Highlight subs in frame"),true);
 
-	SetText(_T("Fonts Collector Destination"),AegisubApp::folderName + _T("fonts"));
+	SetText(_T("Fonts Collector Destination"),_T("?script"));
 
 	SetBool(_T("Threaded Video"),false);
 	SetInt(_T("Avisynth MemoryMax"),64);
diff --git a/docs/feature comparison.xls b/docs/feature comparison.xls
index dda40d3692f97b535dff5e2747c20dffadca2edb..7358af049e2f158ba8fad33fe1cad8338b39db42 100644
GIT binary patch
delta 3148
zcmZ8jYiv|S6h5<Cu$0gml+|)sP!VA*C=UZ|F@3UqcWJ>wTdK6>xqu6nrL<7E2n1Vs
zg!b4{5EUN?KNOMm{UH7_#u#D<iHY%t;fE4qjE^50qvFiDGqd;5CU<&fzVn^$JUaL8
zyCL@75EsKiaUG`y!?!$pg5hb`$B0tsf;e=*7MKT<;R_IO)BPj>00B^5PEf9?tHD@?
zSb+CtPQNW{{3&^QIaQnaN7lp~fcmY;_}0Wd$*ztyo8yTMsiHfAV)7~JU+n-4&Hz~b
zFhE`bfU^Xkqb{}T&cboxRB9wFCW%;Tbbe5Xw$$kbgF!bYokH-beEthr5R*zK!+2{2
zq?K*0AhR-jR)fUk!gP&nlxqm?x0au?QKp!V(0CsxQWLNd6zLP%aT(Ffz$=TKN+V(!
z;nS91#B#zvpuLx~RF->Tac+J@%*57wM`UAnek5;}MmI5Z6BF6wX~Zw{o$yl{zk={a
z#|pw{W1t`+5N8)SO(vt2Oz%p{&zv=r-sd!9GgHv)G1@b#5}qz_!ozy6h2dLte%GXe
z5&W+pDn7y`g~jnUit(}bX=6TZEJhns+D1xEeySt6@StW{Emublt~WBPiE}>wT-b;c
zVpBwRs&#Q#h(xOA(Z#~e4BQT`M2>-*@+p5r4h>qn{L_JF<x`DayT@TI|Jb!NUG1dn
zuts*sH3WIq@()^v%5JtDtq!k=7ODovG@_GeW@Al}lV?)yWMMm5Io1$<4jwOxRz9Q|
z*Rs;C_1a<2{6oH$4Z%9%dJCr%N5w_#ERKYYg7qxs2EsMtd5JK(H!!A+glNHEiXGQ*
zY-Cw%WQ=jb%X@-a5NG=1q<^kGQ~J}Es-3Ym5z8YQxyfU}{*noKqjt}q{U)YiGkGt>
z&q^FI9=|Jzh($QIG@aoVmf@3x&d0jaMQcok3EFGbu@Wqc1RL-Kt3`q_Z<GGHP^?+h
zKe+=%_(N$lr$p~{>C6htoB~t-F2=E4B17=F#&0LQQMuil2Rv5hxW+q4_%e-8GUZ98
zJjs+NSp|0xOSxv*K`evT^53;PJQkc)KEY<tP2RN{-%Z|i*7E-wc5ClMxl<X{h@FJ5
zu$CXclkk=H%zsh$$lVZB;n(F6JE=V^t6oB^(%!wSHodGiy%fjPw3l^c7qOhyEW3#1
z1#2m_FFs~XHKZ?DOUX6XZn+zRGx}^d6SJGdykgH3OE!MB#BpENdwmSw$HezB@qMfW
zd!&B|&T5uD#PXW8l=xSzMNzFqr8bxKUb!6t^%_tY?OviWQ@Pg@gU6%O8q}#v*f%xS
zWmuQ6rp_)C?%Jw<17&a_3!piGgEObd_rX+AfnzJqih<M{6*I*g^*T5y`EPw4JT3Qf
z;cXpxzg$Cb3FlX(Z^QkpI0p!k!XAk*nhsbMDwl(V_y8|gshj27s)%?8GpeKE_jHUy
ztSyIhCDvC*#JhN0;@;P|epZEkuL}5k_4HK(6yZaS8(@3`9-lq)H)w!ma#&(=L4KuC
ze~!pC1l72$MyWnh<K&s_j?zhu#vNtRj%xK+Ya(I@|B=2&@b21(sK>I}sEA>|d@jW+
zwd$kir`kxkL9+}omLZ+n+&U-6ObAlc1h&>i#a2917j@N5sp>n->N3po9j56p9K)<H
zBgCjWtXM{fMRn7&)L5r2RW;Q|?@W#LK{M7Th~^o6c!G&Jq04csKH?tJh*3hQ(Nkoj
zgiznhp5<@PC~J@M2*Cx7JV`9CTT97JTZ-kJJyUYe;ji^AVjkAS%CnbBUitY0OXY7y
s20kDAbEx6_ad7R&^XnFVE`q7w8gg>5VN&L$_P-_u?y67y-8EMH4}R<UM*si-

delta 2994
zcmZ8jTWnNS6y0a0U|Y!4AWWQI2ZD(8wp9^~ePH^SGJVq)u%&{f(-wt7fm+^u*arj~
zT1z_HmPb%Q#aCjfT&<|6e}?$shd(C97`_bg&yXl-R6J+jbI;7SP43OQd!4n{-e;fF
z4&4?*x5aGOFV5g{fB1jTWB%}pGYdp1^gt)HK^Hs)nQ#*X+#9^%0{|bWRhD1Aoge*m
zDPkqAOkH)~-SjCL{o1KXy_4=VJm43Z=OsDM0vKEku<=QNPyxWzGJrcZ&c3CEY2v)|
zL0Bvk_0C6Y{X(=jGwUY(+w0|`5Ui5Ve;^$i<U0tD7$l^XMF#m8@-vho(GJbrL@KNC
zLY|cqFy9nEffV0En~DD@-paEoylk5xS${Jqz8Bj<{4A}!MYbwArd$Rvl5dO0uq)pZ
zi*PjG&Usn08;R{@Zj{|k_-Le@0sJN33Zv#XG4&?mFT$k-ws;+j3amy?X)E))mHc|K
zX7W3w6`Pr2v#V%g)FqrLu*5WeFP{PYP3HO%?=Ossudu1GxU)raLy)aksGeJLWZeDR
zLE38#O0I5)Tb+rij*e;6D&H2IHb`|efd3Y5!f&$z*t$L-%AKzDVIdAUr=MLfHmO;O
zNp=u&^qLr}D#ogcvEIbkUbc}+E@l@cW~GfeZDYM`C;sEuE&1L&v@`v7rr$yQCvdJP
zDz4(+Nm+KXEIV127irZjMv9}N8Aprlu$Sv4roM}K&*Klpc89myyO`2$V#w1-=W93X
z(r)U~8WU4{pFnDVJk&`lPvf={E9ac%ce1KGS=K$oe+Dm=sQJGkS9$*TQY24n>}7uT
zlAi$jN^Oykxutg4tEr2r?<0+E*i)L<;prZb-$GEVb-U%;f+B;GPiQxrjc!&&H|wrC
zvq31q#gS-+ntC;LJ>)omv4}bw{Sm7pq9X@cEeG9NOf32KImoIxL|NoLN&1IKWzrzJ
z^Kd?r=-^@E*J#FJ;@2AF-aaK|mYIhm#E)vm5#pB{lzc*uP%kP>EcuQ+N-C8)cGRsE
zzbR8)_*p);<DX^rptl>xSRaqm+KYPaaa#L^LCV3K2B|*1Wsq{<p<ekl2$yuM*L7f!
zQh9sOz~pxKvUc}LP7p3@W*?L3W1H5;Mx&3Z^pnaJt<p~_?}E&)W~85F-Z8;sGyP0v
zfMj0K%mI?|W`2N~8DM4xSbtw3m5%}NVl*Vr+gx--`cF^-&!q!w@ZsgGhx9eN7+cCy
zGlnF60o;>M`6DtgR(?gCb{1A-iB{!)NPZ2$C-SM#uzUyMnnB4YX_y>(dp=AKJ@><`
z&Jj{^a9d^KCL3WjoFK+^yi{oycp4{|#z|s)s-2u<8+X#}75b`dF^9QT(eP)QcZ&7&
zl<OELB=2*)E_q*Q-YC->)q0uLs|M9yr4Ve;yfOI>LX|<u{TO5Y7-RhyW7Uq6O0`xQ
zXSv7S++OTqCNs`j@*2s+@z-igjN^Q@9p0#yO)$v`T~0}jE$VPjO;pt5Y)v%WpxKj*
zJ?WN#OKR<k{hARchPN?sW--nj##y22-<TjAz>(Uh=*FA1(Lpr|YOtnAQEj`6)B#Q)
zb!60ryD@bQcxajwU)8Z`=4+bynr6PH-Ogp}g=a}-!XUMe>K|B@@GQw(z`2d~x*7fL
z93^_sAZ0g!l->8e7&h0n3W3+_$^y&fDtX3Wx%`!%((3=hHNpMyhFfVvDG&Z04}B;6
Z&L0gK@(eCZy%xK>#P?yXGvBjN{0Dd(<`n<{