Merge lp:~bkidwell/zim/pyzim-win-installer into lp:~jaap.karssenberg/zim/pyzim

[Brendan Kidwell]

Forgot to "propose merging" on Sunday, sorry. It's ready.

Bugs worked on the latest work on this branch:

lp:562111 [0.46] [Win32]: "No handlers could be found for logger 'zim.fs'"
- Submitted my own ADDITIONAL fix in my branch: If OS is Windows do NOT log failure to load Xdg.Mime.
- Zim for Windows doesn't warn about entries in log file EVERY time you quit now.

lp:567614 [0.46] [Win32] Windows installer is missing translations
- Merged Jaap's fixes into my branch and cleaned up new errors this produced.

lp:562155 [0.46] [Win32] Bad app icon in 0.46 installer
- Fixed in my branch.

lp:584793 [pyzm] [win32] Attach command always causes logged warning
- Reported by me today.
- Fixed in my branch.

[lp:~bkidwell/zim/pyzim-win-installer]

250. By Jaap Karssenberg on 2010-05-25

Brought back support for TODO and FIXME tags in the task list

251. By Jaap Karssenberg on 2010-05-25

Added special case for headers above task lists

252. By Jaap Karssenberg on 2010-05-26

Merged patch to allow moving placeholder pages

253. By Jaap Karssenberg on 2010-05-28

Added option to remove links when deleting a page or placeholder

254. By Jaap Karssenberg on 2010-05-28

Added single page export

255. By Jaap Karssenberg on 2010-05-29

Updated translation template

256. By Jaap Karssenberg on 2010-05-29

Yet another fix for filesystem encoding on windows

257. By Jaap Karssenberg on 2010-05-29

Removed file which was checked in by accident

258. By Jaap Karssenberg on 2010-05-30

Added test case for behavior with respect to symlinks

259. By Jaap Karssenberg on 2010-05-30

Fixed bug with correct setting of edit mode
Caused e.g. heading tag to jump back at end-of-word in certain cases

260. By Jaap Karssenberg on 2010-05-30

Merging work on windows installer by Brendan Kidwell

261. By Jaap Karssenberg on 2010-05-30

Small fixes for custom tools functionality

262. By Jaap Karssenberg on 2010-06-01

Merging another small fix for windows installer

263. By Jaap Karssenberg on 2010-06-01

Fix for icons for custom tools

264. By Jaap Karssenberg on 2010-06-01

Merging small fixed by Johannes Reinhardt

265. By Jaap Karssenberg on 2010-06-02

Committed patch by Fabian Moser to fix indented verbatim paragraphs (lp:570615)

266. By Jaap Karssenberg on 2010-06-06

Two small fixes for unicode paths

267. By Jaap Karssenberg on 2010-06-06

Imported translations from launchpad

268. By Jaap Karssenberg on 2010-06-06

Release 0.47

269. By Jaap Karssenberg on 2010-06-07

* Fix for exception when deleting directories on windows (lp:590736)
* Fix for exporting single page (lp:590882)

270. By Jaap Karssenberg on 2010-06-14

Added copy to clipboard for task list based on patch by lukas (lp:319976)

271. By Jaap Karssenberg on 2010-06-14

Updated debian control file to allow installing package with python 2.5

272. By Jaap Karssenberg on 2010-06-14

Merged patch to support for sub- and superscript

273. By Jaap Karssenberg on 2010-06-24

Updated icon design

274. By Jaap Karssenberg <jaap@no-spoon> on 2010-06-30

Create Note plugin now supports templates

275. By Jaap Karssenberg <jaap@no-spoon> on 2010-07-06

* Renamed "Create Note" plugin to "Quick Note"
* Quick Note plugin now allows appending to an existing page

276. By Jaap Karssenberg <jaap@no-spoon> on 2010-07-06

Merge with trunk

277. By Jaap Karssenberg on 2010-07-08

* Two manual updates drafted by Bob Hof
* Improved copy paste of page names - lp:602859
* Added checkbox to search dialog to search current namespace
* Fixed copy page and insert link keybindings for index (^C and ^L)
* Added test to validate translation and fixed french translation - lp:592828
* Fixed bug when adding a custom tool without an icon - lp:596194

278. By Jaap Karssenberg on 2010-07-11

Fixed bug in test case

279. By Jaap Karssenberg on 2010-07-12

* Rewrote the export dialog to use an Assistent style interface
* Added widget needed for a generic Assistent dialog with input validation
* Changed zim.fs.File to throw an error when file does not exist on read()

280. By Jaap Karssenberg on 2010-07-12

Updated translation template

281. By Jaap Karssenberg <jaap@no-spoon> on 2010-07-18

* Removed limit to localhost from webserver
* Fixed bug where pageview would freeze up due to a stray image placeholder char
* Fixed bug with inconsistency of format buttons for selections
* Fixed export dialog controls for exporting a single page
* Added image preview for the Insert Image dialog

282. By Jaap Karssenberg on 2010-07-19

Various fixes for small issues found while testing on win32

283. By Jaap Karssenberg on 2010-07-20

Merged windows installer work

284. By Jaap Karssenberg on 2010-07-20

Merged latex fix from Johannes\' tree

285. By Jaap Karssenberg on 2010-07-20

Merged work for maemo support from "maacruz"

286. By Jaap Karssenberg on 2010-07-20

Small fixes

287. By Jaap Karssenberg on 2010-07-20

Two small fixes

288. By Jaap Karssenberg on 2010-07-21

* Updated translations
* Fixed failing test for plugins

289. By Jaap Karssenberg on 2010-07-22

* Fixed critical bug in export dialog
* Added support for serving attachments to www module
* Fixed logo in about dialog

290. By Jaap Karssenberg on 2010-07-22

Release 0.48

291. By Jaap Karssenberg on 2010-07-22

typos

292. By Jaap Karssenberg on 2010-07-26

Two small fixed and added default handler /usr/bin/open for Mac

293. By Jaap Karssenberg on 2010-07-28

* Fixed 'shared' property for notebooks
* Added wrapper with error handler for all action handlers

294. By Jaap Karssenberg on 2010-07-29

* Added property for notebooks to set preferred end of line
* Added logic to make writing fiels on windows more robust

295. By Jaap Karssenberg on 2010-08-01

* Patch to jump to task within page - by Thomas Liebertraut
* Patch to show indenting on tab for end of buffer - by Thomas Liebertraut
* Fix for zim executable when executed as "python zim.py"
* Repair for radio actions with new error handler

296. By Jaap Karssenberg on 2010-08-02

* Improved behavior of 'Edit Source'
* Added special case for handling outlook:// urls
* Fixed bug in 'Save Version'

297. By Jaap Karssenberg on 2010-08-06

* Added option to set custom applications
* Added encoding=url option for quicknote plugin commandline options

298. By Jaap Karssenberg <jaap@no-spoon> on 2010-09-01

Added new plugin for inline evaluation of expressions

299. By Jaap Karssenberg <jaap@no-spoon> on 2010-09-01

Merged windows installer branch

300. By Jaap Karssenberg <jaap@no-spoon> on 2010-09-01

Merged fixes for verbatim paragraphs by Fabian Moser

301. By Jaap Karssenberg on 2010-09-10

* Fixed bug with unicode handling for file objects
* Added names for pageindex and pageview widgets for use in gtkrc
* Added special case for mid: and cid: uris when parsing links
* Fixed printtobrowser plugin to use proper preference for web browser
* Added checkbox to quicknote dialog to open the new page or not
* Added character count to "Count words" dialog

302. By Jaap Karssenberg on 2010-09-11

* Reworked setdefault a bit so tasklist plugin can have empty string for labels
* Fixed unicode conversion in Path so e.g. tasklist dialog opens non-ascii page names correctly

303. By Jaap Karssenberg on 2010-09-12

Possible fix for unicode in quicknote dialog

304. By Jaap Karssenberg on 2010-09-12

Fix for issues with empty lines automatically inserted after indented
sections. Added a new parsetree element 'div' with a property 'indent'
to handle indenting within paragraphs. Also 'ul' can now have the 'indent'
property. Should fix bug lp:297932.

305. By Jaap Karssenberg on 2010-09-16

Updated file write logic for Windows

306. By Jaap Karssenberg on 2010-09-19

Merging path by Jiří Janoušek
* Backport per-user site-packages dir for python 2.5
* Fix bug with spaces in links in exported HTML

307. By Jaap Karssenberg on 2010-09-20

Further adapted the patch merged in rev306, fixing a break introduced by
adapting the patch in the first place - mea culpa.

308. By Jaap Karssenberg on 2010-09-20

* Now robust for error during os.remove "step 4" - should prevent
  subsequent mtime error
* Now robust when files go missing in mtime check

309. By Jaap Karssenberg on 2010-10-05

Fixed a number of bugs

310. By Jaap Karssenberg on 2010-10-16

Made locking in versioncontrol sync with locking in fs.py to avoid conflicts (mainly seen on windows)

311. By Jaap Karssenberg on 2010-10-18

Merged patch by Yelve Yakut to update the history when pages are deleted or moved - lp:506813

312. By Jaap Karssenberg on 2010-10-18

Merged experimental attachments browser plugin

313. By Jaap Karssenberg on 2010-10-18

Updated inline calculator to have functions

314. By Jaap Karssenberg on 2010-10-18

Updated translation template

315. By Jaap Karssenberg on 2010-10-18

Two small fixes

316. By Jaap Karssenberg on 2010-10-19

Fixed 2 more bugs + 1 typo

317. By Jaap Karssenberg on 2010-10-21

Added commandline option to export index

318. By Jaap Karssenberg on 2010-10-30

Fixed bug that could make bullet disappear when formatting the bullet character itself

319. By Jaap Karssenberg on 2010-11-01

Fix from lp:665121 by smu

320. By Jaap Karssenberg on 2010-11-01

Updated translations

321. By Jaap Karssenberg on 2010-11-02

Release 0.49

322. By Jaap Karssenberg on 2010-12-18

Merged update for latex output

323. By Jaap Karssenberg on 2010-12-18

Merged windows installer branch

324. By Jaap Karssenberg on 2010-12-18

Fixed the following bugs:
* Text from quicknote dialog is formatted directly when inserted in zim
* Renaming a page with title updat does not remove empty lines
* Error with "invalid literal" in HTML export
* Create config key for applications even when no app is found
* Fixed autohiding of index when switch focus back to editor
* First time run on windows now checks log dir exists
* Fixed copy to clipboard function in tasklist
* Removed capitalization for title for renamed pages
* Fixed bug when changing image height

325. By Jaap Karssenberg on 2010-12-21

Calendar template now also supports month and year pages

326. By Jaap Karssenberg on 2010-12-28

Reworked logic for indent and bullets / checkboxes. Each bullet type now has it's own tag type, allowing to set custom formatting per bullet type. This also fixes a number of known issues with indent formatting.

327. By Jaap Karssenberg on 2010-12-28

* Added timezone in creation time for pages
* Added option for tasklist to convert page name to tags
* Merged patch bu 'smu' to show path and icon in notebook list

328. By Jaap Karssenberg on 2011-01-03

Merging refactoring tree
* Added new class for InputForms and added tests for many dialogs using it
* Added framework so plugins can add widgets to panes in the window
* Updated attachment browser to properly add and remove widget
* Merged patched related to InsertImageDialog and AttachFileDialog by 'smu'

329. By Jaap Karssenberg on 2011-01-04

* Reworked history to use proper Path objects
* Fixed bug on windows with log file location

330. By Jaap Karssenberg on 2011-01-08

Various small fixes:
* Bug fix for remove_link with selection
* Bug fix preferenes dialog (broke in refactoring)
* Small fix attachment browser
* Fix in www for url encode file names
* Added scrollbars to image generator dialog
* Fix in tasklist parsing of labels for checkbox lists
* Added some shortcut codes for inserting symbols

331. By Jaap Karssenberg on 2011-01-16

* Fixed style config for tabs
* Added style config for linespacing
* Worked on improving test coverage

332. By Jaap Karssenberg on 2011-01-16

polished previous commit

333. By Jaap Karssenberg on 2011-01-16

* Fixed typo causing edge case bug in index
* Added custom tool option for getting formatted text
* Fixed 'basename' commandline option for quicknote dialog
* Fine-tuned trigger behavior of input forms (last-activated now ignores checkboxes)

334. By Jaap Karssenberg on 2011-01-18

merging website updates

335. By Jaap Karssenberg on 2011-01-18

Merged new description in debian control file

336. By Jaap Karssenberg on 2011-01-18

Documentation updates

337. By Jaap Karssenberg on 2011-01-20

Fixed issue when toggling checkboxes

338. By Jaap Karssenberg on 2011-01-24

Number of fixes:
* Changed behavior of history so cursor position is only re-used when
  explicitly opening a page from the history
* Added functionality to FileEntry to show relative paths, solving
  issue with EditImageDialog
* Fixed issues with backspace broken with new indenting tags
* Fixed issues with indent tags "spilling over" to the next lines
* Fixed bug when setting icon for custom tools
* Fixed bug for attaching unsupported image formats (e.g. DJVU)
* Fixed bug when typing space after a link tag
* Fixed bug so insert symbol can distinguish -- and -->

339. By Jaap Karssenberg on 2011-01-25

* Fixed a few small issues
* Changed config key used by history to make it backward compatible again
* Merged updates of attachment browser plugin

340. By Jaap Karssenberg on 2011-01-25

Updated translation template

341. By Jaap Karssenberg on 2011-01-30

* Fixed critical bug making text after a Verbatim block go missing lp:708752
* Fixed bug for opening inter-wiki links correctly lp:701625

342. By Jaap Karssenberg on 2011-01-30

Fixed 3 small issues in export dialog for single page export

343. By Jaap Karssenberg on 2011-01-31

Merged new "cleanup attachments" dialog by Stefan Muthers

344. By Jaap Karssenberg on 2011-01-31

Merged patch to add page template in "New Page" dialog

345. By Jaap Karssenberg on 2011-02-07

* Added menu items to insert and format lists
* Added indication of files to be delete in DeletePageDialog
* Added debug output to "You found a bug" ErrorDialog variant
* Updated translation template

346. By Jaap Karssenberg on 2011-02-08

* Merged fix for bug in export with custom template by Jiří Janoušek
* Added Danish translation by Morten Juhl-Johansen Zölde-Fejér

347. By Jaap Karssenberg on 2011-02-13

Fixed clipboard support for image:
* Merged patch by Jiří Janoušek to make image links relative on paste
* Adopted patch by Stefan Muthers to allow pasting image data

348. By Jaap Karssenberg on 2011-02-14

Small fixes

349. By Jaap Karssenberg on 2011-02-14

Updated translations

350. By Jaap Karssenberg on 2011-02-14

Release 0.50

351. By Jaap Karssenberg on 2011-02-19

Package layout and meta data update

352. By Jaap Karssenberg on 2011-03-02

Merged patch so canceling the preferences dialog also resets the loaded plugins

353. By Jaap Karssenberg on 2011-03-02

Merging plugin to sort lines in zim by NorfCran

354. By Jaap Karssenberg on 2011-03-02

Fix for issue with float numbers for image size by smu

355. By Jaap Karssenberg on 2011-03-02

Patch to switch menu sensitivity for checkbox items and link items on cursor movement by kba

356. By Jaap Karssenberg on 2011-03-02

Patch to allow text zoom by Konstantin Baierer

357. By Jaap Karssenberg on 2011-03-02

Fix for icon in custom tools dialog and made preview for images the default

358. By Jaap Karssenberg on 2011-03-02

Fix resizing of text entry widgets in dialogs

359. By Jaap Karssenberg on 2011-03-05

* Fixed two regressions from previous commit(s)
* Fixed error for non-existing interwikis
* Fixed bug with "create new page" in QuickNoteDialog
* Fixed bug in sort plugin when last line does not end with newline
* Fixed bug with word count when last line does not end with newline

360. By Jaap Karssenberg on 2011-03-26

Support for snapshots

361. By Jaap Karssenberg on 2011-03-26

Trash can support

362. By Jaap Karssenberg on 2011-03-28

Added GNUplot plugin - Alessandro Magni

363. By Jaap Karssenberg on 2011-03-28

Merging two bug fixes

364. By Jaap Karssenberg on 2011-03-28

Fix generating relative file links when document root is subfolder of notebook folder

365. By Jaap Karssenberg on 2011-03-29

