Advertisement
Guest User

Untitled

a guest
Jul 21st, 2010
149
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 82.99 KB | None | 0 0
  1. From - Tue Jul 20 16:12:53 2010
  2. X-Mozilla-Status: 0001
  3. X-Mozilla-Status2: 00800000
  4. X-Mozilla-Keys:
  5. Message-ID: <4C461143.4090601@softplc.com>
  6. Date: Tue, 20 Jul 2010 16:12:35 -0500
  7. From: Dick Hollenbeck <dick@softplc.com>
  8. User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100528 Thunderbird/3.0.5
  9. MIME-Version: 1.0
  10. To: merge@code.launchpad.net, 'Dick Hollenbeck' <dick@softplc.com>
  11. Subject: long eeschema titles
  12. X-Enigmail-Version: 1.0.1
  13. Content-Type: multipart/signed; micalg=pgp-sha1;
  14. protocol="application/pgp-signature";
  15. boundary="------------enigBBA799E93CA0C13E7014B319"
  16.  
  17. This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
  18. --------------enigBBA799E93CA0C13E7014B319
  19. Content-Type: multipart/mixed;
  20. boundary="------------030907010307000307020808"
  21.  
  22. This is a multi-part message in MIME format.
  23. --------------030907010307000307020808
  24. Content-Type: text/plain; charset=ISO-8859-1
  25. Content-Transfer-Encoding: quoted-printable
  26.  
  27.  
  28. --------------030907010307000307020808
  29. Content-Type: text/plain;
  30. name="fulltitle.bundle"
  31. Content-Transfer-Encoding: quoted-printable
  32. Content-Disposition: attachment;
  33. filename="fulltitle.bundle"
  34.  
  35. # Bazaar merge directive format 2 (Bazaar 0.90)
  36. # revision_id: dick@softplc.com-20100720201533-5lwswb5vdwwto45o
  37. # target_branch: bzr+ssh://bazaar.launchpad.net/~kicad-testing-\
  38. # committers/kicad/testing/
  39. # testament_sha1: f8a1aac33eb0af0a30ae15fde453e8fa8c9cd432
  40. # timestamp: 2010-07-20 15:18:12 -0500
  41. # base_revision_id: dick@softplc.com-20100720170511-blrm6ryf1r9c01qj
  42. #=20
  43. # Begin patch
  44. =3D=3D=3D modified file 'common/common.cpp'
  45. --- common/common.cpp 2010-07-13 13:18:13 +0000
  46. +++ common/common.cpp 2010-07-20 20:15:33 +0000
  47. @@ -72,6 +72,7 @@
  48. =20
  49. wxString g_ProductName =3D wxT( "KiCad E.D.A. " );
  50. bool g_ShowPageLimits =3D true;
  51. +bool g_TitleFullPath =3D true;
  52. wxString g_UserLibDirBuffer;
  53. int g_DebugLevel;
  54. int g_MouseOldButtons;
  55.  
  56. =3D=3D=3D modified file 'common/edaappl.cpp'
  57. --- common/edaappl.cpp 2010-02-28 13:44:29 +0000
  58. +++ common/edaappl.cpp 2010-07-20 20:15:33 +0000
  59. @@ -618,6 +618,7 @@
  60. m_fileHistory.Load( *m_EDA_Config );
  61. =20
  62. m_EDA_Config->Read( wxT( "ShowPageLimits" ), &g_ShowPageLimits );
  63. + m_EDA_Config->Read( wxT( "TitleFullPath" ), &g_TitleFullPath );
  64. =20
  65. if( aReopenLastUsedDirectory )
  66. {
  67. @@ -640,6 +641,7 @@
  68. {
  69. wxASSERT( m_EDA_Config !=3D NULL );
  70. m_EDA_Config->Write( wxT( "ShowPageLimits" ), g_ShowPageLimits );
  71. + m_EDA_Config->Write( wxT( "TitleFullPath" ), g_TitleFullPath );
  72. m_EDA_Config->Write( wxT( "WorkingDir" ), wxGetCwd() );
  73. m_EDA_Config->Write( wxT( "BgColor" ), g_DrawBgColor );
  74. =20
  75.  
  76. =3D=3D=3D modified file 'eeschema/dialog_eeschema_options.h'
  77. --- eeschema/dialog_eeschema_options.h 2010-06-17 16:30:10 +0000
  78. +++ eeschema/dialog_eeschema_options.h 2010-07-20 20:15:33 +0000
  79. @@ -92,6 +92,15 @@
  80. return m_checkPageLimits->GetValue();
  81. }
  82. =20
  83. + void SetTitleFullPath( bool show )
  84. + {
  85. + m_checkTitleFullPath->SetValue( show );
  86. + }
  87. + bool GetTitleFullPath( void )
  88. + {
  89. + return m_checkTitleFullPath->GetValue();
  90. + }
  91. +
  92. =20
  93. /** Set the field \a aNdx textctrl to \a aName */
  94. void SetFieldName( int aNdx, wxString aName);
  95.  
  96. =3D=3D=3D modified file 'eeschema/dialog_eeschema_options_base.cpp'
  97. --- eeschema/dialog_eeschema_options_base.cpp 2010-06-17 16:30:10 +0000
  98. +++ eeschema/dialog_eeschema_options_base.cpp 2010-07-20 20:15:33 +0000
  99. @@ -1,5 +1,5 @@
  100. ////////////////////////////////////////////////////////////////////////=
  101. ///
  102. -// C++ code generated with wxFormBuilder (version Dec 21 2009)
  103. +// C++ code generated with wxFormBuilder (version Apr 17 2008)
  104. // http://www.wxformbuilder.org/
  105. //
  106. // PLEASE DO "NOT" EDIT THIS FILE!
  107. @@ -124,20 +124,29 @@
  108. bSizer2 =3D new wxBoxSizer( wxVERTICAL );
  109. =09
  110. m_checkShowGrid =3D new wxCheckBox( m_panel1, wxID_ANY, _("Show g&rid")=
  111. , wxDefaultPosition, wxDefaultSize, 0 );
  112. +=09
  113. bSizer2->Add( m_checkShowGrid, 0, wxALL|wxEXPAND, 3 );
  114. =09
  115. m_checkShowHiddenPins =3D new wxCheckBox( m_panel1, wxID_ANY, _("Show h=
  116. i&dden pins"), wxDefaultPosition, wxDefaultSize, 0 );
  117. +=09
  118. bSizer2->Add( m_checkShowHiddenPins, 0, wxALL|wxEXPAND, 3 );
  119. =09
  120. m_checkAutoPan =3D new wxCheckBox( m_panel1, wxID_ANY, _("Enable automa=
  121. tic &panning"), wxDefaultPosition, wxDefaultSize, 0 );
  122. +=09
  123. bSizer2->Add( m_checkAutoPan, 0, wxALL|wxEXPAND, 3 );
  124. =09
  125. m_checkHVOrientation =3D new wxCheckBox( m_panel1, wxID_ANY, _("Allow b=
  126. uses and wires to be placed in H or V &orientation only"), wxDefaultPosit=
  127. ion, wxDefaultSize, 0 );
  128. +=09
  129. bSizer2->Add( m_checkHVOrientation, 0, wxALL|wxEXPAND, 3 );
  130. =09
  131. m_checkPageLimits =3D new wxCheckBox( m_panel1, wxID_ANY, _("Show p&age=
  132. limits"), wxDefaultPosition, wxDefaultSize, 0 );
  133. +=09
  134. bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 );
  135. =09
  136. + m_checkTitleFullPath =3D new wxCheckBox( m_panel1, wxID_ANY, _("Show pr=
  137. oject full path in title"), wxDefaultPosition, wxDefaultSize, 0 );
  138. +=09
  139. + bSizer2->Add( m_checkTitleFullPath, 0, wxALL|wxEXPAND, 3 );
  140. +=09
  141. bSizer3->Add( bSizer2, 0, wxEXPAND, 0 );
  142. =09
  143. =09
  144.  
  145. =3D=3D=3D modified file 'eeschema/dialog_eeschema_options_base.fbp'
  146. --- eeschema/dialog_eeschema_options_base.fbp 2010-06-17 16:30:10 +0000
  147. +++ eeschema/dialog_eeschema_options_base.fbp 2010-07-20 20:15:33 +0000
  148. @@ -7,7 +7,6 @@
  149. <property name=3D"disconnect_events">1</property>
  150. <property name=3D"encoding">UTF-8</property>
  151. <property name=3D"event_generation">table</property>
  152. - <property name=3D"event_handler">impl_virtual</property>
  153. <property name=3D"file">dialog_eeschema_options_base</property>
  154. <property name=3D"first_id">1000</property>
  155. <property name=3D"help_provider">none</property>
  156. @@ -19,7 +18,7 @@
  157. <property name=3D"relative_path">1</property>
  158. <property name=3D"use_enum">1</property>
  159. <property name=3D"use_microsoft_bom">0</property>
  160. - <object class=3D"Dialog" expanded=3D"1">
  161. + <object class=3D"Dialog" expanded=3D"0">
  162. <property name=3D"bg"></property>
  163. <property name=3D"center">wxBOTH</property>
  164. <property name=3D"context_help"></property>
  165. @@ -38,10 +37,6 @@
  166. <property name=3D"subclass"></property>
  167. <property name=3D"title">Schematic Editor Options</property>=
  168.  
  169. <property name=3D"tooltip"></property>
  170. - <property name=3D"validator_data_type"></property>
  171. - <property name=3D"validator_style">wxFILTER_NONE</property>
  172. - <property name=3D"validator_type">wxDefaultValidator</proper=
  173. ty>
  174. - <property name=3D"validator_variable"></property>
  175. <property name=3D"window_extra_style"></property>
  176. <property name=3D"window_name"></property>
  177. <property name=3D"window_style"></property>
  178. @@ -111,10 +106,6 @@
  179. <property name=3D"style"></property>
  180. <property name=3D"subclass"></property>
  181. <property name=3D"tooltip"></property>
  182. - <property name=3D"validator_data_type"><=
  183. /property>
  184. - <property name=3D"validator_style">wxFIL=
  185. TER_NONE</property>
  186. - <property name=3D"validator_type">wxDefa=
  187. ultValidator</property>
  188. - <property name=3D"validator_variable"></=
  189. property>
  190. <property name=3D"window_extra_style"></=
  191. property>
  192. <property name=3D"window_name"></propert=
  193. y>
  194. <property name=3D"window_style"></proper=
  195. ty>
  196. @@ -163,10 +154,6 @@
  197. <property name=3D"size"></proper=
  198. ty>
  199. <property name=3D"subclass"></pr=
  200. operty>
  201. <property name=3D"tooltip"></pro=
  202. perty>
  203. - <property name=3D"validator_data=
  204. _type"></property>
  205. - <property name=3D"validator_styl=
  206. e">wxFILTER_NONE</property>
  207. - <property name=3D"validator_type=
  208. ">wxDefaultValidator</property>
  209. - <property name=3D"validator_vari=
  210. able"></property>
  211. <property name=3D"window_extra_s=
  212. tyle"></property>
  213. <property name=3D"window_name"><=
  214. /property>
  215. <property name=3D"window_style">=
  216. wxTAB_TRAVERSAL</property>
  217. @@ -245,10 +232,6 @@
  218. <pro=
  219. perty name=3D"style"></property>
  220. <pro=
  221. perty name=3D"subclass"></property>
  222. <pro=
  223. perty name=3D"tooltip"></property>
  224. - <pro=
  225. perty name=3D"validator_data_type"></property>
  226. - <pro=
  227. perty name=3D"validator_style">wxFILTER_NONE</property>
  228. - <pro=
  229. perty name=3D"validator_type">wxDefaultValidator</property>
  230. - <pro=
  231. perty name=3D"validator_variable"></property>
  232. <pro=
  233. perty name=3D"window_extra_style"></property>
  234. <pro=
  235. perty name=3D"window_name"></property>
  236. <pro=
  237. perty name=3D"window_style"></property>
  238. @@ -300,10 +283,6 @@
  239. <pro=
  240. perty name=3D"size"></property>
  241. <pro=
  242. perty name=3D"subclass"></property>
  243. <pro=
  244. perty name=3D"tooltip"></property>
  245. - <pro=
  246. perty name=3D"validator_data_type"></property>
  247. - <pro=
  248. perty name=3D"validator_style">wxFILTER_NONE</property>
  249. - <pro=
  250. perty name=3D"validator_type">wxDefaultValidator</property>
  251. - <pro=
  252. perty name=3D"validator_variable"></property>
  253. <pro=
  254. perty name=3D"window_extra_style"></property>
  255. <pro=
  256. perty name=3D"window_name"></property>
  257. <pro=
  258. perty name=3D"window_style"></property>
  259. @@ -365,10 +344,6 @@
  260. <pro=
  261. perty name=3D"style"></property>
  262. <pro=
  263. perty name=3D"subclass"></property>
  264. <pro=
  265. perty name=3D"tooltip"></property>
  266. - <pro=
  267. perty name=3D"validator_data_type"></property>
  268. - <pro=
  269. perty name=3D"validator_style">wxFILTER_NONE</property>
  270. - <pro=
  271. perty name=3D"validator_type">wxDefaultValidator</property>
  272. - <pro=
  273. perty name=3D"validator_variable"></property>
  274. <pro=
  275. perty name=3D"window_extra_style"></property>
  276. <pro=
  277. perty name=3D"window_name"></property>
  278. <pro=
  279. perty name=3D"window_style"></property>
  280. @@ -420,10 +395,6 @@
  281. <pro=
  282. perty name=3D"size"></property>
  283. <pro=
  284. perty name=3D"subclass"></property>
  285. <pro=
  286. perty name=3D"tooltip"></property>
  287. - <pro=
  288. perty name=3D"validator_data_type"></property>
  289. - <pro=
  290. perty name=3D"validator_style">wxFILTER_NONE</property>
  291. - <pro=
  292. perty name=3D"validator_type">wxDefaultValidator</property>
  293. - <pro=
  294. perty name=3D"validator_variable"></property>
  295. <pro=
  296. perty name=3D"window_extra_style"></property>
  297. <pro=
  298. perty name=3D"window_name"></property>
  299. <pro=
  300. perty name=3D"window_style"></property>
  301. @@ -475,10 +446,6 @@
  302. <pro=
  303. perty name=3D"style"></property>
  304. <pro=
  305. perty name=3D"subclass"></property>
  306. <pro=
  307. perty name=3D"tooltip"></property>
  308. - <pro=
  309. perty name=3D"validator_data_type"></property>
  310. - <pro=
  311. perty name=3D"validator_style">wxFILTER_NONE</property>
  312. - <pro=
  313. perty name=3D"validator_type">wxDefaultValidator</property>
  314. - <pro=
  315. perty name=3D"validator_variable"></property>
  316. <pro=
  317. perty name=3D"window_extra_style"></property>
  318. <pro=
  319. perty name=3D"window_name"></property>
  320. <pro=
  321. perty name=3D"window_style"></property>
  322. @@ -530,10 +497,6 @@
  323. <pro=
  324. perty name=3D"style"></property>
  325. <pro=
  326. perty name=3D"subclass"></property>
  327. <pro=
  328. perty name=3D"tooltip"></property>
  329. - <pro=
  330. perty name=3D"validator_data_type"></property>
  331. - <pro=
  332. perty name=3D"validator_style">wxFILTER_NONE</property>
  333. - <pro=
  334. perty name=3D"validator_type">wxDefaultValidator</property>
  335. - <pro=
  336. perty name=3D"validator_variable"></property>
  337. <pro=
  338. perty name=3D"window_extra_style"></property>
  339. <pro=
  340. perty name=3D"window_name"></property>
  341. <pro=
  342. perty name=3D"window_style"></property>
  343. @@ -587,10 +550,6 @@
  344. <pro=
  345. perty name=3D"style">wxSP_ARROW_KEYS|wxSP_WRAP</property>
  346. <pro=
  347. perty name=3D"subclass"></property>
  348. <pro=
  349. perty name=3D"tooltip"></property>
  350. - <pro=
  351. perty name=3D"validator_data_type"></property>
  352. - <pro=
  353. perty name=3D"validator_style">wxFILTER_NONE</property>
  354. - <pro=
  355. perty name=3D"validator_type">wxDefaultValidator</property>
  356. - <pro=
  357. perty name=3D"validator_variable"></property>
  358. <pro=
  359. perty name=3D"value"></property>
  360. <pro=
  361. perty name=3D"window_extra_style"></property>
  362. <pro=
  363. perty name=3D"window_name"></property>
  364. @@ -644,10 +603,6 @@
  365. <pro=
  366. perty name=3D"style"></property>
  367. <pro=
  368. perty name=3D"subclass"></property>
  369. <pro=
  370. perty name=3D"tooltip"></property>
  371. - <pro=
  372. perty name=3D"validator_data_type"></property>
  373. - <pro=
  374. perty name=3D"validator_style">wxFILTER_NONE</property>
  375. - <pro=
  376. perty name=3D"validator_type">wxDefaultValidator</property>
  377. - <pro=
  378. perty name=3D"validator_variable"></property>
  379. <pro=
  380. perty name=3D"window_extra_style"></property>
  381. <pro=
  382. perty name=3D"window_name"></property>
  383. <pro=
  384. perty name=3D"window_style"></property>
  385. @@ -699,10 +654,6 @@
  386. <pro=
  387. perty name=3D"style"></property>
  388. <pro=
  389. perty name=3D"subclass"></property>
  390. <pro=
  391. perty name=3D"tooltip"></property>
  392. - <pro=
  393. perty name=3D"validator_data_type"></property>
  394. - <pro=
  395. perty name=3D"validator_style">wxFILTER_NONE</property>
  396. - <pro=
  397. perty name=3D"validator_type">wxDefaultValidator</property>
  398. - <pro=
  399. perty name=3D"validator_variable"></property>
  400. <pro=
  401. perty name=3D"window_extra_style"></property>
  402. <pro=
  403. perty name=3D"window_name"></property>
  404. <pro=
  405. perty name=3D"window_style"></property>
  406. @@ -756,10 +707,6 @@
  407. <pro=
  408. perty name=3D"style">wxSP_ARROW_KEYS|wxSP_WRAP</property>
  409. <pro=
  410. perty name=3D"subclass"></property>
  411. <pro=
  412. perty name=3D"tooltip"></property>
  413. - <pro=
  414. perty name=3D"validator_data_type"></property>
  415. - <pro=
  416. perty name=3D"validator_style">wxFILTER_NONE</property>
  417. - <pro=
  418. perty name=3D"validator_type">wxDefaultValidator</property>
  419. - <pro=
  420. perty name=3D"validator_variable"></property>
  421. <pro=
  422. perty name=3D"value"></property>
  423. <pro=
  424. perty name=3D"window_extra_style"></property>
  425. <pro=
  426. perty name=3D"window_name"></property>
  427. @@ -813,10 +760,6 @@
  428. <pro=
  429. perty name=3D"style"></property>
  430. <pro=
  431. perty name=3D"subclass"></property>
  432. <pro=
  433. perty name=3D"tooltip"></property>
  434. - <pro=
  435. perty name=3D"validator_data_type"></property>
  436. - <pro=
  437. perty name=3D"validator_style">wxFILTER_NONE</property>
  438. - <pro=
  439. perty name=3D"validator_type">wxDefaultValidator</property>
  440. - <pro=
  441. perty name=3D"validator_variable"></property>
  442. <pro=
  443. perty name=3D"window_extra_style"></property>
  444. <pro=
  445. perty name=3D"window_name"></property>
  446. <pro=
  447. perty name=3D"window_style"></property>
  448. @@ -868,10 +811,6 @@
  449. <pro=
  450. perty name=3D"style"></property>
  451. <pro=
  452. perty name=3D"subclass"></property>
  453. <pro=
  454. perty name=3D"tooltip"></property>
  455. - <pro=
  456. perty name=3D"validator_data_type"></property>
  457. - <pro=
  458. perty name=3D"validator_style">wxFILTER_NONE</property>
  459. - <pro=
  460. perty name=3D"validator_type">wxDefaultValidator</property>
  461. - <pro=
  462. perty name=3D"validator_variable"></property>
  463. <pro=
  464. perty name=3D"window_extra_style"></property>
  465. <pro=
  466. perty name=3D"window_name"></property>
  467. <pro=
  468. perty name=3D"window_style"></property>
  469. @@ -925,10 +864,6 @@
  470. <pro=
  471. perty name=3D"style">wxSP_ARROW_KEYS|wxSP_WRAP</property>
  472. <pro=
  473. perty name=3D"subclass"></property>
  474. <pro=
  475. perty name=3D"tooltip"></property>
  476. - <pro=
  477. perty name=3D"validator_data_type"></property>
  478. - <pro=
  479. perty name=3D"validator_style">wxFILTER_NONE</property>
  480. - <pro=
  481. perty name=3D"validator_type">wxDefaultValidator</property>
  482. - <pro=
  483. perty name=3D"validator_variable"></property>
  484. <pro=
  485. perty name=3D"value"></property>
  486. <pro=
  487. perty name=3D"window_extra_style"></property>
  488. <pro=
  489. perty name=3D"window_name"></property>
  490. @@ -982,10 +917,6 @@
  491. <pro=
  492. perty name=3D"style"></property>
  493. <pro=
  494. perty name=3D"subclass"></property>
  495. <pro=
  496. perty name=3D"tooltip"></property>
  497. - <pro=
  498. perty name=3D"validator_data_type"></property>
  499. - <pro=
  500. perty name=3D"validator_style">wxFILTER_NONE</property>
  501. - <pro=
  502. perty name=3D"validator_type">wxDefaultValidator</property>
  503. - <pro=
  504. perty name=3D"validator_variable"></property>
  505. <pro=
  506. perty name=3D"window_extra_style"></property>
  507. <pro=
  508. perty name=3D"window_name"></property>
  509. <pro=
  510. perty name=3D"window_style"></property>
  511. @@ -1037,10 +968,6 @@
  512. <pro=
  513. perty name=3D"style"></property>
  514. <pro=
  515. perty name=3D"subclass"></property>
  516. <pro=
  517. perty name=3D"tooltip"></property>
  518. - <pro=
  519. perty name=3D"validator_data_type"></property>
  520. - <pro=
  521. perty name=3D"validator_style">wxFILTER_NONE</property>
  522. - <pro=
  523. perty name=3D"validator_type">wxDefaultValidator</property>
  524. - <pro=
  525. perty name=3D"validator_variable"></property>
  526. <pro=
  527. perty name=3D"window_extra_style"></property>
  528. <pro=
  529. perty name=3D"window_name"></property>
  530. <pro=
  531. perty name=3D"window_style"></property>
  532. @@ -1094,10 +1021,6 @@
  533. <pro=
  534. perty name=3D"style">wxSP_ARROW_KEYS|wxSP_WRAP</property>
  535. <pro=
  536. perty name=3D"subclass"></property>
  537. <pro=
  538. perty name=3D"tooltip"></property>
  539. - <pro=
  540. perty name=3D"validator_data_type"></property>
  541. - <pro=
  542. perty name=3D"validator_style">wxFILTER_NONE</property>
  543. - <pro=
  544. perty name=3D"validator_type">wxDefaultValidator</property>
  545. - <pro=
  546. perty name=3D"validator_variable"></property>
  547. <pro=
  548. perty name=3D"value"></property>
  549. <pro=
  550. perty name=3D"window_extra_style"></property>
  551. <pro=
  552. perty name=3D"window_name"></property>
  553. @@ -1151,10 +1074,6 @@
  554. <pro=
  555. perty name=3D"style"></property>
  556. <pro=
  557. perty name=3D"subclass"></property>
  558. <pro=
  559. perty name=3D"tooltip"></property>
  560. - <pro=
  561. perty name=3D"validator_data_type"></property>
  562. - <pro=
  563. perty name=3D"validator_style">wxFILTER_NONE</property>
  564. - <pro=
  565. perty name=3D"validator_type">wxDefaultValidator</property>
  566. - <pro=
  567. perty name=3D"validator_variable"></property>
  568. <pro=
  569. perty name=3D"window_extra_style"></property>
  570. <pro=
  571. perty name=3D"window_name"></property>
  572. <pro=
  573. perty name=3D"window_style"></property>
  574. @@ -1206,10 +1125,6 @@
  575. <pro=
  576. perty name=3D"style"></property>
  577. <pro=
  578. perty name=3D"subclass"></property>
  579. <pro=
  580. perty name=3D"tooltip"></property>
  581. - <pro=
  582. perty name=3D"validator_data_type"></property>
  583. - <pro=
  584. perty name=3D"validator_style">wxFILTER_NONE</property>
  585. - <pro=
  586. perty name=3D"validator_type">wxDefaultValidator</property>
  587. - <pro=
  588. perty name=3D"validator_variable"></property>
  589. <pro=
  590. perty name=3D"window_extra_style"></property>
  591. <pro=
  592. perty name=3D"window_name"></property>
  593. <pro=
  594. perty name=3D"window_style"></property>
  595. @@ -1263,10 +1178,6 @@
  596. <pro=
  597. perty name=3D"style">wxSP_ARROW_KEYS|wxSP_WRAP</property>
  598. <pro=
  599. perty name=3D"subclass"></property>
  600. <pro=
  601. perty name=3D"tooltip"></property>
  602. - <pro=
  603. perty name=3D"validator_data_type"></property>
  604. - <pro=
  605. perty name=3D"validator_style">wxFILTER_NONE</property>
  606. - <pro=
  607. perty name=3D"validator_type">wxDefaultValidator</property>
  608. - <pro=
  609. perty name=3D"validator_variable"></property>
  610. <pro=
  611. perty name=3D"value">1</property>
  612. <pro=
  613. perty name=3D"window_extra_style"></property>
  614. <pro=
  615. perty name=3D"window_name"></property>
  616. @@ -1342,10 +1253,6 @@
  617. <pro=
  618. perty name=3D"style"></property>
  619. <pro=
  620. perty name=3D"subclass"></property>
  621. <pro=
  622. perty name=3D"tooltip"></property>
  623. - <pro=
  624. perty name=3D"validator_data_type"></property>
  625. - <pro=
  626. perty name=3D"validator_style">wxFILTER_NONE</property>
  627. - <pro=
  628. perty name=3D"validator_type">wxDefaultValidator</property>
  629. - <pro=
  630. perty name=3D"validator_variable"></property>
  631. <pro=
  632. perty name=3D"window_extra_style"></property>
  633. <pro=
  634. perty name=3D"window_name"></property>
  635. <pro=
  636. perty name=3D"window_style"></property>
  637. @@ -1398,10 +1305,6 @@
  638. <pro=
  639. perty name=3D"style"></property>
  640. <pro=
  641. perty name=3D"subclass"></property>
  642. <pro=
  643. perty name=3D"tooltip"></property>
  644. - <pro=
  645. perty name=3D"validator_data_type"></property>
  646. - <pro=
  647. perty name=3D"validator_style">wxFILTER_NONE</property>
  648. - <pro=
  649. perty name=3D"validator_type">wxDefaultValidator</property>
  650. - <pro=
  651. perty name=3D"validator_variable"></property>
  652. <pro=
  653. perty name=3D"window_extra_style"></property>
  654. <pro=
  655. perty name=3D"window_name"></property>
  656. <pro=
  657. perty name=3D"window_style"></property>
  658. @@ -1454,10 +1357,6 @@
  659. <pro=
  660. perty name=3D"style"></property>
  661. <pro=
  662. perty name=3D"subclass"></property>
  663. <pro=
  664. perty name=3D"tooltip"></property>
  665. - <pro=
  666. perty name=3D"validator_data_type"></property>
  667. - <pro=
  668. perty name=3D"validator_style">wxFILTER_NONE</property>
  669. - <pro=
  670. perty name=3D"validator_type">wxDefaultValidator</property>
  671. - <pro=
  672. perty name=3D"validator_variable"></property>
  673. <pro=
  674. perty name=3D"window_extra_style"></property>
  675. <pro=
  676. perty name=3D"window_name"></property>
  677. <pro=
  678. perty name=3D"window_style"></property>
  679. @@ -1510,10 +1409,6 @@
  680. <pro=
  681. perty name=3D"style"></property>
  682. <pro=
  683. perty name=3D"subclass"></property>
  684. <pro=
  685. perty name=3D"tooltip"></property>
  686. - <pro=
  687. perty name=3D"validator_data_type"></property>
  688. - <pro=
  689. perty name=3D"validator_style">wxFILTER_NONE</property>
  690. - <pro=
  691. perty name=3D"validator_type">wxDefaultValidator</property>
  692. - <pro=
  693. perty name=3D"validator_variable"></property>
  694. <pro=
  695. perty name=3D"window_extra_style"></property>
  696. <pro=
  697. perty name=3D"window_name"></property>
  698. <pro=
  699. perty name=3D"window_style"></property>
  700. @@ -1566,10 +1461,58 @@
  701. <pro=
  702. perty name=3D"style"></property>
  703. <pro=
  704. perty name=3D"subclass"></property>
  705. <pro=
  706. perty name=3D"tooltip"></property>
  707. - <pro=
  708. perty name=3D"validator_data_type"></property>
  709. - <pro=
  710. perty name=3D"validator_style">wxFILTER_NONE</property>
  711. - <pro=
  712. perty name=3D"validator_type">wxDefaultValidator</property>
  713. - <pro=
  714. perty name=3D"validator_variable"></property>
  715. + <pro=
  716. perty name=3D"window_extra_style"></property>
  717. + <pro=
  718. perty name=3D"window_name"></property>
  719. + <pro=
  720. perty name=3D"window_style"></property>
  721. + <eve=
  722. nt name=3D"OnChar"></event>
  723. + <eve=
  724. nt name=3D"OnCheckBox"></event>
  725. + <eve=
  726. nt name=3D"OnEnterWindow"></event>
  727. + <eve=
  728. nt name=3D"OnEraseBackground"></event>
  729. + <eve=
  730. nt name=3D"OnKeyDown"></event>
  731. + <eve=
  732. nt name=3D"OnKeyUp"></event>
  733. + <eve=
  734. nt name=3D"OnKillFocus"></event>
  735. + <eve=
  736. nt name=3D"OnLeaveWindow"></event>
  737. + <eve=
  738. nt name=3D"OnLeftDClick"></event>
  739. + <eve=
  740. nt name=3D"OnLeftDown"></event>
  741. + <eve=
  742. nt name=3D"OnLeftUp"></event>
  743. + <eve=
  744. nt name=3D"OnMiddleDClick"></event>
  745. + <eve=
  746. nt name=3D"OnMiddleDown"></event>
  747. + <eve=
  748. nt name=3D"OnMiddleUp"></event>
  749. + <eve=
  750. nt name=3D"OnMotion"></event>
  751. + <eve=
  752. nt name=3D"OnMouseEvents"></event>
  753. + <eve=
  754. nt name=3D"OnMouseWheel"></event>
  755. + <eve=
  756. nt name=3D"OnPaint"></event>
  757. + <eve=
  758. nt name=3D"OnRightDClick"></event>
  759. + <eve=
  760. nt name=3D"OnRightDown"></event>
  761. + <eve=
  762. nt name=3D"OnRightUp"></event>
  763. + <eve=
  764. nt name=3D"OnSetFocus"></event>
  765. + <eve=
  766. nt name=3D"OnSize"></event>
  767. + <eve=
  768. nt name=3D"OnUpdateUI"></event>
  769. + </object=
  770. >
  771. + </object>
  772. + <object clas=
  773. s=3D"sizeritem" expanded=3D"1">
  774. + <propert=
  775. y name=3D"border">3</property>
  776. + <propert=
  777. y name=3D"flag">wxALL|wxEXPAND</property>
  778. + <propert=
  779. y name=3D"proportion">0</property>
  780. + <object =
  781. class=3D"wxCheckBox" expanded=3D"1">
  782. + <pro=
  783. perty name=3D"bg"></property>
  784. + <pro=
  785. perty name=3D"checked">0</property>
  786. + <pro=
  787. perty name=3D"context_help"></property>
  788. + <pro=
  789. perty name=3D"enabled">1</property>
  790. + <pro=
  791. perty name=3D"fg"></property>
  792. + <pro=
  793. perty name=3D"font"></property>
  794. + <pro=
  795. perty name=3D"hidden">0</property>
  796. + <pro=
  797. perty name=3D"id">wxID_ANY</property>
  798. + <pro=
  799. perty name=3D"label">Show project full path in title</property>
  800. + <pro=
  801. perty name=3D"maximum_size"></property>
  802. + <pro=
  803. perty name=3D"minimum_size"></property>
  804. + <pro=
  805. perty name=3D"name">m_checkTitleFullPath</property>
  806. + <pro=
  807. perty name=3D"permission">protected</property>
  808. + <pro=
  809. perty name=3D"pos"></property>
  810. + <pro=
  811. perty name=3D"size"></property>
  812. + <pro=
  813. perty name=3D"style"></property>
  814. + <pro=
  815. perty name=3D"subclass"></property>
  816. + <pro=
  817. perty name=3D"tooltip"></property>
  818. <pro=
  819. perty name=3D"window_extra_style"></property>
  820. <pro=
  821. perty name=3D"window_name"></property>
  822. <pro=
  823. perty name=3D"window_style"></property>
  824. @@ -1636,10 +1579,6 @@
  825. <property name=3D"size"></proper=
  826. ty>
  827. <property name=3D"subclass"></pr=
  828. operty>
  829. <property name=3D"tooltip">User =
  830. defined field names for schematic components. </property>
  831. - <property name=3D"validator_data=
  832. _type"></property>
  833. - <property name=3D"validator_styl=
  834. e">wxFILTER_NONE</property>
  835. - <property name=3D"validator_type=
  836. ">wxDefaultValidator</property>
  837. - <property name=3D"validator_vari=
  838. able"></property>
  839. <property name=3D"window_extra_s=
  840. tyle"></property>
  841. <property name=3D"window_name"><=
  842. /property>
  843. <property name=3D"window_style">=
  844. wxTAB_TRAVERSAL</property>
  845. @@ -1702,10 +1641,6 @@
  846. <property na=
  847. me=3D"style"></property>
  848. <property na=
  849. me=3D"subclass"></property>
  850. <property na=
  851. me=3D"tooltip"></property>
  852. - <property na=
  853. me=3D"validator_data_type"></property>
  854. - <property na=
  855. me=3D"validator_style">wxFILTER_NONE</property>
  856. - <property na=
  857. me=3D"validator_type">wxDefaultValidator</property>
  858. - <property na=
  859. me=3D"validator_variable"></property>
  860. <property na=
  861. me=3D"window_extra_style"></property>
  862. <property na=
  863. me=3D"window_name"></property>
  864. <property na=
  865. me=3D"window_style"></property>
  866. @@ -1784,10 +1719,6 @@
  867. <pro=
  868. perty name=3D"style"></property>
  869. <pro=
  870. perty name=3D"subclass"></property>
  871. <pro=
  872. perty name=3D"tooltip"></property>
  873. - <pro=
  874. perty name=3D"validator_data_type"></property>
  875. - <pro=
  876. perty name=3D"validator_style">wxFILTER_NONE</property>
  877. - <pro=
  878. perty name=3D"validator_type">wxDefaultValidator</property>
  879. - <pro=
  880. perty name=3D"validator_variable"></property>
  881. <pro=
  882. perty name=3D"window_extra_style"></property>
  883. <pro=
  884. perty name=3D"window_name"></property>
  885. <pro=
  886. perty name=3D"window_style"></property>
  887. @@ -1839,10 +1770,6 @@
  888. <pro=
  889. perty name=3D"style"></property>
  890. <pro=
  891. perty name=3D"subclass"></property>
  892. <pro=
  893. perty name=3D"tooltip"></property>
  894. - <pro=
  895. perty name=3D"validator_data_type"></property>
  896. - <pro=
  897. perty name=3D"validator_style">wxFILTER_NONE</property>
  898. - <pro=
  899. perty name=3D"validator_type">wxDefaultValidator</property>
  900. - <pro=
  901. perty name=3D"validator_variable"></property>
  902. <pro=
  903. perty name=3D"value"></property>
  904. <pro=
  905. perty name=3D"window_extra_style"></property>
  906. <pro=
  907. perty name=3D"window_name"></property>
  908. @@ -1898,10 +1825,6 @@
  909. <pro=
  910. perty name=3D"style"></property>
  911. <pro=
  912. perty name=3D"subclass"></property>
  913. <pro=
  914. perty name=3D"tooltip"></property>
  915. - <pro=
  916. perty name=3D"validator_data_type"></property>
  917. - <pro=
  918. perty name=3D"validator_style">wxFILTER_NONE</property>
  919. - <pro=
  920. perty name=3D"validator_type">wxDefaultValidator</property>
  921. - <pro=
  922. perty name=3D"validator_variable"></property>
  923. <pro=
  924. perty name=3D"window_extra_style"></property>
  925. <pro=
  926. perty name=3D"window_name"></property>
  927. <pro=
  928. perty name=3D"window_style"></property>
  929. @@ -1953,10 +1876,6 @@
  930. <pro=
  931. perty name=3D"style"></property>
  932. <pro=
  933. perty name=3D"subclass"></property>
  934. <pro=
  935. perty name=3D"tooltip"></property>
  936. - <pro=
  937. perty name=3D"validator_data_type"></property>
  938. - <pro=
  939. perty name=3D"validator_style">wxFILTER_NONE</property>
  940. - <pro=
  941. perty name=3D"validator_type">wxDefaultValidator</property>
  942. - <pro=
  943. perty name=3D"validator_variable"></property>
  944. <pro=
  945. perty name=3D"value"></property>
  946. <pro=
  947. perty name=3D"window_extra_style"></property>
  948. <pro=
  949. perty name=3D"window_name"></property>
  950. @@ -2012,10 +1931,6 @@
  951. <pro=
  952. perty name=3D"style"></property>
  953. <pro=
  954. perty name=3D"subclass"></property>
  955. <pro=
  956. perty name=3D"tooltip"></property>
  957. - <pro=
  958. perty name=3D"validator_data_type"></property>
  959. - <pro=
  960. perty name=3D"validator_style">wxFILTER_NONE</property>
  961. - <pro=
  962. perty name=3D"validator_type">wxDefaultValidator</property>
  963. - <pro=
  964. perty name=3D"validator_variable"></property>
  965. <pro=
  966. perty name=3D"window_extra_style"></property>
  967. <pro=
  968. perty name=3D"window_name"></property>
  969. <pro=
  970. perty name=3D"window_style"></property>
  971. @@ -2067,10 +1982,6 @@
  972. <pro=
  973. perty name=3D"style"></property>
  974. <pro=
  975. perty name=3D"subclass"></property>
  976. <pro=
  977. perty name=3D"tooltip"></property>
  978. - <pro=
  979. perty name=3D"validator_data_type"></property>
  980. - <pro=
  981. perty name=3D"validator_style">wxFILTER_NONE</property>
  982. - <pro=
  983. perty name=3D"validator_type">wxDefaultValidator</property>
  984. - <pro=
  985. perty name=3D"validator_variable"></property>
  986. <pro=
  987. perty name=3D"value"></property>
  988. <pro=
  989. perty name=3D"window_extra_style"></property>
  990. <pro=
  991. perty name=3D"window_name"></property>
  992. @@ -2126,10 +2037,6 @@
  993. <pro=
  994. perty name=3D"style"></property>
  995. <pro=
  996. perty name=3D"subclass"></property>
  997. <pro=
  998. perty name=3D"tooltip"></property>
  999. - <pro=
  1000. perty name=3D"validator_data_type"></property>
  1001. - <pro=
  1002. perty name=3D"validator_style">wxFILTER_NONE</property>
  1003. - <pro=
  1004. perty name=3D"validator_type">wxDefaultValidator</property>
  1005. - <pro=
  1006. perty name=3D"validator_variable"></property>
  1007. <pro=
  1008. perty name=3D"window_extra_style"></property>
  1009. <pro=
  1010. perty name=3D"window_name"></property>
  1011. <pro=
  1012. perty name=3D"window_style"></property>
  1013. @@ -2181,10 +2088,6 @@
  1014. <pro=
  1015. perty name=3D"style"></property>
  1016. <pro=
  1017. perty name=3D"subclass"></property>
  1018. <pro=
  1019. perty name=3D"tooltip"></property>
  1020. - <pro=
  1021. perty name=3D"validator_data_type"></property>
  1022. - <pro=
  1023. perty name=3D"validator_style">wxFILTER_NONE</property>
  1024. - <pro=
  1025. perty name=3D"validator_type">wxDefaultValidator</property>
  1026. - <pro=
  1027. perty name=3D"validator_variable"></property>
  1028. <pro=
  1029. perty name=3D"value"></property>
  1030. <pro=
  1031. perty name=3D"window_extra_style"></property>
  1032. <pro=
  1033. perty name=3D"window_name"></property>
  1034. @@ -2240,10 +2143,6 @@
  1035. <pro=
  1036. perty name=3D"style"></property>
  1037. <pro=
  1038. perty name=3D"subclass"></property>
  1039. <pro=
  1040. perty name=3D"tooltip"></property>
  1041. - <pro=
  1042. perty name=3D"validator_data_type"></property>
  1043. - <pro=
  1044. perty name=3D"validator_style">wxFILTER_NONE</property>
  1045. - <pro=
  1046. perty name=3D"validator_type">wxDefaultValidator</property>
  1047. - <pro=
  1048. perty name=3D"validator_variable"></property>
  1049. <pro=
  1050. perty name=3D"window_extra_style"></property>
  1051. <pro=
  1052. perty name=3D"window_name"></property>
  1053. <pro=
  1054. perty name=3D"window_style"></property>
  1055. @@ -2295,10 +2194,6 @@
  1056. <pro=
  1057. perty name=3D"style"></property>
  1058. <pro=
  1059. perty name=3D"subclass"></property>
  1060. <pro=
  1061. perty name=3D"tooltip"></property>
  1062. - <pro=
  1063. perty name=3D"validator_data_type"></property>
  1064. - <pro=
  1065. perty name=3D"validator_style">wxFILTER_NONE</property>
  1066. - <pro=
  1067. perty name=3D"validator_type">wxDefaultValidator</property>
  1068. - <pro=
  1069. perty name=3D"validator_variable"></property>
  1070. <pro=
  1071. perty name=3D"value"></property>
  1072. <pro=
  1073. perty name=3D"window_extra_style"></property>
  1074. <pro=
  1075. perty name=3D"window_name"></property>
  1076. @@ -2354,10 +2249,6 @@
  1077. <pro=
  1078. perty name=3D"style"></property>
  1079. <pro=
  1080. perty name=3D"subclass"></property>
  1081. <pro=
  1082. perty name=3D"tooltip"></property>
  1083. - <pro=
  1084. perty name=3D"validator_data_type"></property>
  1085. - <pro=
  1086. perty name=3D"validator_style">wxFILTER_NONE</property>
  1087. - <pro=
  1088. perty name=3D"validator_type">wxDefaultValidator</property>
  1089. - <pro=
  1090. perty name=3D"validator_variable"></property>
  1091. <pro=
  1092. perty name=3D"window_extra_style"></property>
  1093. <pro=
  1094. perty name=3D"window_name"></property>
  1095. <pro=
  1096. perty name=3D"window_style"></property>
  1097. @@ -2409,10 +2300,6 @@
  1098. <pro=
  1099. perty name=3D"style"></property>
  1100. <pro=
  1101. perty name=3D"subclass"></property>
  1102. <pro=
  1103. perty name=3D"tooltip"></property>
  1104. - <pro=
  1105. perty name=3D"validator_data_type"></property>
  1106. - <pro=
  1107. perty name=3D"validator_style">wxFILTER_NONE</property>
  1108. - <pro=
  1109. perty name=3D"validator_type">wxDefaultValidator</property>
  1110. - <pro=
  1111. perty name=3D"validator_variable"></property>
  1112. <pro=
  1113. perty name=3D"value"></property>
  1114. <pro=
  1115. perty name=3D"window_extra_style"></property>
  1116. <pro=
  1117. perty name=3D"window_name"></property>
  1118. @@ -2468,10 +2355,6 @@
  1119. <pro=
  1120. perty name=3D"style"></property>
  1121. <pro=
  1122. perty name=3D"subclass"></property>
  1123. <pro=
  1124. perty name=3D"tooltip"></property>
  1125. - <pro=
  1126. perty name=3D"validator_data_type"></property>
  1127. - <pro=
  1128. perty name=3D"validator_style">wxFILTER_NONE</property>
  1129. - <pro=
  1130. perty name=3D"validator_type">wxDefaultValidator</property>
  1131. - <pro=
  1132. perty name=3D"validator_variable"></property>
  1133. <pro=
  1134. perty name=3D"window_extra_style"></property>
  1135. <pro=
  1136. perty name=3D"window_name"></property>
  1137. <pro=
  1138. perty name=3D"window_style"></property>
  1139. @@ -2523,10 +2406,6 @@
  1140. <pro=
  1141. perty name=3D"style"></property>
  1142. <pro=
  1143. perty name=3D"subclass"></property>
  1144. <pro=
  1145. perty name=3D"tooltip"></property>
  1146. - <pro=
  1147. perty name=3D"validator_data_type"></property>
  1148. - <pro=
  1149. perty name=3D"validator_style">wxFILTER_NONE</property>
  1150. - <pro=
  1151. perty name=3D"validator_type">wxDefaultValidator</property>
  1152. - <pro=
  1153. perty name=3D"validator_variable"></property>
  1154. <pro=
  1155. perty name=3D"value"></property>
  1156. <pro=
  1157. perty name=3D"window_extra_style"></property>
  1158. <pro=
  1159. perty name=3D"window_name"></property>
  1160. @@ -2582,10 +2461,6 @@
  1161. <pro=
  1162. perty name=3D"style"></property>
  1163. <pro=
  1164. perty name=3D"subclass"></property>
  1165. <pro=
  1166. perty name=3D"tooltip"></property>
  1167. - <pro=
  1168. perty name=3D"validator_data_type"></property>
  1169. - <pro=
  1170. perty name=3D"validator_style">wxFILTER_NONE</property>
  1171. - <pro=
  1172. perty name=3D"validator_type">wxDefaultValidator</property>
  1173. - <pro=
  1174. perty name=3D"validator_variable"></property>
  1175. <pro=
  1176. perty name=3D"window_extra_style"></property>
  1177. <pro=
  1178. perty name=3D"window_name"></property>
  1179. <pro=
  1180. perty name=3D"window_style"></property>
  1181. @@ -2637,10 +2512,6 @@
  1182. <pro=
  1183. perty name=3D"style"></property>
  1184. <pro=
  1185. perty name=3D"subclass"></property>
  1186. <pro=
  1187. perty name=3D"tooltip"></property>
  1188. - <pro=
  1189. perty name=3D"validator_data_type"></property>
  1190. - <pro=
  1191. perty name=3D"validator_style">wxFILTER_NONE</property>
  1192. - <pro=
  1193. perty name=3D"validator_type">wxDefaultValidator</property>
  1194. - <pro=
  1195. perty name=3D"validator_variable"></property>
  1196. <pro=
  1197. perty name=3D"value"></property>
  1198. <pro=
  1199. perty name=3D"window_extra_style"></property>
  1200. <pro=
  1201. perty name=3D"window_name"></property>
  1202.  
  1203. =3D=3D=3D modified file 'eeschema/dialog_eeschema_options_base.h'
  1204. --- eeschema/dialog_eeschema_options_base.h 2010-06-17 16:30:10 +0000
  1205. +++ eeschema/dialog_eeschema_options_base.h 2010-07-20 20:15:33 +0000
  1206. @@ -1,5 +1,5 @@
  1207. ////////////////////////////////////////////////////////////////////////=
  1208. ///
  1209. -// C++ code generated with wxFormBuilder (version Dec 21 2009)
  1210. +// C++ code generated with wxFormBuilder (version Apr 17 2008)
  1211. // http://www.wxformbuilder.org/
  1212. //
  1213. // PLEASE DO "NOT" EDIT THIS FILE!
  1214. @@ -72,6 +72,7 @@
  1215. wxCheckBox* m_checkAutoPan;
  1216. wxCheckBox* m_checkHVOrientation;
  1217. wxCheckBox* m_checkPageLimits;
  1218. + wxCheckBox* m_checkTitleFullPath;
  1219. =09
  1220. wxPanel* m_panel2;
  1221. wxStaticText* m_staticText211;
  1222. @@ -96,11 +97,10 @@
  1223. wxButton* m_sdbSizer1Cancel;
  1224. =09
  1225. // Virtual event handlers, overide them in your derived class
  1226. - virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); }
  1227. + virtual void OnChooseUnits( wxCommandEvent& event ){ event.Skip(); }
  1228. =09
  1229. =09
  1230. public:
  1231. - =09
  1232. DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id =3D wxID=
  1233. _ANY, const wxString& title =3D _("Schematic Editor Options"), const wxPo=
  1234. int& pos =3D wxDefaultPosition, const wxSize& size =3D wxDefaultSize, lon=
  1235. g style =3D wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
  1236. ~DIALOG_EESCHEMA_OPTIONS_BASE();
  1237. =09
  1238.  
  1239. =3D=3D=3D modified file 'eeschema/eeredraw.cpp'
  1240. --- eeschema/eeredraw.cpp 2010-03-18 20:35:29 +0000
  1241. +++ eeschema/eeredraw.cpp 2010-07-20 20:15:33 +0000
  1242. @@ -77,8 +77,16 @@
  1243. else
  1244. {
  1245. title =3D wxT( "[" );
  1246. - title << GetScreen()->m_FileName << wxT( "] " ) << _( "Sheet" )=
  1247. ;
  1248. - title << wxT( " " ) << m_CurrentSheet->PathHumanReadable();
  1249. + if (g_TitleFullPath)
  1250. + {
  1251. + title << GetScreen()->m_FileName << wxT( "] " ) << _( "Shee=
  1252. t" );
  1253. + title << wxT( " " ) << m_CurrentSheet->PathHumanReadable();
  1254. + }
  1255. + else
  1256. + {
  1257. + wxFileName t(GetScreen()->m_FileName);
  1258. + title << t.GetName() << wxT( "] " ) << _( "Sheet" );
  1259. + }
  1260. SetTitle( title );
  1261. }
  1262. }
  1263.  
  1264. =3D=3D=3D modified file 'eeschema/eeschema_config.cpp'
  1265. --- eeschema/eeschema_config.cpp 2010-07-14 13:24:36 +0000
  1266. +++ eeschema/eeschema_config.cpp 2010-07-20 20:15:33 +0000
  1267. @@ -203,6 +203,7 @@
  1268. dlg.SetEnableAutoPan( DrawPanel->m_AutoPAN_Enable );
  1269. dlg.SetEnableHVBusOrientation( g_HVLines );
  1270. dlg.SetShowPageLimits( g_ShowPageLimits );
  1271. + dlg.SetTitleFullPath( g_TitleFullPath );
  1272. dlg.Layout();
  1273. dlg.Fit();
  1274. dlg.SetMinSize( dlg.GetSize() );
  1275. @@ -235,6 +236,7 @@
  1276. DrawPanel->m_AutoPAN_Enable =3D dlg.GetEnableAutoPan();
  1277. g_HVLines =3D dlg.GetEnableHVBusOrientation();
  1278. g_ShowPageLimits =3D dlg.GetShowPageLimits();
  1279. + g_TitleFullPath =3D dlg.GetTitleFullPath();
  1280. =20
  1281. wxString templateFieldName;
  1282. =20
  1283.  
  1284. =3D=3D=3D modified file 'include/common.h'
  1285. --- include/common.h 2010-07-13 13:18:13 +0000
  1286. +++ include/common.h 2010-07-20 20:15:33 +0000
  1287. @@ -160,6 +160,7 @@
  1288. extern int g_KeyPressed;
  1289. =20
  1290. extern bool g_ShowPageLimits; // TRUE to display the page limi=
  1291. ts
  1292. +extern bool g_TitleFullPath; // TRUE to display full path in =
  1293. window title
  1294. =20
  1295. /* File name extension definitions. */
  1296. extern const wxString ProjectFileExtension;
  1297.  
  1298. =3D=3D=3D modified file 'pcbnew/dialog_display_options_base.cpp'
  1299. --- pcbnew/dialog_display_options_base.cpp 2010-03-01 11:25:08 +0000
  1300. +++ pcbnew/dialog_display_options_base.cpp 2010-07-20 20:15:33 +0000
  1301. @@ -12,139 +12,139 @@
  1302. DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, =
  1303. wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& s=
  1304. ize, long style ) : wxDialog( parent, id, title, pos, size, style )
  1305. {
  1306. this->SetSizeHints( wxDefaultSize, wxDefaultSize );
  1307. -=09
  1308. +
  1309. wxBoxSizer* bMainSizer;
  1310. bMainSizer =3D new wxBoxSizer( wxHORIZONTAL );
  1311. -=09
  1312. +
  1313. wxStaticBoxSizer* sLeftBoxSizer;
  1314. sLeftBoxSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY=
  1315. , _("Tracks and vias:") ), wxVERTICAL );
  1316. -=09
  1317. +
  1318. wxString m_OptDisplayTracksChoices[] =3D { _("Sketch"), _("Filled") };
  1319. int m_OptDisplayTracksNChoices =3D sizeof( m_OptDisplayTracksChoices ) =
  1320. / sizeof( wxString );
  1321. m_OptDisplayTracks =3D new wxRadioBox( this, wxID_DISPLAY_TRACK, _("Tra=
  1322. cks:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksNChoices, m_O=
  1323. ptDisplayTracksChoices, 1, wxRA_SPECIFY_COLS );
  1324. m_OptDisplayTracks->SetSelection( 1 );
  1325. m_OptDisplayTracks->SetToolTip( _("Select how tracks are displayed") );=
  1326.  
  1327. -=09
  1328. +
  1329. sLeftBoxSizer->Add( m_OptDisplayTracks, 0, wxALL|wxEXPAND, 5 );
  1330. -=09
  1331. +
  1332. wxString m_OptDisplayTracksClearanceChoices[] =3D { _("Never"), _("New =
  1333. track"), _("New track with via area"), _("Always") };
  1334. int m_OptDisplayTracksClearanceNChoices =3D sizeof( m_OptDisplayTracksC=
  1335. learanceChoices ) / sizeof( wxString );
  1336. m_OptDisplayTracksClearance =3D new wxRadioBox( this, ID_SHOW_CLEARANCE=
  1337. , _("Show Tracks Clearance:"), wxDefaultPosition, wxDefaultSize, m_OptDis=
  1338. playTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_=
  1339. SPECIFY_COLS );
  1340. m_OptDisplayTracksClearance->SetSelection( 0 );
  1341. m_OptDisplayTracksClearance->SetToolTip( _("Show( or not) tracks cleara=
  1342. nce area.\nIf New track is selected, track clearance area is shown only =
  1343. when creating the track.") );
  1344. -=09
  1345. +
  1346. sLeftBoxSizer->Add( m_OptDisplayTracksClearance, 0, wxALL|wxEXPAND, 5 )=
  1347. ;
  1348. -=09
  1349. +
  1350. wxString m_OptDisplayViaHoleChoices[] =3D { _("Never"), _("Defined hole=
  1351. s"), _("Always") };
  1352. int m_OptDisplayViaHoleNChoices =3D sizeof( m_OptDisplayViaHoleChoices =
  1353. ) / sizeof( wxString );
  1354. m_OptDisplayViaHole =3D new wxRadioBox( this, ID_VIAS_HOLES, _("Show Vi=
  1355. a Holes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViaHoleNChoices=
  1356. , m_OptDisplayViaHoleChoices, 1, wxRA_SPECIFY_COLS );
  1357. m_OptDisplayViaHole->SetSelection( 1 );
  1358. m_OptDisplayViaHole->SetToolTip( _("Show (or not) via holes.\nIf Define=
  1359. d Holes is selected, only the non default size holes are shown") );
  1360. -=09
  1361. +
  1362. sLeftBoxSizer->Add( m_OptDisplayViaHole, 0, wxALL|wxEXPAND, 5 );
  1363. -=09
  1364. +
  1365. bMainSizer->Add( sLeftBoxSizer, 0, wxEXPAND|wxALL, 5 );
  1366. -=09
  1367. +
  1368. wxStaticBoxSizer* sbMiddleLeftSizer;
  1369. sbMiddleLeftSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID=
  1370. _ANY, _("Net Names:") ), wxVERTICAL );
  1371. -=09
  1372. +
  1373. wxString m_ShowNetNamesOptionChoices[] =3D { _("Do not show"), _("On pa=
  1374. ds"), _("On tracks"), _("On pads and tracks") };
  1375. int m_ShowNetNamesOptionNChoices =3D sizeof( m_ShowNetNamesOptionChoice=
  1376. s ) / sizeof( wxString );
  1377. m_ShowNetNamesOption =3D new wxRadioBox( this, wxID_ANY, _("Show Net Na=
  1378. mes:"), wxDefaultPosition, wxDefaultSize, m_ShowNetNamesOptionNChoices, m=
  1379. _ShowNetNamesOptionChoices, 1, wxRA_SPECIFY_COLS );
  1380. m_ShowNetNamesOption->SetSelection( 3 );
  1381. m_ShowNetNamesOption->SetToolTip( _("Show or not net names on pads and/=
  1382. or tracks") );
  1383. -=09
  1384. +
  1385. sbMiddleLeftSizer->Add( m_ShowNetNamesOption, 0, wxALL, 5 );
  1386. -=09
  1387. +
  1388. bMainSizer->Add( sbMiddleLeftSizer, 0, wxALL|wxEXPAND, 5 );
  1389. -=09
  1390. +
  1391. wxStaticBoxSizer* sMiddleRightSizer;
  1392. sMiddleRightSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID=
  1393. _ANY, _("Footprints:") ), wxHORIZONTAL );
  1394. -=09
  1395. +
  1396. wxBoxSizer* bLModuleSizer;
  1397. bLModuleSizer =3D new wxBoxSizer( wxVERTICAL );
  1398. -=09
  1399. +
  1400. wxString m_OptDisplayModEdgesChoices[] =3D { _("Line"), _("Filled"), _(=
  1401. "Sketch") };
  1402. int m_OptDisplayModEdgesNChoices =3D sizeof( m_OptDisplayModEdgesChoice=
  1403. s ) / sizeof( wxString );
  1404. m_OptDisplayModEdges =3D new wxRadioBox( this, ID_EDGES_MODULES, _("Mod=
  1405. ule Edges:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModEdgesNChoi=
  1406. ces, m_OptDisplayModEdgesChoices, 1, wxRA_SPECIFY_COLS );
  1407. m_OptDisplayModEdges->SetSelection( 1 );
  1408. bLModuleSizer->Add( m_OptDisplayModEdges, 0, wxALL|wxEXPAND, 5 );
  1409. -=09
  1410. +
  1411. wxString m_OptDisplayModTextsChoices[] =3D { _("Line"), _("Filled"), _(=
  1412. "Sketch") };
  1413. int m_OptDisplayModTextsNChoices =3D sizeof( m_OptDisplayModTextsChoice=
  1414. s ) / sizeof( wxString );
  1415. m_OptDisplayModTexts =3D new wxRadioBox( this, ID_TEXT_MODULES, _("Text=
  1416. s:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModTextsNChoices, m_O=
  1417. ptDisplayModTextsChoices, 1, wxRA_SPECIFY_COLS );
  1418. m_OptDisplayModTexts->SetSelection( 1 );
  1419. bLModuleSizer->Add( m_OptDisplayModTexts, 0, wxALL|wxEXPAND, 5 );
  1420. -=09
  1421. +
  1422. sMiddleRightSizer->Add( bLModuleSizer, 0, 0, 5 );
  1423. -=09
  1424. +
  1425. wxStaticBoxSizer* bRModuleSizer;
  1426. bRModuleSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY=
  1427. , _("Pad Options:") ), wxVERTICAL );
  1428. -=09
  1429. +
  1430. wxString m_OptDisplayPadsChoices[] =3D { _("Sketch"), _("Filled") };
  1431. int m_OptDisplayPadsNChoices =3D sizeof( m_OptDisplayPadsChoices ) / si=
  1432. zeof( wxString );
  1433. m_OptDisplayPads =3D new wxRadioBox( this, ID_PADS_SHAPES, _("Pad Shape=
  1434. s:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayPadsNChoices, m_OptDi=
  1435. splayPadsChoices, 1, wxRA_SPECIFY_COLS );
  1436. m_OptDisplayPads->SetSelection( 1 );
  1437. bRModuleSizer->Add( m_OptDisplayPads, 0, wxALL|wxEXPAND, 5 );
  1438. -=09
  1439. +
  1440. wxString m_OptDisplayViasChoices[] =3D { _("Sketch"), _("Filled") };
  1441. int m_OptDisplayViasNChoices =3D sizeof( m_OptDisplayViasChoices ) / si=
  1442. zeof( wxString );
  1443. m_OptDisplayVias =3D new wxRadioBox( this, ID_VIAS_SHAPES, _("Via Shape=
  1444. s:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViasNChoices, m_OptDi=
  1445. splayViasChoices, 1, wxRA_SPECIFY_COLS );
  1446. m_OptDisplayVias->SetSelection( 1 );
  1447. bRModuleSizer->Add( m_OptDisplayVias, 0, wxALL|wxEXPAND, 5 );
  1448. -=09
  1449. +
  1450. m_OptDisplayPadClearence =3D new wxCheckBox( this, wxID_ANY, _("Show pa=
  1451. d clearance"), wxDefaultPosition, wxDefaultSize, 0 );
  1452. -=09
  1453. +
  1454. bRModuleSizer->Add( m_OptDisplayPadClearence, 0, wxALL, 5 );
  1455. -=09
  1456. +
  1457. m_OptDisplayPadNumber =3D new wxCheckBox( this, wxID_ANY, _("Show pad n=
  1458. umber"), wxDefaultPosition, wxDefaultSize, 0 );
  1459. m_OptDisplayPadNumber->SetValue(true);
  1460. -=09
  1461. +
  1462. bRModuleSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 );
  1463. -=09
  1464. +
  1465. m_OptDisplayPadNoConn =3D new wxCheckBox( this, wxID_ANY, _("Show pad N=
  1466. oConnect"), wxDefaultPosition, wxDefaultSize, 0 );
  1467. m_OptDisplayPadNoConn->SetValue(true);
  1468. -=09
  1469. +
  1470. bRModuleSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 );
  1471. -=09
  1472. +
  1473. sMiddleRightSizer->Add( bRModuleSizer, 0, 0, 5 );
  1474. -=09
  1475. +
  1476. bMainSizer->Add( sMiddleRightSizer, 0, wxEXPAND|wxALL, 5 );
  1477. -=09
  1478. +
  1479. wxBoxSizer* bRightSizer;
  1480. bRightSizer =3D new wxBoxSizer( wxVERTICAL );
  1481. -=09
  1482. +
  1483. wxStaticBoxSizer* sRightUpperSizer;
  1484. sRightUpperSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID_=
  1485. ANY, _("Others:") ), wxVERTICAL );
  1486. -=09
  1487. +
  1488. wxString m_OptDisplayDrawingsChoices[] =3D { _("Line"), _("Filled"), _(=
  1489. "Sketch") };
  1490. int m_OptDisplayDrawingsNChoices =3D sizeof( m_OptDisplayDrawingsChoice=
  1491. s ) / sizeof( wxString );
  1492. m_OptDisplayDrawings =3D new wxRadioBox( this, wxID_ANY, _("Display oth=
  1493. er items:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayDrawingsNChoic=
  1494. es, m_OptDisplayDrawingsChoices, 1, wxRA_SPECIFY_COLS );
  1495. m_OptDisplayDrawings->SetSelection( 1 );
  1496. sRightUpperSizer->Add( m_OptDisplayDrawings, 0, wxALL|wxEXPAND, 5 );
  1497. -=09
  1498. +
  1499. wxString m_Show_Page_LimitsChoices[] =3D { _("Yes"), _("No") };
  1500. int m_Show_Page_LimitsNChoices =3D sizeof( m_Show_Page_LimitsChoices ) =
  1501. / sizeof( wxString );
  1502. m_Show_Page_Limits =3D new wxRadioBox( this, wxID_ANY, _("Show page lim=
  1503. its"), wxDefaultPosition, wxDefaultSize, m_Show_Page_LimitsNChoices, m_Sh=
  1504. ow_Page_LimitsChoices, 1, wxRA_SPECIFY_COLS );
  1505. m_Show_Page_Limits->SetSelection( 0 );
  1506. sRightUpperSizer->Add( m_Show_Page_Limits, 0, wxALL|wxEXPAND, 5 );
  1507. -=09
  1508. +
  1509. bRightSizer->Add( sRightUpperSizer, 1, wxEXPAND, 5 );
  1510. -=09
  1511. -=09
  1512. +
  1513. +
  1514. bRightSizer->Add( 10, 10, 0, 0, 5 );
  1515. -=09
  1516. +
  1517. m_buttonOK =3D new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition,=
  1518. wxDefaultSize, 0 );
  1519. bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPA=
  1520. ND, 5 );
  1521. -=09
  1522. +
  1523. m_buttonCANCEL =3D new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefa=
  1524. ultPosition, wxDefaultSize, 0 );
  1525. bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wx=
  1526. EXPAND, 5 );
  1527. -=09
  1528. +
  1529. bMainSizer->Add( bRightSizer, 0, wxEXPAND|wxALL, 5 );
  1530. -=09
  1531. +
  1532. this->SetSizer( bMainSizer );
  1533. this->Layout();
  1534. -=09
  1535. +
  1536. // Connect Events
  1537. m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandle=
  1538. r( DialogDisplayOptions_base::OnOkClick ), NULL, this );
  1539. m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHa=
  1540. ndler( DialogDisplayOptions_base::OnCancelClick ), NULL, this );
  1541.  
  1542. # Begin bundle
  1543. IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbFLglQADRXfgETwU3///=
  1544. 3/v
  1545. 3+L////+YBGO+RbPAzz27M153lTTUKqJSqKRpTdqqRtqVCiiKrqzbGG7HHhJITQTCANTGgBT0=
  1546. JtU
  1547. /SaJ+qGKeo9TQ0ANqbUwSgmgE1BqT01IyAaAAAABoAAABqeQImqmho9QaGjQAAAyAAAAAASaV=
  1548. BMS
  1549. mj1NTT2qPEgNAHqPUDQaADIDQADmE0ZGhoZDCNDIaaNABiMmQDCAYBIkCAECU8FPKemRqT2lP=
  1550. RPS
  1551. eptJo0ekNAxNGhoiRYBMkRGxFzIZ+aBlxxBB+rJxDLp0aHT3aC7Dz9YHZFFVC/Vec7dxtqpEZ=
  1552. VRG
  1553. vBgYQ/7/b9gxwQGO3dbiG2RkSnt+RTWpJj1QC5mea88GLjNRTKCNOXhaecuQWaRc5OTIY3JyZ=
  1554. gzi
  1555. wzRRTXXBwzyaVrbbW24WuAKI4JUWZoLWVBZWsWSfv4zxZZZi3UOxs5BcVibFouKYYKpbSlLaU=
  1556. b5D
  1557. JZT5h1zdaVhSvKcc+f8L+PYJILAj7xgJQCF+J3OSuZCRzY5fV4p/74qj9M8yLe6lSQNFThF7/=
  1558. AjQ
  1559. IhIsBQikgLIoLAVSXyfGSSc/Tx4dGOPTwenulx5DThbvu/azbfV0Uytt3ObmjJgkl1plCDi6o=
  1560. sbU
  1561. RBD0rM6oycG0wqKIJk6gRBwXuqLMtMw7ZDNes3onKBu4u7kUXZaGSgaNpbDCnu2DJqVYm90KL=
  1562. zd9
  1563. 3FqiGEmjGRLYIVJqWhvfSrqpjOIcSoUw9O73lsTisY0imiNHesJ1EGMaNDvLOxDG2MKzES6Il=
  1564. YL2
  1565. NyAQymLsGIEFG5gomVrjMsLm2hy0GJW/5q1phmoQ/KOEkc8Zn5nntm0x+hbrgTTEKapZi9oUP=
  1566. YMX
  1567. uHp8f9GA9vju4KfGXhGR9+wdywY5Tkp8nSmiMEVWjDv23l7jX65i5UBNJkVQFBBjpt2TOn9U7=
  1568. Cwh
  1569. eiZXD7GJTRC7L1J812jjbEuesAhaduqiv8cq379ssyNdsnddSRwwvgyHrIZfXy7AsXniebv8P=
  1570. Dzx
  1571. T0f9+n1bbSzMMwmZMNjwaBmC6rUIx/Szy+x8eMWmzbALDSdQ1rk8vaOrXeN9yH5zuki/K2YeI=
  1572. 3qO
  1573. wjLByCRTrS/ZAtx8TCEgUhUKmRzgSGTEDGsxJNZXfb/oYe3rK78pbpys8ikG/HEOwZSIW5njB=
  1574. CZh
  1575. mGlc5qfWfwKzrLR82/OELnX7vw+7AgD3eoOptckL1IA8AFFAHa/3b3NYX0ILF2wSy0i84Kk4Y=
  1576. zNe
  1577. fGsDx+mAAMXjnrR0GZ3ZncgdGFlFAqRjbtsDamEMIjZOI8wFvlec1AxAwC6Z7c9IhZmEjy0h0=
  1578. IHW
  1579. ww3WQqEyetBSImqZsycU0YG5BYGqB0V4YYQgKYoevnSSJ1m/2DOeCGIDfaUkJfCpEpAKI+U1I=
  1580. JKZ
  1581. tuk4jcgCPAgA8ym0CpsSHXYJqKOwiI76MUdsTFxIiiQTAVQkl0+BIE0OZNClRzBMmZLkjcWxu=
  1582. N4J
  1583. KUo0SJtEWaSmwesRFxZ1nPW1p1WlCUUZlXc78JUe4QgBKTiAdjIHhUShu8ZFjIvakIs1mWuwk=
  1584. VaV
  1585. NnCAGlfjogCWe6+4ccNMx7pc2RvWGIVDIjS/cSE0MVTsbaSinWYcqUJldWVNGWbt2He7lNtqc=
  1586. oEd
  1587. js0c3mSUwaqfWJLkqzLk/gBwys4JP9curAmbnu/NU6uVArsRFA6+YRpqUKLr6KhuUpK/C1sZK=
  1588. /jV
  1589. CcaSeC+VtKkqrSRKsSq1aSpLg44chAJgJCdc4AXPC6IhdRoJmJIwdswrdc231oAqE9hWJdaj9=
  1590. ql0
  1591. tMnfU0TndADaJPMYjcxOULH+DUFhTqK+Ga7QPoZx+C227hooQIBI7SqcixcnaB374uCDtdBPC=
  1592. AIZ
  1593. MlTidpYY0bGSZ0I7TkcxWMCjHllQ2pz5oGhkL35bLvJVK8KyvOLp2lacosAqjrK0BEcbyuCYY=
  1594. dCA
  1595. IFJlG79gcnsAixz1BitbSydx3Fcm/MVEzxl15DSqKsuVq4oAhZ3WzcO/qqIMTcXcDQ3GCAKGt=
  1596. dUA
  1597. SsVKng2xNoYm730txqNpWh2JcqwmaIAPdsYLYdSeDQBK60W4dPDfQ3mh8O7MdKQ88dxRUpMg1=
  1598. c7G
  1599. vacAFaznFZFoGRdElTKRSZclxqSo+tSjikdJU48dSWJnzbksxG+ls9olLSbo7pk6OK8pvSoxY=
  1600. v4q
  1601. ADIBcUkitMoODrZkwOgQAipzwdo6JNdhcrRMDww9tEDzFpTVI0MQd+JgWIOBwJkhmhsdQCvAV=
  1602. AE9
  1603. c3kDddeDsLM4knnzij8GZXhbMtxeabGS5LIaGkSGSDu4HjDQ4UGu8tMxZTW5l8rZeZxLm1g0T=
  1604. lmR
  1605. tY22BalDIsadBCALyC2Bgtuo718NNt2RKUa2hFNaKCyVopR5OxLd997gtJ1OwViAhl3WSQp7G=
  1606. 4sS
  1607. wMiuJvGXmjNWujotcTN0GO7Mor3YYceFOBTpoEtwLHKSmHwehk4kxmTd2vWEq0oabSdIygBzQ=
  1608. Arw
  1609. kq90veVVgWVB5lSCGMmDUFFITRMU3zFijLgqbzvG9EtPsC4GKb0HNyAGUMjU4nOU6EAUNSRvL=
  1610. HLF
  1611. acpzizpTXO+pb1e0DUZ2ciLPKJPeKTXn3DNjRyMYxlaY27hsSHuTNFILNYWNhis5qbGCHcU4K=
  1612. 6bm
  1613. 3IvxGdCiY8h7iRqbHx5RPMIN6aIdR6Mu1AjGHXdvkkUgE7OiRghWkrov5IA8heXKBQ/EDzAJ2=
  1614. i/X
  1615. 1yJPRkevCRhvgXAS+MBelI9+ek2wbgLJlN06tiyRQ5FsGK+UgSojA6hE4CTQpsT7fB+SVylJq=
  1616. EkR
  1617. CQSUJCPMhv0MgOYFyDsGQQMGaISO48QAy9h9x7TrOfScpzwUWMii+DYO2ZTjvUdZdp+Zoc2z8=
  1618. hU4
  1619. +XPSr/CMCxkdU/QCRSjhAHqu4UJqqQfo3/Q45o8GjS4v0Jv+Yw+0YoDEzfAqxI/ErskGdvkaW=
  1620. FSQ
  1621. teEWIVof2Y0hTp2Id65UHcFX9uJ1hlyo6v0dZoNJ+VRYtRmNaPgluBOF1T0l2vqsYTMzMW5oU=
  1622. qBv
  1623. GNitd23CJDEVpdMSPYVEj0hwLj0Y93efaXhkAUJLP6ydf/8B56dDnHDT2Jepl+P37dTSSdSFE=
  1624. Dvw
  1625. ORpgahp0m9C4Gvskvq+rzMA/EuyEUwcsIzDDCEqOlO2W8PmXQY0ag2VQXBkkRfME8uIdOJbpq=
  1626. chS
  1627. QwGxT0zLeFlS8Ozs7es7TEdpJNnE3cUASjxWGcBbiEplKh5Sc9MpOTH9piB9nUFgMKAIHF5hS=
  1628. A3W
  1629. Z3jVEpZ8kRMinXW71u2C40ACjSEjn6gA5lzmhrT0oAxwmgDvGbanSWJEy4j1FkAelIBlCh4Lr=
  1630. Mss
  1631. D4CZoaDMzpOnpoZnENvPSPZ8ItvUhBlS9wwQQkRx7wWRSwAb/mBdRcJDQIH8lwDyDGcKSRnHA=
  1632. 7Tm
  1633. ePkkElpaJlMZAuxUR4FxsKCY1FBEpiXRKF5zkg1BduZqC23DKXbYjvGYmyuDRCLuweoUGuown=
  1634. WQe
  1635. XzCWFBSGQ1qWJUVrPh1nOvEai5hsbGx9qX0kJDER+34EjE7loZqXg8tQKJmnHj7wFv7rQvJ3f=
  1636. JfI
  1637. RmUIKuCUfM2mSJHR4yicSOi1AJhECX6yFhIHcbTvuQBEl327MMrFTQ1mwlqQVQAz0DMjhtwEY=
  1638. iEu
  1639. OOzEcakogSJuc2ZwitCh9x7OfvsLx3luFADHcPO8hOkZ0Vswyq0uLifuJDpLqHwXM52m8pXcN=
  1640. cYz
  1641. vtvleHNiamgssLLC8PBD+QKhVnYtO4vZ1j0YuINg0Oe/c2f73Eys/fpcJBxGtiZNGCJtNyBb2=
  1642. gyB
  1643. MkMDApZg8DEobyi6Na42soQC787kIPjzUL5PwTGN693qATdAFYoIWAIBYJG/d+ZVXdz1rUOd5=
  1644. dlj
  1645. Lush7LiY5HgczkQOri0Y8vbWYD2rcWECoYrSMRyIj5jKkRx3I2CNSuEMIhBnFtjpVnABwOg+/=
  1646. TTS
  1647. d41+F/3v2/XPBJZX7wYlYvXefp2UCqMFAmgcwNxEjh+T8Tgcl+ngub0IH+8t+d6TxJ6UUF/qr=
  1648. gQG
  1649. Oc+XLtuSWVID0hrkZbogBpWPlahE//k+r3TJHBHZbT4D0kfgmEattxQZcPbQK8yKFahUG0YOr=
  1650. 21t
  1651. 4+Xnr5jUbaEwDHlph0DhCkGUu00RfeB50gZY33dwd9k2IfdH5HqXeDGRw8UsEANIRVmx0CS6l=
  1652. 3oW
  1653. U8F0mmgQ5REj3L0kIyQpwDAjltrCUEGwJjKhgTHZZJIJHmEloyQSUMRkqzydDDyWvnC990QkG=
  1654. +cM
  1655. AvxxTmSpeonmfEBZ0+ZopJMKgY2J7Gbqe8+Tz1s9rChCD+hHfeuvJWaMj2wIS+OfhsWuvvEmC=
  1656. uqk
  1657. OpYQyOxdyOFMBBsfUlWFE9WMA/yQNEkE5XHnygQlMnevfBtJCgGAy6hUiRIl1KcMvcfv0gBjN=
  1658. Oqy
  1659. TLUhG0kB8TZgwjPAet5hxBkiLCNbwF1XkdDgZ/EJsnkAHqANKiKoPq04AbTwchYjw3jkwMMJg=
  1660. Xi/
  1661. 5xIqtRSWWRbtDmx0uWMCBeZJcqoVnBgoLvWQD2+y+PdzydNx0PaZxtSfGHhDf2mHmsqRZ3g5t=
  1662. Xw8
  1663. /H0ye/HW7V63iGBMlnV6ZI+BaHiyAVi3hpACMISaxB3rw8SoLG3X+YCgAp+tKS7B9q4A1NxfI=
  1664. 2D2
  1665. 5OD8SVOxxQp3kq1v6QN6jFtkFNmKnxnYSPbky5kjIt2fTHetUQctdBWaQLs9wV1tcSG2b4AF9=
  1666. RgI
  1667. D31qHzKduLI6ZVk6+aW/E8lfRZyBVkUEg30Qr73xG1zNMXi0chEg+DUx0Qr6nxMQ8dANmHuAC=
  1668. wTD
  1669. Yh7tELTDBuQfOArrrR1pflICU4flh3OQs5La56JQJze2uZxTG0McaezkQUEN26Xvwm0ujGYrW=
  1670. i1B
  1671. DPulRCiKoqIkltx3HFO1JXW/JMLOiEmHIBc2wlMz2ZwADa6TvQBQlXSAWspb2ALBbQb5dG5E/=
  1672. lNU
  1673. fIkDxPWfPjZAGEY/q+7cTOGeh3L6AFpvQL0tAuSiF7yH7noV9Xj5ZzzsSIjDDTLm5eqcBTi1J=
  1674. kQD
  1675. AAtYCuAUPZF1jL9Tc5SMicJgRXps2g9IWUrk1udHUAnwwSL4nGICnJlNFQXEKySkQSzlxnOyP=
  1676. r8g
  1677. zYS/4u5IpwoSFilwSoA=3D
  1678.  
  1679. --------------030907010307000307020808--
  1680.  
  1681. --------------enigBBA799E93CA0C13E7014B319
  1682. Content-Type: application/pgp-signature; name="signature.asc"
  1683. Content-Description: OpenPGP digital signature
  1684. Content-Disposition: attachment; filename="signature.asc"
  1685.  
  1686. -----BEGIN PGP SIGNATURE-----
  1687. Version: GnuPG v1.4.10 (GNU/Linux)
  1688. Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
  1689.  
  1690. iEYEARECAAYFAkxGEVEACgkQxCT5S5ALbCSQtgCfVbSNLCWDCaRheE6nIwA6dBpy
  1691. 7wwAoJVw9D1NwqahB+ydzKnW0gQSzYGX
  1692. =mVbN
  1693. -----END PGP SIGNATURE-----
  1694.  
  1695. --------------enigBBA799E93CA0C13E7014B319--
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement