Zim

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

  1. pyzim-win-installer
  2. Merge into pyzim
Proposed by Brendan Kidwell
Status: Superseded
Proposed branch: lp:~bkidwell/zim/pyzim-win-installer
Merge into: lp:~jaap.karssenberg/zim/pyzim
Diff against target: 1927 lines (+1756/-51)
9 files modified
.bzrignore (+2/-1)
setup.py (+30/-1)
windows/README-BUILD-win32.txt (+17/-8)
windows/build_win32.py (+30/-34)
windows/create-zim-setup.nsi (+3/-3)
windows/env.cmd (+1/-1)
windows/hicolor-icon-theme__index.theme (+1662/-0)
zim/__init__.py (+7/-2)
zim/fs.py (+4/-1)
To merge this branch: bzr merge lp:~bkidwell/zim/pyzim-win-installer
Reviewer Review Type Date Requested Status
Jaap Karssenberg Pending
Review via email: mp+25968@code.launchpad.net

This proposal has been superseded by a proposal from 2010-05-30.

Description of the change

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.

To post a comment you must log in.
lp:~bkidwell/zim/pyzim-win-installer updated
250. By Jaap Karssenberg

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

251. By Jaap Karssenberg

Added special case for headers above task lists

252. By Jaap Karssenberg

Merged patch to allow moving placeholder pages

253. By Jaap Karssenberg

Added option to remove links when deleting a page or placeholder

254. By Jaap Karssenberg

Added single page export

255. By Jaap Karssenberg

Updated translation template

256. By Jaap Karssenberg

Yet another fix for filesystem encoding on windows

257. By Jaap Karssenberg

Removed file which was checked in by accident

258. By Jaap Karssenberg

Added test case for behavior with respect to symlinks

259. By Jaap Karssenberg

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

Merging work on windows installer by Brendan Kidwell

261. By Jaap Karssenberg

Small fixes for custom tools functionality

262. By Jaap Karssenberg

Merging another small fix for windows installer

263. By Jaap Karssenberg

Fix for icons for custom tools

264. By Jaap Karssenberg

Merging small fixed by Johannes Reinhardt

265. By Jaap Karssenberg

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

266. By Jaap Karssenberg

Two small fixes for unicode paths

267. By Jaap Karssenberg

Imported translations from launchpad

268. By Jaap Karssenberg

Release 0.47

269. By Jaap Karssenberg

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

270. By Jaap Karssenberg

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

271. By Jaap Karssenberg

Updated debian control file to allow installing package with python 2.5

272. By Jaap Karssenberg

Merged patch to support for sub- and superscript

273. By Jaap Karssenberg

Updated icon design

274. By Jaap Karssenberg <jaap@no-spoon>

Create Note plugin now supports templates

275. By Jaap Karssenberg <jaap@no-spoon>

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

276. By Jaap Karssenberg <jaap@no-spoon>

Merge with trunk

277. By Jaap Karssenberg

* 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

Fixed bug in test case

279. By Jaap Karssenberg

* 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

Updated translation template

281. By Jaap Karssenberg <jaap@no-spoon>

* 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

Various fixes for small issues found while testing on win32

283. By Jaap Karssenberg

Merged windows installer work

284. By Jaap Karssenberg

Merged latex fix from Johannes\' tree

285. By Jaap Karssenberg

Merged work for maemo support from "maacruz"

286. By Jaap Karssenberg

Small fixes

287. By Jaap Karssenberg

Two small fixes

288. By Jaap Karssenberg

* Updated translations
* Fixed failing test for plugins

289. By Jaap Karssenberg

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

290. By Jaap Karssenberg

Release 0.48

291. By Jaap Karssenberg

typos

292. By Jaap Karssenberg

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

293. By Jaap Karssenberg

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

294. By Jaap Karssenberg

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

295. By Jaap Karssenberg

* 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

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

297. By Jaap Karssenberg

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

298. By Jaap Karssenberg <jaap@no-spoon>

Added new plugin for inline evaluation of expressions

299. By Jaap Karssenberg <jaap@no-spoon>

Merged windows installer branch

300. By Jaap Karssenberg <jaap@no-spoon>

Merged fixes for verbatim paragraphs by Fabian Moser

301. By Jaap Karssenberg

* 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

* 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

Possible fix for unicode in quicknote dialog

304. By Jaap Karssenberg

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

Updated file write logic for Windows

306. By Jaap Karssenberg

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

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

* 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

Fixed a number of bugs

310. By Jaap Karssenberg

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

311. By Jaap Karssenberg

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

312. By Jaap Karssenberg

Merged experimental attachments browser plugin

313. By Jaap Karssenberg

Updated inline calculator to have functions

314. By Jaap Karssenberg

Updated translation template

315. By Jaap Karssenberg

Two small fixes

316. By Jaap Karssenberg

Fixed 2 more bugs + 1 typo

317. By Jaap Karssenberg

Added commandline option to export index

318. By Jaap Karssenberg

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

319. By Jaap Karssenberg

Fix from lp:665121 by smu

320. By Jaap Karssenberg

Updated translations

321. By Jaap Karssenberg

Release 0.49

322. By Jaap Karssenberg

Merged update for latex output

323. By Jaap Karssenberg

Merged windows installer branch

324. By Jaap Karssenberg

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

Calendar template now also supports month and year pages

326. By Jaap Karssenberg

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

* 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

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

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

330. By Jaap Karssenberg

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

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

332. By Jaap Karssenberg

polished previous commit

333. By Jaap Karssenberg

* 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

merging website updates

335. By Jaap Karssenberg

Merged new description in debian control file

336. By Jaap Karssenberg

Documentation updates

337. By Jaap Karssenberg

Fixed issue when toggling checkboxes

338. By Jaap Karssenberg

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

* 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

Updated translation template

341. By Jaap Karssenberg

* 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

Fixed 3 small issues in export dialog for single page export

343. By Jaap Karssenberg

Merged new "cleanup attachments" dialog by Stefan Muthers

344. By Jaap Karssenberg

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

345. By Jaap Karssenberg

* 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

* 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

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

Small fixes

349. By Jaap Karssenberg

Updated translations

350. By Jaap Karssenberg

Release 0.50

351. By Jaap Karssenberg

Package layout and meta data update

352. By Jaap Karssenberg

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

353. By Jaap Karssenberg

Merging plugin to sort lines in zim by NorfCran

354. By Jaap Karssenberg

Fix for issue with float numbers for image size by smu

355. By Jaap Karssenberg

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

356. By Jaap Karssenberg

Patch to allow text zoom by Konstantin Baierer

357. By Jaap Karssenberg

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

358. By Jaap Karssenberg

Fix resizing of text entry widgets in dialogs

359. By Jaap Karssenberg

* 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

Support for snapshots

361. By Jaap Karssenberg

Trash can support

362. By Jaap Karssenberg

Added GNUplot plugin - Alessandro Magni

363. By Jaap Karssenberg

Merging two bug fixes

364. By Jaap Karssenberg

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

365. By Jaap Karssenberg

Added calendar widget to "Insert Date" dialog

366. By Jaap Karssenberg

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

Fixed auto-completion for links and added test

368. By Jaap Karssenberg

Fixed interwiki links for export

369. By Jaap Karssenberg

Fixed copy-paste images for some MSOffice components

370. By Jaap Karssenberg

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

Merged tag support - Fabian

372. By Jaap Karssenberg

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

373. By Jaap Karssenberg

Updated translation template

374. By Jaap Karssenberg

Update meta data

375. By Jaap Karssenberg

Fixed error handling in spell check plugin

376. By Jaap Karssenberg

Fixed bug when pasting bullets that end with formatting

377. By Jaap Karssenberg

Disabled Alt-Space

378. By Jaap Karssenberg

Code clean up and additional test coverage

379. By Jaap Karssenberg

Reworked notebook list and hooked intialize_notebook for plugins

380. By Jaap Karssenberg

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

Fixed linkmap widget to actually go to the clicked page

382. By Jaap Karssenberg

Minor update in translation tempalte

383. By Jaap Karssenberg

Small fix in loading NotebookInfo

384. By Jaap Karssenberg

Updated translations

385. By Jaap Karssenberg

Last minute fix to the tray icon

386. By Jaap Karssenberg

Release 0.51

387. By Jaap Karssenberg

Added page name auto-completion in quicknote dialog

388. By Jaap Karssenberg

Fixed critical bug when starting zim without any defined notebooks

389. By Jaap Karssenberg

Two more fixes related to the notebook list

390. By Jaap Karssenberg

* 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

Release 0.52

392. By Jaap Karssenberg

* 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

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

394. By Jaap Karssenberg

Small fix for executing zim from source on windows

395. By Jaap Karssenberg

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

Merge support for optional dependencies for plugins - John Drinkwater

397. By Jaap Karssenberg

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

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

399. By Jaap Karssenberg

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

400. By Jaap Karssenberg

Small fix for the Insert Date dialog

401. By Jaap Karssenberg

Merging typo fixes

402. By Jaap Karssenberg

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

403. By Jaap Karssenberg

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

404. By Jaap Karssenberg

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

405. By Jaap Karssenberg

Merge interwiki keyword patch

406. By Jaap Karssenberg

Resolving branch for interwiki keyword

407. By Jaap Karssenberg

Refactoring on loading extension modules

408. By Jaap Karssenberg

Merging template function for page index - jiri

409. By Jaap Karssenberg

Merging more typos and bugs - Oliver

410. By Jaap Karssenberg

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

website update

412. By Jaap Karssenberg

Merged template resources feature

413. By Jaap Karssenberg

* 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

Performance improvement for index

415. By Jaap Karssenberg

* 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

Merging branch with image links

417. By Jaap Karssenberg

Improved error handling while reading and writing pages fron the ui

418. By Jaap Karssenberg

merged trunk

419. By Jaap Karssenberg

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

420. By Jaap Karssenberg

Moved daemon to zim.gui namespace

421. By Jaap Karssenberg

Added --search commandline option

422. By Jaap Karssenberg

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

423. By Jaap Karssenberg

Added number of child pages in the index pane

424. By Jaap Karssenberg

Merging patch for calendar and tasklist plugins

425. By Jaap Karssenberg

Made setup now hardcode platform on compile time

426. By Jaap Karssenberg

Added arithmetic plugin

427. By Jaap Karssenberg

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

428. By Jaap Karssenberg

Added numbers to tag list in the tasklist dialog

429. By Jaap Karssenberg

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

430. By Jaap Karssenberg

Added 3 small checks to prevent crashes

431. By Jaap Karssenberg

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

432. By Jaap Karssenberg

* 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

* 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

Fixes for 3 possible exceptions when moving a page

435. By Jaap Karssenberg

Merged patch for highlighting find match

436. By Jaap Karssenberg

Updated translations

437. By Jaap Karssenberg

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

438. By Jaap Karssenberg

Made current page highlight bold in the index and tag index

439. By Jaap Karssenberg

* 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

Added tooltips for index pane

441. By Jaap Karssenberg

Merged windows installer branch

442. By Jaap Karssenberg

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

443. By Jaap Karssenberg

* 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

Imported new translations

445. By Jaap Karssenberg

Fixes to make test suite run on windows

446. By Jaap Karssenberg

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

447. By Jaap Karssenberg

Release updates

448. By Jaap Karssenberg

Very small update for the website

449. By Jaap Karssenberg

Added mono icons for ubuntu

450. By Jaap Karssenberg

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

451. By Jaap Karssenberg

Fixed problem in test suite when loading gtk pixbufs

452. By Jaap Karssenberg

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

453. By Jaap Karssenberg

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

454. By Jaap Karssenberg

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

455. By Jaap Karssenberg

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

* 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

Updated translation template

458. By Jaap Karssenberg

* 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

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

460. By Jaap Karssenberg

Fixed autocomplete for page entry in quicknote

461. By Jaap Karssenberg

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

462. By Jaap Karssenberg

Possible fix for encoding issues in strftime

463. By Jaap Karssenberg

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

464. By Jaap Karssenberg

Imported translations

465. By Jaap Karssenberg

Update package data for release

466. By Jaap Karssenberg

Updated tasklist to use markup - fixes bug with tooltips

467. By Jaap Karssenberg

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

468. By Jaap Karssenberg

Added spinner to search dialog

469. By Jaap Karssenberg

Further optimization for search

470. By Jaap Karssenberg

Added Table Of Contents plugin

471. By Jaap Karssenberg

Small fix for ToC

472. By Jaap Karssenberg

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

473. By Jaap Karssenberg

Fixed docs

474. By Jaap Karssenberg

Fixed regression in rev472

475. By Jaap Karssenberg

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

Made index sort naturally and locale aware :)

477. By Jaap Karssenberg

Merged update of windows installer files

478. By Jaap Karssenberg

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

479. By Jaap Karssenberg

Refactored Clipboard code

480. By Jaap Karssenberg

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

481. By Jaap Karssenberg

Fixed running zim daemon with proper python executable

482. By Jaap Karssenberg

Fixed small bug when attaching a file for selected text

483. By Jaap Karssenberg

Decoupled recent pages from history stack

484. By Jaap Karssenberg

Made history test not use private arguments

485. By Jaap Karssenberg

Fixed behavior when replacing a formatted word

486. By Jaap Karssenberg

Patch to improve behavior of automatic selections

487. By Jaap Karssenberg

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

488. By Jaap Karssenberg

Very small fix for testcase

489. By Jaap Karssenberg

Fixed to make zim icons more customizable - Andrei

490. By Jaap Karssenberg

Fixed bug for latex templates

491. By Jaap Karssenberg

Small fix for making tasklist more robust

492. By Jaap Karssenberg

Fixed small regression in trayicon

493. By Jaap Karssenberg

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

494. By Jaap Karssenberg

Added Markdown with pandoc extensions as export format

495. By Jaap Karssenberg

Merge feature numbered lists

496. By Jaap Karssenberg

Added context menu item for mocing selected text to new page

497. By Jaap Karssenberg

Updated translations

498. By Jaap Karssenberg

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

499. By Jaap Karssenberg

Updated testing for formats and fixed regression in Markdown format

500. By Jaap Karssenberg

"Move text" now uses new page template

501. By Jaap Karssenberg

Small fix for zim.desktop

502. By Jaap Karssenberg

Fixed remembering folder for exporting single file

503. By Jaap Karssenberg

Fix for undoing numbered list changes

504. By Jaap Karssenberg

Added more formal alternative keybindings

505. By Jaap Karssenberg

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

506. By Jaap Karssenberg

Further refactoring of attachmentbrowser thumbnailing, now with testcase

507. By Jaap Karssenberg

Added async queue again for thumbnailmanager - cross fingers

508. By Jaap Karssenberg

Small spelling fixes

509. By Jaap Karssenberg

Updated translations

510. By Jaap Karssenberg

Version 0.55

511. By Jaap Karssenberg

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

512. By Jaap Karssenberg

Added drag&drop for attachment browser

513. By Jaap Karssenberg

Updated bounty

514. By Jaap Karssenberg

Fixed bug for opening email adresses

515. By Jaap Karssenberg

Added test for fix in rev514

516. By Jaap Karssenberg

* Made sidepane remember state
* Made tag cloud remember state

517. By Jaap Karssenberg

Small fix to make daemon process more robust

518. By Jaap Karssenberg

Small fix in clipboard (lp:954091)

519. By Jaap Karssenberg

Merge Git & Hg support

520. By Jaap Karssenberg

Some refactoring on versioncontrol plugin

521. By Jaap Karssenberg

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

522. By Jaap Karssenberg

Merged plugin for "ditaa" diagrams

523. By Jaap Karssenberg

Updated translation template

524. By Jaap Karssenberg

Merging patch for config profiles

525. By Jaap Karssenberg

Refactored profile loading

526. By Jaap Karssenberg

Small fix for style linked to profile

527. By Jaap Karssenberg

Fix for context menu page index

528. By Jaap Karssenberg

Small fix for GNU R plugin

529. By Jaap Karssenberg

Small fix for git support

530. By Jaap Karssenberg

Small fix for trayicon

531. By Jaap Karssenberg

Small fix for windows paths

532. By Jaap Karssenberg

Fix for small bugje in Insert Date dialog

533. By Jaap Karssenberg

Version 0.56

534. By Brendan Kidwell

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

535. By Brendan Kidwell

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

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2010-03-24 22:06:16 +0000
+++ .bzrignore 2010-05-30 22:47:23 +0000
@@ -15,5 +15,6 @@
15./debian/pycompat15./debian/pycompat
16./man16./man
17./html17./html
18./windows18./windows/build
19./windows/version-and-date.nsi
19./xdg/hicolor20./xdg/hicolor
2021
=== 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 @@
5import shutil5import shutil
6import subprocess6import subprocess
77
8try:
9 import py2exe
10except ImportError:
11 py2exe = None
12
8from distutils.core import setup13from distutils.core import setup
9from distutils.command.sdist import sdist as sdist_class14from distutils.command.sdist import sdist as sdist_class
10from distutils.command.build import build as build_class15from distutils.command.build import build as build_class
@@ -222,6 +227,28 @@
222 dependencies.append('simplejson')227 dependencies.append('simplejson')
223228
224229
230if py2exe:
231 py2exeoptions = {
232 'windows': [ {
233 "script": "zim.py",
234 "icon_resources": [(1, "data/pixmaps/favicon.ico")]
235 } ],
236 'zipfile': None,
237 'options': {
238 "py2exe": {
239 "compressed": 0,
240 "optimize": 2,
241 "ascii": 1,
242 "bundle_files": 3,
243 "packages": ["encodings", "cairo", "atk", "pangocairo", "zim", "bzrlib"],
244 "dist_dir" : "windows/build"
245 }
246 }
247 }
248else:
249 py2exeoptions = {}
250
251
225setup(252setup(
226 # wire overload commands253 # wire overload commands
227 cmdclass = {254 cmdclass = {
@@ -243,6 +270,8 @@
243 scripts = ['zim.py'],270 scripts = ['zim.py'],
244 packages = collect_packages(),271 packages = collect_packages(),
245 data_files = collect_data_files(),272 data_files = collect_data_files(),
246 requires = dependencies273 requires = dependencies,
274
275 **py2exeoptions
247)276)
248277
249278
=== 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 @@
3131
321. Checkout or update a copy of pyzim from "lp:zim".321. Checkout or update a copy of pyzim from "lp:zim".
3333
342. In the Zim root folder, run "windows\env.cmd" if your GTK binary folder isn't already in your PATH environment variable.342. Run "[path-to-python]\python.exe setup.py build" to create a standard build. (Needed to get translation files.)
3535
363. Run "[path-to-python]\python.exe windows\build_win32.py".363. Look at "windows\env.cmd" -- make sure that your paths to GTK and Python binaries are correct.
3737
383. Make sure it built okay by running ".\windows\zim\zim.exe"383. Run "windows\env.cmd" to initialize your $PATH environment variable..
39
404. Run "python.exe windows\build_win32.py".
41
425. Make sure it built okay by running ".\windows\build\zim.exe".
3943
4044
41Packaging the Installer45Packaging the Installer
4246
431. Run ./windows/create-zim-setup.nsi .471. Create or modify ./windows/version-and-date.nsi . (Fill in the appropriate values.)
4448
452. Find its output in ./dist/Zim-setup-*.exe and test it.49 !define VER "version_number_goes_here"
50 !define BUILDDATE "yyyy-mm-dd"
51
522. Run ./windows/create-zim-setup.nsi .
53
543. Find its output in ./dist/Zim-setup-*.exe and test it.
4655
=== 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 @@
1import os, sys, shutil1import os
2import py2exe2import sys
3import shutil
3import datetime4import datetime
4from distutils.core import setup5import subprocess
6import distutils.dir_util
7
5sys.path.append(".")8sys.path.append(".")
6from zim import __version__9from zim import __version__
710
8# For the complete Windows build procedure, please read11# For the complete Windows build procedure, please read
9# README-BUILD-win32.txt12# README-BUILD-win32.txt
1013
11# If run without args, build executables, in quiet mode.14# Clean up the build directory
12if len(sys.argv) == 1:15shutil.rmtree("windows/build", True)
13 sys.argv.append("py2exe")
1416
15# update "data" folder17# update "data" folder
16shutil.rmtree("windows/zim/data", True)18shutil.copytree("data", "windows/build/data")
17shutil.copytree("data", "windows/zim/data")
1819
19# If you installed GTK to a different folder, change these lines:20# If you installed GTK to a different folder, change these lines:
20shutil.rmtree("windows/zim/etc", True)21shutil.copytree("c:/Program Files/Common Files/GTK/2.0/etc", "windows/build/etc")
21shutil.copytree("c:/Program Files/Common Files/GTK/2.0/etc", "windows/zim/etc")22shutil.copytree("c:/Program Files/Common Files/GTK/2.0/lib", "windows/build/lib")
22shutil.rmtree("windows/zim/lib", True)23shutil.copytree("c:/Program Files/Common Files/GTK/2.0/share", "windows/build/share")
23shutil.copytree("c:/Program Files/Common Files/GTK/2.0/lib", "windows/zim/lib")24
24shutil.rmtree("windows/zim/share", True)25# Copy translation files
25shutil.copytree("c:/Program Files/Common Files/GTK/2.0/share", "windows/zim/share")26# Use function from distutils because shutil.copytree fails when destination folder exists
2627distutils.dir_util.copy_tree("locale", "windows/build/share/locale", update=1)
27# copy plugins folder so Preferences dialog can iterate through them28
28shutil.rmtree("windows/zim/zim", True)29# Copy plugins folder so Preferences dialog can iterate through them
29shutil.copytree("zim/plugins", "windows/zim/zim/plugins")30shutil.rmtree("windows/build/zim", True)
31shutil.copytree("zim/plugins", "windows/build/zim/plugins")
32
33# Copy the hicolor icon theme from windows folder because it's missing from Gtk/win32 distro
34os.makedirs("windows/build/share/icons/hicolor")
35shutil.copyfile(
36 "windows/hicolor-icon-theme__index.theme",
37 "windows/build/share/icons/hicolor/index.theme"
38)
3039
31# print out version number40# print out version number
32f = open("windows/version-and-date.nsi", "w")41f = open("windows/version-and-date.nsi", "w")
@@ -34,22 +43,9 @@
34f.write('!define BUILDDATE "%s"\n' % datetime.datetime.now().strftime("%Y-%m-%d"))43f.write('!define BUILDDATE "%s"\n' % datetime.datetime.now().strftime("%Y-%m-%d"))
35f.close()44f.close()
3645
46# create main.exe
47subprocess.check_call(['python.exe', 'setup.py', 'py2exe'])
48
37# NSIS script compiles to "dist" folder but compiler won't create it if it's needed49# NSIS script compiles to "dist" folder but compiler won't create it if it's needed
38if not os.path.exists("dist"):50if not os.path.exists("dist"):
39 os.mkdir("dist")51 os.mkdir("dist")
40
41# create main.exe
42setup(
43 options = {"py2exe": {"compressed": 0,
44 "optimize": 2,
45 "ascii": 1,
46 "bundle_files": 3,
47 "packages": ["encodings", "cairo", "atk", "pangocairo", "zim", "bzrlib"],
48 "dist_dir" : "windows/zim"
49 }},
50 zipfile = None,
51 windows = [{
52 "script": "zim.py",
53 "icon_resources": [(1, "data/pixmaps/favicon.ico")]
54 }],
55)
5652
=== 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 @@
2525
26!define MUI_HEADERIMAGE26!define MUI_HEADERIMAGE
27!define MUI_HEADERIMAGE_BITMAP "zim-logo-big.bmp" ; optional27!define MUI_HEADERIMAGE_BITMAP "zim-logo-big.bmp" ; optional
28!define MUI_ICON "zim\data\pixmaps\favicon.ico"28!define MUI_ICON "zim.ico"
2929
30!define MUI_DIRECTORYPAGE_TEXT_TOP \30!define MUI_DIRECTORYPAGE_TEXT_TOP \
31 "Setup will install ${APPNAME} in the following folder. \31 "Setup will install ${APPNAME} in the following folder. \
@@ -57,8 +57,8 @@
5757
58 ; Set Section Files and Shortcuts58 ; Set Section Files and Shortcuts
59 SetOutPath "$INSTDIR\"59 SetOutPath "$INSTDIR\"
60 File /r /x .svn /x Zim-setup*.exe /x "zim.exe.log" "zim\*.*"60 File /r /x .svn /x Zim-setup*.exe /x "zim.exe.log" "build\*.*"
61 File /oname=zim.ico "zim\data\pixmaps\favicon.ico"61 File "zim.ico"
6262
63SectionEnd63SectionEnd
6464
6565
=== 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 @@
1SET PATH=%PATH%;C:\Program Files\Common Files\GTK\2.0\bin1SET PATH=%PATH%;C:\Program Files\Common Files\GTK\2.0\bin;c:\Programs\Python26
22
=== 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 @@
1[Icon Theme]
2Name=Hicolor
3Comment=Fallback icon theme
4Hidden=true
5Directories=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
6
7
8[16x16/actions]
9Size=16
10Context=Actions
11Type=Threshold
12
13[16x16/animations]
14Size=16
15Context=Animations
16Type=Threshold
17
18[16x16/apps]
19Size=16
20Context=Applications
21Type=Threshold
22
23[16x16/categories]
24Size=16
25Context=Categories
26Type=Threshold
27
28[16x16/devices]
29Size=16
30Context=Devices
31Type=Threshold
32
33[16x16/emblems]
34Size=16
35Context=Emblems
36Type=Threshold
37
38[16x16/emotes]
39Size=16
40Context=Emotes
41Type=Threshold
42
43[16x16/filesystems]
44Size=16
45Context=FileSystems
46Type=Threshold
47
48[16x16/intl]
49Size=16
50Context=International
51Type=Threshold
52
53[16x16/mimetypes]
54Size=16
55Context=MimeTypes
56Type=Threshold
57
58[16x16/places]
59Size=16
60Context=Places
61Type=Threshold
62
63[16x16/status]
64Size=16
65Context=Status
66Type=Threshold
67
68[16x16/stock/chart]
69Size=16
70Context=Stock
71Type=Threshold
72
73[16x16/stock/code]
74Size=16
75Context=Stock
76Type=Threshold
77
78[16x16/stock/data]
79Size=16
80Context=Stock
81Type=Threshold
82
83[16x16/stock/form]
84Size=16
85Context=Stock
86Type=Threshold
87
88[16x16/stock/image]
89Size=16
90Context=Stock
91Type=Threshold
92
93[16x16/stock/io]
94Size=16
95Context=Stock
96Type=Threshold
97
98[16x16/stock/media]
99Size=16
100Context=Stock
101Type=Threshold
102
103[16x16/stock/navigation]
104Size=16
105Context=Stock
106Type=Threshold
107
108[16x16/stock/net]
109Size=16
110Context=Stock
111Type=Threshold
112
113[16x16/stock/object]
114Size=16
115Context=Stock
116Type=Threshold
117
118[16x16/stock/table]
119Size=16
120Context=Stock
121Type=Threshold
122
123[16x16/stock/text]
124Size=16
125Context=Stock
126Type=Threshold
127
128[22x22/actions]
129Size=22
130Context=Actions
131Type=Threshold
132
133[22x22/animations]
134Size=22
135Context=Animations
136Type=Threshold
137
138[22x22/apps]
139Size=22
140Context=Applications
141Type=Threshold
142
143[22x22/categories]
144Size=22
145Context=Categories
146Type=Threshold
147
148[22x22/devices]
149Size=22
150Context=Devices
151Type=Threshold
152
153[22x22/emblems]
154Size=22
155Context=Emblems
156Type=Threshold
157
158[22x22/emotes]
159Size=22
160Context=Emotes
161Type=Threshold
162
163[22x22/filesystems]
164Size=22
165Context=FileSystems
166Type=Threshold
167
168[22x22/intl]
169Size=22
170Context=International
171Type=Threshold
172
173[22x22/mimetypes]
174Size=22
175Context=MimeTypes
176Type=Threshold
177
178[22x22/places]
179Size=22
180Context=Places
181Type=Threshold
182
183[22x22/status]
184Size=22
185Context=Status
186Type=Threshold
187
188[22x22/stock/chart]
189Size=22
190Context=Stock
191Type=Threshold
192
193[22x22/stock/code]
194Size=22
195Context=Stock
196Type=Threshold
197
198[22x22/stock/data]
199Size=22
200Context=Stock
201Type=Threshold
202
203[22x22/stock/form]
204Size=22
205Context=Stock
206Type=Threshold
207
208[22x22/stock/image]
209Size=22
210Context=Stock
211Type=Threshold
212
213[22x22/stock/io]
214Size=22
215Context=Stock
216Type=Threshold
217
218[22x22/stock/media]
219Size=22
220Context=Stock
221Type=Threshold
222
223[22x22/stock/navigation]
224Size=22
225Context=Stock
226Type=Threshold
227
228[22x22/stock/net]
229Size=22
230Context=Stock
231Type=Threshold
232
233[22x22/stock/object]
234Size=22
235Context=Stock
236Type=Threshold
237
238[22x22/stock/table]
239Size=22
240Context=Stock
241Type=Threshold
242
243[22x22/stock/text]
244Size=22
245Context=Stock
246Type=Threshold
247
248[24x24/actions]
249Size=24
250Context=Actions
251Type=Threshold
252
253[24x24/animations]
254Size=24
255Context=Animations
256Type=Threshold
257
258[24x24/apps]
259Size=24
260Context=Applications
261Type=Threshold
262
263[24x24/categories]
264Size=24
265Context=Categories
266Type=Threshold
267
268[24x24/devices]
269Size=24
270Context=Devices
271Type=Threshold
272
273[24x24/emblems]
274Size=24
275Context=Emblems
276Type=Threshold
277
278[24x24/emotes]
279Size=24
280Context=Emotes
281Type=Threshold
282
283[24x24/filesystems]
284Size=24
285Context=FileSystems
286Type=Threshold
287
288[24x24/intl]
289Size=24
290Context=International
291Type=Threshold
292
293[24x24/mimetypes]
294Size=24
295Context=MimeTypes
296Type=Threshold
297
298[24x24/places]
299Size=24
300Context=Places
301Type=Threshold
302
303[24x24/status]
304Size=24
305Context=Status
306Type=Threshold
307
308[24x24/stock/chart]
309Size=24
310Context=Stock
311Type=Threshold
312
313[24x24/stock/code]
314Size=24
315Context=Stock
316Type=Threshold
317
318[24x24/stock/data]
319Size=24
320Context=Stock
321Type=Threshold
322
323[24x24/stock/form]
324Size=24
325Context=Stock
326Type=Threshold
327
328[24x24/stock/image]
329Size=24
330Context=Stock
331Type=Threshold
332
333[24x24/stock/io]
334Size=24
335Context=Stock
336Type=Threshold
337
338[24x24/stock/media]
339Size=24
340Context=Stock
341Type=Threshold
342
343[24x24/stock/navigation]
344Size=24
345Context=Stock
346Type=Threshold
347
348[24x24/stock/net]
349Size=24
350Context=Stock
351Type=Threshold
352
353[24x24/stock/object]
354Size=24
355Context=Stock
356Type=Threshold
357
358[24x24/stock/table]
359Size=24
360Context=Stock
361Type=Threshold
362
363[24x24/stock/text]
364Size=24
365Context=Stock
366Type=Threshold
367
368[32x32/actions]
369Size=32
370Context=Actions
371Type=Threshold
372
373[32x32/animations]
374Size=32
375Context=Animations
376Type=Threshold
377
378[32x32/apps]
379Size=32
380Context=Applications
381Type=Threshold
382
383[32x32/categories]
384Size=32
385Context=Categories
386Type=Threshold
387
388[32x32/devices]
389Size=32
390Context=Devices
391Type=Threshold
392
393[32x32/emblems]
394Size=32
395Context=Emblems
396Type=Threshold
397
398[32x32/emotes]
399Size=32
400Context=Emotes
401Type=Threshold
402
403[32x32/filesystems]
404Size=32
405Context=FileSystems
406Type=Threshold
407
408[32x32/intl]
409Size=32
410Context=International
411Type=Threshold
412
413[32x32/mimetypes]
414Size=32
415Context=MimeTypes
416Type=Threshold
417
418[32x32/places]
419Size=32
420Context=Places
421Type=Threshold
422
423[32x32/status]
424Size=32
425Context=Status
426Type=Threshold
427
428[32x32/stock/chart]
429Size=32
430Context=Stock
431Type=Threshold
432
433[32x32/stock/code]
434Size=32
435Context=Stock
436Type=Threshold
437
438[32x32/stock/data]
439Size=32
440Context=Stock
441Type=Threshold
442
443[32x32/stock/form]
444Size=32
445Context=Stock
446Type=Threshold
447
448[32x32/stock/image]
449Size=32
450Context=Stock
451Type=Threshold
452
453[32x32/stock/io]
454Size=32
455Context=Stock
456Type=Threshold
457
458[32x32/stock/media]
459Size=32
460Context=Stock
461Type=Threshold
462
463[32x32/stock/navigation]
464Size=32
465Context=Stock
466Type=Threshold
467
468[32x32/stock/net]
469Size=32
470Context=Stock
471Type=Threshold
472
473[32x32/stock/object]
474Size=32
475Context=Stock
476Type=Threshold
477
478[32x32/stock/table]
479Size=32
480Context=Stock
481Type=Threshold
482
483[32x32/stock/text]
484Size=32
485Context=Stock
486Type=Threshold
487
488[36x36/actions]
489Size=36
490Context=Actions
491Type=Threshold
492
493[36x36/animations]
494Size=36
495Context=Animations
496Type=Threshold
497
498[36x36/apps]
499Size=36
500Context=Applications
501Type=Threshold
502
503[36x36/categories]
504Size=36
505Context=Categories
506Type=Threshold
507
508[36x36/devices]
509Size=36
510Context=Devices
511Type=Threshold
512
513[36x36/emblems]
514Size=36
515Context=Emblems
516Type=Threshold
517
518[36x36/emotes]
519Size=36
520Context=Emotes
521Type=Threshold
522
523[36x36/filesystems]
524Size=36
525Context=FileSystems
526Type=Threshold
527
528[36x36/intl]
529Size=36
530Context=International
531Type=Threshold
532
533[36x36/mimetypes]
534Size=36
535Context=MimeTypes
536Type=Threshold
537
538[36x36/places]
539Size=36
540Context=Places
541Type=Threshold
542
543[36x36/status]
544Size=36
545Context=Status
546Type=Threshold
547
548[36x36/stock/chart]
549Size=36
550Context=Stock
551Type=Threshold
552
553[36x36/stock/code]
554Size=36
555Context=Stock
556Type=Threshold
557
558[36x36/stock/data]
559Size=36
560Context=Stock
561Type=Threshold
562
563[36x36/stock/form]
564Size=36
565Context=Stock
566Type=Threshold
567
568[36x36/stock/image]
569Size=36
570Context=Stock
571Type=Threshold
572
573[36x36/stock/io]
574Size=36
575Context=Stock
576Type=Threshold
577
578[36x36/stock/media]
579Size=36
580Context=Stock
581Type=Threshold
582
583[36x36/stock/navigation]
584Size=36
585Context=Stock
586Type=Threshold
587
588[36x36/stock/net]
589Size=36
590Context=Stock
591Type=Threshold
592
593[36x36/stock/object]
594Size=36
595Context=Stock
596Type=Threshold
597
598[36x36/stock/table]
599Size=36
600Context=Stock
601Type=Threshold
602
603[36x36/stock/text]
604Size=36
605Context=Stock
606Type=Threshold
607
608[48x48/actions]
609Size=48
610Context=Actions
611Type=Threshold
612
613[48x48/animations]
614Size=48
615Context=Animations
616Type=Threshold
617
618[48x48/apps]
619Size=48
620Context=Applications
621Type=Threshold
622
623[48x48/categories]
624Size=48
625Context=Categories
626Type=Threshold
627
628[48x48/devices]
629Size=48
630Context=Devices
631Type=Threshold
632
633[48x48/emblems]
634Size=48
635Context=Emblems
636Type=Threshold
637
638[48x48/emotes]
639Size=48
640Context=Emotes
641Type=Threshold
642
643[48x48/filesystems]
644Size=48
645Context=FileSystems
646Type=Threshold
647
648[48x48/intl]
649Size=48
650Context=International
651Type=Threshold
652
653[48x48/mimetypes]
654Size=48
655Context=MimeTypes
656Type=Threshold
657
658[48x48/places]
659Size=48
660Context=Places
661Type=Threshold
662
663[48x48/status]
664Size=48
665Context=Status
666Type=Threshold
667
668[48x48/stock/chart]
669Size=48
670Context=Stock
671Type=Threshold
672
673[48x48/stock/code]
674Size=48
675Context=Stock
676Type=Threshold
677
678[48x48/stock/data]
679Size=48
680Context=Stock
681Type=Threshold
682
683[48x48/stock/form]
684Size=48
685Context=Stock
686Type=Threshold
687
688[48x48/stock/image]
689Size=48
690Context=Stock
691Type=Threshold
692
693[48x48/stock/io]
694Size=48
695Context=Stock
696Type=Threshold
697
698[48x48/stock/media]
699Size=48
700Context=Stock
701Type=Threshold
702
703[48x48/stock/navigation]
704Size=48
705Context=Stock
706Type=Threshold
707
708[48x48/stock/net]
709Size=48
710Context=Stock
711Type=Threshold
712
713[48x48/stock/object]
714Size=48
715Context=Stock
716Type=Threshold
717
718[48x48/stock/table]
719Size=48
720Context=Stock
721Type=Threshold
722
723[48x48/stock/text]
724Size=48
725Context=Stock
726Type=Threshold
727
728[64x64/actions]
729Size=64
730Context=Actions
731Type=Threshold
732
733[64x64/animations]
734Size=64
735Context=Animations
736Type=Threshold
737
738[64x64/apps]
739Size=64
740Context=Applications
741Type=Threshold
742
743[64x64/categories]
744Size=64
745Context=Categories
746Type=Threshold
747
748[64x64/devices]
749Size=64
750Context=Devices
751Type=Threshold
752
753[64x64/emblems]
754Size=64
755Context=Emblems
756Type=Threshold
757
758[64x64/emotes]
759Size=64
760Context=Emotes
761Type=Threshold
762
763[64x64/filesystems]
764Size=64
765Context=FileSystems
766Type=Threshold
767
768[64x64/intl]
769Size=64
770Context=International
771Type=Threshold
772
773[64x64/mimetypes]
774Size=64
775Context=MimeTypes
776Type=Threshold
777
778[64x64/places]
779Size=64
780Context=Places
781Type=Threshold
782
783[64x64/status]
784Size=64
785Context=Status
786Type=Threshold
787
788[64x64/stock/chart]
789Size=64
790Context=Stock
791Type=Threshold
792
793[64x64/stock/code]
794Size=64
795Context=Stock
796Type=Threshold
797
798[64x64/stock/data]
799Size=64
800Context=Stock
801Type=Threshold
802
803[64x64/stock/form]
804Size=64
805Context=Stock
806Type=Threshold
807
808[64x64/stock/image]
809Size=64
810Context=Stock
811Type=Threshold
812
813[64x64/stock/io]
814Size=64
815Context=Stock
816Type=Threshold
817
818[64x64/stock/media]
819Size=64
820Context=Stock
821Type=Threshold
822
823[64x64/stock/navigation]
824Size=64
825Context=Stock
826Type=Threshold
827
828[64x64/stock/net]
829Size=64
830Context=Stock
831Type=Threshold
832
833[64x64/stock/object]
834Size=64
835Context=Stock
836Type=Threshold
837
838[64x64/stock/table]
839Size=64
840Context=Stock
841Type=Threshold
842
843[64x64/stock/text]
844Size=64
845Context=Stock
846Type=Threshold
847[72x72/actions]
848Size=72
849Context=Actions
850Type=Threshold
851
852[72x72/animations]
853Size=72
854Context=Animations
855Type=Threshold
856
857[72x72/apps]
858Size=72
859Context=Applications
860Type=Threshold
861
862[72x72/categories]
863Size=72
864Context=Categories
865Type=Threshold
866
867[72x72/devices]
868Size=72
869Context=Devices
870Type=Threshold
871
872[72x72/emblems]
873Size=72
874Context=Emblems
875Type=Threshold
876
877[72x72/emotes]
878Size=72
879Context=Emotes
880Type=Threshold
881
882[72x72/filesystems]
883Size=72
884Context=FileSystems
885Type=Threshold
886
887[72x72/intl]
888Size=72
889Context=International
890Type=Threshold
891
892[72x72/mimetypes]
893Size=72
894Context=MimeTypes
895Type=Threshold
896
897[72x72/places]
898Size=72
899Context=Places
900Type=Threshold
901
902[72x72/status]
903Size=72
904Context=Status
905Type=Threshold
906
907[72x72/stock/chart]
908Size=72
909Context=Stock
910Type=Threshold
911
912[72x72/stock/code]
913Size=72
914Context=Stock
915Type=Threshold
916
917[72x72/stock/data]
918Size=72
919Context=Stock
920Type=Threshold
921
922[72x72/stock/form]
923Size=72
924Context=Stock
925Type=Threshold
926
927[72x72/stock/image]
928Size=72
929Context=Stock
930Type=Threshold
931
932[72x72/stock/io]
933Size=72
934Context=Stock
935Type=Threshold
936
937[72x72/stock/media]
938Size=72
939Context=Stock
940Type=Threshold
941
942[72x72/stock/navigation]
943Size=72
944Context=Stock
945Type=Threshold
946
947[72x72/stock/net]
948Size=72
949Context=Stock
950Type=Threshold
951
952[72x72/stock/object]
953Size=72
954Context=Stock
955Type=Threshold
956
957[72x72/stock/table]
958Size=72
959Context=Stock
960Type=Threshold
961
962[72x72/stock/text]
963Size=72
964Context=Stock
965Type=Threshold
966
967[96x96/actions]
968Size=96
969Context=Actions
970Type=Threshold
971
972[96x96/animations]
973Size=96
974Context=Animations
975Type=Threshold
976
977[96x96/apps]
978Size=96
979Context=Applications
980Type=Threshold
981
982[96x96/categories]
983Size=96
984Context=Categories
985Type=Threshold
986
987[96x96/devices]
988Size=96
989Context=Devices
990Type=Threshold
991
992[96x96/emblems]
993Size=96
994Context=Emblems
995Type=Threshold
996
997[96x96/emotes]
998Size=96
999Context=Emotes
1000Type=Threshold
1001
1002[96x96/filesystems]
1003Size=96
1004Context=FileSystems
1005Type=Threshold
1006
1007[96x96/intl]
1008Size=96
1009Context=International
1010Type=Threshold
1011
1012[96x96/mimetypes]
1013Size=96
1014Context=MimeTypes
1015Type=Threshold
1016
1017[96x96/places]
1018Size=96
1019Context=Places
1020Type=Threshold
1021
1022[96x96/status]
1023Size=96
1024Context=Status
1025Type=Threshold
1026
1027[96x96/stock/chart]
1028Size=96
1029Context=Stock
1030Type=Threshold
1031
1032[96x96/stock/code]
1033Size=96
1034Context=Stock
1035Type=Threshold
1036
1037[96x96/stock/data]
1038Size=96
1039Context=Stock
1040Type=Threshold
1041
1042[96x96/stock/form]
1043Size=96
1044Context=Stock
1045Type=Threshold
1046
1047[96x96/stock/image]
1048Size=96
1049Context=Stock
1050Type=Threshold
1051
1052[96x96/stock/io]
1053Size=96
1054Context=Stock
1055Type=Threshold
1056
1057[96x96/stock/media]
1058Size=96
1059Context=Stock
1060Type=Threshold
1061
1062[96x96/stock/navigation]
1063Size=96
1064Context=Stock
1065Type=Threshold
1066
1067[96x96/stock/net]
1068Size=96
1069Context=Stock
1070Type=Threshold
1071
1072[96x96/stock/object]
1073Size=96
1074Context=Stock
1075Type=Threshold
1076
1077[96x96/stock/table]
1078Size=96
1079Context=Stock
1080Type=Threshold
1081
1082[96x96/stock/text]
1083Size=96
1084Context=Stock
1085Type=Threshold
1086
1087[128x128/actions]
1088Size=128
1089Context=Actions
1090Type=Threshold
1091
1092[128x128/animations]
1093Size=128
1094Context=Animations
1095Type=Threshold
1096
1097[128x128/apps]
1098Size=128
1099Context=Applications
1100Type=Threshold
1101
1102[128x128/categories]
1103Size=128
1104Context=Categories
1105Type=Threshold
1106
1107[128x128/devices]
1108Size=128
1109Context=Devices
1110Type=Threshold
1111
1112[128x128/emblems]
1113Size=128
1114Context=Emblems
1115Type=Threshold
1116
1117[128x128/emotes]
1118Size=128
1119Context=Emotes
1120Type=Threshold
1121
1122[128x128/filesystems]
1123Size=128
1124Context=FileSystems
1125Type=Threshold
1126
1127[128x128/intl]
1128Size=128
1129Context=International
1130Type=Threshold
1131
1132[128x128/mimetypes]
1133Size=128
1134Context=MimeTypes
1135Type=Threshold
1136
1137[128x128/places]
1138Size=128
1139Context=Places
1140Type=Threshold
1141
1142[128x128/status]
1143Size=128
1144Context=Status
1145Type=Threshold
1146
1147[128x128/stock/chart]
1148Size=128
1149Context=Stock
1150Type=Threshold
1151
1152[128x128/stock/code]
1153Size=128
1154Context=Stock
1155Type=Threshold
1156
1157[128x128/stock/data]
1158Size=128
1159Context=Stock
1160Type=Threshold
1161
1162[128x128/stock/form]
1163Size=128
1164Context=Stock
1165Type=Threshold
1166
1167[128x128/stock/image]
1168Size=128
1169Context=Stock
1170Type=Threshold
1171
1172[128x128/stock/io]
1173Size=128
1174Context=Stock
1175Type=Threshold
1176
1177[128x128/stock/media]
1178Size=128
1179Context=Stock
1180Type=Threshold
1181
1182[128x128/stock/navigation]
1183Size=128
1184Context=Stock
1185Type=Threshold
1186
1187[128x128/stock/net]
1188Size=128
1189Context=Stock
1190Type=Threshold
1191
1192[128x128/stock/object]
1193Size=128
1194Context=Stock
1195Type=Threshold
1196
1197[128x128/stock/table]
1198Size=128
1199Context=Stock
1200Type=Threshold
1201
1202[128x128/stock/text]
1203Size=128
1204Context=Stock
1205Type=Threshold
1206
1207[192x192/actions]
1208Size=192
1209Context=Actions
1210Type=Threshold
1211
1212[192x192/animations]
1213Size=192
1214Context=Animations
1215Type=Threshold
1216
1217[192x192/apps]
1218Size=192
1219Context=Applications
1220Type=Threshold
1221
1222[192x192/categories]
1223Size=192
1224Context=Categories
1225Type=Threshold
1226
1227[192x192/devices]
1228Size=192
1229Context=Devices
1230Type=Threshold
1231
1232[192x192/emblems]
1233Size=192
1234Context=Emblems
1235Type=Threshold
1236
1237[192x192/emotes]
1238Size=192
1239Context=Emotes
1240Type=Threshold
1241
1242[192x192/filesystems]
1243Size=192
1244Context=FileSystems
1245Type=Threshold
1246
1247[192x192/intl]
1248Size=192
1249Context=International
1250Type=Threshold
1251
1252[192x192/mimetypes]
1253Size=192
1254Context=MimeTypes
1255Type=Threshold
1256
1257[192x192/places]
1258Size=192
1259Context=Places
1260Type=Threshold
1261
1262[192x192/status]
1263Size=192
1264Context=Status
1265Type=Threshold
1266
1267[192x192/stock/chart]
1268Size=192
1269Context=Stock
1270Type=Threshold
1271
1272[192x192/stock/code]
1273Size=192
1274Context=Stock
1275Type=Threshold
1276
1277[192x192/stock/data]
1278Size=192
1279Context=Stock
1280Type=Threshold
1281
1282[192x192/stock/form]
1283Size=192
1284Context=Stock
1285Type=Threshold
1286
1287[192x192/stock/image]
1288Size=192
1289Context=Stock
1290Type=Threshold
1291
1292[192x192/stock/io]
1293Size=192
1294Context=Stock
1295Type=Threshold
1296
1297[192x192/stock/media]
1298Size=192
1299Context=Stock
1300Type=Threshold
1301
1302[192x192/stock/navigation]
1303Size=192
1304Context=Stock
1305Type=Threshold
1306
1307[192x192/stock/net]
1308Size=192
1309Context=Stock
1310Type=Threshold
1311
1312[192x192/stock/object]
1313Size=192
1314Context=Stock
1315Type=Threshold
1316
1317[192x192/stock/table]
1318Size=192
1319Context=Stock
1320Type=Threshold
1321
1322[192x192/stock/text]
1323Size=192
1324Context=Stock
1325Type=Threshold
1326
1327[256x256/actions]
1328MinSize=64
1329Size=256
1330MaxSize=256
1331Context=Actions
1332Type=Scalable
1333
1334[256x256/animations]
1335MinSize=64
1336Size=256
1337MaxSize=256
1338Context=Animations
1339Type=Scalable
1340
1341[256x256/apps]
1342MinSize=64
1343Size=256
1344MaxSize=256
1345Context=Applications
1346Type=Scalable
1347
1348[256x256/categories]
1349MinSize=64
1350Size=256
1351MaxSize=256
1352Context=Categories
1353Type=Scalable
1354
1355[256x256/devices]
1356MinSize=64
1357Size=256
1358MaxSize=256
1359Context=Devices
1360Type=Scalable
1361
1362[256x256/emblems]
1363MinSize=64
1364Size=256
1365MaxSize=256
1366Context=Emblems
1367Type=Scalable
1368
1369[256x256/emotes]
1370MinSize=64
1371Size=256
1372MaxSize=256
1373Context=Emotes
1374Type=Scalable
1375
1376[256x256/filesystems]
1377MinSize=64
1378Size=256
1379MaxSize=256
1380Context=FileSystems
1381Type=Scalable
1382
1383[256x256/intl]
1384MinSize=64
1385Size=256
1386MaxSize=256
1387Context=International
1388Type=Scalable
1389
1390[256x256/mimetypes]
1391MinSize=64
1392Size=256
1393MaxSize=256
1394Context=MimeTypes
1395Type=Scalable
1396
1397[256x256/places]
1398MinSize=64
1399Size=256
1400MaxSize=256
1401Context=Places
1402Type=Scalable
1403
1404[256x256/status]
1405MinSize=64
1406Size=256
1407MaxSize=256
1408Context=Status
1409Type=Scalable
1410
1411[256x256/stock/chart]
1412MinSize=64
1413Size=256
1414MaxSize=256
1415Context=Stock
1416Type=Scalable
1417
1418[256x256/stock/code]
1419MinSize=64
1420Size=256
1421MaxSize=256
1422Context=Stock
1423Type=Scalable
1424
1425[256x256/stock/data]
1426MinSize=64
1427Size=256
1428MaxSize=256
1429Context=Stock
1430Type=Scalable
1431
1432[256x256/stock/form]
1433MinSize=64
1434Size=256
1435MaxSize=256
1436Context=Stock
1437Type=Scalable
1438
1439[256x256/stock/image]
1440MinSize=64
1441Size=256
1442MaxSize=256
1443Context=Stock
1444Type=Scalable
1445
1446[256x256/stock/io]
1447MinSize=64
1448Size=256
1449MaxSize=256
1450Context=Stock
1451Type=Scalable
1452
1453[256x256/stock/media]
1454MinSize=64
1455Size=256
1456MaxSize=256
1457Context=Stock
1458Type=Scalable
1459
1460[256x256/stock/navigation]
1461MinSize=64
1462Size=256
1463MaxSize=256
1464Context=Stock
1465Type=Scalable
1466
1467[256x256/stock/net]
1468MinSize=64
1469Size=256
1470MaxSize=256
1471Context=Stock
1472Type=Scalable
1473
1474[256x256/stock/object]
1475MinSize=64
1476Size=256
1477MaxSize=256
1478Context=Stock
1479Type=Scalable
1480
1481[256x256/stock/table]
1482MinSize=64
1483Size=256
1484MaxSize=256
1485Context=Stock
1486Type=Scalable
1487
1488[256x256/stock/text]
1489MinSize=64
1490Size=256
1491MaxSize=256
1492Context=Stock
1493Type=Scalable
1494
1495[scalable/actions]
1496MinSize=1
1497Size=128
1498MaxSize=256
1499Context=Actions
1500Type=Scalable
1501
1502[scalable/animations]
1503MinSize=1
1504Size=128
1505MaxSize=256
1506Context=Animations
1507Type=Scalable
1508
1509[scalable/apps]
1510MinSize=1
1511Size=128
1512MaxSize=256
1513Context=Applications
1514Type=Scalable
1515
1516[scalable/categories]
1517MinSize=1
1518Size=128
1519MaxSize=256
1520Context=Categories
1521Type=Scalable
1522
1523[scalable/devices]
1524MinSize=1
1525Size=128
1526MaxSize=256
1527Context=Devices
1528Type=Scalable
1529
1530[scalable/emblems]
1531MinSize=1
1532Size=128
1533MaxSize=256
1534Context=Emblems
1535Type=Scalable
1536
1537[scalable/emotes]
1538MinSize=1
1539Size=128
1540MaxSize=256
1541Context=Emotes
1542Type=Scalable
1543
1544[scalable/filesystems]
1545MinSize=1
1546Size=128
1547MaxSize=256
1548Context=FileSystems
1549Type=Scalable
1550
1551[scalable/intl]
1552MinSize=1
1553Size=128
1554MaxSize=256
1555Context=International
1556Type=Scalable
1557
1558[scalable/mimetypes]
1559MinSize=1
1560Size=128
1561MaxSize=256
1562Context=MimeTypes
1563Type=Scalable
1564
1565[scalable/places]
1566MinSize=1
1567Size=128
1568MaxSize=256
1569Context=Places
1570Type=Scalable
1571
1572[scalable/status]
1573MinSize=1
1574Size=128
1575MaxSize=256
1576Context=Status
1577Type=Scalable
1578
1579[scalable/stock/chart]
1580MinSize=1
1581Size=128
1582MaxSize=256
1583Context=Stock
1584Type=Scalable
1585
1586[scalable/stock/code]
1587MinSize=1
1588Size=128
1589MaxSize=256
1590Context=Stock
1591Type=Scalable
1592
1593[scalable/stock/data]
1594MinSize=1
1595Size=128
1596MaxSize=256
1597Context=Stock
1598Type=Scalable
1599
1600[scalable/stock/form]
1601MinSize=1
1602Size=128
1603MaxSize=256
1604Context=Stock
1605Type=Scalable
1606
1607[scalable/stock/image]
1608MinSize=1
1609Size=128
1610MaxSize=256
1611Context=Stock
1612Type=Scalable
1613
1614[scalable/stock/io]
1615MinSize=1
1616Size=128
1617MaxSize=256
1618Context=Stock
1619Type=Scalable
1620
1621[scalable/stock/media]
1622MinSize=1
1623Size=128
1624MaxSize=256
1625Context=Stock
1626Type=Scalable
1627
1628[scalable/stock/navigation]
1629MinSize=1
1630Size=128
1631MaxSize=256
1632Context=Stock
1633Type=Scalable
1634
1635[scalable/stock/net]
1636MinSize=1
1637Size=128
1638MaxSize=256
1639Context=Stock
1640Type=Scalable
1641
1642[scalable/stock/object]
1643MinSize=1
1644Size=128
1645MaxSize=256
1646Context=Stock
1647Type=Scalable
1648
1649[scalable/stock/table]
1650MinSize=1
1651Size=128
1652MaxSize=256
1653Context=Stock
1654Type=Scalable
1655
1656[scalable/stock/text]
1657MinSize=1
1658Size=128
1659MaxSize=256
1660Context=Stock
1661Type=Scalable
1662
01663
=== modified file 'windows/zim.ico'
1Binary files windows/zim.ico 2010-04-13 07:34:45 +0000 and windows/zim.ico 2010-05-30 22:47:23 +0000 differ1664Binary 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 @@
224 except ValueError:224 except ValueError:
225 raise GetoptError, ("--port takes an integer argument", 'port')225 raise GetoptError, ("--port takes an integer argument", 'port')
226226
227 # set loggin output level for logging root (format has been set in zim.py)227 # set logging output level for logging root (format has been set in zim.py)
228 level = logging.WARN228 if not ZIM_EXECUTABLE[-4:].lower() == '.exe':
229 # for most platforms
230 level = logging.WARN
231 else:
232 # if running from Windows compiled .exe
233 level = logging.ERROR
229 if optsdict.pop('verbose', False): level = logging.INFO234 if optsdict.pop('verbose', False): level = logging.INFO
230 if optsdict.pop('debug', False): level = logging.DEBUG # no "elif" !235 if optsdict.pop('debug', False): level = logging.DEBUG # no "elif" !
231 logging.getLogger().setLevel(level)236 logging.getLogger().setLevel(level)
232237
=== 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 @@
139try:139try:
140 import xdg.Mime as xdgmime140 import xdg.Mime as xdgmime
141except ImportError:141except ImportError:
142 logger.warn("Can not import 'xdg.Mime' - falling back to 'mimetypes'")142 if os.name != 'nt':
143 logger.warn("Can not import 'xdg.Mime' - falling back to 'mimetypes'")
144 else:
145 pass # Ignore this error on Windows; doesn't come with xdg.Mime
143 import mimetypes146 import mimetypes
144147
145148