Added calendar widget to "Insert Date" dialog

366. By Jaap Karssenberg on 2011-03-29

Fixed a number of smaller bugs:
* Fixed bug with searching by namespace
* Fixed bug in NewPageDialog disabling direct "OK" on <Enter>
* Fixed search to go directly to next match after a single replace

367. By Jaap Karssenberg on 2011-04-02

Fixed auto-completion for links and added test

368. By Jaap Karssenberg on 2011-04-02

Fixed interwiki links for export

369. By Jaap Karssenberg on 2011-04-05

Fixed copy-paste images for some MSOffice components

370. By Jaap Karssenberg on 2011-04-05

Copy pasting now by default in plain text
* Added preference to set default back to wiki
* Added context menu for "Copy As Wiki/Text" depending on the default

371. By Jaap Karssenberg on 2011-04-05

Merged tag support - Fabian

372. By Jaap Karssenberg on 2011-04-06

Couple of small fixes
* Added hidden param for autosave timeout
* Fixed manual for template parameters

373. By Jaap Karssenberg on 2011-04-06

Updated translation template

374. By Jaap Karssenberg on 2011-04-07

Update meta data

375. By Jaap Karssenberg on 2011-04-07

Fixed error handling in spell check plugin

376. By Jaap Karssenberg on 2011-04-08

Fixed bug when pasting bullets that end with formatting

377. By Jaap Karssenberg on 2011-04-08

Disabled Alt-Space

378. By Jaap Karssenberg on 2011-04-10

Code clean up and additional test coverage

379. By Jaap Karssenberg on 2011-04-14

Reworked notebook list and hooked intialize_notebook for plugins

380. By Jaap Karssenberg on 2011-04-14

Made parsing for document_root consistent with what is done for icon and added test case. Removed "get_document_root()" in favor of a ".document_root" attribute.

381. By Jaap Karssenberg on 2011-04-14

Fixed linkmap widget to actually go to the clicked page

382. By Jaap Karssenberg on 2011-04-14

Minor update in translation tempalte

383. By Jaap Karssenberg on 2011-04-19

Small fix in loading NotebookInfo

384. By Jaap Karssenberg on 2011-04-19

Updated translations

385. By Jaap Karssenberg on 2011-04-19

Last minute fix to the tray icon

386. By Jaap Karssenberg on 2011-04-19

Release 0.51

387. By Jaap Karssenberg on 2011-04-20

Added page name auto-completion in quicknote dialog

388. By Jaap Karssenberg on 2011-04-27

Fixed critical bug when starting zim without any defined notebooks

389. By Jaap Karssenberg on 2011-04-27

Two more fixes related to the notebook list

390. By Jaap Karssenberg on 2011-04-27

* Fixed debian/pyversions to allow python 2.7
* Added two missing translation strings for tabs in the preferences dialog
* Renamed GNUPlot to Gnuplot to match official name
  (see gnuplot FAQ, they have no affiliation with the GNU project)

391. By Jaap Karssenberg on 2011-04-28

Release 0.52

392. By Jaap Karssenberg on 2011-05-09

* Updated tasklit dialog to filter an the fly with more sexy entry widget
  and fixed minimum column width and tooltips
* Made NamespaceEntry accept empty input as top level namespace and made
  the widget show "<Top>" when empty and not focussed
* Fixed bug with moving to non-existing namespace

393. By Jaap Karssenberg on 2011-05-10

Fix for tests/coding.py to better detect with_statemen + small manual update

394. By Jaap Karssenberg on 2011-05-10

Small fix for executing zim from source on windows

395. By Jaap Karssenberg on 2011-05-10

Two fixes for find by Chris Liechti
* Added keybindings for F3 <Shift>F3 and <Ctrl>F3
* Give focus to textview after clicking "Next" or "Previous" buttons

396. By Jaap Karssenberg on 2011-05-10

Merge support for optional dependencies for plugins - John Drinkwater

397. By Jaap Karssenberg on 2011-05-10

Merging 3 fixes:
* Remember position of main window and dialogs (within one instance)
* Make search hand over partial searches correctly to find
* When copying attachments keep the modification time etc.

398. By Jaap Karssenberg on 2011-05-10

Fix for relative path checkboxes in exported HTML - Jiří Janoušek
Small manual update

399. By Jaap Karssenberg on 2011-05-12

Fixed error handling for bazaar errors to show a normal error dialog

400. By Jaap Karssenberg on 2011-05-12

Small fix for the Insert Date dialog

401. By Jaap Karssenberg on 2011-05-13

Merging typo fixes

402. By Jaap Karssenberg on 2011-05-14

Updated test suite, now using unittest from python 2.7 and some refactoring

403. By Jaap Karssenberg on 2011-05-15

* Fixed indexing error for syncing scenario - test case by Stefan Muthers
* Increased test coverage for Gtk interface and main window

404. By Jaap Karssenberg on 2011-05-17

* Removed dependency on unittest2 in debian/control
* Updated API for index.update
* Fixed small regression in versioncontrol bzr backend

405. By Jaap Karssenberg on 2011-06-04

Merge interwiki keyword patch

406. By Jaap Karssenberg on 2011-06-04

Resolving branch for interwiki keyword

407. By Jaap Karssenberg on 2011-06-05

Refactoring on loading extension modules

408. By Jaap Karssenberg on 2011-06-06

Merging template function for page index - jiri

409. By Jaap Karssenberg on 2011-06-06

Merging more typos and bugs - Oliver

410. By Jaap Karssenberg on 2011-06-09

Many small fixes and some manual updates

* Fix issue with default notebook / notebooklist in compiled Windows exe by fixing assert statement
* Fix for crash in "Insert date" dialog when iter not set
* Fix for selection TAB / Backspace / email quote behavior in pageview
* Fixed Latex \textless{} \textgreater{} codes
* Update for Calendar template to allow normal pages below calendar namespace

Miguel Angel Alvarez:
* zim/formats/wiki.py: str.format() doesn't exist in python.25
* zim/gui/widgets.py: Window variable in maemo detection block renamed to gtkwindowclass, but a reference to Window remained
* zim/index.py: sqlite3 in python 2.5 doesn't alias "table.field" as "field" in Row factory

Jiří Janoušek:
* Fix for unit testing with unittest2
* Fix for unicode handling in template module
* Fix for unicode characters in tags in pageview formatting

411. By Jaap Karssenberg on 2011-06-15

website update

412. By Jaap Karssenberg on 2011-06-19

Merged template resources feature

413. By Jaap Karssenberg on 2011-06-20

* Added preference for cursor placement position when navigating to a recent page
* Fixed putting cursor at the end of the template for new pages
* Fix for utf-8 / unicode usage in exporter
* Update for windows/README-BUILD-win32.txt

414. By Jaap Karssenberg on 2011-06-25

Performance improvement for index

415. By Jaap Karssenberg on 2011-06-30

* Fix vivicate new path in index pane
* Fix usage error for --index without notebook
* Fix handling cancellation of trash dialog on windows
* Fix error handling moving a page below itself

416. By Jaap Karssenberg on 2011-07-02

Merging branch with image links

417. By Jaap Karssenberg on 2011-07-04

Improved error handling while reading and writing pages fron the ui

418. By Jaap Karssenberg on 2011-07-29

merged trunk

419. By Jaap Karssenberg on 2011-08-06

Big patch with API documentation in epydoc format. All main modules documented, some secondairy ones still to be updated.

420. By Jaap Karssenberg on 2011-08-06

Moved daemon to zim.gui namespace

421. By Jaap Karssenberg on 2011-08-06

Added --search commandline option

422. By Jaap Karssenberg on 2011-08-06

* Fixed bug with relative paths for copy-paste and drag-drop
* Fixed bug when saving empty page from template

423. By Jaap Karssenberg on 2011-08-06

Added number of child pages in the index pane

424. By Jaap Karssenberg on 2011-08-13

Merging patch for calendar and tasklist plugins

425. By Jaap Karssenberg on 2011-08-13

Made setup now hardcode platform on compile time

426. By Jaap Karssenberg on 2011-08-13

Added arithmetic plugin

427. By Jaap Karssenberg on 2011-08-13

* Moved zim/_lib --> zim/inc (on windows the "_" gave issues)
* Fixed small test regression
* Small fix for handling bullet indenting

