API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Oct 13th, 2013
57
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 59.55 KB | None | 0 0
raw download clone embed print report
  1. From ac3351f4d858e1229931c0bec9ddebd550fdfac9 Mon Sep 17 00:00:00 2001
  2. From: Alex Tereschenko <alttoucan@gmail.com>
  3. Date: Sat, 31 Aug 2013 18:33:26 +0200
  4. Subject: [PATCH 01/29] Fixed "forward declaration" compilation problem
  5.  
  6. ---
  7. forms/frmmain.h | 1 +
  8. 1 file changed, 1 insertion(+)
  9.  
  10. diff --git a/forms/frmmain.h b/forms/frmmain.h
  11. index fcd6898..f9fb83b 100644
  12. --- a/forms/frmmain.h
  13. +++ b/forms/frmmain.h
  14. @@ -32,6 +32,7 @@ class SyncPreviewDirCtrl;
  15. class Settings;
  16. class RulesGrid;
  17.  
  18. +#include <wx/frame.h>
  19. #include <wx/aui/framemanager.h>
  20. #include <wx/aui/auibook.h>
  21.  
  22. --
  23. 1.8.4.msysgit.0
  24.  
  25. From ae1a4a962ebc4514413d77f293750051ac08ef44 Mon Sep 17 00:00:00 2001
  26. From: Alex Tereschenko <alttoucan@gmail.com>
  27. Date: Wed, 28 Aug 2013 19:59:18 +0200
  28. Subject: [PATCH 02/29] Fixed "no known conversion" compilation error
  29.  
  30. ---
  31. forms/frmmain.cpp | 12 +++++++++---
  32. 1 file changed, 9 insertions(+), 3 deletions(-)
  33.  
  34. diff --git a/forms/frmmain.cpp b/forms/frmmain.cpp
  35. index 1add50f..332e61f 100644
  36. --- a/forms/frmmain.cpp
  37. +++ b/forms/frmmain.cpp
  38. @@ -1252,7 +1252,9 @@ void frmMain::OnSyncJobAddClick(wxCommandEvent& WXUNUSED(event)){
  39. }
  40. JobAdd(m_Sync_Job_Select);
  41. //We save the newly added job
  42. - OnSyncJobSaveClick(wxCommandEvent());
  43. + wxCommandEvent tmpevent;
  44. + OnSyncJobSaveClick(tmpevent);
  45. + //OnSyncJobSaveClick(wxCommandEvent());
  46. UpdateSizer(SyncTopSizer);
  47. }
  48.  
  49. @@ -1271,7 +1273,9 @@ void frmMain::OnBackupJobAddClick(wxCommandEvent& WXUNUSED(event)){
  50. }
  51. JobAdd(m_Backup_Job_Select);
  52. //We save the newly added job
  53. - OnBackupJobSaveClick(wxCommandEvent());
  54. + wxCommandEvent tmpevent;
  55. + OnBackupJobSaveClick(tmpevent);
  56. + //OnBackupJobSaveClick(wxCommandEvent());
  57. UpdateSizer(BackupTopSizer);
  58. }
  59.  
  60. @@ -1290,7 +1294,9 @@ void frmMain::OnSecureJobAddClick(wxCommandEvent& WXUNUSED(event)){
  61. }
  62. JobAdd(m_Secure_Job_Select);
  63. //We save the newly added job
  64. - OnSecureJobSaveClick(wxCommandEvent());
  65. + wxCommandEvent tmpevent;
  66. + OnSecureJobSaveClick(tmpevent);
  67. + //OnSecureJobSaveClick(wxCommandEvent());
  68. UpdateSizer(SecureTopSizer);
  69. }
  70.  
  71. --
  72. 1.8.4.msysgit.0
  73.  
  74. From c0add2d61c3a905eba586c69e2b81c6ae001c2dc Mon Sep 17 00:00:00 2001
  75. From: Alex Tereschenko <alttoucan@gmail.com>
  76. Date: Wed, 28 Aug 2013 19:59:52 +0200
  77. Subject: [PATCH 03/29] Fixed one more compilation problem
  78.  
  79. ---
  80. luamanager.cpp | 2 ++
  81. 1 file changed, 2 insertions(+)
  82.  
  83. diff --git a/luamanager.cpp b/luamanager.cpp
  84. index 2f2d6a2..10a4e4f 100644
  85. --- a/luamanager.cpp
  86. +++ b/luamanager.cpp
  87. @@ -43,7 +43,9 @@ void LuaManager::Run(const wxString &line, const bool showprogress){
  88.  
  89. if(wxGetApp().IsGui()){
  90. m_Window = new frmProgress(wxGetApp().MainWindow, wxID_ANY, _("Progress"));
  91. +#if defined(__WXMSW__) && !defined(__MINGW32__)
  92. m_Window->SetTaskbar(wxGetApp().MainWindow->m_Taskbar);
  93. +#endif
  94.  
  95. if(!showprogress){
  96. m_Window->m_Gauge->Show(false);
  97. --
  98. 1.8.4.msysgit.0
  99.  
  100. From e154aff77d0d6fe0916a710759d323722f675841 Mon Sep 17 00:00:00 2001
  101. From: Alex Tereschenko <alttoucan@gmail.com>
  102. Date: Sat, 31 Aug 2013 18:39:33 +0200
  103. Subject: [PATCH 04/29] Adjusted CMake config to fix library search problems
  104.  
  105. ---
  106. CMakeLists.txt | 10 +++++++---
  107. 1 file changed, 7 insertions(+), 3 deletions(-)
  108.  
  109. diff --git a/CMakeLists.txt b/CMakeLists.txt
  110. index bcfb6fa..d48f768 100644
  111. --- a/CMakeLists.txt
  112. +++ b/CMakeLists.txt
  113. @@ -9,8 +9,11 @@ find_package(wxWidgets COMPONENTS net adv aui stc scintilla core base REQUIRED)
  114. include(${wxWidgets_USE_FILE})
  115.  
  116. #Find boost
  117. -set(BOOST_ROOT "C:/Programming/boost_1_48_0")
  118. -find_package(Boost REQUIRED)
  119. +#set(BOOST_ROOT "E:/dev/tools/boost_1_54_0")
  120. +set(BOOST_ROOT "" CACHE PATH "Path to directory with Boost library")
  121. +set(Boost_USE_STATIC_LIBS "ON")
  122. +#find_package(Boost REQUIRED)
  123. +find_package(Boost COMPONENTS thread system REQUIRED)
  124. add_definitions(-DBOOST_DATE_TIME_NO_LIB)
  125. include_directories(${Boost_INCLUDE_DIRS})
  126. link_directories(${Boost_LIBRARY_DIRS})
  127. @@ -89,7 +92,8 @@ add_custom_command(
  128.  
  129. #Set up the exe
  130. add_executable(toucan ${source} ${headers})
  131. -target_link_libraries(toucan forms backup controls data secure sync ${wxWidgets_LIBRARIES} ${LUA_LIBRARIES})
  132. +#target_link_libraries(toucan forms backup controls data secure sync ${wxWidgets_LIBRARIES} ${LUA_LIBRARIES})
  133. +target_link_libraries(toucan forms backup controls data secure sync ${wxWidgets_LIBRARIES} ${LUA_LIBRARIES} ${Boost_LIBRARIES})
  134.  
  135. #Once we have built Toucan move it somewhere suitable
  136. set(Toucan_Output "" CACHE PATH "The path to an existing Toucan installation")
  137. --
  138. 1.8.4.msysgit.0
  139.  
  140. From a9049460a345a7fec3596a620792c99cf6ea089d Mon Sep 17 00:00:00 2001
  141. From: Alex Tereschenko <alttoucan@gmail.com>
  142. Date: Sat, 31 Aug 2013 22:08:01 +0200
  143. Subject: [PATCH 05/29] Fixed sRGB profile-related warnings thrown by new
  144. libpng
  145.  
  146. ---
  147. bitmaps/add.png | Bin 907 -> 1241 bytes
  148. bitmaps/addvar.png | Bin 1129 -> 1281 bytes
  149. bitmaps/backup.png | Bin 4541 -> 1617 bytes
  150. bitmaps/drive-harddisk.png | Bin 632 -> 711 bytes
  151. bitmaps/drive-optical.png | Bin 556 -> 797 bytes
  152. bitmaps/drive-removable-media.png | Bin 363 -> 426 bytes
  153. bitmaps/expandall.png | Bin 1059 -> 1205 bytes
  154. bitmaps/file-exe.png | Bin 614 -> 736 bytes
  155. bitmaps/file.png | Bin 629 -> 765 bytes
  156. bitmaps/folder-open.png | Bin 419 -> 526 bytes
  157. bitmaps/folder.png | Bin 386 -> 447 bytes
  158. bitmaps/help.png | Bin 1650 -> 1675 bytes
  159. bitmaps/load.png | Bin 796 -> 1207 bytes
  160. bitmaps/ok.png | Bin 1047 -> 1179 bytes
  161. bitmaps/remove.png | Bin 498 -> 742 bytes
  162. bitmaps/rules.png | Bin 4433 -> 1991 bytes
  163. bitmaps/save.png | Bin 798 -> 1230 bytes
  164. bitmaps/script.png | Bin 4983 -> 2002 bytes
  165. bitmaps/secure.png | Bin 4962 -> 2180 bytes
  166. bitmaps/settings.png | Bin 4732 -> 2101 bytes
  167. bitmaps/sync.png | Bin 4603 -> 2017 bytes
  168. bitmaps/variables.png | Bin 3907 -> 1356 bytes
  169. 22 files changed, 0 insertions(+), 0 deletions(-)
  170.  
  171. The png files were not passing the newer libpng ICC profile validity checks, so I've just stripped the profilesFrom 9037d90a3b04d1fabc60dee6a37b653ebc03e4b9 Mon Sep 17 00:00:00 2001
  172. From: Alex Tereschenko <alttoucan@gmail.com>
  173. Date: Wed, 11 Sep 2013 18:50:24 +0200
  174. Subject: [PATCH 06/29] Added missing icons
  175.  
  176. ---
  177. bitmaps/autoscroll.png | Bin 0 -> 1372 bytes
  178. bitmaps/redo.png | Bin 0 -> 1334 bytes
  179. bitmaps/undo.png | Bin 0 -> 1309 bytes
  180. 3 files changed, 0 insertions(+), 0 deletions(-)
  181. create mode 100644 bitmaps/autoscroll.png
  182. create mode 100644 bitmaps/redo.png
  183. create mode 100644 bitmaps/undo.png
  184.  
  185. diff --git a/bitmaps/autoscroll.png b/bitmaps/autoscroll.png
  186. new file mode 100644
  187. index 0000000000000000000000000000000000000000..a8dd49e39612d00669b2130ed6054d16f48892cc
  188. GIT binary patch
  189. literal 1372
  190. zcmV-i1*7_jP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006O%
  191. z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
  192. zVoOIv0RI600RN!9r;`8x010qNS#tmY19kua19ky@)q>0b00f&!L_t(I%e9qVY*a-Q
  193. z$Ny*M&b@bc?{+`hN?Tf~BBf|3ltPfmhelK&QiW(@3_cKIeDTGPcVps%&ju1P1|lIb
  194. zA;ynJ(KIF|B?=azh%vOWAE9(t=(gQ<_wMe!dq0j3OMw;ejY-banfcB6|7Ye5F*EMR
  195. z(C(F>gJeSDZ3^g#&O~Q#+DI=W5V?W7c)fJ}@0^_*W}A=jSA6;Qb$h<wgVVcDgYH(b
  196. zJV<*j(QvY>t*c>W$4Yc8??5aWgHj59*~fft9%IvEICJq#$##k#a|Is&NKgVtcW!v5
  197. zXYj4TwmLAqOooccuUo9v=XUMbP3;}+|0|cPj30hF&F4oiT!vt=^YLf9&;K=yxuf$`
  198. zXN9iIZ`Zc3-??q;HfWlLqFubDf+WH)1XI1j?OUIuHLD(b)UFiJx#D3AUpiOsapX0%
  199. zKc&)7_x1L{ah#e0B8-oZV{CE^*_kYS-$!Gz5v{GQSl6=-kw^ppV8jg=Rx^s_B9<J`
  200. z0DxYhXpAE#Hf-5QrAi3^;JPl(4xdH#dKQ8S#9%=Jv$Hvxv1c$cJA%!<o6-J2JHP<K
  201. zS}cJD03@QuJL!hTm~QB>OE&D1jiFzLaBU_FLr6PrsaIET3ROdkZyKh2Q*(t=RW636
  202. zhj68Q1vYHhfeqWUQQKvy;;MKm+89N_E&u>BnGABXIp|8-9{9n^=T82HV*&NkIYY=C
  203. z$EhP|XH4@nlu)&-2XJ^B*spT8W+>RU4FH(ROhK^#3qI_B;V(f!{bXt+js?Bkk=T_&
  204. z8@ItMn<y5FSST!D{^~rcUiCJxA2xfQhhk7O-|-#jknB~%KmT*X{AJ1H@@r!YSUkLl
  205. z0xyC>An*fFNFV}COPvA$jrxfUsBkJX1t}z0XCMvGf&hZB{@xC-51<JE=zT)+lCGqZ
  206. zAzLb#J65inD|mpJG|sz@i&9uZ*(d`kKs6BwfqnOU^1opXCAHL|<yv;pjhHVg)qEgE
  207. zH^Bf93LZ5z2{Zsm07wF1H(;3B9??%P+yUK7T~de-t6hGdTq_>(w{V-g(NBBrY*~kN
  208. zanoZKJSZWzBMzVe5K#il5RIE+(ZV0jXX+(++;_tP2vjv8wwSthDAf}g4N~DI*AFs+
  209. zDC<W3*~o&H&zs%^fLarxeoB~{mKBdsw6e^Dp)?qphKN!~n^ELP%kc7H$W?}JNzuG6
  210. zHtT5qwW=RXIG#W0c-~b7nei`%lk=aHf4x=l058&hdLxlFPk1c>DJfwp4W`n-lF`y*
  211. zK`0>tRXa@SQIqs^O$t9Gz}JKbDi{3je7<s|&SL=JFZrZhst&ef;?PM#mlDPecxW-~
  212. zbQQ%W7sVzQcDjnd3X>6~t%&HV(-_zK=Kd*JAdK7r27n+8_hlvuKZ=VKMoT($DFFkh
  213. z#C?=gRoIQSD5pF)aUYg663*}bs)@^U0v_JwQ|#P4;JY<?+DFgF<Hm6`plRi5iPDM~
  214. z<~vJpntfPv2AU_Lm^_yUPjbFo_TB^VDSyM2I>x>JJUT!Iig=v_cBC32>+^xr#)3sk
  215. zL~@G-XCw^yXL$ICzvKK}*Wa(t^k2=99$-n`ePI9q02y>eSaefwW^{L9a%BK_cXuvn
  216. eZfkR6VQ^(GZ*pgw?mQX*0000<MNUMnLSTZ;kYgVJ
  217.  
  218. literal 0
  219. HcmV?d00001
  220.  
  221. diff --git a/bitmaps/redo.png b/bitmaps/redo.png
  222. new file mode 100644
  223. index 0000000000000000000000000000000000000000..72e7b385a2a727afccfa99e09024a30a34b4cabd
  224. GIT binary patch
  225. literal 1334
  226. zcmV-61<Cq}P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006O%
  227. z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
  228. zVoOIv0RI600RN!9r;`8x010qNS#tmY19kua19ky@)q>0b00ebOL_t(I%e9ruZ&Xzr
  229. z$3N#jX6DXx+L?Cx0?G`~!n72@Hh~0;V#MIWuu!85qdPa&h5v$ynz$euwcvt<8xqu@
  230. zF(f8LP(sicad;?=Ln#e~4yBz=+v&XSoqNwcE?O#&YFOwu`Q;=h=lA)2&s!*^SWSb&
  231. z=|*5LFaQiL2f!uZ;&OXBGnAcsAWzE-Wqq+4cyKuVg3!d_madkzSgeV3Vk;YBDWXP{
  232. zx#~P4`ODnMkCU6YQ}8|YR%R%BY;ZW;0UTX6^4@*m!QpfQ_#_;&UU_WC<6>PjLEH>u
  233. znFcjg2EY;xcv5H9EizS^W8~6BH8)#24s1<zukAh1`!XM&_^`49UWR5mH?LXWyP=Qf
  234. zKmZSif0HRf)V%<sxhn`E=;}yPkyXxp|C2KA8F#pS<C^t7$sRnp$eo&hAH)y=d?db-
  235. zD}90@8anGcQus<y^%n4!k;byyS4}JM;-=&V3bknzOS8~~M$XPNQN7J%Z3<Vp#LXtw
  236. zT5a@4Hene-P*9?b0u&0<Y+Ncj@adKWFxo#b5U++7skv1EJbW&fvN*Cv%GyX<Ac28N
  237. z!ON3(CP8}iM7v1@nn8g?;iHII3C{m`UKzl?U^E<aLv^MqGfUMpjcoavY7ZsYX6z9Y
  238. zqu14}GijqB7z&1-=zCJ!Qh#!%dJ_|kkY*v3LMk6+EiIu23`857MBd4>=vDkhuj1aS
  239. z-nI=P?0(W>^vcMbW81GOrD6)zYuom0d9g@yAVy3N;mR_ebaACa-FJ}6TLBNYH8(R+
  240. z&Q(gXGF6h5vFUpLQlGKeyK!w?0dHo8vPUyR**b8fy{j$J)T!|860L!DBBBB1yVPWf
  241. zf;)}tJ1d(vpmfQCEM8ZFd8H^jzEcT#ft?GETL-?r=Wsl>W6MTSa0|4>k{|>Mfv+Sj
  242. zv;u<4j0Z4g0KQYVDSC@JU#J2~l>x_h+@%w>6nFK`$y2|)4>SS@Az0<+jtIpY25`YE
  243. z*Y`#Ipqw{KlRy<g)$!~}-O#(FD_;kW0Az-;hk!!>Fa7YWXk8aEW@-yEqDNGi5TErQ
  244. zU#VgMzs)WbpXq7o4F9T1Q-BRrXDJ*{G`7B7ER;SP98Lp#kr~RC?k1+zGzO2|I;~2s
  245. zEsM|D57{<=3$>a<Q@tUD$qZlzg>K&rO`mACqw$7NaH~_UJujr%wfkWAmz~>_r&1jq
  246. z;%a?d8cOJ4Js{#IEiu2prXB>JqV8SQDpt5J(A6^<$(;#mrekSl{bnNfLCQ}w2W=78
  247. z5p^N`8QJ7(W6mG`WO>#L>jA0x-m342P)f1;VE1;Ri34qG;^J)Z%6EELD~0ud8`jLa
  248. zrJ0qGX4s~td%6%l;Gf<-cAvZSnRb!gJFOl913dk1G9KQRjBM(Uif_ix$*>;qmf?=2
  249. zn{H4ud_!pdx4TAG{~1<u{P$}mIB<4<B%Ykqr}Ox8)kPW6171WoWk@sCS37@yB<Mrn
  250. zyL#&9Jz}uE%eXe5^EbyVRjACX&$pj{WavMF{|jmV3l;ba^n)Y&nBDtX0000PbVXQn
  251. sQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Q07*qoM6N<$f-Rm}P5=M^
  252.  
  253. literal 0
  254. HcmV?d00001
  255.  
  256. diff --git a/bitmaps/undo.png b/bitmaps/undo.png
  257. new file mode 100644
  258. index 0000000000000000000000000000000000000000..07d84eee86ef8d4ea508cd5796447c07a9c72d3e
  259. GIT binary patch
  260. literal 1309
  261. zcmV+&1>*XNP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006O%
  262. z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
  263. zVoOIv0RI600RN!9r;`8x010qNS#tmY19kua19ky@)q>0b00dk~L_t(I%bk@;j8#Px
  264. zhQD)fz5B)<pc`qr8Jr-16Cfxt8q-mu#6%M`#yN3GqUnXM)P)P<!iAAU6E`kgU|g|q
  265. zz{CMeoPr7h9gH>zH2P?IpdYXMP50iaIxf1=r;UdACnu@o<a~ANoKsbzs_fe-!Qha3
  266. z+O%({EC%iXHqP6IdDnq9`(kiNXSj%D@9R7Vya*fw9vvLgv-@_+!xG4wJ<IcpI~N(c
  267. z7Of;#Tm=%4w8p4SpP@1_&E%PQLcQ)79Matv1J^g-`*fjv>>b8NW`72bcJ$;PSbf6)
  268. zQRz0q(o%w)f>!4vx^T@DU!Nv9{{<t5%ham&J>Z$aA)RUm>y|sWB4&Wev!9_VEM0ah
  269. zLFbi-#Qc}kN4V+3jF0Z;^zryNg-sXW1^^o)g(dX#ZbQNX<Z}2p0d0d2BBJoORwPJq
  270. zJxf;hV$%;-lt+`dfCv8sJ9YTjf$2nrxwU{#TGUVeL^?S}dTyK`49P6&BiFy0{PHV+
  271. z`Axze`c|xGYJB*CeLLl`!6DrxdtXO4-F6M$+ysGu2nZyzXPG&*AD=WSbz7pmCqPN6
  272. zp89D|rgIe?>u({*WadxgY0iGcFGnipfz<}UtHW6fp+E?(RiQfmHKyn&_Ipl^c#^tp
  273. zsX~+wbIY#{;nZoJ8BU~Q-R&TAHH%~&xzhgbR?XcJ%+=Up(-zLP@IEF^$^<1aMNhph
  274. z#I<xvRo8-cB~APIiJ#I6D+96hv7|9NY+bXduGz$=1#$%dHU|K<HBMuEm}K@0&NhfT
  275. z2PpM#Cg|&<(5);Ph<bsy2ZuBn9MWCDj^9rzW|`P{;@1(^sQ=~~^@^>z=~B@E+-QK~
  276. zl}37XSLr0^DRf4VsECA+4LlgQtRE)JT;DbhyOY=_&PZNu>x8XUIwUj=Rlhh>jBbW_
  277. zlbNaWP~%AJl`v$33F!<23eZFZ^sjN70bXjqSb$h32wG0g{n`)-iq6}n4#WW7-2c4(
  278. z2yD9$G5&EVwuXeITsW3y?8f`fw@ve(deRulq|Kn5#Si;dH4hXMktInh1UP8^8L@Pm
  279. z(_^n0(Z~ngYfKhsUGVLBRf;BLy9s%%Pzta$^KRDY6xQW|nlG4+R?`FgumC&<&4^}<
  280. zx^saa{i-K8Uvd7>x7B-0$b-hv-Psi$nw^P;mqp<Rs^kQ6SeLbtTwxOja9{ygGZ{3K
  281. z@fsO_^&=BHvU`;*UQ`Y1iR7~pUuVO>Cvon?<^9DmwP^vQi4sj|aC_?1)oOefhJ3OB
  282. zOcbG+khM=uE5MrVqk8oHt2`$CydJx*ty>2sur8~qEg(3Q+)Tq#2~2OL-26zDT~EBM
  283. zRZ+cIZx(9!(`y1i#CsvNM$$AZaT>+7R(`U{ipff~>+FOpKl_Fr{_AzS1YLL6QGevi
  284. zje?zfphT4@6Z)kCm2_E)BYoev*%#XWl1t9GT_?ZaBBt?s(B0+3c>G-2d$(N(QPux#
  285. z$M*bt{Qt`MQuGHOvu#IEGMH2V000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Y
  286. To9;Xs00000NkvXXu0mjfpo?B=
  287.  
  288. literal 0
  289. HcmV?d00001
  290.  
  291. --
  292. 1.8.4.msysgit.0
  293.  
  294. From 6ee88cfefae1c3c82dc19d744a203116ad874188 Mon Sep 17 00:00:00 2001
  295. From: Alex Tereschenko <alttoucan@gmail.com>
  296. Date: Thu, 12 Sep 2013 17:50:35 +0200
  297. Subject: [PATCH 09/29] Added localization and help data into repo, were not
  298. included before.
  299.  
  300. Including both sources and the resulting files, to make
  301. it easier for now. Ideally we should build those during Toucan build process.
  302. ---
  303. help/_images/backup.png | Bin 0 -> 69377 bytes
  304. help/_images/insertrule.png | Bin 0 -> 8805 bytes
  305. help/_images/jobarea.png | Bin 0 -> 3040 bytes
  306. help/_images/rules.png | Bin 0 -> 52696 bytes
  307. help/_images/rulesarea.png | Bin 0 -> 1430 bytes
  308. help/_images/script.png | Bin 0 -> 52453 bytes
  309. help/_images/secure.png | Bin 0 -> 63405 bytes
  310. help/_images/settings.png | Bin 0 -> 62602 bytes
  311. help/_images/sync.png | Bin 0 -> 67776 bytes
  312. help/_images/variables.png | Bin 0 -> 54303 bytes
  313. help/_sources/changelog.txt | 314 +++++++++++
  314. help/_sources/commandline.txt | 43 ++
  315. help/_sources/devel/compiling.txt | 44 ++
  316. help/_sources/examples/examples.txt | 90 ++++
  317. help/_sources/generaloverview.txt | 84 +++
  318. help/_sources/index.txt | 26 +
  319. help/_sources/introduction.txt | 100 ++++
  320. help/_sources/ui/backup.txt | 110 ++++
  321. help/_sources/ui/rules.txt | 117 ++++
  322. help/_sources/ui/scripts.txt | 285 ++++++++++
  323. help/_sources/ui/secure.txt | 52 ++
  324. help/_sources/ui/settings.txt | 61 +++
  325. help/_sources/ui/sync.txt | 132 +++++
  326. help/_sources/ui/variables.txt | 61 +++
  327. help/_static/basic.css | 509 ++++++++++++++++++
  328. help/_static/default.css | 272 ++++++++++
  329. help/_static/doctools.js | 247 +++++++++
  330. help/_static/file.png | Bin 0 -> 392 bytes
  331. help/_static/jquery.js | 154 ++++++
  332. help/_static/minus.png | Bin 0 -> 199 bytes
  333. help/_static/plus.png | Bin 0 -> 199 bytes
  334. help/_static/pygments.css | 61 +++
  335. help/_static/searchtools.js | 505 ++++++++++++++++++
  336. help/_static/sidebar.js | 147 +++++
  337. help/_static/toucan.png | Bin 0 -> 5514 bytes
  338. help/_static/underscore.js | 16 +
  339. help/changelog.html | 385 ++++++++++++++
  340. help/commandline.html | 164 ++++++
  341. help/devel/compiling.html | 178 +++++++
  342. help/examples/examples.html | 195 +++++++
  343. help/generaloverview.html | 198 +++++++
  344. help/genindex.html | 218 ++++++++
  345. help/index.html | 203 +++++++
  346. help/introduction.html | 219 ++++++++
  347. help/objects.inv | 7 +
  348. help/search.html | 99 ++++
  349. help/searchindex.js | 1 +
  350. help/ui/backup.html | 221 ++++++++
  351. help/ui/rules.html | 224 ++++++++
  352. help/ui/scripts.html | 590 ++++++++++++++++++++
  353. help/ui/secure.html | 168 ++++++
  354. help/ui/settings.html | 177 ++++++
  355. help/ui/sync.html | 303 +++++++++++
  356. help/ui/variables.html | 221 ++++++++
  357. lang/bg/lang.ini | 3 +
  358. lang/bg/toucan.mo | Bin 0 -> 6616 bytes
  359. lang/bg/toucan.po | 764 ++++++++++++++++++++++++++
  360. lang/cs/lang.ini | 3 +
  361. lang/cs/toucan.mo | Bin 0 -> 5759 bytes
  362. lang/cs/toucan.po | 768 ++++++++++++++++++++++++++
  363. lang/de/lang.ini | Bin 0 -> 156 bytes
  364. lang/de/toucan.mo | Bin 0 -> 6371 bytes
  365. lang/de/toucan.po | 754 ++++++++++++++++++++++++++
  366. lang/el/lang.ini | 3 +
  367. lang/el/toucan.mo | Bin 0 -> 10776 bytes
  368. lang/el/toucan.po | 749 ++++++++++++++++++++++++++
  369. lang/en/lang.ini | 3 +
  370. lang/en/toucan.mo | Bin 0 -> 7927 bytes
  371. lang/en/toucan.po | 662 +++++++++++++++++++++++
  372. lang/es/lang.ini | 3 +
  373. lang/es/toucan.mo | Bin 0 -> 9888 bytes
  374. lang/es/toucan.po | 825 ++++++++++++++++++++++++++++
  375. lang/et/lang.ini | 3 +
  376. lang/et/toucan.mo | Bin 0 -> 9214 bytes
  377. lang/et/toucan.po | 789 +++++++++++++++++++++++++++
  378. lang/fr/lang.ini | 3 +
  379. lang/fr/toucan.mo | Bin 0 -> 9865 bytes
  380. lang/fr/toucan.po | 925 ++++++++++++++++++++++++++++++++
  381. lang/hu/lang.ini | 3 +
  382. lang/hu/toucan.mo | Bin 0 -> 11062 bytes
  383. lang/hu/toucan.po | 845 +++++++++++++++++++++++++++++
  384. lang/it/lang.ini | 3 +
  385. lang/it/toucan.mo | Bin 0 -> 9482 bytes
  386. lang/it/toucan.po | 941 ++++++++++++++++++++++++++++++++
  387. lang/ja/lang.ini | 3 +
  388. lang/ja/toucan.mo | Bin 0 -> 10074 bytes
  389. lang/ja/toucan.po | 865 ++++++++++++++++++++++++++++++
  390. lang/ka/lang.ini | 3 +
  391. lang/ka/toucan.mo | Bin 0 -> 12549 bytes
  392. lang/ka/toucan.po | 672 +++++++++++++++++++++++
  393. lang/ko/lang.ini | 3 +
  394. lang/ko/toucan.mo | Bin 0 -> 8841 bytes
  395. lang/ko/toucan.po | 634 ++++++++++++++++++++++
  396. lang/nl/lang.ini | 3 +
  397. lang/nl/toucan.mo | Bin 0 -> 9455 bytes
  398. lang/nl/toucan.po | 1006 +++++++++++++++++++++++++++++++++++
  399. lang/pl/lang.ini | 3 +
  400. lang/pl/toucan.mo | Bin 0 -> 9600 bytes
  401. lang/pl/toucan.po | 904 +++++++++++++++++++++++++++++++
  402. lang/pt/lang.ini | 3 +
  403. lang/pt/toucan.mo | Bin 0 -> 6261 bytes
  404. lang/pt/toucan.po | 758 ++++++++++++++++++++++++++
  405. lang/pt_br/lang.ini | Bin 0 -> 170 bytes
  406. lang/pt_br/toucan.mo | Bin 0 -> 6246 bytes
  407. lang/pt_br/toucan.po | 766 ++++++++++++++++++++++++++
  408. lang/ru/lang.ini | 3 +
  409. lang/ru/toucan.mo | Bin 0 -> 11937 bytes
  410. lang/ru/toucan.po | 856 +++++++++++++++++++++++++++++
  411. lang/sv/lang.ini | 3 +
  412. lang/sv/toucan.mo | Bin 0 -> 7864 bytes
  413. lang/sv/toucan.po | 672 +++++++++++++++++++++++
  414. lang/tr/lang.ini | 3 +
  415. lang/tr/toucan.mo | Bin 0 -> 5822 bytes
  416. lang/tr/toucan.po | 769 ++++++++++++++++++++++++++
  417. lang/zh_cn/lang.ini | 3 +
  418. lang/zh_cn/toucan.mo | Bin 0 -> 5496 bytes
  419. lang/zh_cn/toucan.po | 766 ++++++++++++++++++++++++++
  420. lang/zh_tw/lang.ini | 3 +
  421. lang/zh_tw/toucan.mo | Bin 0 -> 5845 bytes
  422. lang/zh_tw/toucan.po | 780 +++++++++++++++++++++++++++
  423. 120 files changed, 24731 insertions(+)
  424. create mode 100644 help/_images/backup.png
  425. create mode 100644 help/_images/insertrule.png
  426. create mode 100644 help/_images/jobarea.png
  427. create mode 100644 help/_images/rules.png
  428. create mode 100644 help/_images/rulesarea.png
  429. create mode 100644 help/_images/script.png
  430. create mode 100644 help/_images/secure.png
  431. create mode 100644 help/_images/settings.png
  432. create mode 100644 help/_images/sync.png
  433. create mode 100644 help/_images/variables.png
  434. create mode 100644 help/_sources/changelog.txt
  435. create mode 100644 help/_sources/commandline.txt
  436. create mode 100644 help/_sources/devel/compiling.txt
  437. create mode 100644 help/_sources/examples/examples.txt
  438. create mode 100644 help/_sources/generaloverview.txt
  439. create mode 100644 help/_sources/index.txt
  440. create mode 100644 help/_sources/introduction.txt
  441. create mode 100644 help/_sources/ui/backup.txt
  442. create mode 100644 help/_sources/ui/rules.txt
  443. create mode 100644 help/_sources/ui/scripts.txt
  444. create mode 100644 help/_sources/ui/secure.txt
  445. create mode 100644 help/_sources/ui/settings.txt
  446. create mode 100644 help/_sources/ui/sync.txt
  447. create mode 100644 help/_sources/ui/variables.txt
  448. create mode 100644 help/_static/basic.css
  449. create mode 100644 help/_static/default.css
  450. create mode 100644 help/_static/doctools.js
  451. create mode 100644 help/_static/file.png
  452. create mode 100644 help/_static/jquery.js
  453. create mode 100644 help/_static/minus.png
  454. create mode 100644 help/_static/plus.png
  455. create mode 100644 help/_static/pygments.css
  456. create mode 100644 help/_static/searchtools.js
  457. create mode 100644 help/_static/sidebar.js
  458. create mode 100644 help/_static/toucan.png
  459. create mode 100644 help/_static/underscore.js
  460. create mode 100644 help/changelog.html
  461. create mode 100644 help/commandline.html
  462. create mode 100644 help/devel/compiling.html
  463. create mode 100644 help/examples/examples.html
  464. create mode 100644 help/generaloverview.html
  465. create mode 100644 help/genindex.html
  466. create mode 100644 help/index.html
  467. create mode 100644 help/introduction.html
  468. create mode 100644 help/objects.inv
  469. create mode 100644 help/search.html
  470. create mode 100644 help/searchindex.js
  471. create mode 100644 help/ui/backup.html
  472. create mode 100644 help/ui/rules.html
  473. create mode 100644 help/ui/scripts.html
  474. create mode 100644 help/ui/secure.html
  475. create mode 100644 help/ui/settings.html
  476. create mode 100644 help/ui/sync.html
  477. create mode 100644 help/ui/variables.html
  478. create mode 100644 lang/bg/lang.ini
  479. create mode 100644 lang/bg/toucan.mo
  480. create mode 100644 lang/bg/toucan.po
  481. create mode 100644 lang/cs/lang.ini
  482. create mode 100644 lang/cs/toucan.mo
  483. create mode 100644 lang/cs/toucan.po
  484. create mode 100644 lang/de/lang.ini
  485. create mode 100644 lang/de/toucan.mo
  486. create mode 100644 lang/de/toucan.po
  487. create mode 100644 lang/el/lang.ini
  488. create mode 100644 lang/el/toucan.mo
  489. create mode 100644 lang/el/toucan.po
  490. create mode 100644 lang/en/lang.ini
  491. create mode 100644 lang/en/toucan.mo
  492. create mode 100644 lang/en/toucan.po
  493. create mode 100644 lang/es/lang.ini
  494. create mode 100644 lang/es/toucan.mo
  495. create mode 100644 lang/es/toucan.po
  496. create mode 100644 lang/et/lang.ini
  497. create mode 100644 lang/et/toucan.mo
  498. create mode 100644 lang/et/toucan.po
  499. create mode 100644 lang/fr/lang.ini
  500. create mode 100644 lang/fr/toucan.mo
  501. create mode 100644 lang/fr/toucan.po
  502. create mode 100644 lang/hu/lang.ini
  503. create mode 100644 lang/hu/toucan.mo
  504. create mode 100644 lang/hu/toucan.po
  505. create mode 100644 lang/it/lang.ini
  506. create mode 100644 lang/it/toucan.mo
  507. create mode 100644 lang/it/toucan.po
  508. create mode 100644 lang/ja/lang.ini
  509. create mode 100644 lang/ja/toucan.mo
  510. create mode 100644 lang/ja/toucan.po
  511. create mode 100644 lang/ka/lang.ini
  512. create mode 100644 lang/ka/toucan.mo
  513. create mode 100644 lang/ka/toucan.po
  514. create mode 100644 lang/ko/lang.ini
  515. create mode 100644 lang/ko/toucan.mo
  516. create mode 100644 lang/ko/toucan.po
  517. create mode 100644 lang/nl/lang.ini
  518. create mode 100644 lang/nl/toucan.mo
  519. create mode 100644 lang/nl/toucan.po
  520. create mode 100644 lang/pl/lang.ini
  521. create mode 100644 lang/pl/toucan.mo
  522. create mode 100644 lang/pl/toucan.po
  523. create mode 100644 lang/pt/lang.ini
  524. create mode 100644 lang/pt/toucan.mo
  525. create mode 100644 lang/pt/toucan.po
  526. create mode 100644 lang/pt_br/lang.ini
  527. create mode 100644 lang/pt_br/toucan.mo
  528. create mode 100644 lang/pt_br/toucan.po
  529. create mode 100644 lang/ru/lang.ini
  530. create mode 100644 lang/ru/toucan.mo
  531. create mode 100644 lang/ru/toucan.po
  532. create mode 100644 lang/sv/lang.ini
  533. create mode 100644 lang/sv/toucan.mo
  534. create mode 100644 lang/sv/toucan.po
  535. create mode 100644 lang/tr/lang.ini
  536. create mode 100644 lang/tr/toucan.mo
  537. create mode 100644 lang/tr/toucan.po
  538. create mode 100644 lang/zh_cn/lang.ini
  539. create mode 100644 lang/zh_cn/toucan.mo
  540. create mode 100644 lang/zh_cn/toucan.po
  541. create mode 100644 lang/zh_tw/lang.ini
  542. create mode 100644 lang/zh_tw/toucan.mo
  543. create mode 100644 lang/zh_tw/toucan.po
  544. From d15f00e14fafa2b29c73bb4ec5e66093cebaa2e2 Mon Sep 17 00:00:00 2001
  545. From: Alex Tereschenko <alttoucan@gmail.com>
  546. Date: Thu, 12 Sep 2013 18:13:02 +0200
  547. Subject: [PATCH 10/29] Added wrapper file generated by SWIG to .hgignore
  548.  
  549. ---
  550. .hgignore | 2 ++
  551. 1 file changed, 2 insertions(+)
  552.  
  553. diff --git a/.hgignore b/.hgignore
  554. index be44647..15ecfab 100644
  555. --- a/.hgignore
  556. +++ b/.hgignore
  557. @@ -7,3 +7,5 @@ syntax:glob
  558. # These lines are suggested according to the svn:ignore property
  559. # Feel free to enable them by uncommenting them
  560. syntax:glob
  561. +syntax: glob
  562. +toucan_wrap.cpp
  563. --
  564. 1.8.4.msysgit.0
  565.  
  566. From e596b528255d8ec766fcece48e668b17d538bed4 Mon Sep 17 00:00:00 2001
  567. From: Alex Tereschenko <alttoucan@gmail.com>
  568. Date: Fri, 13 Sep 2013 11:14:25 +0200
  569. Subject: [PATCH 14/29] Added Sphinx config file for help generation & removed
  570. non-source files
  571.  
  572. ---
  573. .hgignore | 1 +
  574. help/_images/backup.png | Bin 69377 -> 0 bytes
  575. help/_images/insertrule.png | Bin 8805 -> 0 bytes
  576. help/_images/jobarea.png | Bin 3040 -> 0 bytes
  577. help/_images/rules.png | Bin 52696 -> 0 bytes
  578. help/_images/rulesarea.png | Bin 1430 -> 0 bytes
  579. help/_images/script.png | Bin 52453 -> 0 bytes
  580. help/_images/secure.png | Bin 63405 -> 0 bytes
  581. help/_images/settings.png | Bin 62602 -> 0 bytes
  582. help/_images/sync.png | Bin 67776 -> 0 bytes
  583. help/_images/variables.png | Bin 54303 -> 0 bytes
  584. help/_sources/changelog.txt | 314 -------------------
  585. help/_sources/commandline.txt | 43 ---
  586. help/_sources/devel/compiling.txt | 44 ---
  587. help/_sources/examples/examples.txt | 90 ------
  588. help/_sources/generaloverview.txt | 84 -----
  589. help/_sources/index.txt | 26 --
  590. help/_sources/introduction.txt | 100 ------
  591. help/_sources/ui/backup.txt | 110 -------
  592. help/_sources/ui/rules.txt | 117 -------
  593. help/_sources/ui/scripts.txt | 285 -----------------
  594. help/_sources/ui/secure.txt | 52 ----
  595. help/_sources/ui/settings.txt | 61 ----
  596. help/_sources/ui/sync.txt | 132 --------
  597. help/_sources/ui/variables.txt | 61 ----
  598. help/_static/basic.css | 509 -------------------------------
  599. help/_static/default.css | 272 -----------------
  600. help/_static/doctools.js | 247 ---------------
  601. help/_static/file.png | Bin 392 -> 0 bytes
  602. help/_static/jquery.js | 154 ----------
  603. help/_static/minus.png | Bin 199 -> 0 bytes
  604. help/_static/plus.png | Bin 199 -> 0 bytes
  605. help/_static/pygments.css | 61 ----
  606. help/_static/searchtools.js | 505 ------------------------------
  607. help/_static/sidebar.js | 147 ---------
  608. help/_static/toucan.png | Bin 5514 -> 0 bytes
  609. help/_static/underscore.js | 16 -
  610. help/changelog.html | 385 -----------------------
  611. help/commandline.html | 164 ----------
  612. help/devel/compiling.html | 178 -----------
  613. help/examples/examples.html | 195 ------------
  614. help/generaloverview.html | 198 ------------
  615. help/genindex.html | 218 -------------
  616. help/index.html | 203 -------------
  617. help/introduction.html | 219 -------------
  618. help/make.bat | 190 ++++++++++++
  619. help/objects.inv | 7 -
  620. help/search.html | 99 ------
  621. help/searchindex.js | 1 -
  622. help/source/changelog.txt | 314 +++++++++++++++++++
  623. help/source/commandline.txt | 43 +++
  624. help/source/conf.py | 243 +++++++++++++++
  625. help/source/devel/compiling.txt | 44 +++
  626. help/source/examples/examples.txt | 90 ++++++
  627. help/source/generaloverview.txt | 84 +++++
  628. help/source/images/backup.png | Bin 0 -> 69377 bytes
  629. help/source/images/insertrule.png | Bin 0 -> 8805 bytes
  630. help/source/images/jobarea.png | Bin 0 -> 3040 bytes
  631. help/source/images/rules.png | Bin 0 -> 52696 bytes
  632. help/source/images/rulesarea.png | Bin 0 -> 1430 bytes
  633. help/source/images/script.png | Bin 0 -> 52453 bytes
  634. help/source/images/secure.png | Bin 0 -> 63405 bytes
  635. help/source/images/settings.png | Bin 0 -> 62602 bytes
  636. help/source/images/sync.png | Bin 0 -> 67776 bytes
  637. help/source/images/variables.png | Bin 0 -> 54303 bytes
  638. help/source/index.txt | 26 ++
  639. help/source/introduction.txt | 100 ++++++
  640. help/source/toucan.png | Bin 0 -> 5514 bytes
  641. help/source/ui/backup.txt | 110 +++++++
  642. help/source/ui/rules.txt | 117 +++++++
  643. help/source/ui/scripts.txt | 285 +++++++++++++++++
  644. help/source/ui/secure.txt | 52 ++++
  645. help/source/ui/settings.txt | 61 ++++
  646. help/source/ui/sync.txt | 132 ++++++++
  647. help/source/ui/variables.txt | 61 ++++
  648. help/ui/backup.html | 221 --------------
  649. help/ui/rules.html | 224 --------------
  650. help/ui/scripts.html | 590 ------------------------------------
  651. help/ui/secure.html | 168 ----------
  652. help/ui/settings.html | 177 -----------
  653. help/ui/sync.html | 303 ------------------
  654. help/ui/variables.html | 221 --------------
  655. 82 files changed, 1953 insertions(+), 7201 deletions(-)
  656. delete mode 100644 help/_images/backup.png
  657. delete mode 100644 help/_images/insertrule.png
  658. delete mode 100644 help/_images/jobarea.png
  659. delete mode 100644 help/_images/rules.png
  660. delete mode 100644 help/_images/rulesarea.png
  661. delete mode 100644 help/_images/script.png
  662. delete mode 100644 help/_images/secure.png
  663. delete mode 100644 help/_images/settings.png
  664. delete mode 100644 help/_images/sync.png
  665. delete mode 100644 help/_images/variables.png
  666. delete mode 100644 help/_sources/changelog.txt
  667. delete mode 100644 help/_sources/commandline.txt
  668. delete mode 100644 help/_sources/devel/compiling.txt
  669. delete mode 100644 help/_sources/examples/examples.txt
  670. delete mode 100644 help/_sources/generaloverview.txt
  671. delete mode 100644 help/_sources/index.txt
  672. delete mode 100644 help/_sources/introduction.txt
  673. delete mode 100644 help/_sources/ui/backup.txt
  674. delete mode 100644 help/_sources/ui/rules.txt
  675. delete mode 100644 help/_sources/ui/scripts.txt
  676. delete mode 100644 help/_sources/ui/secure.txt
  677. delete mode 100644 help/_sources/ui/settings.txt
  678. delete mode 100644 help/_sources/ui/sync.txt
  679. delete mode 100644 help/_sources/ui/variables.txt
  680. delete mode 100644 help/_static/basic.css
  681. delete mode 100644 help/_static/default.css
  682. delete mode 100644 help/_static/doctools.js
  683. delete mode 100644 help/_static/file.png
  684. delete mode 100644 help/_static/jquery.js
  685. delete mode 100644 help/_static/minus.png
  686. delete mode 100644 help/_static/plus.png
  687. delete mode 100644 help/_static/pygments.css
  688. delete mode 100644 help/_static/searchtools.js
  689. delete mode 100644 help/_static/sidebar.js
  690. delete mode 100644 help/_static/toucan.png
  691. delete mode 100644 help/_static/underscore.js
  692. delete mode 100644 help/changelog.html
  693. delete mode 100644 help/commandline.html
  694. delete mode 100644 help/devel/compiling.html
  695. delete mode 100644 help/examples/examples.html
  696. delete mode 100644 help/generaloverview.html
  697. delete mode 100644 help/genindex.html
  698. delete mode 100644 help/index.html
  699. delete mode 100644 help/introduction.html
  700. create mode 100644 help/make.bat
  701. delete mode 100644 help/objects.inv
  702. delete mode 100644 help/search.html
  703. delete mode 100644 help/searchindex.js
  704. create mode 100644 help/source/changelog.txt
  705. create mode 100644 help/source/commandline.txt
  706. create mode 100644 help/source/conf.py
  707. create mode 100644 help/source/devel/compiling.txt
  708. create mode 100644 help/source/examples/examples.txt
  709. create mode 100644 help/source/generaloverview.txt
  710. create mode 100644 help/source/images/backup.png
  711. create mode 100644 help/source/images/insertrule.png
  712. create mode 100644 help/source/images/jobarea.png
  713. create mode 100644 help/source/images/rules.png
  714. create mode 100644 help/source/images/rulesarea.png
  715. create mode 100644 help/source/images/script.png
  716. create mode 100644 help/source/images/secure.png
  717. create mode 100644 help/source/images/settings.png
  718. create mode 100644 help/source/images/sync.png
  719. create mode 100644 help/source/images/variables.png
  720. create mode 100644 help/source/index.txt
  721. create mode 100644 help/source/introduction.txt
  722. create mode 100644 help/source/toucan.png
  723. create mode 100644 help/source/ui/backup.txt
  724. create mode 100644 help/source/ui/rules.txt
  725. create mode 100644 help/source/ui/scripts.txt
  726. create mode 100644 help/source/ui/secure.txt
  727. create mode 100644 help/source/ui/settings.txt
  728. create mode 100644 help/source/ui/sync.txt
  729. create mode 100644 help/source/ui/variables.txt
  730. delete mode 100644 help/ui/backup.html
  731. delete mode 100644 help/ui/rules.html
  732. delete mode 100644 help/ui/scripts.html
  733. delete mode 100644 help/ui/secure.html
  734. delete mode 100644 help/ui/settings.html
  735. delete mode 100644 help/ui/sync.html
  736. delete mode 100644 help/ui/variables.html
  737. From 61e663a579f6a5ee488c2b0f311204251c82854a Mon Sep 17 00:00:00 2001
  738. From: Alex Tereschenko <alttoucan@gmail.com>
  739. Date: Fri, 13 Sep 2013 16:06:35 +0200
  740. Subject: [PATCH 15/29] Added an ability to specify builddir for Sphinx build
  741. script
  742.  
  743. ---
  744. help/make.bat | 6 +++++-
  745. 1 file changed, 5 insertions(+), 1 deletion(-)
  746.  
  747. diff --git a/help/make.bat b/help/make.bat
  748. index ad84346..d3facb2 100644
  749. --- a/help/make.bat
  750. +++ b/help/make.bat
  751. @@ -6,6 +6,10 @@ if "%SPHINXBUILD%" == "" (
  752. set SPHINXBUILD=sphinx-build
  753. )
  754. set BUILDDIR=build
  755. +if NOT {%2} == {} (
  756. + set BUILDDIR=%2
  757. +)
  758. +
  759. set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
  760. set I18NSPHINXOPTS=%SPHINXOPTS% source
  761. if NOT "%PAPER%" == "" (
  762. @@ -17,7 +21,7 @@ if "%1" == "" goto help
  763.  
  764. if "%1" == "help" (
  765. :help
  766. - echo.Please use `make ^<target^>` where ^<target^> is one of
  767. + echo.Please use `make ^<target^> ^[destdir^]` where ^<target^> is one of
  768. echo. html to make standalone HTML files
  769. echo. dirhtml to make HTML files named index.html in directories
  770. echo. singlehtml to make a single large HTML file
  771. --
  772. 1.8.4.msysgit.0
  773.  
  774. From 7b3b34b8170b1996dcd52024d618e0147883e87e Mon Sep 17 00:00:00 2001
  775. From: Alex Tereschenko <alttoucan@gmail.com>
  776. Date: Wed, 18 Sep 2013 21:12:13 +0200
  777. Subject: [PATCH 16/29] Fixed bug #3 (missing libs libgcc_s_dw2-1.dll &
  778. libstdc++-6.dll)
  779.  
  780. ---
  781. CMakeLists.txt | 7 +++++++
  782. 1 file changed, 7 insertions(+)
  783.  
  784. diff --git a/CMakeLists.txt b/CMakeLists.txt
  785. index d48f768..ebc45ad 100644
  786. --- a/CMakeLists.txt
  787. +++ b/CMakeLists.txt
  788. @@ -48,6 +48,13 @@ if(MSVC)
  789. endif(Toucan_Static)
  790. endif(MSVC)
  791.  
  792. +if(MINGW)
  793. + # Under MinGW we want to add these flags
  794. + # -std=gnu++11 enables C++11 support with GNU extensions (otherwise it doesn't compile)
  795. + # -static-libgcc and -static-libstdc++ are to avoid shipping the respective DLLs alongside toucan.exe
  796. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -static-libgcc -static-libstdc++")
  797. +endif(MINGW)
  798. +
  799. #Traverse through the sub-directories
  800. add_subdirectory(backup)
  801. add_subdirectory(controls)
  802. --
  803. 1.8.4.msysgit.0
  804.  
  805. From 22b04d897cc483b1d224a37a19c80a6700d4d507 Mon Sep 17 00:00:00 2001
  806. From: Alex Tereschenko <alttoucan@gmail.com>
  807. Date: Sat, 21 Sep 2013 23:50:05 +0200
  808. Subject: [PATCH 19/29] [tickets:#3] Fixed Backup job picking up only the first
  809. source file/dir in Complete and Update
  810.  
  811. It was repeating the "add to archive" command for each source file/dir, but
  812. always used the first one in the list. I've introduced back the include file
  813. option, which, together with exclude file now covers it properly. That affected
  814. Complete and Update functions.
  815. ---
  816. backup/backupjob.cpp | 117 ++++++++++++++++++++++++++++++---------------------
  817. backup/backupjob.h | 3 ++
  818. data/backupdata.cpp | 5 ++-
  819. 3 files changed, 75 insertions(+), 50 deletions(-)
  820.  
  821. diff --git a/backup/backupjob.cpp b/backup/backupjob.cpp
  822. index c78bbcc..9c6bec2 100644
  823. --- a/backup/backupjob.cpp
  824. +++ b/backup/backupjob.cpp
  825. @@ -17,12 +17,25 @@
  826. #include <wx/textfile.h>
  827. #include <wx/stdpaths.h>
  828.  
  829. -#include <boost/shared_ptr.hpp>
  830.  
  831. BackupJob::BackupJob(BackupData *Data) : Job(Data){
  832. ;
  833. }
  834.  
  835. +//This is a utility function for properlly creating the include/exclude file
  836. +boost::shared_ptr<wxTextFile> BackupJob::CreateSysFile(const wxString &filename) {
  837. + boost::shared_ptr<wxTextFile> sysfile(new wxTextFile(wxGetApp().GetSettingsPath() + filename));
  838. + if(wxFileExists(sysfile->GetName())){
  839. + sysfile->Open();
  840. + sysfile->Clear();
  841. + sysfile->Write();
  842. + }
  843. + else{
  844. + sysfile->Create();
  845. + }
  846. + return sysfile;
  847. +}
  848. +
  849. void* BackupJob::Entry(){
  850. BackupData *data = static_cast<BackupData*>(GetData());
  851.  
  852. @@ -32,6 +45,17 @@ void* BackupJob::Entry(){
  853. }
  854. data->SetFileLocation(Path::Normalise(data->GetFileLocation()));
  855.  
  856. + //If we are not running a restore job we need to create exclude & possibly include files
  857. + boost::shared_ptr<wxTextFile> includefile, excludefile;
  858. + if(data->GetFunction() != _("Restore")){
  859. + excludefile = CreateSysFile(wxT("Excludes.txt"));
  860. + //Include file is only used for Complete and Update functions
  861. + if(data->GetFunction() == _("Complete") || data->GetFunction() == _("Update")) {
  862. + includefile = CreateSysFile(wxT("Includes.txt"));
  863. + }
  864. + }
  865. +
  866. + OutputProgress(_("Creating file list, this may take some time."), Message);
  867. for(unsigned int i = 0; i < data->GetLocations().Count(); i++){
  868. wxString path = data->GetLocation(i);
  869. bool isDir = false;
  870. @@ -42,19 +66,17 @@ void* BackupJob::Entry(){
  871. }
  872. isDir = true;
  873. }
  874. - //If we are not running a restore job we need to create a list file
  875. + //If we are not running a restore job we need to create exclude & possibly include files
  876. if(data->GetFunction() != _("Restore")){
  877. - boost::shared_ptr<wxTextFile> file(new wxTextFile(wxGetApp().GetSettingsPath() + wxT("Excludes.txt")));
  878. - if(wxFileExists(wxGetApp().GetSettingsPath() + wxT("Excludes.txt"))){
  879. - file->Open();
  880. - file->Clear();
  881. - file->Write();
  882. - }
  883. - else{
  884. - file->Create();
  885. - }
  886. wxFileName filename(path);
  887. - int length;
  888. + int length;
  889. +
  890. + //Include file is only used for Complete and Update functions
  891. + if(data->GetFunction() == _("Complete") || data->GetFunction() == _("Update")) {
  892. + includefile->AddLine(data->GetLocation(i));
  893. + includefile->Write();
  894. + }
  895. +
  896. //If we have a directory then take of the last dir and take off one for the remaining slash
  897. if(isDir){
  898. filename.RemoveLastDir();
  899. @@ -69,45 +91,44 @@ void* BackupJob::Entry(){
  900. length += 2;
  901. }
  902. }
  903. - OutputProgress(_("Creating file list, this may take some time."), Message);
  904. - if(!data->CreateList(file, data->GetLocation(i), length)){
  905. + if(!data->CreateList(excludefile, data->GetLocation(i), length)){
  906. return false;
  907. }
  908. - file->Write();
  909. - }
  910. - wxArrayString commands = data->CreateCommands();
  911. - wxSetWorkingDirectory(path);
  912. -
  913. - for(unsigned int i = 0; i < commands.Count(); ++i){
  914. - int id = wxDateTime::Now().GetTicks();
  915. - BackupProcess *process = new BackupProcess(id);
  916. - wxCommandEvent *event = new wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, ID_BACKUPPROCESS);
  917. - event->SetEventObject(process);
  918. - event->SetInt(id);
  919. - event->SetString(commands.Item(i));
  920. - wxGetApp().QueueEvent(event);
  921. - while(wxGetApp().m_StatusMap[id] != true){
  922. - if(!process->HasInput()){
  923. - //If there was no input then sleep for a while so we don't thrash the CPU
  924. - wxMilliSleep(100);
  925. - }
  926. - }
  927. -
  928. - //Grab any remaining output
  929. - while(process->HasInput())
  930. - ;
  931. - //Tidy up any temp files
  932. - if(wxFileExists(data->GetFileLocation() + wxT(".tmp"))){
  933. - wxRemoveFile(data->GetFileLocation() + wxT(".tmp"));
  934. - }
  935. - }
  936. - if(data->GetFormat() == wxT("tar")){
  937. - wxString ext = data->GetFileLocation().AfterLast('\\').AfterFirst('.');
  938. - wxString path = data->GetFileLocation().Left(data->GetFileLocation().Length() - ext.Length()) + "tar";
  939. - if(wxFileExists(path)){
  940. - wxRemoveFile(path);
  941. - }
  942. + excludefile->Write();
  943. }
  944. }
  945. +
  946. + wxArrayString commands = data->CreateCommands();
  947. +
  948. + for(unsigned int i = 0; i < commands.Count(); ++i){
  949. + int id = wxDateTime::Now().GetTicks();
  950. + BackupProcess *process = new BackupProcess(id);
  951. + wxCommandEvent *event = new wxCommandEvent(wxEVT_COMMAND_BUTTON_CLICKED, ID_BACKUPPROCESS);
  952. + event->SetEventObject(process);
  953. + event->SetInt(id);
  954. + event->SetString(commands.Item(i));
  955. + wxGetApp().QueueEvent(event);
  956. + while(wxGetApp().m_StatusMap[id] != true){
  957. + if(!process->HasInput()){
  958. + //If there was no input then sleep for a while so we don't thrash the CPU
  959. + wxMilliSleep(100);
  960. + }
  961. + }
  962. +
  963. + //Grab any remaining output
  964. + while(process->HasInput());
  965. +
  966. + //Tidy up any temp files
  967. + if(wxFileExists(data->GetFileLocation() + wxT(".tmp"))){
  968. + wxRemoveFile(data->GetFileLocation() + wxT(".tmp"));
  969. + }
  970. + }
  971. + if(data->GetFormat() == wxT("tar")){
  972. + wxString ext = data->GetFileLocation().AfterLast('\\').AfterFirst('.');
  973. + wxString path = data->GetFileLocation().Left(data->GetFileLocation().Length() - ext.Length()) + "tar";
  974. + if(wxFileExists(path)){
  975. + wxRemoveFile(path);
  976. + }
  977. + }
  978. return NULL;
  979. }
  980. diff --git a/backup/backupjob.h b/backup/backupjob.h
  981. index 135cbbb..1455f37 100644
  982. --- a/backup/backupjob.h
  983. +++ b/backup/backupjob.h
  984. @@ -8,6 +8,7 @@
  985. #define H_BACKUPJOB
  986.  
  987. class BackupData;
  988. +#include <boost/shared_ptr.hpp>
  989. #include "../job.h"
  990.  
  991. /*!
  992. @@ -18,6 +19,8 @@ class BackupJob : public Job{
  993. public:
  994. BackupJob(BackupData *Data);
  995. virtual void* Entry();
  996. +protected:
  997. + boost::shared_ptr<wxTextFile> CreateSysFile(const wxString &filename);
  998. };
  999.  
  1000. #endif
  1001. diff --git a/data/backupdata.cpp b/data/backupdata.cpp
  1002. index e459cf5..4d98775 100644
  1003. --- a/data/backupdata.cpp
  1004. +++ b/data/backupdata.cpp
  1005. @@ -122,6 +122,7 @@ wxArrayString BackupData::CreateCommands(){
  1006. wxString solid = wxEmptyString;
  1007. wxString exe = wxPathOnly(wxStandardPaths::Get().GetExecutablePath()) + wxFILE_SEP_PATH + wxT("7za");
  1008. wxString excludes = wxT(" -x@\"") + wxGetApp().GetSettingsPath() + wxT("Excludes.txt") + wxT("\" ");
  1009. + wxString includes = wxT(" -i@\"" + wxGetApp().GetSettingsPath() + wxT("Includes.txt") + wxT("\" "));
  1010.  
  1011. //Turn the inputted format into one 7zip will understand
  1012. if (GetFormat() == wxT("Zip")){
  1013. @@ -170,10 +171,10 @@ wxArrayString BackupData::CreateCommands(){
  1014. SetLocation(0, "\"" + GetLocation(0) + "\"");
  1015.  
  1016. if(GetFunction() == _("Complete")){
  1017. - commands.Add(exe + wxT(" a -t") + GetFormat() + GetPassword() + ratio + solid + wxT(" \"") + GetFileLocation() + wxT("\"") + excludes + tempdir + " -sccUTF-8 " + GetLocation(0));
  1018. + commands.Add(exe + wxT(" a -t") + GetFormat() + GetPassword() + ratio + solid + wxT(" \"") + GetFileLocation() + wxT("\"") + excludes + tempdir + " -sccUTF-8 " + includes);
  1019. }
  1020. else if(GetFunction() == _("Update")){
  1021. - commands.Add(exe + wxT(" u -t") + GetFormat() + GetPassword() + ratio + solid + wxT(" \"") + GetFileLocation() + wxT("\"") + excludes + tempdir + " -sccUTF-8 " + GetLocation(0));
  1022. + commands.Add(exe + wxT(" u -t") + GetFormat() + GetPassword() + ratio + solid + wxT(" \"") + GetFileLocation() + wxT("\"") + excludes + tempdir + " -sccUTF-8 " + includes);
  1023. }
  1024. else if(GetFunction() == _("Restore")){
  1025. commands.Add(exe + wxT(" x -aoa \"") + GetLocation(0) + wxT("\" -o\"") + GetFileLocation() + wxT("\" * -r") + GetPassword() + " -sccUTF-8 " + GetLocation(0));
  1026. --
  1027. 1.8.4.msysgit.0
  1028.  
  1029. From 632b6355b634f1451a6025d920a4a9abd06297cc Mon Sep 17 00:00:00 2001
  1030. From: Alex Tereschenko <alttoucan@gmail.com>
  1031. Date: Sat, 21 Sep 2013 23:53:15 +0200
  1032. Subject: [PATCH 20/29] Added ".exe" to "7za" to avoid inadvertent execution of
  1033. e.g. 7za.com or .bat
  1034.  
  1035. Especially in view of the fact some viruses use this trick to have the user
  1036. run them.
  1037. ---
  1038. data/backupdata.cpp | 2 +-
  1039. 1 file changed, 1 insertion(+), 1 deletion(-)
  1040.  
  1041. diff --git a/data/backupdata.cpp b/data/backupdata.cpp
  1042. index 4d98775..6f00fcd 100644
  1043. --- a/data/backupdata.cpp
  1044. +++ b/data/backupdata.cpp
  1045. @@ -120,7 +120,7 @@ wxArrayString BackupData::CreateCommands(){
  1046. wxString ratio, originalext;
  1047. wxString tempdir = wxT(" -w\"") + wxPathOnly(GetFileLocation()) + wxT("\"");
  1048. wxString solid = wxEmptyString;
  1049. - wxString exe = wxPathOnly(wxStandardPaths::Get().GetExecutablePath()) + wxFILE_SEP_PATH + wxT("7za");
  1050. + wxString exe = wxPathOnly(wxStandardPaths::Get().GetExecutablePath()) + wxFILE_SEP_PATH + wxT("7za.exe");
  1051. wxString excludes = wxT(" -x@\"") + wxGetApp().GetSettingsPath() + wxT("Excludes.txt") + wxT("\" ");
  1052. wxString includes = wxT(" -i@\"" + wxGetApp().GetSettingsPath() + wxT("Includes.txt") + wxT("\" "));
  1053.  
  1054. --
  1055. 1.8.4.msysgit.0
  1056.  
  1057. From f0722216d52c84b64e79c3f461f9fb7ff0d11141 Mon Sep 17 00:00:00 2001
  1058. From: Alex Tereschenko <alttoucan@gmail.com>
  1059. Date: Sat, 21 Sep 2013 23:56:03 +0200
  1060. Subject: [PATCH 21/29] Fixed 7-zip error message during restore due to source
  1061. filename used twice
  1062.  
  1063. The error it was triggering was "Cannot use absolute pathnames for this command"
  1064. ---
  1065. data/backupdata.cpp | 2 +-
  1066. 1 file changed, 1 insertion(+), 1 deletion(-)
  1067.  
  1068. diff --git a/data/backupdata.cpp b/data/backupdata.cpp
  1069. index 6f00fcd..5110c10 100644
  1070. --- a/data/backupdata.cpp
  1071. +++ b/data/backupdata.cpp
  1072. @@ -177,7 +177,7 @@ wxArrayString BackupData::CreateCommands(){
  1073. commands.Add(exe + wxT(" u -t") + GetFormat() + GetPassword() + ratio + solid + wxT(" \"") + GetFileLocation() + wxT("\"") + excludes + tempdir + " -sccUTF-8 " + includes);
  1074. }
  1075. else if(GetFunction() == _("Restore")){
  1076. - commands.Add(exe + wxT(" x -aoa \"") + GetLocation(0) + wxT("\" -o\"") + GetFileLocation() + wxT("\" * -r") + GetPassword() + " -sccUTF-8 " + GetLocation(0));
  1077. + commands.Add(exe + wxT(" x -aoa \"") + GetLocation(0) + wxT("\" -o\"") + GetFileLocation() + wxT("\" * -r") + GetPassword() + " -sccUTF-8 " + GetLocation(0));
  1078. }
  1079. //With the Differential type the first use creates a file called base file. On subsequent runs a file is created with a filename based on both the date and time.
  1080. else if(GetFunction() == _("Differential")){
  1081. --
  1082. 1.8.4.msysgit.0
  1083.  
  1084. From 5112458f504015254acf0c2a8aabe92da13e521a Mon Sep 17 00:00:00 2001
  1085. From: Alex Tereschenko <alttoucan@gmail.com>
  1086. Date: Sun, 22 Sep 2013 00:00:45 +0200
  1087. Subject: [PATCH 22/29] Now actually fixed 7-zip error message during restore
  1088. due to source filename used twice
  1089.  
  1090. The error it was triggering was "Cannot use absolute pathnames for this command"
  1091. ---
  1092. data/backupdata.cpp | 2 +-
  1093. 1 file changed, 1 insertion(+), 1 deletion(-)
  1094.  
  1095. diff --git a/data/backupdata.cpp b/data/backupdata.cpp
  1096. index 5110c10..061b9f4 100644
  1097. --- a/data/backupdata.cpp
  1098. +++ b/data/backupdata.cpp
  1099. @@ -177,7 +177,7 @@ wxArrayString BackupData::CreateCommands(){
  1100. commands.Add(exe + wxT(" u -t") + GetFormat() + GetPassword() + ratio + solid + wxT(" \"") + GetFileLocation() + wxT("\"") + excludes + tempdir + " -sccUTF-8 " + includes);
  1101. }
  1102. else if(GetFunction() == _("Restore")){
  1103. - commands.Add(exe + wxT(" x -aoa \"") + GetLocation(0) + wxT("\" -o\"") + GetFileLocation() + wxT("\" * -r") + GetPassword() + " -sccUTF-8 " + GetLocation(0));
  1104. + commands.Add(exe + wxT(" x -aoa \"") + GetLocation(0) + wxT("\" -o\"") + GetFileLocation() + wxT("\" * -r") + GetPassword() + " -sccUTF-8 ");
  1105. }
  1106. //With the Differential type the first use creates a file called base file. On subsequent runs a file is created with a filename based on both the date and time.
  1107. else if(GetFunction() == _("Differential")){
  1108. --
  1109. 1.8.4.msysgit.0
  1110.  
  1111. From c28e6d5e45b65424185945f9c3e5f60c5da7c6d3 Mon Sep 17 00:00:00 2001
  1112. From: Alex Tereschenko <alttoucan@gmail.com>
  1113. Date: Sun, 22 Sep 2013 00:03:45 +0200
  1114. Subject: [PATCH 23/29] Added error message and made it impossible to add many
  1115. source files for restore
  1116.  
  1117. It was never trying to use more than one, but didn't warn, now it's explicit.
  1118. ---
  1119. forms/frmmain.cpp | 8 ++++++++
  1120. 1 file changed, 8 insertions(+)
  1121.  
  1122. diff --git a/forms/frmmain.cpp b/forms/frmmain.cpp
  1123. index 6625b3e..de446bb 100644
  1124. --- a/forms/frmmain.cpp
  1125. +++ b/forms/frmmain.cpp
  1126. @@ -1054,6 +1054,10 @@ void frmMain::OnBackupAddClick(wxCommandEvent& WXUNUSED(event)){
  1127. wxMessageBox(_("Mirror only supports one folder"), _("Error"), wxICON_ERROR|wxOK);
  1128. return;
  1129. }
  1130. + else if(m_Backup_Function->GetStringSelection() == _("Restore") && added + existing > 1) {
  1131. + wxMessageBox(_("Restore only supports one source archive file"), _("Error"), wxICON_ERROR|wxOK);
  1132. + return;
  1133. + }
  1134. for(unsigned int i = 0; i < arrPaths.Count(); i++){
  1135. m_BackupLocations->Add(arrPaths.Item(i));
  1136. m_Backup_TreeCtrl->AddItem(arrPaths.Item(i));
  1137. @@ -1400,6 +1404,10 @@ void frmMain::OnBackupRunClick(wxCommandEvent& WXUNUSED(event)){
  1138. wxMessageBox(_("Mirror only supports one folder"), _("Error"), wxICON_ERROR|wxOK);
  1139. return;
  1140. }
  1141. + else if(m_Backup_Function->GetStringSelection() == _("Restore") && m_BackupLocations->GetCount() > 1) {
  1142. + wxMessageBox(_("Restore only supports one source archive file"), _("Error"), wxICON_ERROR|wxOK);
  1143. + return;
  1144. + }
  1145. //Differential only supoprts 7z
  1146. if(m_Backup_Function->GetStringSelection() == _("Differential") && m_Backup_Format->GetStringSelection() != _("7-Zip")){
  1147. wxMessageBox(_("Differential only supports the 7-Zip format"), _("Error"), wxICON_ERROR|wxOK);
  1148. --
  1149. 1.8.4.msysgit.0
  1150.  
  1151. From fed17e68c46d8d1dc8bade55f07786e17bb9f286 Mon Sep 17 00:00:00 2001
  1152. From: Alex Tereschenko <alttoucan@gmail.com>
  1153. Date: Sun, 22 Sep 2013 00:06:45 +0200
  1154. Subject: [PATCH 24/29] Fixed error message mistakenly triggered during restore
  1155.  
  1156. It was complaining that you should specify a file as a destination, which is
  1157. invalid for restore.
  1158. ---
  1159. toucan.i | 5 +++--
  1160. 1 file changed, 3 insertions(+), 2 deletions(-)
  1161.  
  1162. diff --git a/toucan.i b/toucan.i
  1163. index 3b96823..6fe26bf 100644
  1164. --- a/toucan.i
  1165. +++ b/toucan.i
  1166. @@ -100,8 +100,9 @@
  1167. if(data->GetFunction() == wxEmptyString){
  1168. throw std::invalid_argument("A valid function must be selected");
  1169. }
  1170. - if(data->GetFunction() != _("Differential") && (data->GetFileLocation() == wxEmptyString || wxDirExists(data->GetFileLocation()))){
  1171. - throw std::invalid_argument("The backup archive must be specified");
  1172. + if(data->GetFunction() != _("Differential") && data->GetFunction() != _("Restore") &&
  1173. + (data->GetFileLocation() == wxEmptyString || wxDirExists(data->GetFileLocation()))){
  1174. + throw std::invalid_argument("The backup archive file must be specified");
  1175. }
  1176. else if(data->GetFunction() == _("Differential") && (data->GetFileLocation() == wxEmptyString || !wxDirExists(data->GetFileLocation()))){
  1177. throw std::invalid_argument("The backup folder must be specified and exist");
  1178. --
  1179. 1.8.4.msysgit.0
  1180.  
  1181. From 771d029cf24f2a2679ec8ad3b626137a019239b1 Mon Sep 17 00:00:00 2001
  1182. From: Alex Tereschenko <alttoucan@gmail.com>
  1183. Date: Sun, 22 Sep 2013 00:08:39 +0200
  1184. Subject: [PATCH 25/29] Now the check for empty or non-directory destination
  1185. also executed for restores
  1186.  
  1187. ---
  1188. toucan.i | 3 ++-
  1189. 1 file changed, 2 insertions(+), 1 deletion(-)
  1190.  
  1191. diff --git a/toucan.i b/toucan.i
  1192. index 6fe26bf..6215b52 100644
  1193. --- a/toucan.i
  1194. +++ b/toucan.i
  1195. @@ -104,7 +104,8 @@
  1196. (data->GetFileLocation() == wxEmptyString || wxDirExists(data->GetFileLocation()))){
  1197. throw std::invalid_argument("The backup archive file must be specified");
  1198. }
  1199. - else if(data->GetFunction() == _("Differential") && (data->GetFileLocation() == wxEmptyString || !wxDirExists(data->GetFileLocation()))){
  1200. + else if((data->GetFunction() == _("Differential") || data->GetFunction() == _("Restore")) &&
  1201. + (data->GetFileLocation() == wxEmptyString || !wxDirExists(data->GetFileLocation()))){
  1202. throw std::invalid_argument("The backup folder must be specified and exist");
  1203. }
  1204. if(data->GetFormat() == wxEmptyString){
  1205. --
  1206. 1.8.4.msysgit.0
  1207.  
  1208. From 8e02a40f4279d78abb91ed2b45df703c865c4a02 Mon Sep 17 00:00:00 2001
  1209. From: Alex Tereschenko <alttoucan@gmail.com>
  1210. Date: Sun, 22 Sep 2013 21:07:14 +0200
  1211. Subject: [PATCH 27/29] [tickets:#1] Updated docs for backup (Mirror mode was
  1212. missing)
  1213.  
  1214. Added mode description and replaced the UI screenshot.
  1215. Also added added two small clarifications for Formats and Restore
  1216. descriptions.
  1217. ---
  1218. help/source/images/backup.png | Bin 69377 -> 64256 bytes
  1219. help/source/ui/backup.txt | 31 +++++++++++++++++++++++++++++--
  1220. 2 files changed, 29 insertions(+), 2 deletions(-)
  1221.  
  1222. <Inserted new screenshot with Mirror mode selector present (old one didn't have it>
  1223.  
  1224. diff --git a/help/source/ui/backup.txt b/help/source/ui/backup.txt
  1225. index 26afeb7..4240bd8 100644
  1226. --- a/help/source/ui/backup.txt
  1227. +++ b/help/source/ui/backup.txt
  1228. @@ -54,12 +54,39 @@ Differential
  1229. Restore
  1230. Restores files from an archive into a folder. This works the other way
  1231. on to other the main functions, you add the files to the file list and
  1232. - they are extracted into the folder specified.
  1233. + they are extracted into the folder specified. Currently this only supports
  1234. + one source file.
  1235. +
  1236. +Mirror
  1237. + This one is somewhat similar to Update, however it strives to exactly
  1238. + mirror the changes in the source files/folders into the Backup Location.
  1239. + Specifically, the following 7-Zip options are used: "-up1q0r2x1y2z1w2".
  1240. + Below are details about archive and file actions that translates into.
  1241. +
  1242. + +-------------------------------------------------+------------------------------------------+
  1243. + |State condition |Action |
  1244. + +=================================================+==========================================+
  1245. + |File exists in archive, but is not matched |File copied from old archive to new |
  1246. + |with wildcard | |
  1247. + +-------------------------------------------------+------------------------------------------+
  1248. + |File exists in archive, but doesn't exist on disk|File ignored, not added to the new archive|
  1249. + +-------------------------------------------------+------------------------------------------+
  1250. + |File doesn't exist in archive, but exists on disk|File added from disk to new archive |
  1251. + +-------------------------------------------------+------------------------------------------+
  1252. + |File in archive is newer than the file on disk |File is copied from old archive to new |
  1253. + +-------------------------------------------------+------------------------------------------+
  1254. + |File in archive is older than the file on disk |File is added from disk to new archive |
  1255. + +-------------------------------------------------+------------------------------------------+
  1256. + |File in archive is same as the file on disk |File is copied from old archive to new |
  1257. + +-------------------------------------------------+------------------------------------------+
  1258. + |Can not be detected what file is newer |File is added from disk to new archive |
  1259. + |(times are the same, sizes are different) | |
  1260. + +-------------------------------------------------+------------------------------------------+
  1261.  
  1262. Format
  1263. ======
  1264.  
  1265. -Toucan supports two formats currently, they are:
  1266. +Toucan supports three formats currently, they are:
  1267.  
  1268. Zip
  1269. An industry standard format with average compression levels and speed.
  1270. --
  1271. 1.8.4.msysgit.0
  1272.  
  1273. From 3a194cdf750d3c96939e8af9a49833122faa5603 Mon Sep 17 00:00:00 2001
  1274. From: Alex Tereschenko <alttoucan@gmail.com>
  1275. Date: Sun, 22 Sep 2013 22:25:04 +0200
  1276. Subject: [PATCH 28/29] Update changelog for 3.1.1
  1277.  
  1278. ---
  1279. help/source/changelog.txt | 8 ++++++++
  1280. 1 file changed, 8 insertions(+)
  1281.  
  1282. diff --git a/help/source/changelog.txt b/help/source/changelog.txt
  1283. index 46f317e..cbc41b9 100644
  1284. --- a/help/source/changelog.txt
  1285. +++ b/help/source/changelog.txt
  1286. @@ -2,6 +2,14 @@
  1287. Changelog
  1288. =========
  1289.  
  1290. +3.1.1 (2013-09-22)
  1291. +==================
  1292. +
  1293. +- Fixed bug with Backup in Complete or Update modes
  1294. + only including the first source file/dir into the resulting archive (`bug #2 <https://sourceforge.net/p/alt-toucan/tickets/2/>`_)
  1295. +- Added description of Mirror mode for Backup into documenation (`bug #1 <https://sourceforge.net/p/alt-toucan/tickets/1/>`_)
  1296. +- Fixed several error handling cases for Restore mode (errors were triggered when not needed and vice versa)
  1297. +
  1298. 3.1
  1299. ===
  1300.  
  1301. --
  1302. 1.8.4.msysgit.0
  1303.  
  1304. From ef470fc0d399bf6ff0cee781cc24bda8f898d408 Mon Sep 17 00:00:00 2001
  1305. From: Alex Tereschenko <alttoucan@gmail.com>
  1306. Date: Sun, 22 Sep 2013 22:26:30 +0200
  1307. Subject: [PATCH 29/29] Bumped up version, updated copyright year
  1308.  
  1309. ---
  1310. forms/frmmain.cpp | 4 ++--
  1311. luathread.cpp | 2 +-
  1312. 2 files changed, 3 insertions(+), 3 deletions(-)
  1313.  
  1314. diff --git a/forms/frmmain.cpp b/forms/frmmain.cpp
  1315. index de446bb..fd22334 100644
  1316. --- a/forms/frmmain.cpp
  1317. +++ b/forms/frmmain.cpp
  1318. @@ -1812,9 +1812,9 @@ void frmMain::OnSecureAddVarClick(wxCommandEvent& WXUNUSED(event)){
  1319. void frmMain::OnAboutClick(wxCommandEvent& WXUNUSED(event)){
  1320. wxAboutDialogInfo info;
  1321. info.SetName(wxT("Toucan"));
  1322. - info.SetVersion(wxT("3.1.1-pre.2"));
  1323. + info.SetVersion(wxT("3.1.1"));
  1324. info.SetDescription(wxString::Format(wxT("Built on %s at %s"), __TDATE__, __TTIME__));
  1325. - info.SetCopyright(wxT("(C) 2006-2011 Steven Lamerton \nName by Danny Mensingh\nMain icons by Neorame\nOther icons by the Oxygen Project\n7Zip and ccrypt are by their respective teams.\nAll items (C) their owners."));
  1326. + info.SetCopyright(wxT("(C) 2006-2013 Steven Lamerton \nName by Danny Mensingh\nMain icons by Neorame\nOther icons by the Oxygen Project\n7Zip and ccrypt are by their respective teams.\nAll items (C) their owners."));
  1327. info.SetWebSite(wxT("http://portableapps.com/toucan"));
  1328. info.SetLicense(wxT("Toucan and its component parts are all licensed under the GNU GPL Version 2 or a compatible license."));
  1329. info.SetTranslators(GetTranslatorNames());
  1330. diff --git a/luathread.cpp b/luathread.cpp
  1331. index 788602b..c62ffa2 100644
  1332. --- a/luathread.cpp
  1333. +++ b/luathread.cpp
  1334. @@ -29,7 +29,7 @@ LuaThread::LuaThread(const wxString &line) : wxThread(), m_Command(line){
  1335. }
  1336.  
  1337. void *LuaThread::Entry(){
  1338. - OutputProgress("Toucan 3.1.1-pre.2", StartingLine);
  1339. + OutputProgress("Toucan 3.1.1", StartingLine);
  1340. OutputProgress(_("Date:") + " " + m_StartTime.FormatISODate(), StartingInfo);
  1341. OutputProgress(_("Computer Name:") + " " + wxGetHostName(), StartingInfo);
  1342. OutputProgress(_("Operating System:") + " " + wxGetOsDescription(), StartingInfo);
  1343. --
  1344. 1.8.4.msysgit.0
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!