428. By Jaap Karssenberg on 2011-08-25

Added numbers to tag list in the tasklist dialog

429. By Jaap Karssenberg on 2011-08-25

Moved back zim.gui.daemon to zim.daemon -- caused bugs when gtk is loaded by zim.gui

430. By Jaap Karssenberg on 2011-08-25

Added 3 small checks to prevent crashes

431. By Jaap Karssenberg on 2011-08-26

Fixed look of the tasklist dialog under the standard Ubuntu theme - still don't understand why it was wrong though :(

432. By Jaap Karssenberg on 2011-08-28

* Changed label in quicknote dialog to make <Alt>O trigger OK directly
* Show notebook list after error dialog for notebook not found in order not
  to lock out the user when the default notebook is missing
* Fixed bug allowing to click checkboxes in read-only mode
* Fixed bug in parsing tags in the editor for auto-formatting (partial fix)
* Fixed exception in export for empty pages
* Fixed exception in pathbar for pages with an "&" in the name
* Fixed an exception in the diagram plugin and added test coverage
  for the image generator plugins
* Added specific error dialog when a helper application is not available
* Remove unmatches html tag from Default template

433. By Jaap Karssenberg on 2011-08-28

* Improve Add Notebook dialog, name and folder fields update each other
* Fixed bug in custom tools when tool name is not a valid file name

434. By Jaap Karssenberg on 2011-08-30

Fixes for 3 possible exceptions when moving a page

435. By Jaap Karssenberg on 2011-08-30

Merged patch for highlighting find match

436. By Jaap Karssenberg on 2011-08-30

Updated translations

437. By Jaap Karssenberg on 2011-08-31

* Added hook for plugins to add handlers for specific url schemes
* Fixed possible exception in remove_link()

438. By Jaap Karssenberg on 2011-09-02

Made current page highlight bold in the index and tag index

439. By Jaap Karssenberg on 2011-09-06

* Made paths in the notebook.list relative to HOME folder in order to
  facilitate portable install
* Fixed API for SearchDialog to show dialog before starting search
* Fixed small regression in pageindex select_page()

440. By Jaap Karssenberg on 2011-09-14

Added tooltips for index pane

441. By Jaap Karssenberg on 2011-09-14

Merged windows installer branch

442. By Jaap Karssenberg on 2011-09-14

Fixed normal background color of text entries for theming with revesed color scheme

443. By Jaap Karssenberg on 2011-09-17

* Fix for regression in notebook list, showing default double
* Fixed style for assistent dialog heading to match theme
* Fixed count of all open tasks in task dialog
* Made pathname check more strict, now explicitly shows starting "_" as invalid

444. By Jaap Karssenberg on 2011-09-17

Imported new translations

445. By Jaap Karssenberg on 2011-09-17

Fixes to make test suite run on windows

446. By Jaap Karssenberg on 2011-09-17

Small change to build scripts for windows to make setup.py run without 'windows/' being present

447. By Jaap Karssenberg on 2011-09-19

Release updates

448. By Jaap Karssenberg on 2011-09-23

Very small update for the website

449. By Jaap Karssenberg on 2011-09-29

Added mono icons for ubuntu

450. By Jaap Karssenberg on 2011-11-06

* Bug fix for relative links to parents of current page
* Updated zim.desktop with ubuntu unity specific shortcuts

451. By Jaap Karssenberg on 2011-11-06

Fixed problem in test suite when loading gtk pixbufs

452. By Jaap Karssenberg on 2011-12-08

Fixed bug in "You found a bug" error reporting :S
and added a test case.

453. By Jaap Karssenberg on 2011-12-11

Tasklist plugin now supports nested tasks and shows an hierarchic list.

454. By Jaap Karssenberg on 2011-12-11

Added an "automount" plugin to automatically mount notebook folders.

455. By Jaap Karssenberg on 2011-12-11

Fixed bug which prevented following links in read-only mode (and thus the manual :( ) regression of earlier fix in rev432 - mea culpa

456. By Jaap Karssenberg on 2011-12-11

* Fixed a bug causing the index to jump with every page selection
* Fixed a bug causing the default icon for custom tools to be missing in the toolbar
* Fixed a bug causing the trayicon to be missing when run from source

457. By Jaap Karssenberg on 2011-12-11

Updated translation template

458. By Jaap Karssenberg on 2011-12-14

* Fix for drag and drop of files on windows
* Interwiki lookup now goes over all urls.list files in the config and data paths
* More strict parsing for .desktop files
* Fix for notebook= parameter quickstart plugin

459. By Jaap Karssenberg on 2011-12-15

* Tasklist now keeps selection when data is refreshed
* Calendar now updates the label with todays date every few minutes

460. By Jaap Karssenberg on 2011-12-15

Fixed autocomplete for page entry in quicknote

461. By Jaap Karssenberg on 2011-12-19

* Fix bug when tag selected in tag cloud is deleted
* Add option in context menu to sort tag cload alphabetically

462. By Jaap Karssenberg on 2011-12-19

Possible fix for encoding issues in strftime

463. By Jaap Karssenberg on 2011-12-21

* Updated manual page on templates
* Small bug fix in tasklist

464. By Jaap Karssenberg on 2011-12-22

Imported translations

465. By Jaap Karssenberg on 2011-12-22

Update package data for release

466. By Jaap Karssenberg on 2012-01-02

Updated tasklist to use markup - fixes bug with tooltips

467. By Jaap Karssenberg on 2012-01-02

Added cancel option to search dialog and made it report results iterative

468. By Jaap Karssenberg on 2012-01-02

Added spinner to search dialog

469. By Jaap Karssenberg on 2012-01-04

Further optimization for search

470. By Jaap Karssenberg on 2012-01-09

Added Table Of Contents plugin

471. By Jaap Karssenberg on 2012-01-09

Small fix for ToC

472. By Jaap Karssenberg on 2012-01-10

* ToC plugin now has context menu with "promote" and "demote" items
* Refactored code for context menu popup in BrowserTreeView

473. By Jaap Karssenberg on 2012-01-10

Fixed docs

474. By Jaap Karssenberg on 2012-01-17

Fixed regression in rev472

475. By Jaap Karssenberg on 2012-01-17

Additional fixes and feature for tasklist
* Fixed regression for tags in tasklist dialog
* Made sorting of tags case insensitive
* Fixed continuity for tasklist whith normal bullet in between
* Introduced "Next" keyword and allow hiding not-yet-actionable tasks

476. By Jaap Karssenberg on 2012-01-17

Made index sort naturally and locale aware :)

477. By Jaap Karssenberg on 2012-01-18

Merged update of windows installer files

478. By Jaap Karssenberg on 2012-01-25

Update logic in table-of-contents plugin to find a heading

479. By Jaap Karssenberg on 2012-01-25

Refactored Clipboard code

480. By Jaap Karssenberg on 2012-02-12

Fixed critical bug that caused progress bar for export to hang ad infinitum

481. By Jaap Karssenberg on 2012-02-13

Fixed running zim daemon with proper python executable

482. By Jaap Karssenberg on 2012-02-13

Fixed small bug when attaching a file for selected text

483. By Jaap Karssenberg on 2012-02-13

Decoupled recent pages from history stack

484. By Jaap Karssenberg on 2012-02-14

Made history test not use private arguments

485. By Jaap Karssenberg on 2012-02-15

Fixed behavior when replacing a formatted word

486. By Jaap Karssenberg on 2012-02-15

Patch to improve behavior of automatic selections

487. By Jaap Karssenberg on 2012-02-15

* Fixed regression for pasting by middle button
* Small fix for recent paths pathbar

488. By Jaap Karssenberg on 2012-02-15

Very small fix for testcase

489. By Jaap Karssenberg on 2012-02-15

Fixed to make zim icons more customizable - Andrei

490. By Jaap Karssenberg on 2012-02-15

Fixed bug for latex templates

491. By Jaap Karssenberg on 2012-02-15

Small fix for making tasklist more robust

492. By Jaap Karssenberg on 2012-02-17

Fixed small regression in trayicon

493. By Jaap Karssenberg on 2012-02-17

* Fixed case-sensitive rename on windows (case-insensitive file system)
* Fixed small regression in Latex test case

494. By Jaap Karssenberg on 2012-02-17

Added Markdown with pandoc extensions as export format

495. By Jaap Karssenberg on 2012-02-17

Merge feature numbered lists

496. By Jaap Karssenberg on 2012-02-17

Added context menu item for mocing selected text to new page

497. By Jaap Karssenberg on 2012-02-17

Updated translations

498. By Jaap Karssenberg on 2012-02-20

* Fixed bug with uistate for export dialog
* Small update for website

499. By Jaap Karssenberg on 2012-02-22

Updated testing for formats and fixed regression in Markdown format

500. By Jaap Karssenberg on 2012-02-22

"Move text" now uses new page template

501. By Jaap Karssenberg on 2012-02-22

Small fix for zim.desktop

502. By Jaap Karssenberg on 2012-02-22

Fixed remembering folder for exporting single file

503. By Jaap Karssenberg on 2012-02-22

Fix for undoing numbered list changes

504. By Jaap Karssenberg on 2012-02-22

Added more formal alternative keybindings

505. By Jaap Karssenberg on 2012-02-26

Fixes in attachment browser to use proper file system calls (cross fingers - no testing...)

506. By Jaap Karssenberg on 2012-02-27

Further refactoring of attachmentbrowser thumbnailing, now with testcase

507. By Jaap Karssenberg on 2012-02-28

Added async queue again for thumbnailmanager - cross fingers

508. By Jaap Karssenberg on 2012-02-28

Small spelling fixes

509. By Jaap Karssenberg on 2012-02-28

Updated translations

510. By Jaap Karssenberg on 2012-02-28

Version 0.55

511. By Jaap Karssenberg on 2012-02-29

Oops - switched 'promote' and 'demote' in table of contents plugin

512. By Jaap Karssenberg on 2012-02-29

Added drag&drop for attachment browser

513. By Jaap Karssenberg on 2012-03-01

Updated bounty

514. By Jaap Karssenberg on 2012-03-17

Fixed bug for opening email adresses

515. By Jaap Karssenberg on 2012-03-17

Added test for fix in rev514

516. By Jaap Karssenberg on 2012-03-17

* Made sidepane remember state
* Made tag cloud remember state

517. By Jaap Karssenberg on 2012-03-17

Small fix to make daemon process more robust

518. By Jaap Karssenberg on 2012-03-17

Small fix in clipboard (lp:954091)

519. By Jaap Karssenberg on 2012-03-17

Merge Git & Hg support

520. By Jaap Karssenberg on 2012-03-18

Some refactoring on versioncontrol plugin

521. By Jaap Karssenberg on 2012-03-18

* Made version control backend an option for init dialog
* Fixed UTF-8 support for version control

522. By Jaap Karssenberg on 2012-03-18

Merged plugin for "ditaa" diagrams

523. By Jaap Karssenberg on 2012-03-18

Updated translation template

524. By Jaap Karssenberg on 2012-03-18

Merging patch for config profiles

525. By Jaap Karssenberg on 2012-03-20

Refactored profile loading

526. By Jaap Karssenberg on 2012-03-21

Small fix for style linked to profile

527. By Jaap Karssenberg on 2012-03-26

Fix for context menu page index

528. By Jaap Karssenberg on 2012-03-26

Small fix for GNU R plugin

529. By Jaap Karssenberg on 2012-03-26

Small fix for git support

530. By Jaap Karssenberg on 2012-03-27

Small fix for trayicon

531. By Jaap Karssenberg on 2012-04-02

Small fix for windows paths

532. By Jaap Karssenberg on 2012-04-02

Fix for small bugje in Insert Date dialog

533. By Jaap Karssenberg on 2012-04-02

Version 0.56

534. By Brendan Kidwell on 2012-04-03

removing "[version]" section from PortableApps ini file; this is added by build script

535. By Brendan Kidwell on 2012-04-04

Fixing "Zim 0.54 doesn't work on Windows XP"

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2010-03-24 22:06:16 +0000
+++ .bzrignore	2010-05-30 22:47:23 +0000
@@ -15,5 +15,6 @@
 ./debian/pycompat
 ./man
 ./html
-./windows
+./windows/build
+./windows/version-and-date.nsi
 ./xdg/hicolor

=== modified file 'setup.py'
--- setup.py	2010-05-17 19:31:00 +0000
+++ setup.py	2010-05-30 22:47:23 +0000
@@ -5,6 +5,11 @@
 import shutil
 import subprocess
 
+try:
+	import py2exe
+except ImportError:
+	py2exe = None
+
 from distutils.core import setup
 from distutils.command.sdist import sdist as sdist_class
 from distutils.command.build import build as build_class
@@ -222,6 +227,28 @@
 	dependencies.append('simplejson')
 
 
+if py2exe:
+	py2exeoptions = {
+		'windows': [ {
+			"script": "zim.py",
+			"icon_resources": [(1, "data/pixmaps/favicon.ico")]
+		} ],
+		'zipfile': None,
+		'options': {
+			"py2exe": {
+				"compressed": 0,
+				"optimize": 2,
+				"ascii": 1,
+				"bundle_files": 3,
+				"packages": ["encodings", "cairo", "atk", "pangocairo", "zim", "bzrlib"],
+				"dist_dir" : "windows/build"
+			}
+		}
+	}
+else:
+	py2exeoptions = {}
+
+
 setup(
 	# wire overload commands
 	cmdclass = {
@@ -243,6 +270,8 @@
 	scripts      = ['zim.py'],
 	packages     = collect_packages(),
 	data_files   = collect_data_files(),
-	requires     = dependencies
+	requires     = dependencies,
+
+	**py2exeoptions
 )
 

=== modified file 'windows/README-BUILD-win32.txt'
--- windows/README-BUILD-win32.txt	2010-04-13 07:49:27 +0000
+++ windows/README-BUILD-win32.txt	2010-05-30 22:47:23 +0000
@@ -31,15 +31,24 @@
 
 1. Checkout or update a copy of pyzim from "lp:zim".
 
-2. In the Zim root folder, run "windows\env.cmd" if your GTK binary folder isn't already in your PATH environment variable.
-
-3. Run "[path-to-python]\python.exe windows\build_win32.py".
-
-3. Make sure it built okay by running ".\windows\zim\zim.exe"
+2. Run "[path-to-python]\python.exe setup.py build" to create a standard build. (Needed to get translation files.)
+
+3. Look at "windows\env.cmd" -- make sure that your paths to GTK and Python binaries are correct.
+
+3. Run "windows\env.cmd" to initialize your $PATH environment variable..
+
+4. Run "python.exe windows\build_win32.py".
+
+5. Make sure it built okay by running ".\windows\build\zim.exe".
 
 
 Packaging the Installer
 
-1. Run ./windows/create-zim-setup.nsi .
-
-2. Find its output in ./dist/Zim-setup-*.exe and test it.
+1. Create or modify ./windows/version-and-date.nsi . (Fill in the appropriate values.)
+
+   !define VER "version_number_goes_here"
+   !define BUILDDATE "yyyy-mm-dd"
+
+2. Run ./windows/create-zim-setup.nsi .
+
+3. Find its output in ./dist/Zim-setup-*.exe and test it.

=== modified file 'windows/build_win32.py'
--- windows/build_win32.py	2010-04-13 07:49:27 +0000
+++ windows/build_win32.py	2010-05-30 22:47:23 +0000
@@ -1,32 +1,41 @@
-import os, sys, shutil
-import py2exe
+import os
+import sys
+import shutil
 import datetime
-from distutils.core import setup
+import subprocess
+import distutils.dir_util
+
 sys.path.append(".")
 from zim import __version__
 
 # For the complete Windows build procedure, please read
 # README-BUILD-win32.txt
 
-# If run without args, build executables, in quiet mode.
-if len(sys.argv) == 1:
-    sys.argv.append("py2exe")
+#  Clean up the build directory
+shutil.rmtree("windows/build", True)
 
 # update "data" folder
-shutil.rmtree("windows/zim/data", True)
-shutil.copytree("data", "windows/zim/data")
+shutil.copytree("data", "windows/build/data")
 
 # If you installed GTK to a different folder, change these lines:
-shutil.rmtree("windows/zim/etc", True)
-shutil.copytree("c:/Program Files/Common Files/GTK/2.0/etc", "windows/zim/etc")
-shutil.rmtree("windows/zim/lib", True)
-shutil.copytree("c:/Program Files/Common Files/GTK/2.0/lib", "windows/zim/lib")
-shutil.rmtree("windows/zim/share", True)
-shutil.copytree("c:/Program Files/Common Files/GTK/2.0/share", "windows/zim/share")
-
-# copy plugins folder so Preferences dialog can iterate through them
-shutil.rmtree("windows/zim/zim", True)
-shutil.copytree("zim/plugins", "windows/zim/zim/plugins")
+shutil.copytree("c:/Program Files/Common Files/GTK/2.0/etc", "windows/build/etc")
+shutil.copytree("c:/Program Files/Common Files/GTK/2.0/lib", "windows/build/lib")
+shutil.copytree("c:/Program Files/Common Files/GTK/2.0/share", "windows/build/share")
+
+# Copy translation files
+# Use function from distutils because shutil.copytree fails when destination folder exists
+distutils.dir_util.copy_tree("locale", "windows/build/share/locale", update=1)
+
+# Copy plugins folder so Preferences dialog can iterate through them
+shutil.rmtree("windows/build/zim", True)
+shutil.copytree("zim/plugins", "windows/build/zim/plugins")
+
+# Copy the hicolor icon theme from windows folder because it's missing from Gtk/win32 distro
+os.makedirs("windows/build/share/icons/hicolor")
+shutil.copyfile(
+	"windows/hicolor-icon-theme__index.theme",
+	"windows/build/share/icons/hicolor/index.theme"
+)
 
 # print out version number
 f = open("windows/version-and-date.nsi", "w")
@@ -34,22 +43,9 @@
 f.write('!define BUILDDATE "%s"\n' % datetime.datetime.now().strftime("%Y-%m-%d"))
 f.close()
 
+# create main.exe
+subprocess.check_call(['python.exe', 'setup.py', 'py2exe'])
+
 # NSIS script compiles to "dist" folder but compiler won't create it if it's needed
 if not os.path.exists("dist"):
     os.mkdir("dist")
-
-# create main.exe
-setup(
-    options = {"py2exe": {"compressed": 0,
-                          "optimize": 2,
-                          "ascii": 1,
-                          "bundle_files": 3,
-                          "packages": ["encodings", "cairo", "atk", "pangocairo", "zim", "bzrlib"],
-                          "dist_dir" : "windows/zim"
-                          }},
-    zipfile = None,
-    windows = [{
-            "script": "zim.py",
-            "icon_resources": [(1, "data/pixmaps/favicon.ico")]
-        }],
-)

=== modified file 'windows/create-zim-setup.nsi'
--- windows/create-zim-setup.nsi	2010-04-13 07:49:27 +0000
+++ windows/create-zim-setup.nsi	2010-05-30 22:47:23 +0000
@@ -25,7 +25,7 @@
 
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP "zim-logo-big.bmp" ; optional
-!define MUI_ICON "zim\data\pixmaps\favicon.ico"
+!define MUI_ICON "zim.ico"
 
 !define MUI_DIRECTORYPAGE_TEXT_TOP \
 	"Setup will install ${APPNAME} in the following folder. \
@@ -57,8 +57,8 @@
 
 	; Set Section Files and Shortcuts
 	SetOutPath "$INSTDIR\"
-	File /r /x .svn /x Zim-setup*.exe /x "zim.exe.log" "zim\*.*"
-	File /oname=zim.ico "zim\data\pixmaps\favicon.ico"
+	File /r /x .svn /x Zim-setup*.exe /x "zim.exe.log" "build\*.*"
+	File "zim.ico"
 
 SectionEnd
 

=== modified file 'windows/env.cmd'
--- windows/env.cmd	2010-04-13 07:49:27 +0000
+++ windows/env.cmd	2010-05-30 22:47:23 +0000
@@ -1,1 +1,1 @@
-SET PATH=%PATH%;C:\Program Files\Common Files\GTK\2.0\bin
+SET PATH=%PATH%;C:\Program Files\Common Files\GTK\2.0\bin;c:\Programs\Python26

=== added file 'windows/hicolor-icon-theme__index.theme'
--- windows/hicolor-icon-theme__index.theme	1970-01-01 00:00:00 +0000
+++ windows/hicolor-icon-theme__index.theme	2010-05-30 22:47:23 +0000
@@ -0,0 +1,1662 @@
+[Icon Theme]
+Name=Hicolor
+Comment=Fallback icon theme
+Hidden=true
+Directories=16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/intl,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/filesystems,22x22/intl,22x22/mimetypes,22x22/places,22x22/status,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/intl,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/filesystems,32x32/intl,32x32/mimetypes,32x32/places,32x32/status,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/emblems,36x36/emotes,36x36/filesystems,36x36/intl,36x36/mimetypes,36x36/places,36x36/status,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/filesystems,48x48/intl,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/animations,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/filesystems,64x64/intl,64x64/mimetypes,64x64/places,64x64/status,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stock/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/animations,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/filesystems,72x72/intl,72x72/mimetypes,72x72/places,72x72/status,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/animations,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/filesystems,96x96/intl,96x96/mimetypes,96x96/places,96x96/status,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/animations,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/filesystems,128x128/intl,128x128/mimetypes,128x128/places,128x128/status,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigation,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/animations,192x192/apps,192x192/categories,192x192/devices,192x192/emblems,192x192/emotes,192x192/filesystems,192x192/intl,192x192/mimetypes,192x192/places,192x192/status,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,256x256/actions,256x256/animations,256x256/apps,256x256/categories,256x256/devices,256x256/emblems,256x256/emotes,256x256/filesystems,256x256/intl,256x256/mimetypes,256x256/places,256x256/status,256x256/stock/chart,256x256/stock/code,256x256/stock/data,256x256/stock/form,256x256/stock/image,256x256/stock/io,256x256/stock/media,256x256/stock/navigation,256x256/stock/net,256x256/stock/object,256x256/stock/table,256x256/stock/text,scalable/actions,scalable/animations,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/filesystems,scalable/intl,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text
+
+
+[16x16/actions]
+Size=16
+Context=Actions
+Type=Threshold
+
+[16x16/animations]
+Size=16
+Context=Animations
+Type=Threshold
+
+[16x16/apps]
+Size=16
+Context=Applications
+Type=Threshold
+
+[16x16/categories]
+Size=16
+Context=Categories
+Type=Threshold
+
+[16x16/devices]
+Size=16
+Context=Devices
+Type=Threshold
+
+[16x16/emblems]
+Size=16
+Context=Emblems
+Type=Threshold
+
+[16x16/emotes]
+Size=16
+Context=Emotes
+Type=Threshold
+
+[16x16/filesystems]
+Size=16
+Context=FileSystems
+Type=Threshold
+
+[16x16/intl]
+Size=16
+Context=International
+Type=Threshold
+
+[16x16/mimetypes]
+Size=16
+Context=MimeTypes
+Type=Threshold
+
+[16x16/places]
+Size=16
+Context=Places
+Type=Threshold
+
+[16x16/status]
+Size=16
+Context=Status
+Type=Threshold
+
+[16x16/stock/chart]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/code]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/data]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/form]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/image]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/io]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/media]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/navigation]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/net]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/object]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/table]
+Size=16
+Context=Stock
+Type=Threshold
+
+[16x16/stock/text]
+Size=16
+Context=Stock
+Type=Threshold
+
+[22x22/actions]
+Size=22
+Context=Actions
+Type=Threshold
+
+[22x22/animations]
+Size=22
+Context=Animations
+Type=Threshold
+
+[22x22/apps]
+Size=22
+Context=Applications
+Type=Threshold
+
+[22x22/categories]
+Size=22
+Context=Categories
+Type=Threshold
+
+[22x22/devices]
+Size=22
+Context=Devices
+Type=Threshold
+
+[22x22/emblems]
+Size=22
+Context=Emblems
+Type=Threshold
+
+[22x22/emotes]
+Size=22
+Context=Emotes
+Type=Threshold
+
+[22x22/filesystems]
+Size=22
+Context=FileSystems
+Type=Threshold
+
+[22x22/intl]
+Size=22
+Context=International
+Type=Threshold
+
+[22x22/mimetypes]
+Size=22
+Context=MimeTypes
+Type=Threshold
+
+[22x22/places]
+Size=22
+Context=Places
+Type=Threshold
+
+[22x22/status]
+Size=22
+Context=Status
+Type=Threshold
+
+[22x22/stock/chart]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/code]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/data]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/form]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/image]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/io]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/media]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/navigation]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/net]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/object]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/table]
+Size=22
+Context=Stock
+Type=Threshold
+
+[22x22/stock/text]
+Size=22
+Context=Stock
+Type=Threshold
+
+[24x24/actions]
+Size=24
+Context=Actions
+Type=Threshold
+
+[24x24/animations]
+Size=24
+Context=Animations
+Type=Threshold
+
+[24x24/apps]
+Size=24
+Context=Applications
+Type=Threshold
+
+[24x24/categories]
+Size=24
+Context=Categories
+Type=Threshold
+
+[24x24/devices]
+Size=24
+Context=Devices
+Type=Threshold
+
+[24x24/emblems]
+Size=24
+Context=Emblems
+Type=Threshold
+
+[24x24/emotes]
+Size=24
+Context=Emotes
+Type=Threshold
+
+[24x24/filesystems]
+Size=24
+Context=FileSystems
+Type=Threshold
+
+[24x24/intl]
+Size=24
+Context=International
+Type=Threshold
+
+[24x24/mimetypes]
+Size=24
+Context=MimeTypes
+Type=Threshold
+
+[24x24/places]
+Size=24
+Context=Places
+Type=Threshold
+
+[24x24/status]
+Size=24
+Context=Status
+Type=Threshold
+
+[24x24/stock/chart]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/code]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/data]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/form]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/image]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/io]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/media]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/navigation]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/net]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/object]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/table]
+Size=24
+Context=Stock
+Type=Threshold
+
+[24x24/stock/text]
+Size=24
+Context=Stock
+Type=Threshold
+
+[32x32/actions]
+Size=32
+Context=Actions
+Type=Threshold
+
+[32x32/animations]
+Size=32
+Context=Animations
+Type=Threshold
+
+[32x32/apps]
+Size=32
+Context=Applications
+Type=Threshold
+
+[32x32/categories]
+Size=32
+Context=Categories
+Type=Threshold
+
+[32x32/devices]
+Size=32
+Context=Devices
+Type=Threshold
+
+[32x32/emblems]
+Size=32
+Context=Emblems
+Type=Threshold
+
+[32x32/emotes]
+Size=32
+Context=Emotes
+Type=Threshold
+
+[32x32/filesystems]
+Size=32
+Context=FileSystems
+Type=Threshold
+
+[32x32/intl]
+Size=32
+Context=International
+Type=Threshold
+
+[32x32/mimetypes]
+Size=32
+Context=MimeTypes
+Type=Threshold
+
+[32x32/places]
+Size=32
+Context=Places
+Type=Threshold
+
+[32x32/status]
+Size=32
+Context=Status
+Type=Threshold
+
+[32x32/stock/chart]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/code]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/data]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/form]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/image]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/io]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/media]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/navigation]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/net]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/object]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/table]
+Size=32
+Context=Stock
+Type=Threshold
+
+[32x32/stock/text]
+Size=32
+Context=Stock
+Type=Threshold
+
+[36x36/actions]
+Size=36
+Context=Actions
+Type=Threshold
+
+[36x36/animations]
+Size=36
+Context=Animations
+Type=Threshold
+
+[36x36/apps]
+Size=36
+Context=Applications
+Type=Threshold
+
+[36x36/categories]
+Size=36
+Context=Categories
+Type=Threshold
+
+[36x36/devices]
+Size=36
+Context=Devices
+Type=Threshold
+
+[36x36/emblems]
+Size=36
+Context=Emblems
+Type=Threshold
+
+[36x36/emotes]
+Size=36
+Context=Emotes
+Type=Threshold
+
+[36x36/filesystems]
+Size=36
+Context=FileSystems
+Type=Threshold
+
+[36x36/intl]
+Size=36
+Context=International
+Type=Threshold
+
+[36x36/mimetypes]
+Size=36
+Context=MimeTypes
+Type=Threshold
+
+[36x36/places]
+Size=36
+Context=Places
+Type=Threshold
+
+[36x36/status]
+Size=36
+Context=Status
+Type=Threshold
+
+[36x36/stock/chart]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/code]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/data]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/form]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/image]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/io]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/media]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/navigation]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/net]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/object]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/table]
+Size=36
+Context=Stock
+Type=Threshold
+
+[36x36/stock/text]
+Size=36
+Context=Stock
+Type=Threshold
+
+[48x48/actions]
+Size=48
+Context=Actions
+Type=Threshold
+
+[48x48/animations]
+Size=48
+Context=Animations
+Type=Threshold
+
+[48x48/apps]
+Size=48
+Context=Applications
+Type=Threshold
+
+[48x48/categories]
+Size=48
+Context=Categories
+Type=Threshold
+
+[48x48/devices]
+Size=48
+Context=Devices
+Type=Threshold
+
+[48x48/emblems]
+Size=48
+Context=Emblems
+Type=Threshold
+
+[48x48/emotes]
+Size=48
+Context=Emotes
+Type=Threshold
+
+[48x48/filesystems]
+Size=48
+Context=FileSystems
+Type=Threshold
+
+[48x48/intl]
+Size=48
+Context=International
+Type=Threshold
+
+[48x48/mimetypes]
+Size=48
+Context=MimeTypes
+Type=Threshold
+
+[48x48/places]
+Size=48
+Context=Places
+Type=Threshold
+
+[48x48/status]
+Size=48
+Context=Status
+Type=Threshold
+
+[48x48/stock/chart]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/code]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/data]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/form]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/image]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/io]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/media]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/navigation]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/net]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/object]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/table]
+Size=48
+Context=Stock
+Type=Threshold
+
+[48x48/stock/text]
+Size=48
+Context=Stock
+Type=Threshold
+
+[64x64/actions]
+Size=64
+Context=Actions
+Type=Threshold
+
+[64x64/animations]
+Size=64
+Context=Animations
+Type=Threshold
+
+[64x64/apps]
+Size=64
+Context=Applications
+Type=Threshold
+
+[64x64/categories]
+Size=64
+Context=Categories
+Type=Threshold
+
+[64x64/devices]
+Size=64
+Context=Devices
+Type=Threshold
+
+[64x64/emblems]
+Size=64
+Context=Emblems
+Type=Threshold
+
+[64x64/emotes]
+Size=64
+Context=Emotes
+Type=Threshold
+
+[64x64/filesystems]
+Size=64
+Context=FileSystems
+Type=Threshold
+
+[64x64/intl]
+Size=64
+Context=International
+Type=Threshold
+
+[64x64/mimetypes]
+Size=64
+Context=MimeTypes
+Type=Threshold
+
+[64x64/places]
+Size=64
+Context=Places
+Type=Threshold
+
+[64x64/status]
+Size=64
+Context=Status
+Type=Threshold
+
+[64x64/stock/chart]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/code]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/data]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/form]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/image]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/io]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/media]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/navigation]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/net]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/object]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/table]
+Size=64
+Context=Stock
+Type=Threshold
+
+[64x64/stock/text]
+Size=64
+Context=Stock
+Type=Threshold
+[72x72/actions]
+Size=72
+Context=Actions
+Type=Threshold
+
+[72x72/animations]
+Size=72
+Context=Animations
+Type=Threshold
+
+[72x72/apps]
+Size=72
+Context=Applications
+Type=Threshold
+
+[72x72/categories]
+Size=72
+Context=Categories
+Type=Threshold
+
+[72x72/devices]
+Size=72
+Context=Devices
+Type=Threshold
+
+[72x72/emblems]
+Size=72
+Context=Emblems
+Type=Threshold
+
+[72x72/emotes]
+Size=72
+Context=Emotes
+Type=Threshold
+
+[72x72/filesystems]
+Size=72
+Context=FileSystems
+Type=Threshold
+
+[72x72/intl]
+Size=72
+Context=International
+Type=Threshold
+
+[72x72/mimetypes]
+Size=72
+Context=MimeTypes
+Type=Threshold
+
+[72x72/places]
+Size=72
+Context=Places
+Type=Threshold
+
+[72x72/status]
+Size=72
+Context=Status
+Type=Threshold
+
+[72x72/stock/chart]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/code]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/data]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/form]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/image]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/io]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/media]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/navigation]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/net]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/object]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/table]
+Size=72
+Context=Stock
+Type=Threshold
+
+[72x72/stock/text]
+Size=72
+Context=Stock
+Type=Threshold
+
+[96x96/actions]
+Size=96
+Context=Actions
+Type=Threshold
+
+[96x96/animations]
+Size=96
+Context=Animations
+Type=Threshold
+
+[96x96/apps]
+Size=96
+Context=Applications
+Type=Threshold
+
+[96x96/categories]
+Size=96
+Context=Categories
+Type=Threshold
+
+[96x96/devices]
+Size=96
+Context=Devices
+Type=Threshold
+
+[96x96/emblems]
+Size=96
+Context=Emblems
+Type=Threshold
+
+[96x96/emotes]
+Size=96
+Context=Emotes
+Type=Threshold
+
+[96x96/filesystems]
+Size=96
+Context=FileSystems
+Type=Threshold
+
+[96x96/intl]
+Size=96
+Context=International
+Type=Threshold
+
+[96x96/mimetypes]
+Size=96
+Context=MimeTypes
+Type=Threshold
+
+[96x96/places]
+Size=96
+Context=Places
+Type=Threshold
+
+[96x96/status]
+Size=96
+Context=Status
+Type=Threshold
+
+[96x96/stock/chart]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/code]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/data]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/form]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/image]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/io]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/media]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/navigation]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/net]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/object]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/table]
+Size=96
+Context=Stock
+Type=Threshold
+
+[96x96/stock/text]
+Size=96
+Context=Stock
+Type=Threshold
+
+[128x128/actions]
+Size=128
+Context=Actions
+Type=Threshold
+
+[128x128/animations]
+Size=128
+Context=Animations
+Type=Threshold
+
+[128x128/apps]
+Size=128
+Context=Applications
+Type=Threshold
+
+[128x128/categories]
+Size=128
+Context=Categories
+Type=Threshold
+
+[128x128/devices]
+Size=128
+Context=Devices
+Type=Threshold
+
+[128x128/emblems]
+Size=128
+Context=Emblems
+Type=Threshold
+
+[128x128/emotes]
+Size=128
+Context=Emotes
+Type=Threshold
+
+[128x128/filesystems]
+Size=128
+Context=FileSystems
+Type=Threshold
+
+[128x128/intl]
+Size=128
+Context=International
+Type=Threshold
+
+[128x128/mimetypes]
+Size=128
+Context=MimeTypes
+Type=Threshold
+
+[128x128/places]
+Size=128
+Context=Places
+Type=Threshold
+
+[128x128/status]
+Size=128
+Context=Status
+Type=Threshold
+
+[128x128/stock/chart]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/code]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/data]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/form]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/image]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/io]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/media]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/navigation]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/net]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/object]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/table]
+Size=128
+Context=Stock
+Type=Threshold
+
+[128x128/stock/text]
+Size=128
+Context=Stock
+Type=Threshold
+
+[192x192/actions]
+Size=192
+Context=Actions
+Type=Threshold
+
+[192x192/animations]
+Size=192
+Context=Animations
+Type=Threshold
+
+[192x192/apps]
+Size=192
+Context=Applications
+Type=Threshold
+
+[192x192/categories]
+Size=192
+Context=Categories
+Type=Threshold
+
+[192x192/devices]
+Size=192
+Context=Devices
+Type=Threshold
+
+[192x192/emblems]
+Size=192
+Context=Emblems
+Type=Threshold
+
+[192x192/emotes]
+Size=192
+Context=Emotes
+Type=Threshold
+
+[192x192/filesystems]
+Size=192
+Context=FileSystems
+Type=Threshold
+
+[192x192/intl]
+Size=192
+Context=International
+Type=Threshold
+
+[192x192/mimetypes]
+Size=192
+Context=MimeTypes
+Type=Threshold
+
+[192x192/places]
+Size=192
+Context=Places
+Type=Threshold
+
+[192x192/status]
+Size=192
+Context=Status
+Type=Threshold
+
+[192x192/stock/chart]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/code]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/data]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/form]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/image]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/io]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/media]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/navigation]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/net]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/object]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/table]
+Size=192
+Context=Stock
+Type=Threshold
+
+[192x192/stock/text]
+Size=192
+Context=Stock
+Type=Threshold
+
+[256x256/actions]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Actions
+Type=Scalable
+
+[256x256/animations]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Animations
+Type=Scalable
+
+[256x256/apps]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Applications
+Type=Scalable
+
+[256x256/categories]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Categories
+Type=Scalable
+
+[256x256/devices]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Devices
+Type=Scalable
+
+[256x256/emblems]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Emblems
+Type=Scalable
+
+[256x256/emotes]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Emotes
+Type=Scalable
+
+[256x256/filesystems]
+MinSize=64
+Size=256
+MaxSize=256
+Context=FileSystems
+Type=Scalable
+
+[256x256/intl]
+MinSize=64
+Size=256
+MaxSize=256
+Context=International
+Type=Scalable
+
+[256x256/mimetypes]
+MinSize=64
+Size=256
+MaxSize=256
+Context=MimeTypes
+Type=Scalable
+
+[256x256/places]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Places
+Type=Scalable
+
+[256x256/status]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Status
+Type=Scalable
+
+[256x256/stock/chart]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/code]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/data]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/form]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/image]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/io]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/media]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/navigation]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/net]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/object]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/table]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[256x256/stock/text]
+MinSize=64
+Size=256
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/actions]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Actions
+Type=Scalable
+
+[scalable/animations]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Animations
+Type=Scalable
+
+[scalable/apps]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Applications
+Type=Scalable
+
+[scalable/categories]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Categories
+Type=Scalable
+
+[scalable/devices]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Devices
+Type=Scalable
+
+[scalable/emblems]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Emblems
+Type=Scalable
+
+[scalable/emotes]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Emotes
+Type=Scalable
+
+[scalable/filesystems]
+MinSize=1
+Size=128
+MaxSize=256
+Context=FileSystems
+Type=Scalable
+
+[scalable/intl]
+MinSize=1
+Size=128
+MaxSize=256
+Context=International
+Type=Scalable
+
+[scalable/mimetypes]
+MinSize=1
+Size=128
+MaxSize=256
+Context=MimeTypes
+Type=Scalable
+
+[scalable/places]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Places
+Type=Scalable
+
+[scalable/status]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Status
+Type=Scalable
+
+[scalable/stock/chart]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/code]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/data]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/form]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/image]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/io]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/media]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/navigation]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/net]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/object]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/table]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+
+[scalable/stock/text]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Stock
+Type=Scalable
+

=== modified file 'windows/zim.ico'
Binary files windows/zim.ico	2010-04-13 07:34:45 +0000 and windows/zim.ico	2010-05-30 22:47:23 +0000 differ
=== modified file 'zim/__init__.py'
--- zim/__init__.py	2010-05-25 19:31:00 +0000
+++ zim/__init__.py	2010-05-30 22:47:23 +0000
@@ -224,8 +224,13 @@
 		except ValueError:
 			raise GetoptError, ("--port takes an integer argument", 'port')
 
-	# set loggin output level for logging root (format has been set in zim.py)
-	level = logging.WARN
+	# set logging output level for logging root (format has been set in zim.py)
+	if not ZIM_EXECUTABLE[-4:].lower() == '.exe':
+		# for most platforms
+		level = logging.WARN
+	else:
+		# if running from Windows compiled .exe
+		level = logging.ERROR
 	if optsdict.pop('verbose', False): level = logging.INFO
 	if optsdict.pop('debug', False): level = logging.DEBUG # no "elif" !
 	logging.getLogger().setLevel(level)

=== modified file 'zim/fs.py'
--- zim/fs.py	2010-05-29 10:13:33 +0000
+++ zim/fs.py	2010-05-30 22:47:23 +0000
@@ -139,7 +139,10 @@
 try:
 	import xdg.Mime as xdgmime
 except ImportError:
-	logger.warn("Can not import 'xdg.Mime' - falling back to 'mimetypes'")
+	if os.name != 'nt':
+		logger.warn("Can not import 'xdg.Mime' - falling back to 'mimetypes'")
+	else:
+		pass # Ignore this error on Windows; doesn't come with xdg.Mime
 	import mimetypes