[gimp] themes, icons: move icons from themes/Default/images/ to the toplevel icons/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] themes, icons: move icons from themes/Default/images/ to the toplevel icons/
- Date: Wed, 7 May 2014 20:00:00 +0000 (UTC)
commit ae4a41d7a53acf365129cb30cd6575473a5668f1
Author: Michael Natterer <mitch gimp org>
Date: Wed May 7 21:57:21 2014 +0200
themes, icons: move icons from themes/Default/images/ to the toplevel icons/
and install them in datadir/icons.
Makefile.am | 1 +
app/core/gimpviewable.c | 2 +-
configure.ac | 1 +
icons/.gitignore | 5 +
{themes/Default/images => icons}/12/gimp-close.png | Bin 293 -> 293 bytes
.../images => icons}/12/gimp-default-colors.png | Bin 167 -> 167 bytes
{themes/Default/images => icons}/12/gimp-eye.png | Bin 413 -> 413 bytes
.../Default/images => icons}/12/gimp-linked.png | Bin 328 -> 328 bytes
.../Default/images => icons}/12/gimp-menu-left.png | Bin 195 -> 195 bytes
.../images => icons}/12/gimp-menu-right.png | Bin 191 -> 191 bytes
.../images => icons}/12/gimp-quick-mask-off.png | Bin 136 -> 136 bytes
.../images => icons}/12/gimp-quick-mask-on.png | Bin 98 -> 98 bytes
.../images => icons}/12/gimp-swap-colors.png | Bin 283 -> 283 bytes
.../12/gimp-zoom-follow-window.png | Bin 513 -> 513 bytes
.../12/gimp-zoom-follow-window.xcf | Bin 2000 -> 2000 bytes
.../Default/images => icons}/16/gimp-anchor.png | Bin 566 -> 566 bytes
.../Default/images => icons}/16/gimp-cap-butt.png | Bin 388 -> 388 bytes
.../Default/images => icons}/16/gimp-cap-round.png | Bin 518 -> 518 bytes
.../images => icons}/16/gimp-cap-square.png | Bin 413 -> 413 bytes
.../Default/images => icons}/16/gimp-center.png | Bin 449 -> 449 bytes
.../images => icons}/16/gimp-channel-alpha.png | Bin 681 -> 681 bytes
.../images => icons}/16/gimp-channel-alpha.svg | 0
.../images => icons}/16/gimp-channel-blue.png | Bin 775 -> 775 bytes
.../images => icons}/16/gimp-channel-gray.png | Bin 750 -> 750 bytes
.../images => icons}/16/gimp-channel-green.png | Bin 756 -> 756 bytes
.../images => icons}/16/gimp-channel-indexed.png | Bin 723 -> 723 bytes
.../images => icons}/16/gimp-channel-indexed.svg | 0
.../images => icons}/16/gimp-channel-red.png | Bin 752 -> 752 bytes
.../Default/images => icons}/16/gimp-channel.png | Bin 907 -> 907 bytes
.../Default/images => icons}/16/gimp-channels.png | Bin 658 -> 658 bytes
.../16/gimp-color-pick-from-screen.png | Bin 566 -> 566 bytes
.../images => icons}/16/gimp-color-triangle.png | Bin 811 -> 811 bytes
.../Default/images => icons}/16/gimp-colormap.png | Bin 569 -> 569 bytes
.../Default/images => icons}/16/gimp-colormap.svg | 0
.../16/gimp-controller-keyboard.png | Bin 549 -> 549 bytes
.../16/gimp-controller-linux-input.png | Bin 901 -> 901 bytes
.../images => icons}/16/gimp-controller-midi.png | Bin 510 -> 510 bytes
.../images => icons}/16/gimp-controller-midi.xcf | Bin 1845 -> 1845 bytes
.../images => icons}/16/gimp-controller-wheel.png | Bin 705 -> 705 bytes
.../images => icons}/16/gimp-controller-wheel.xcf | Bin 2843 -> 2843 bytes
.../images => icons}/16/gimp-controller.png | Bin 460 -> 460 bytes
.../images => icons}/16/gimp-convert-grayscale.png | Bin 287 -> 287 bytes
.../images => icons}/16/gimp-convert-indexed.png | Bin 381 -> 381 bytes
.../images => icons}/16/gimp-convert-rgb.png | Bin 625 -> 625 bytes
.../Default/images => icons}/16/gimp-cursor.png | Bin 322 -> 322 bytes
.../images => icons}/16/gimp-curve-free.png | Bin 481 -> 481 bytes
.../images => icons}/16/gimp-curve-smooth.png | Bin 414 -> 414 bytes
.../images => icons}/16/gimp-device-status.png | Bin 786 -> 786 bytes
.../16/gimp-display-filter-colorblind.png | Bin 654 -> 654 bytes
.../16/gimp-display-filter-colorblind.svg | 0
.../16/gimp-display-filter-contrast.png | Bin 508 -> 508 bytes
.../16/gimp-display-filter-contrast.svg | 0
.../16/gimp-display-filter-gamma.png | Bin 630 -> 630 bytes
.../16/gimp-display-filter-gamma.svg | 0
.../16/gimp-display-filter-lcms.png | Bin 600 -> 600 bytes
.../16/gimp-display-filter-lcms.svg | 0
.../16/gimp-display-filter-proof.png | Bin 721 -> 721 bytes
.../16/gimp-display-filter-proof.xcf | Bin 2646 -> 2646 bytes
.../images => icons}/16/gimp-display-filter.png | Bin 276 -> 276 bytes
.../Default/images => icons}/16/gimp-duplicate.png | Bin 482 -> 482 bytes
.../Default/images => icons}/16/gimp-dynamics.png | Bin 722 -> 722 bytes
{themes/Default/images => icons}/16/gimp-edit.png | Bin 526 -> 526 bytes
.../images => icons}/16/gimp-flip-horizontal.png | Bin 418 -> 418 bytes
.../images => icons}/16/gimp-flip-vertical.png | Bin 446 -> 446 bytes
.../16/gimp-floating-selection.png | Bin 712 -> 712 bytes
{themes/Default/images => icons}/16/gimp-gegl.png | Bin 961 -> 961 bytes
{themes/Default/images => icons}/16/gimp-gegl.svg | 0
.../images => icons}/16/gimp-gradient-bilinear.png | Bin 164 -> 164 bytes
.../16/gimp-gradient-conical-asymmetric.png | Bin 438 -> 438 bytes
.../16/gimp-gradient-conical-symmetric.png | Bin 515 -> 515 bytes
.../images => icons}/16/gimp-gradient-linear.png | Bin 158 -> 158 bytes
.../images => icons}/16/gimp-gradient-radial.png | Bin 616 -> 616 bytes
.../16/gimp-gradient-shapeburst-angular.png | Bin 370 -> 370 bytes
.../16/gimp-gradient-shapeburst-dimpled.png | Bin 364 -> 364 bytes
.../16/gimp-gradient-shapeburst-spherical.png | Bin 364 -> 364 bytes
.../16/gimp-gradient-spiral-anticlockwise.png | Bin 699 -> 699 bytes
.../16/gimp-gradient-spiral-clockwise.png | Bin 665 -> 665 bytes
.../images => icons}/16/gimp-gradient-square.png | Bin 215 -> 215 bytes
{themes/Default/images => icons}/16/gimp-grid.png | Bin 244 -> 244 bytes
.../images => icons}/16/gimp-histogram-linear.png | Bin 396 -> 396 bytes
.../16/gimp-histogram-logarithmic.png | Bin 364 -> 364 bytes
.../Default/images => icons}/16/gimp-histogram.png | Bin 349 -> 349 bytes
{themes/Default/images => icons}/16/gimp-image.png | Bin 533 -> 533 bytes
.../Default/images => icons}/16/gimp-images.png | Bin 456 -> 456 bytes
{themes/Default/images => icons}/16/gimp-info.png | Bin 485 -> 485 bytes
{themes/Default/images => icons}/16/gimp-info.xcf | Bin 1551 -> 1551 bytes
.../images => icons}/16/gimp-input-device.png | Bin 843 -> 843 bytes
.../Default/images => icons}/16/gimp-invert.png | Bin 259 -> 259 bytes
.../images => icons}/16/gimp-join-bevel.png | Bin 297 -> 297 bytes
.../images => icons}/16/gimp-join-miter.png | Bin 263 -> 263 bytes
.../images => icons}/16/gimp-join-round.png | Bin 357 -> 357 bytes
.../Default/images => icons}/16/gimp-landscape.png | Bin 398 -> 398 bytes
.../images => icons}/16/gimp-layer-mask.png | Bin 715 -> 715 bytes
.../images => icons}/16/gimp-layer-mask.svg | 0
.../16/gimp-layer-to-imagesize.png | Bin 319 -> 319 bytes
{themes/Default/images => icons}/16/gimp-layer.png | Bin 647 -> 647 bytes
{themes/Default/images => icons}/16/gimp-layer.svg | 0
.../Default/images => icons}/16/gimp-layers.png | Bin 585 -> 585 bytes
.../Default/images => icons}/16/gimp-layers.svg | 0
{themes/Default/images => icons}/16/gimp-list.png | Bin 254 -> 254 bytes
.../images => icons}/16/gimp-merge-down.png | Bin 419 -> 419 bytes
.../images => icons}/16/gimp-move-to-screen.png | Bin 592 -> 592 bytes
.../images => icons}/16/gimp-move-to-screen.xcf | Bin 1953 -> 1953 bytes
.../images => icons}/16/gimp-navigation.png | Bin 222 -> 222 bytes
.../images => icons}/16/gimp-paste-as-new.png | Bin 713 -> 713 bytes
.../images => icons}/16/gimp-paste-as-new.xcf | Bin 2119 -> 2119 bytes
.../images => icons}/16/gimp-paste-into.png | Bin 557 -> 557 bytes
.../images => icons}/16/gimp-paste-into.xcf | Bin 2542 -> 2542 bytes
.../images => icons}/16/gimp-path-stroke.png | Bin 715 -> 715 bytes
.../images => icons}/16/gimp-path-stroke.xcf | Bin 2319 -> 2319 bytes
{themes/Default/images => icons}/16/gimp-path.png | Bin 412 -> 412 bytes
{themes/Default/images => icons}/16/gimp-paths.png | Bin 470 -> 470 bytes
.../Default/images => icons}/16/gimp-plugin.png | Bin 378 -> 378 bytes
.../Default/images => icons}/16/gimp-portrait.png | Bin 536 -> 536 bytes
.../images => icons}/16/gimp-print-resolution.png | Bin 514 -> 514 bytes
.../images => icons}/16/gimp-print-resolution.xcf | Bin 2418 -> 2418 bytes
{themes/Default/images => icons}/16/gimp-reset.png | Bin 438 -> 438 bytes
{themes/Default/images => icons}/16/gimp-reset.xcf | Bin 1859 -> 1859 bytes
.../images => icons}/16/gimp-reshow-filter.png | Bin 631 -> 631 bytes
.../images => icons}/16/gimp-reshow-filter.xcf | Bin 2660 -> 2660 bytes
.../Default/images => icons}/16/gimp-resize.png | Bin 299 -> 299 bytes
.../images => icons}/16/gimp-rotate-180.png | Bin 572 -> 572 bytes
.../images => icons}/16/gimp-rotate-180.xcf | Bin 1864 -> 1864 bytes
.../images => icons}/16/gimp-rotate-270.png | Bin 435 -> 435 bytes
.../images => icons}/16/gimp-rotate-270.xcf | Bin 1843 -> 1843 bytes
.../Default/images => icons}/16/gimp-rotate-90.png | Bin 465 -> 465 bytes
.../Default/images => icons}/16/gimp-rotate-90.xcf | Bin 1845 -> 1845 bytes
.../images => icons}/16/gimp-sample-point.png | Bin 417 -> 417 bytes
{themes/Default/images => icons}/16/gimp-scale.png | Bin 390 -> 390 bytes
.../images => icons}/16/gimp-selection-add.png | Bin 519 -> 519 bytes
.../images => icons}/16/gimp-selection-all.png | Bin 201 -> 201 bytes
.../images => icons}/16/gimp-selection-border.png | Bin 388 -> 388 bytes
.../images => icons}/16/gimp-selection-grow.png | Bin 275 -> 275 bytes
.../16/gimp-selection-intersect.png | Bin 338 -> 338 bytes
.../images => icons}/16/gimp-selection-none.png | Bin 417 -> 417 bytes
.../images => icons}/16/gimp-selection-replace.png | Bin 433 -> 433 bytes
.../images => icons}/16/gimp-selection-shrink.png | Bin 284 -> 284 bytes
.../images => icons}/16/gimp-selection-stroke.png | Bin 798 -> 798 bytes
.../images => icons}/16/gimp-selection-stroke.xcf | Bin 2773 -> 2773 bytes
.../16/gimp-selection-subtract.png | Bin 399 -> 399 bytes
.../16/gimp-selection-to-channel.png | Bin 323 -> 323 bytes
.../images => icons}/16/gimp-selection-to-path.png | Bin 558 -> 558 bytes
.../Default/images => icons}/16/gimp-selection.png | Bin 433 -> 433 bytes
.../images => icons}/16/gimp-shape-circle.png | Bin 155 -> 155 bytes
.../images => icons}/16/gimp-shape-diamond.png | Bin 124 -> 124 bytes
.../images => icons}/16/gimp-shape-square.png | Bin 86 -> 86 bytes
.../Default/images => icons}/16/gimp-template.png | Bin 497 -> 497 bytes
.../Default/images => icons}/16/gimp-template.xcf | Bin 1579 -> 1579 bytes
.../images => icons}/16/gimp-text-layer.png | Bin 668 -> 668 bytes
.../images => icons}/16/gimp-text-layer.svg | 0
.../images => icons}/16/gimp-toilet-paper.png | Bin 647 -> 647 bytes
.../images => icons}/16/gimp-toilet-paper.xcf | Bin 1609 -> 1609 bytes
.../images => icons}/16/gimp-tool-airbrush.png | Bin 639 -> 639 bytes
.../images => icons}/16/gimp-tool-align.png | Bin 304 -> 304 bytes
.../images => icons}/16/gimp-tool-blend.png | Bin 290 -> 290 bytes
.../Default/images => icons}/16/gimp-tool-blur.png | Bin 884 -> 884 bytes
.../Default/images => icons}/16/gimp-tool-blur.xcf | Bin 2496 -> 2496 bytes
.../16/gimp-tool-brightness-contrast.png | Bin 920 -> 920 bytes
.../images => icons}/16/gimp-tool-bucket-fill.png | Bin 822 -> 822 bytes
.../16/gimp-tool-by-color-select.png | Bin 599 -> 599 bytes
.../16/gimp-tool-by-color-select.xcf | Bin 1966 -> 1966 bytes
.../Default/images => icons}/16/gimp-tool-cage.png | Bin 1081 -> 1081 bytes
.../Default/images => icons}/16/gimp-tool-cage.svg | 0
.../images => icons}/16/gimp-tool-clone.png | Bin 585 -> 585 bytes
.../16/gimp-tool-color-balance.png | Bin 498 -> 498 bytes
.../images => icons}/16/gimp-tool-color-picker.png | Bin 494 -> 494 bytes
.../images => icons}/16/gimp-tool-colorize.png | Bin 739 -> 739 bytes
.../images => icons}/16/gimp-tool-colorize.xcf | Bin 3038 -> 3038 bytes
.../Default/images => icons}/16/gimp-tool-crop.png | Bin 789 -> 789 bytes
.../images => icons}/16/gimp-tool-curves.png | Bin 455 -> 455 bytes
.../images => icons}/16/gimp-tool-desaturate.png | Bin 561 -> 561 bytes
.../images => icons}/16/gimp-tool-dodge.png | Bin 622 -> 622 bytes
.../images => icons}/16/gimp-tool-dodge.xcf | Bin 1795 -> 1795 bytes
.../16/gimp-tool-ellipse-select.png | Bin 327 -> 327 bytes
.../images => icons}/16/gimp-tool-eraser.png | Bin 408 -> 408 bytes
.../images => icons}/16/gimp-tool-eraser.xcf | Bin 1559 -> 1559 bytes
.../Default/images => icons}/16/gimp-tool-flip.png | Bin 581 -> 581 bytes
.../16/gimp-tool-foreground-select.png | Bin 682 -> 682 bytes
.../16/gimp-tool-foreground-select.xcf | Bin 4463 -> 4463 bytes
.../images => icons}/16/gimp-tool-free-select.png | Bin 686 -> 686 bytes
.../images => icons}/16/gimp-tool-fuzzy-select.png | Bin 729 -> 729 bytes
.../Default/images => icons}/16/gimp-tool-heal.png | Bin 562 -> 562 bytes
.../Default/images => icons}/16/gimp-tool-heal.xcf | Bin 2439 -> 2439 bytes
.../16/gimp-tool-hue-saturation.png | Bin 426 -> 426 bytes
.../Default/images => icons}/16/gimp-tool-ink.png | Bin 842 -> 842 bytes
.../images => icons}/16/gimp-tool-iscissors.png | Bin 484 -> 484 bytes
.../images => icons}/16/gimp-tool-iscissors.xcf | Bin 1766 -> 1766 bytes
.../images => icons}/16/gimp-tool-levels.png | Bin 502 -> 502 bytes
.../images => icons}/16/gimp-tool-levels.xcf | Bin 2143 -> 2143 bytes
.../images => icons}/16/gimp-tool-measure.png | Bin 718 -> 718 bytes
.../images => icons}/16/gimp-tool-measure.svg | 0
.../Default/images => icons}/16/gimp-tool-move.png | Bin 323 -> 323 bytes
.../Default/images => icons}/16/gimp-tool-move.xcf | Bin 1381 -> 1381 bytes
.../images => icons}/16/gimp-tool-options.png | Bin 518 -> 518 bytes
.../images => icons}/16/gimp-tool-paintbrush.png | Bin 635 -> 635 bytes
.../Default/images => icons}/16/gimp-tool-path.png | Bin 678 -> 678 bytes
.../Default/images => icons}/16/gimp-tool-path.xcf | Bin 1800 -> 1800 bytes
.../images => icons}/16/gimp-tool-pencil.png | Bin 607 -> 607 bytes
.../16/gimp-tool-perspective-clone.png | Bin 830 -> 830 bytes
.../16/gimp-tool-perspective-clone.xcf | Bin 3019 -> 3019 bytes
.../images => icons}/16/gimp-tool-perspective.png | Bin 586 -> 586 bytes
.../images => icons}/16/gimp-tool-posterize.png | Bin 568 -> 568 bytes
.../images => icons}/16/gimp-tool-posterize.xcf | Bin 2387 -> 2387 bytes
.../images => icons}/16/gimp-tool-preset.png | Bin 656 -> 656 bytes
.../images => icons}/16/gimp-tool-preset.svg | 0
.../images => icons}/16/gimp-tool-rect-select.png | Bin 281 -> 281 bytes
.../images => icons}/16/gimp-tool-rotate.png | Bin 703 -> 703 bytes
.../images => icons}/16/gimp-tool-scale.png | Bin 576 -> 576 bytes
.../images => icons}/16/gimp-tool-shear.png | Bin 526 -> 526 bytes
.../images => icons}/16/gimp-tool-smudge.png | Bin 896 -> 896 bytes
.../Default/images => icons}/16/gimp-tool-text.png | Bin 704 -> 704 bytes
.../images => icons}/16/gimp-tool-threshold.png | Bin 535 -> 535 bytes
.../images => icons}/16/gimp-tool-threshold.xcf | Bin 1820 -> 1820 bytes
.../16/gimp-tool-unified-transform.png | Bin 586 -> 586 bytes
.../Default/images => icons}/16/gimp-tool-warp.png | Bin 709 -> 709 bytes
.../Default/images => icons}/16/gimp-tool-zoom.png | Bin 703 -> 703 bytes
{themes/Default/images => icons}/16/gimp-tools.png | Bin 586 -> 586 bytes
.../images => icons}/16/gimp-transparency.png | Bin 104 -> 104 bytes
.../images => icons}/16/gimp-undo-history.png | Bin 606 -> 606 bytes
.../images => icons}/16/gimp-undo-history.xcf | Bin 2399 -> 2399 bytes
.../images => icons}/16/gimp-user-manual.png | Bin 928 -> 928 bytes
{themes/Default/images => icons}/16/gimp-video.png | Bin 513 -> 513 bytes
.../Default/images => icons}/16/gimp-warning.png | Bin 603 -> 603 bytes
{themes/Default/images => icons}/16/gimp-web.png | Bin 874 -> 874 bytes
{themes/Default/images => icons}/16/gimp-web.svg | 0
.../Default/images => icons}/16/gimp-wilber.png | Bin 765 -> 765 bytes
.../18/gimp-color-picker-black.png | Bin 527 -> 527 bytes
.../images => icons}/18/gimp-color-picker-gray.png | Bin 546 -> 546 bytes
.../18/gimp-color-picker-white.png | Bin 548 -> 548 bytes
{themes/Default/images => icons}/20/gimp-eye.png | Bin 617 -> 617 bytes
.../Default/images => icons}/20/gimp-linked.png | Bin 644 -> 644 bytes
.../images => icons}/22/gimp-char-picker.png | Bin 714 -> 714 bytes
.../Default/images => icons}/22/gimp-dynamics.png | Bin 997 -> 997 bytes
{themes/Default/images => icons}/22/gimp-gegl.png | Bin 1422 -> 1422 bytes
{themes/Default/images => icons}/22/gimp-gegl.svg | 0
.../Default/images => icons}/22/gimp-histogram.png | Bin 515 -> 515 bytes
.../images => icons}/22/gimp-input-device.png | Bin 1080 -> 1080 bytes
.../Default/images => icons}/22/gimp-landscape.png | Bin 813 -> 813 bytes
.../images => icons}/22/gimp-letter-spacing.png | Bin 663 -> 663 bytes
.../images => icons}/22/gimp-letter-spacing.xcf | Bin 3191 -> 3191 bytes
.../images => icons}/22/gimp-line-spacing.png | Bin 565 -> 565 bytes
.../images => icons}/22/gimp-line-spacing.xcf | Bin 4343 -> 4343 bytes
{themes/Default/images => icons}/22/gimp-path.png | Bin 609 -> 609 bytes
{themes/Default/images => icons}/22/gimp-paths.png | Bin 781 -> 781 bytes
.../Default/images => icons}/22/gimp-portrait.png | Bin 816 -> 816 bytes
.../images => icons}/22/gimp-tool-airbrush.png | Bin 772 -> 772 bytes
.../images => icons}/22/gimp-tool-align.png | Bin 380 -> 380 bytes
.../images => icons}/22/gimp-tool-align.xcf | Bin 1901 -> 1901 bytes
.../images => icons}/22/gimp-tool-blend.png | Bin 449 -> 449 bytes
.../Default/images => icons}/22/gimp-tool-blur.png | Bin 1074 -> 1074 bytes
.../Default/images => icons}/22/gimp-tool-blur.xcf | Bin 2810 -> 2810 bytes
.../22/gimp-tool-brightness-contrast.png | Bin 1394 -> 1394 bytes
.../images => icons}/22/gimp-tool-bucket-fill.png | Bin 1253 -> 1253 bytes
.../images => icons}/22/gimp-tool-bucket-fill.svg | 0
.../22/gimp-tool-by-color-select.png | Bin 689 -> 689 bytes
.../22/gimp-tool-by-color-select.xcf | Bin 2470 -> 2470 bytes
.../Default/images => icons}/22/gimp-tool-cage.png | Bin 1771 -> 1771 bytes
.../Default/images => icons}/22/gimp-tool-cage.svg | 0
.../images => icons}/22/gimp-tool-clone.png | Bin 715 -> 715 bytes
.../22/gimp-tool-color-balance.png | Bin 745 -> 745 bytes
.../images => icons}/22/gimp-tool-color-picker.png | Bin 718 -> 718 bytes
.../images => icons}/22/gimp-tool-colorize.png | Bin 1241 -> 1241 bytes
.../images => icons}/22/gimp-tool-colorize.xcf | Bin 4507 -> 4507 bytes
.../Default/images => icons}/22/gimp-tool-crop.png | Bin 1132 -> 1132 bytes
.../images => icons}/22/gimp-tool-curves.png | Bin 763 -> 763 bytes
.../images => icons}/22/gimp-tool-curves.xcf | Bin 2867 -> 2867 bytes
.../images => icons}/22/gimp-tool-desaturate.png | Bin 789 -> 789 bytes
.../images => icons}/22/gimp-tool-dodge.png | Bin 875 -> 875 bytes
.../images => icons}/22/gimp-tool-dodge.xcf | Bin 2462 -> 2462 bytes
.../22/gimp-tool-ellipse-select.png | Bin 877 -> 877 bytes
.../22/gimp-tool-ellipse-select.xcf | Bin 2914 -> 2914 bytes
.../images => icons}/22/gimp-tool-eraser.png | Bin 830 -> 830 bytes
.../images => icons}/22/gimp-tool-eraser.xcf | Bin 2314 -> 2314 bytes
.../Default/images => icons}/22/gimp-tool-flip.png | Bin 975 -> 975 bytes
.../Default/images => icons}/22/gimp-tool-flip.xcf | Bin 3475 -> 3475 bytes
.../22/gimp-tool-foreground-select.png | Bin 1072 -> 1072 bytes
.../22/gimp-tool-foreground-select.xcf | Bin 6621 -> 6621 bytes
.../images => icons}/22/gimp-tool-free-select.png | Bin 959 -> 959 bytes
.../images => icons}/22/gimp-tool-free-select.xcf | Bin 2281 -> 2281 bytes
.../images => icons}/22/gimp-tool-fuzzy-select.png | Bin 852 -> 852 bytes
.../Default/images => icons}/22/gimp-tool-heal.png | Bin 918 -> 918 bytes
.../Default/images => icons}/22/gimp-tool-heal.xcf | Bin 2978 -> 2978 bytes
.../22/gimp-tool-hue-saturation.png | Bin 551 -> 551 bytes
.../Default/images => icons}/22/gimp-tool-ink.png | Bin 1089 -> 1089 bytes
.../images => icons}/22/gimp-tool-iscissors.png | Bin 996 -> 996 bytes
.../images => icons}/22/gimp-tool-iscissors.xcf | Bin 2734 -> 2734 bytes
.../images => icons}/22/gimp-tool-levels.png | Bin 685 -> 685 bytes
.../images => icons}/22/gimp-tool-levels.xcf | Bin 4575 -> 4575 bytes
.../images => icons}/22/gimp-tool-measure.png | Bin 1030 -> 1030 bytes
.../images => icons}/22/gimp-tool-measure.svg | 0
.../images => icons}/22/gimp-tool-measure.xcf | Bin 2472 -> 2472 bytes
.../Default/images => icons}/22/gimp-tool-move.png | Bin 638 -> 638 bytes
.../Default/images => icons}/22/gimp-tool-move.xcf | Bin 2196 -> 2196 bytes
.../images => icons}/22/gimp-tool-paintbrush.png | Bin 885 -> 885 bytes
.../Default/images => icons}/22/gimp-tool-path.png | Bin 920 -> 920 bytes
.../Default/images => icons}/22/gimp-tool-path.xcf | Bin 2781 -> 2781 bytes
.../images => icons}/22/gimp-tool-pencil.png | Bin 820 -> 820 bytes
.../22/gimp-tool-perspective-clone.png | Bin 1158 -> 1158 bytes
.../22/gimp-tool-perspective-clone.xcf | Bin 3437 -> 3437 bytes
.../images => icons}/22/gimp-tool-perspective.png | Bin 914 -> 914 bytes
.../images => icons}/22/gimp-tool-perspective.xcf | Bin 3778 -> 3778 bytes
.../images => icons}/22/gimp-tool-posterize.png | Bin 1072 -> 1072 bytes
.../images => icons}/22/gimp-tool-posterize.xcf | Bin 3340 -> 3340 bytes
.../images => icons}/22/gimp-tool-preset.png | Bin 933 -> 933 bytes
.../images => icons}/22/gimp-tool-preset.svg | 0
.../images => icons}/22/gimp-tool-rect-select.png | Bin 499 -> 499 bytes
.../images => icons}/22/gimp-tool-rect-select.xcf | Bin 2075 -> 2075 bytes
.../images => icons}/22/gimp-tool-rotate.png | Bin 863 -> 863 bytes
.../images => icons}/22/gimp-tool-rotate.xcf | Bin 3263 -> 3263 bytes
.../images => icons}/22/gimp-tool-scale.png | Bin 902 -> 902 bytes
.../images => icons}/22/gimp-tool-scale.xcf | Bin 4200 -> 4200 bytes
.../images => icons}/22/gimp-tool-shear.png | Bin 797 -> 797 bytes
.../images => icons}/22/gimp-tool-shear.xcf | Bin 3698 -> 3698 bytes
.../images => icons}/22/gimp-tool-smudge.png | Bin 1009 -> 1009 bytes
.../images => icons}/22/gimp-tool-smudge.xcf | Bin 2222 -> 2222 bytes
.../Default/images => icons}/22/gimp-tool-text.png | Bin 1032 -> 1032 bytes
.../images => icons}/22/gimp-tool-threshold.png | Bin 714 -> 714 bytes
.../images => icons}/22/gimp-tool-threshold.xcf | Bin 2327 -> 2327 bytes
.../22/gimp-tool-unified-transform.png | Bin 914 -> 914 bytes
.../22/gimp-tool-unified-transform.xcf | Bin 3778 -> 3778 bytes
.../Default/images => icons}/22/gimp-tool-warp.png | Bin 906 -> 906 bytes
.../Default/images => icons}/22/gimp-tool-zoom.png | Bin 1197 -> 1197 bytes
.../Default/images => icons}/22/gimp-wilber.png | Bin 1071 -> 1071 bytes
.../Default/images => icons}/24/gimp-center.png | Bin 756 -> 756 bytes
.../images => icons}/24/gimp-channel-alpha.png | Bin 1008 -> 1008 bytes
.../images => icons}/24/gimp-channel-alpha.svg | 0
.../images => icons}/24/gimp-channel-blue.png | Bin 1013 -> 1013 bytes
.../images => icons}/24/gimp-channel-gray.png | Bin 999 -> 999 bytes
.../images => icons}/24/gimp-channel-green.png | Bin 998 -> 998 bytes
.../images => icons}/24/gimp-channel-indexed.png | Bin 1035 -> 1035 bytes
.../images => icons}/24/gimp-channel-indexed.svg | 0
.../images => icons}/24/gimp-channel-red.png | Bin 1000 -> 1000 bytes
.../Default/images => icons}/24/gimp-channel.png | Bin 1133 -> 1133 bytes
.../Default/images => icons}/24/gimp-channels.png | Bin 1040 -> 1040 bytes
.../Default/images => icons}/24/gimp-colormap.png | Bin 796 -> 796 bytes
.../Default/images => icons}/24/gimp-colormap.svg | 0
.../24/gimp-controller-keyboard.png | Bin 839 -> 839 bytes
.../24/gimp-controller-linux-input.png | Bin 1232 -> 1232 bytes
.../24/gimp-controller-linux-input.xcf | Bin 3311 -> 3311 bytes
.../images => icons}/24/gimp-controller-midi.png | Bin 804 -> 804 bytes
.../images => icons}/24/gimp-controller-midi.xcf | Bin 4197 -> 4197 bytes
.../images => icons}/24/gimp-controller-wheel.png | Bin 1117 -> 1117 bytes
.../images => icons}/24/gimp-controller-wheel.xcf | Bin 6839 -> 6839 bytes
.../images => icons}/24/gimp-controller.png | Bin 554 -> 554 bytes
.../Default/images => icons}/24/gimp-cursor.png | Bin 442 -> 442 bytes
.../images => icons}/24/gimp-device-status.png | Bin 1492 -> 1492 bytes
.../24/gimp-display-filter-colorblind.png | Bin 976 -> 976 bytes
.../24/gimp-display-filter-colorblind.svg | 0
.../24/gimp-display-filter-contrast.png | Bin 712 -> 712 bytes
.../24/gimp-display-filter-contrast.svg | 0
.../24/gimp-display-filter-gamma.png | Bin 879 -> 879 bytes
.../24/gimp-display-filter-gamma.svg | 0
.../24/gimp-display-filter-lcms.png | Bin 1165 -> 1165 bytes
.../24/gimp-display-filter-lcms.svg | 0
.../24/gimp-display-filter-proof.png | Bin 1262 -> 1262 bytes
.../24/gimp-display-filter-proof.xcf | Bin 4407 -> 4407 bytes
.../images => icons}/24/gimp-display-filter.png | Bin 757 -> 757 bytes
.../24/gimp-floating-selection.png | Bin 1056 -> 1056 bytes
.../images => icons}/24/gimp-gravity-east.png | Bin 548 -> 548 bytes
.../24/gimp-gravity-north-east.png | Bin 662 -> 662 bytes
.../24/gimp-gravity-north-west.png | Bin 630 -> 630 bytes
.../images => icons}/24/gimp-gravity-north.png | Bin 544 -> 544 bytes
.../24/gimp-gravity-south-east.png | Bin 576 -> 576 bytes
.../24/gimp-gravity-south-west.png | Bin 598 -> 598 bytes
.../images => icons}/24/gimp-gravity-south.png | Bin 467 -> 467 bytes
.../images => icons}/24/gimp-gravity-west.png | Bin 569 -> 569 bytes
.../Default/images => icons}/24/gimp-hcenter.png | Bin 762 -> 762 bytes
.../images => icons}/24/gimp-hchain-broken.png | Bin 373 -> 373 bytes
.../Default/images => icons}/24/gimp-hchain.png | Bin 374 -> 374 bytes
{themes/Default/images => icons}/24/gimp-hfill.png | Bin 7270 -> 7270 bytes
{themes/Default/images => icons}/24/gimp-image.png | Bin 774 -> 774 bytes
.../Default/images => icons}/24/gimp-images.png | Bin 740 -> 740 bytes
{themes/Default/images => icons}/24/gimp-info.png | Bin 968 -> 968 bytes
{themes/Default/images => icons}/24/gimp-info.xcf | Bin 4708 -> 4708 bytes
.../images => icons}/24/gimp-layer-mask.png | Bin 1105 -> 1105 bytes
.../images => icons}/24/gimp-layer-mask.svg | 0
{themes/Default/images => icons}/24/gimp-layer.png | Bin 1004 -> 1004 bytes
{themes/Default/images => icons}/24/gimp-layer.svg | 0
.../Default/images => icons}/24/gimp-layers.png | Bin 704 -> 704 bytes
.../Default/images => icons}/24/gimp-layers.svg | 0
.../images => icons}/24/gimp-move-to-screen.png | Bin 1032 -> 1032 bytes
.../images => icons}/24/gimp-move-to-screen.xcf | Bin 3059 -> 3059 bytes
.../images => icons}/24/gimp-print-resolution.png | Bin 839 -> 839 bytes
.../images => icons}/24/gimp-print-resolution.xcf | Bin 3511 -> 3511 bytes
.../images => icons}/24/gimp-sample-point.png | Bin 842 -> 842 bytes
.../Default/images => icons}/24/gimp-template.png | Bin 925 -> 925 bytes
.../Default/images => icons}/24/gimp-template.xcf | Bin 3752 -> 3752 bytes
.../images => icons}/24/gimp-text-dir-ltr.png | Bin 478 -> 478 bytes
.../images => icons}/24/gimp-text-dir-ltr.xcf | Bin 1560 -> 1560 bytes
.../images => icons}/24/gimp-text-dir-rtl.png | Bin 529 -> 529 bytes
.../images => icons}/24/gimp-text-dir-rtl.xcf | Bin 1814 -> 1814 bytes
.../images => icons}/24/gimp-text-layer.png | Bin 878 -> 878 bytes
.../images => icons}/24/gimp-text-layer.svg | 0
.../images => icons}/24/gimp-toilet-paper.png | Bin 1136 -> 1136 bytes
.../images => icons}/24/gimp-toilet-paper.xcf | Bin 2693 -> 2693 bytes
.../images => icons}/24/gimp-tool-options.png | Bin 769 -> 769 bytes
.../images => icons}/24/gimp-tool-options.xcf | Bin 2684 -> 2684 bytes
{themes/Default/images => icons}/24/gimp-tools.png | Bin 961 -> 961 bytes
.../images => icons}/24/gimp-transparency.png | Bin 114 -> 114 bytes
.../images => icons}/24/gimp-undo-history.png | Bin 1327 -> 1327 bytes
.../images => icons}/24/gimp-undo-history.svg | 0
.../images => icons}/24/gimp-user-manual.png | Bin 1458 -> 1458 bytes
.../Default/images => icons}/24/gimp-vcenter.png | Bin 678 -> 678 bytes
.../images => icons}/24/gimp-vchain-broken.png | Bin 422 -> 422 bytes
.../Default/images => icons}/24/gimp-vchain.png | Bin 379 -> 379 bytes
{themes/Default/images => icons}/24/gimp-vfill.png | Bin 7037 -> 7037 bytes
{themes/Default/images => icons}/24/gimp-video.png | Bin 1241 -> 1241 bytes
.../Default/images => icons}/24/gimp-warning.png | Bin 934 -> 934 bytes
{themes/Default/images => icons}/24/gimp-web.png | Bin 1385 -> 1385 bytes
.../images => icons}/32/gimp-channel-alpha.png | Bin 1420 -> 1420 bytes
.../images => icons}/32/gimp-channel-alpha.svg | 0
.../images => icons}/32/gimp-channel-blue.png | Bin 1147 -> 1147 bytes
.../images => icons}/32/gimp-channel-gray.png | Bin 1135 -> 1135 bytes
.../images => icons}/32/gimp-channel-green.png | Bin 1147 -> 1147 bytes
.../images => icons}/32/gimp-channel-indexed.png | Bin 1249 -> 1249 bytes
.../images => icons}/32/gimp-channel-indexed.svg | 0
.../images => icons}/32/gimp-channel-red.png | Bin 1145 -> 1145 bytes
.../Default/images => icons}/32/gimp-channel.png | Bin 1289 -> 1289 bytes
.../32/gimp-floating-selection.png | Bin 1331 -> 1331 bytes
{themes/Default/images => icons}/32/gimp-image.png | Bin 1272 -> 1272 bytes
.../images => icons}/32/gimp-layer-mask.png | Bin 1666 -> 1666 bytes
.../images => icons}/32/gimp-layer-mask.svg | 0
{themes/Default/images => icons}/32/gimp-layer.png | Bin 1335 -> 1335 bytes
{themes/Default/images => icons}/32/gimp-layer.svg | 0
.../images => icons}/32/gimp-text-layer.png | Bin 1158 -> 1158 bytes
.../images => icons}/32/gimp-text-layer.svg | 0
.../images => icons}/32/gimp-user-manual.png | Bin 2146 -> 2146 bytes
.../images => icons}/48/gimp-channel-alpha.png | Bin 2039 -> 2039 bytes
.../images => icons}/48/gimp-channel-blue.png | Bin 1778 -> 1778 bytes
.../images => icons}/48/gimp-channel-gray.png | Bin 1739 -> 1739 bytes
.../images => icons}/48/gimp-channel-green.png | Bin 1788 -> 1788 bytes
.../images => icons}/48/gimp-channel-indexed.png | Bin 1663 -> 1663 bytes
.../images => icons}/48/gimp-channel-red.png | Bin 1743 -> 1743 bytes
.../Default/images => icons}/48/gimp-channel.png | Bin 2055 -> 2055 bytes
.../48/gimp-floating-selection.png | Bin 2032 -> 2032 bytes
{themes/Default/images => icons}/48/gimp-image.png | Bin 2055 -> 2055 bytes
.../images => icons}/48/gimp-layer-mask.png | Bin 2130 -> 2130 bytes
{themes/Default/images => icons}/48/gimp-layer.png | Bin 1651 -> 1651 bytes
.../images => icons}/48/gimp-text-layer.png | Bin 1714 -> 1714 bytes
{themes/Default/images => icons}/64/gimp-error.png | Bin 4819 -> 4819 bytes
{themes/Default/images => icons}/64/gimp-frame.png | Bin 398 -> 398 bytes
{themes/Default/images => icons}/64/gimp-info.png | Bin 5727 -> 5727 bytes
.../Default/images => icons}/64/gimp-question.png | Bin 5178 -> 5178 bytes
.../Default/images => icons}/64/gimp-texture.png | Bin 198 -> 198 bytes
.../images => icons}/64/gimp-user-manual.png | Bin 5206 -> 5206 bytes
.../Default/images => icons}/64/gimp-warning.png | Bin 4660 -> 4660 bytes
.../images => icons}/64/gimp-wilber-eek.png | Bin 4203 -> 4203 bytes
.../Default/images => icons}/64/gimp-wilber.png | Bin 4473 -> 4473 bytes
icons/Makefile.am | 412 +++++++++++++++++++
.../images => icons}/gimp-dialog-icons.xcf.gz | Bin 15795 -> 15795 bytes
{themes/Default/images => icons}/index.theme | 0
.../scalable/gimp-tool-measure.svg | 0
.../scalable}/stock-channel-alpha.svg | 0
.../scalable}/stock-channel-indexed.svg | 0
.../images => icons/scalable}/stock-dynamics.svg | 0
.../images => icons/scalable}/stock-gegl.svg | 0
.../images => icons/scalable}/stock-layer-mask.svg | 0
.../images => icons/scalable}/stock-layer.svg | 0
.../images => icons/scalable}/stock-text-layer.svg | 0
.../scalable}/stock-user-manual.svg | 0
.../images => icons/scalable}/stock-wilber.svg | 0
libgimpwidgets/gimpstock.c | 5 +-
themes/Default/gtkrc | 8 +-
themes/Default/images/.gitignore | 5 -
themes/Default/images/Makefile.am | 413 --------------------
themes/Default/images/tools/.gitignore | 2 -
themes/Small/gtkrc | 8 +-
467 files changed, 430 insertions(+), 432 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 37aae62..6258b57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
SUBDIRS = \
m4macros \
cursors \
+ icons \
themes \
po \
po-libgimp \
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
index 004d638..46c92cc 100644
--- a/app/core/gimpviewable.c
+++ b/app/core/gimpviewable.c
@@ -38,7 +38,7 @@
#include "gimptempbuf.h"
#include "gimpviewable.h"
-#include "themes/Default/images/gimp-core-pixbufs.h"
+#include "icons/gimp-core-pixbufs.h"
enum
diff --git a/configure.ac b/configure.ac
index 62e030f..1fce724 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2274,6 +2274,7 @@ devel-docs/tools/Makefile
docs/Makefile
menus/Makefile
cursors/Makefile
+icons/Makefile
themes/Makefile
themes/Default/Makefile
themes/Default/images/Makefile
diff --git a/icons/.gitignore b/icons/.gitignore
new file mode 100644
index 0000000..fbf83a5
--- /dev/null
+++ b/icons/.gitignore
@@ -0,0 +1,5 @@
+/Makefile
+/Makefile.in
+/stock-icons.list
+/gimp-core-pixbufs.h
+/gimp-stock-pixbufs.h
diff --git a/themes/Default/images/16/gimp-channel-alpha.svg b/icons/16/gimp-channel-alpha.svg
similarity index 100%
rename from themes/Default/images/16/gimp-channel-alpha.svg
rename to icons/16/gimp-channel-alpha.svg
diff --git a/themes/Default/images/16/gimp-channel-indexed.svg b/icons/16/gimp-channel-indexed.svg
similarity index 100%
rename from themes/Default/images/16/gimp-channel-indexed.svg
rename to icons/16/gimp-channel-indexed.svg
diff --git a/themes/Default/images/16/gimp-colormap.svg b/icons/16/gimp-colormap.svg
similarity index 100%
rename from themes/Default/images/16/gimp-colormap.svg
rename to icons/16/gimp-colormap.svg
diff --git a/themes/Default/images/16/gimp-display-filter-colorblind.svg
b/icons/16/gimp-display-filter-colorblind.svg
similarity index 100%
rename from themes/Default/images/16/gimp-display-filter-colorblind.svg
rename to icons/16/gimp-display-filter-colorblind.svg
diff --git a/themes/Default/images/16/gimp-display-filter-contrast.svg
b/icons/16/gimp-display-filter-contrast.svg
similarity index 100%
rename from themes/Default/images/16/gimp-display-filter-contrast.svg
rename to icons/16/gimp-display-filter-contrast.svg
diff --git a/themes/Default/images/16/gimp-display-filter-gamma.svg b/icons/16/gimp-display-filter-gamma.svg
similarity index 100%
rename from themes/Default/images/16/gimp-display-filter-gamma.svg
rename to icons/16/gimp-display-filter-gamma.svg
diff --git a/themes/Default/images/16/gimp-display-filter-lcms.svg b/icons/16/gimp-display-filter-lcms.svg
similarity index 100%
rename from themes/Default/images/16/gimp-display-filter-lcms.svg
rename to icons/16/gimp-display-filter-lcms.svg
diff --git a/themes/Default/images/16/gimp-gegl.svg b/icons/16/gimp-gegl.svg
similarity index 100%
rename from themes/Default/images/16/gimp-gegl.svg
rename to icons/16/gimp-gegl.svg
diff --git a/themes/Default/images/16/gimp-layer-mask.svg b/icons/16/gimp-layer-mask.svg
similarity index 100%
rename from themes/Default/images/16/gimp-layer-mask.svg
rename to icons/16/gimp-layer-mask.svg
diff --git a/themes/Default/images/16/gimp-layer.svg b/icons/16/gimp-layer.svg
similarity index 100%
rename from themes/Default/images/16/gimp-layer.svg
rename to icons/16/gimp-layer.svg
diff --git a/themes/Default/images/16/gimp-layers.svg b/icons/16/gimp-layers.svg
similarity index 100%
rename from themes/Default/images/16/gimp-layers.svg
rename to icons/16/gimp-layers.svg
diff --git a/themes/Default/images/16/gimp-text-layer.svg b/icons/16/gimp-text-layer.svg
similarity index 100%
rename from themes/Default/images/16/gimp-text-layer.svg
rename to icons/16/gimp-text-layer.svg
diff --git a/themes/Default/images/16/gimp-tool-cage.svg b/icons/16/gimp-tool-cage.svg
similarity index 100%
rename from themes/Default/images/16/gimp-tool-cage.svg
rename to icons/16/gimp-tool-cage.svg
diff --git a/themes/Default/images/16/gimp-tool-measure.svg b/icons/16/gimp-tool-measure.svg
similarity index 100%
rename from themes/Default/images/16/gimp-tool-measure.svg
rename to icons/16/gimp-tool-measure.svg
diff --git a/themes/Default/images/16/gimp-tool-preset.svg b/icons/16/gimp-tool-preset.svg
similarity index 100%
rename from themes/Default/images/16/gimp-tool-preset.svg
rename to icons/16/gimp-tool-preset.svg
diff --git a/themes/Default/images/16/gimp-web.svg b/icons/16/gimp-web.svg
similarity index 100%
rename from themes/Default/images/16/gimp-web.svg
rename to icons/16/gimp-web.svg
diff --git a/themes/Default/images/22/gimp-gegl.svg b/icons/22/gimp-gegl.svg
similarity index 100%
rename from themes/Default/images/22/gimp-gegl.svg
rename to icons/22/gimp-gegl.svg
diff --git a/themes/Default/images/22/gimp-tool-bucket-fill.svg b/icons/22/gimp-tool-bucket-fill.svg
similarity index 100%
rename from themes/Default/images/22/gimp-tool-bucket-fill.svg
rename to icons/22/gimp-tool-bucket-fill.svg
diff --git a/themes/Default/images/22/gimp-tool-cage.svg b/icons/22/gimp-tool-cage.svg
similarity index 100%
rename from themes/Default/images/22/gimp-tool-cage.svg
rename to icons/22/gimp-tool-cage.svg
diff --git a/themes/Default/images/22/gimp-tool-measure.svg b/icons/22/gimp-tool-measure.svg
similarity index 100%
rename from themes/Default/images/22/gimp-tool-measure.svg
rename to icons/22/gimp-tool-measure.svg
diff --git a/themes/Default/images/22/gimp-tool-preset.svg b/icons/22/gimp-tool-preset.svg
similarity index 100%
rename from themes/Default/images/22/gimp-tool-preset.svg
rename to icons/22/gimp-tool-preset.svg
diff --git a/themes/Default/images/24/gimp-channel-alpha.svg b/icons/24/gimp-channel-alpha.svg
similarity index 100%
rename from themes/Default/images/24/gimp-channel-alpha.svg
rename to icons/24/gimp-channel-alpha.svg
diff --git a/themes/Default/images/24/gimp-channel-indexed.svg b/icons/24/gimp-channel-indexed.svg
similarity index 100%
rename from themes/Default/images/24/gimp-channel-indexed.svg
rename to icons/24/gimp-channel-indexed.svg
diff --git a/themes/Default/images/24/gimp-colormap.svg b/icons/24/gimp-colormap.svg
similarity index 100%
rename from themes/Default/images/24/gimp-colormap.svg
rename to icons/24/gimp-colormap.svg
diff --git a/themes/Default/images/24/gimp-display-filter-colorblind.svg
b/icons/24/gimp-display-filter-colorblind.svg
similarity index 100%
rename from themes/Default/images/24/gimp-display-filter-colorblind.svg
rename to icons/24/gimp-display-filter-colorblind.svg
diff --git a/themes/Default/images/24/gimp-display-filter-contrast.svg
b/icons/24/gimp-display-filter-contrast.svg
similarity index 100%
rename from themes/Default/images/24/gimp-display-filter-contrast.svg
rename to icons/24/gimp-display-filter-contrast.svg
diff --git a/themes/Default/images/24/gimp-display-filter-gamma.svg b/icons/24/gimp-display-filter-gamma.svg
similarity index 100%
rename from themes/Default/images/24/gimp-display-filter-gamma.svg
rename to icons/24/gimp-display-filter-gamma.svg
diff --git a/themes/Default/images/24/gimp-display-filter-lcms.svg b/icons/24/gimp-display-filter-lcms.svg
similarity index 100%
rename from themes/Default/images/24/gimp-display-filter-lcms.svg
rename to icons/24/gimp-display-filter-lcms.svg
diff --git a/themes/Default/images/24/gimp-layer-mask.svg b/icons/24/gimp-layer-mask.svg
similarity index 100%
rename from themes/Default/images/24/gimp-layer-mask.svg
rename to icons/24/gimp-layer-mask.svg
diff --git a/themes/Default/images/24/gimp-layer.svg b/icons/24/gimp-layer.svg
similarity index 100%
rename from themes/Default/images/24/gimp-layer.svg
rename to icons/24/gimp-layer.svg
diff --git a/themes/Default/images/24/gimp-layers.svg b/icons/24/gimp-layers.svg
similarity index 100%
rename from themes/Default/images/24/gimp-layers.svg
rename to icons/24/gimp-layers.svg
diff --git a/themes/Default/images/24/gimp-text-layer.svg b/icons/24/gimp-text-layer.svg
similarity index 100%
rename from themes/Default/images/24/gimp-text-layer.svg
rename to icons/24/gimp-text-layer.svg
diff --git a/themes/Default/images/24/gimp-undo-history.svg b/icons/24/gimp-undo-history.svg
similarity index 100%
rename from themes/Default/images/24/gimp-undo-history.svg
rename to icons/24/gimp-undo-history.svg
diff --git a/themes/Default/images/32/gimp-channel-alpha.svg b/icons/32/gimp-channel-alpha.svg
similarity index 100%
rename from themes/Default/images/32/gimp-channel-alpha.svg
rename to icons/32/gimp-channel-alpha.svg
diff --git a/themes/Default/images/32/gimp-channel-indexed.svg b/icons/32/gimp-channel-indexed.svg
similarity index 100%
rename from themes/Default/images/32/gimp-channel-indexed.svg
rename to icons/32/gimp-channel-indexed.svg
diff --git a/themes/Default/images/32/gimp-layer-mask.svg b/icons/32/gimp-layer-mask.svg
similarity index 100%
rename from themes/Default/images/32/gimp-layer-mask.svg
rename to icons/32/gimp-layer-mask.svg
diff --git a/themes/Default/images/32/gimp-layer.svg b/icons/32/gimp-layer.svg
similarity index 100%
rename from themes/Default/images/32/gimp-layer.svg
rename to icons/32/gimp-layer.svg
diff --git a/themes/Default/images/32/gimp-text-layer.svg b/icons/32/gimp-text-layer.svg
similarity index 100%
rename from themes/Default/images/32/gimp-text-layer.svg
rename to icons/32/gimp-text-layer.svg
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 0000000..e6fe65b
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1,412 @@
+## Process this file with automake to produce Makefile.in
+
+iconsdir = $(gimpdatadir)/icons/hicolor
+icons12dir = $(gimpdatadir)/icons/hicolor/12x12/apps
+icons16dir = $(gimpdatadir)/icons/hicolor/16x16/apps
+icons18dir = $(gimpdatadir)/icons/hicolor/18x18/apps
+icons20dir = $(gimpdatadir)/icons/hicolor/20x20/apps
+icons22dir = $(gimpdatadir)/icons/hicolor/22x22/apps
+icons24dir = $(gimpdatadir)/icons/hicolor/24x24/apps
+icons32dir = $(gimpdatadir)/icons/hicolor/32x32/apps
+icons48dir = $(gimpdatadir)/icons/hicolor/48x48/apps
+icons64dir = $(gimpdatadir)/icons/hicolor/64x64/apps
+
+
+## A warning Wilber that is used from the core
+
+CORE_IMAGES = \
+ 64/gimp-question.png
+
+CORE_VARIABLES = \
+ gimp_question_64 $(srcdir)/64/gimp-question.png
+
+
+## Compiled in stock icons
+
+icons_DATA = \
+ index.theme
+
+icons12_DATA = \
+ 12/gimp-close.png \
+ 12/gimp-default-colors.png \
+ 12/gimp-eye.png \
+ 12/gimp-linked.png \
+ 12/gimp-menu-left.png \
+ 12/gimp-menu-right.png \
+ 12/gimp-quick-mask-off.png \
+ 12/gimp-quick-mask-on.png \
+ 12/gimp-swap-colors.png \
+ 12/gimp-zoom-follow-window.png
+
+icons16_DATA = \
+ 16/gimp-anchor.png \
+ 16/gimp-cap-butt.png \
+ 16/gimp-cap-round.png \
+ 16/gimp-cap-square.png \
+ 16/gimp-center.png \
+ 16/gimp-channel-alpha.png \
+ 16/gimp-channel-blue.png \
+ 16/gimp-channel-gray.png \
+ 16/gimp-channel-green.png \
+ 16/gimp-channel-indexed.png \
+ 16/gimp-channel-red.png \
+ 16/gimp-channel.png \
+ 16/gimp-channels.png \
+ 16/gimp-color-pick-from-screen.png \
+ 16/gimp-color-triangle.png \
+ 16/gimp-colormap.png \
+ 16/gimp-controller-keyboard.png \
+ 16/gimp-controller-linux-input.png \
+ 16/gimp-controller-midi.png \
+ 16/gimp-controller-wheel.png \
+ 16/gimp-controller.png \
+ 16/gimp-convert-grayscale.png \
+ 16/gimp-convert-indexed.png \
+ 16/gimp-convert-rgb.png \
+ 16/gimp-cursor.png \
+ 16/gimp-curve-free.png \
+ 16/gimp-curve-smooth.png \
+ 16/gimp-device-status.png \
+ 16/gimp-display-filter-colorblind.png \
+ 16/gimp-display-filter-contrast.png \
+ 16/gimp-display-filter-gamma.png \
+ 16/gimp-display-filter-lcms.png \
+ 16/gimp-display-filter-proof.png \
+ 16/gimp-display-filter.png \
+ 16/gimp-duplicate.png \
+ 16/gimp-dynamics.png \
+ 16/gimp-edit.png \
+ 16/gimp-flip-horizontal.png \
+ 16/gimp-flip-vertical.png \
+ 16/gimp-floating-selection.png \
+ 16/gimp-gegl.png \
+ 16/gimp-gradient-bilinear.png \
+ 16/gimp-gradient-conical-asymmetric.png \
+ 16/gimp-gradient-conical-symmetric.png \
+ 16/gimp-gradient-linear.png \
+ 16/gimp-gradient-radial.png \
+ 16/gimp-gradient-shapeburst-angular.png \
+ 16/gimp-gradient-shapeburst-dimpled.png \
+ 16/gimp-gradient-shapeburst-spherical.png \
+ 16/gimp-gradient-spiral-anticlockwise.png \
+ 16/gimp-gradient-spiral-clockwise.png \
+ 16/gimp-gradient-square.png \
+ 16/gimp-grid.png \
+ 16/gimp-histogram-linear.png \
+ 16/gimp-histogram-logarithmic.png \
+ 16/gimp-histogram.png \
+ 16/gimp-image.png \
+ 16/gimp-images.png \
+ 16/gimp-info.png \
+ 16/gimp-input-device.png \
+ 16/gimp-invert.png \
+ 16/gimp-join-bevel.png \
+ 16/gimp-join-miter.png \
+ 16/gimp-join-round.png \
+ 16/gimp-landscape.png \
+ 16/gimp-layer-mask.png \
+ 16/gimp-layer-to-imagesize.png \
+ 16/gimp-layer.png \
+ 16/gimp-layers.png \
+ 16/gimp-list.png \
+ 16/gimp-merge-down.png \
+ 16/gimp-move-to-screen.png \
+ 16/gimp-navigation.png \
+ 16/gimp-paste-as-new.png \
+ 16/gimp-paste-into.png \
+ 16/gimp-path-stroke.png \
+ 16/gimp-path.png \
+ 16/gimp-paths.png \
+ 16/gimp-plugin.png \
+ 16/gimp-portrait.png \
+ 16/gimp-print-resolution.png \
+ 16/gimp-reset.png \
+ 16/gimp-reshow-filter.png \
+ 16/gimp-resize.png \
+ 16/gimp-rotate-180.png \
+ 16/gimp-rotate-270.png \
+ 16/gimp-rotate-90.png \
+ 16/gimp-sample-point.png \
+ 16/gimp-scale.png \
+ 16/gimp-selection-add.png \
+ 16/gimp-selection-all.png \
+ 16/gimp-selection-border.png \
+ 16/gimp-selection-grow.png \
+ 16/gimp-selection-intersect.png \
+ 16/gimp-selection-none.png \
+ 16/gimp-selection-replace.png \
+ 16/gimp-selection-shrink.png \
+ 16/gimp-selection-stroke.png \
+ 16/gimp-selection-subtract.png \
+ 16/gimp-selection-to-channel.png \
+ 16/gimp-selection-to-path.png \
+ 16/gimp-selection.png \
+ 16/gimp-shape-circle.png \
+ 16/gimp-shape-diamond.png \
+ 16/gimp-shape-square.png \
+ 16/gimp-template.png \
+ 16/gimp-text-layer.png \
+ 16/gimp-toilet-paper.png \
+ 16/gimp-tool-airbrush.png \
+ 16/gimp-tool-align.png \
+ 16/gimp-tool-blend.png \
+ 16/gimp-tool-blur.png \
+ 16/gimp-tool-brightness-contrast.png \
+ 16/gimp-tool-bucket-fill.png \
+ 16/gimp-tool-by-color-select.png \
+ 16/gimp-tool-cage.png \
+ 16/gimp-tool-clone.png \
+ 16/gimp-tool-color-balance.png \
+ 16/gimp-tool-color-picker.png \
+ 16/gimp-tool-colorize.png \
+ 16/gimp-tool-crop.png \
+ 16/gimp-tool-curves.png \
+ 16/gimp-tool-desaturate.png \
+ 16/gimp-tool-dodge.png \
+ 16/gimp-tool-ellipse-select.png \
+ 16/gimp-tool-eraser.png \
+ 16/gimp-tool-flip.png \
+ 16/gimp-tool-foreground-select.png \
+ 16/gimp-tool-free-select.png \
+ 16/gimp-tool-fuzzy-select.png \
+ 16/gimp-tool-heal.png \
+ 16/gimp-tool-hue-saturation.png \
+ 16/gimp-tool-ink.png \
+ 16/gimp-tool-iscissors.png \
+ 16/gimp-tool-levels.png \
+ 16/gimp-tool-measure.png \
+ 16/gimp-tool-move.png \
+ 16/gimp-tool-options.png \
+ 16/gimp-tool-paintbrush.png \
+ 16/gimp-tool-path.png \
+ 16/gimp-tool-pencil.png \
+ 16/gimp-tool-perspective-clone.png \
+ 16/gimp-tool-perspective.png \
+ 16/gimp-tool-posterize.png \
+ 16/gimp-tool-preset.png \
+ 16/gimp-tool-rect-select.png \
+ 16/gimp-tool-rotate.png \
+ 16/gimp-tool-scale.png \
+ 16/gimp-tool-shear.png \
+ 16/gimp-tool-smudge.png \
+ 16/gimp-tool-text.png \
+ 16/gimp-tool-threshold.png \
+ 16/gimp-tool-unified-transform.png \
+ 16/gimp-tool-warp.png \
+ 16/gimp-tool-zoom.png \
+ 16/gimp-tools.png \
+ 16/gimp-transparency.png \
+ 16/gimp-undo-history.png \
+ 16/gimp-user-manual.png \
+ 16/gimp-video.png \
+ 16/gimp-warning.png \
+ 16/gimp-web.png \
+ 16/gimp-wilber.png
+
+icons18_DATA = \
+ 18/gimp-color-picker-black.png \
+ 18/gimp-color-picker-gray.png \
+ 18/gimp-color-picker-white.png
+
+icons20_DATA = \
+ 20/gimp-eye.png \
+ 20/gimp-linked.png
+
+icons22_DATA = \
+ 22/gimp-char-picker.png \
+ 22/gimp-dynamics.png \
+ 22/gimp-gegl.png \
+ 22/gimp-histogram.png \
+ 22/gimp-input-device.png \
+ 22/gimp-letter-spacing.png \
+ 22/gimp-line-spacing.png \
+ 22/gimp-path.png \
+ 22/gimp-paths.png \
+ 22/gimp-tool-airbrush.png \
+ 22/gimp-tool-align.png \
+ 22/gimp-tool-blend.png \
+ 22/gimp-tool-blur.png \
+ 22/gimp-tool-brightness-contrast.png \
+ 22/gimp-tool-bucket-fill.png \
+ 22/gimp-tool-by-color-select.png \
+ 22/gimp-tool-cage.png \
+ 22/gimp-tool-clone.png \
+ 22/gimp-tool-color-balance.png \
+ 22/gimp-tool-color-picker.png \
+ 22/gimp-tool-colorize.png \
+ 22/gimp-tool-crop.png \
+ 22/gimp-tool-curves.png \
+ 22/gimp-tool-desaturate.png \
+ 22/gimp-tool-dodge.png \
+ 22/gimp-tool-ellipse-select.png \
+ 22/gimp-tool-eraser.png \
+ 22/gimp-tool-flip.png \
+ 22/gimp-tool-foreground-select.png \
+ 22/gimp-tool-free-select.png \
+ 22/gimp-tool-fuzzy-select.png \
+ 22/gimp-tool-heal.png \
+ 22/gimp-tool-hue-saturation.png \
+ 22/gimp-tool-ink.png \
+ 22/gimp-tool-iscissors.png \
+ 22/gimp-tool-levels.png \
+ 22/gimp-tool-measure.png \
+ 22/gimp-tool-move.png \
+ 22/gimp-tool-paintbrush.png \
+ 22/gimp-tool-path.png \
+ 22/gimp-tool-pencil.png \
+ 22/gimp-tool-perspective-clone.png \
+ 22/gimp-tool-perspective.png \
+ 22/gimp-tool-posterize.png \
+ 22/gimp-tool-preset.png \
+ 22/gimp-tool-rect-select.png \
+ 22/gimp-tool-rotate.png \
+ 22/gimp-tool-scale.png \
+ 22/gimp-tool-shear.png \
+ 22/gimp-tool-smudge.png \
+ 22/gimp-tool-text.png \
+ 22/gimp-tool-threshold.png \
+ 22/gimp-tool-unified-transform.png \
+ 22/gimp-tool-warp.png \
+ 22/gimp-tool-zoom.png \
+ 22/gimp-wilber.png
+
+icons24_DATA = \
+ 24/gimp-center.png \
+ 24/gimp-channel-alpha.png \
+ 24/gimp-channel-blue.png \
+ 24/gimp-channel-gray.png \
+ 24/gimp-channel-green.png \
+ 24/gimp-channel-indexed.png \
+ 24/gimp-channel-red.png \
+ 24/gimp-channel.png \
+ 24/gimp-channels.png \
+ 24/gimp-colormap.png \
+ 24/gimp-controller-keyboard.png \
+ 24/gimp-controller-linux-input.png \
+ 24/gimp-controller-midi.png \
+ 24/gimp-controller-wheel.png \
+ 24/gimp-controller.png \
+ 24/gimp-cursor.png \
+ 24/gimp-device-status.png \
+ 24/gimp-display-filter-colorblind.png \
+ 24/gimp-display-filter-contrast.png \
+ 24/gimp-display-filter-gamma.png \
+ 24/gimp-display-filter-lcms.png \
+ 24/gimp-display-filter-proof.png \
+ 24/gimp-display-filter.png \
+ 24/gimp-floating-selection.png \
+ 24/gimp-gravity-east.png \
+ 24/gimp-gravity-north-east.png \
+ 24/gimp-gravity-north-west.png \
+ 24/gimp-gravity-north.png \
+ 24/gimp-gravity-south-east.png \
+ 24/gimp-gravity-south-west.png \
+ 24/gimp-gravity-south.png \
+ 24/gimp-gravity-west.png \
+ 24/gimp-hcenter.png \
+ 24/gimp-hchain-broken.png \
+ 24/gimp-hchain.png \
+ 24/gimp-hfill.png \
+ 24/gimp-image.png \
+ 24/gimp-images.png \
+ 24/gimp-info.png \
+ 24/gimp-layer-mask.png \
+ 24/gimp-layer.png \
+ 24/gimp-layers.png \
+ 24/gimp-move-to-screen.png \
+ 24/gimp-print-resolution.png \
+ 24/gimp-sample-point.png \
+ 24/gimp-template.png \
+ 24/gimp-text-dir-ltr.png \
+ 24/gimp-text-dir-rtl.png \
+ 24/gimp-text-layer.png \
+ 24/gimp-toilet-paper.png \
+ 24/gimp-tool-options.png \
+ 24/gimp-tools.png \
+ 24/gimp-transparency.png \
+ 24/gimp-undo-history.png \
+ 24/gimp-user-manual.png \
+ 24/gimp-vcenter.png \
+ 24/gimp-vchain-broken.png \
+ 24/gimp-vchain.png \
+ 24/gimp-vfill.png \
+ 24/gimp-video.png \
+ 24/gimp-warning.png \
+ 24/gimp-web.png
+
+icons32_DATA = \
+ 32/gimp-channel-alpha.png \
+ 32/gimp-channel-blue.png \
+ 32/gimp-channel-gray.png \
+ 32/gimp-channel-green.png \
+ 32/gimp-channel-indexed.png \
+ 32/gimp-channel-red.png \
+ 32/gimp-channel.png \
+ 32/gimp-floating-selection.png \
+ 32/gimp-image.png \
+ 32/gimp-layer-mask.png \
+ 32/gimp-layer.png \
+ 32/gimp-text-layer.png \
+ 32/gimp-user-manual.png
+
+icons48_DATA = \
+ 48/gimp-channel-alpha.png \
+ 48/gimp-channel-blue.png \
+ 48/gimp-channel-gray.png \
+ 48/gimp-channel-green.png \
+ 48/gimp-channel-indexed.png \
+ 48/gimp-channel-red.png \
+ 48/gimp-channel.png \
+ 48/gimp-floating-selection.png \
+ 48/gimp-image.png \
+ 48/gimp-layer-mask.png \
+ 48/gimp-layer.png \
+ 48/gimp-text-layer.png
+
+icons64_DATA = \
+ 64/gimp-error.png \
+ 64/gimp-frame.png \
+ 64/gimp-info.png \
+ 64/gimp-question.png \
+ 64/gimp-texture.png \
+ 64/gimp-user-manual.png \
+ 64/gimp-warning.png \
+ 64/gimp-wilber-eek.png \
+ 64/gimp-wilber.png
+
+ICON_IMAGES = \
+ $(icons12_DATA) \
+ $(icons16_DATA) \
+ $(icons18_DATA) \
+ $(icons20_DATA) \
+ $(icons22_DATA) \
+ $(icons24_DATA) \
+ $(icons32_DATA) \
+ $(icons48_DATA) \
+ $(icons64_DATA)
+
+EXTRA_DIST = \
+ $(icons_DATA) \
+ $(ICON_IMAGES) \
+ gimp-dialog-icons.xcf.gz
+
+noinst_DATA = \
+ gimp-core-pixbufs.h \
+ gimp-stock-pixbufs.h
+
+CLEANFILES = $(noinst_DATA) stock-icons.list
+
+
+stock-icons.list: $(ICON_IMAGES) Makefile.am
+ $(AM_V_GEN) ( rm -f $@; \
+ for image in $(ICON_IMAGES); do \
+ echo $$image | \
+ sed -e 's|\(.*\)/\(.*\).png|\2-\1.png|' -e 's|-|_|g' -e 's|\.png$$||' >> $@; \
+ echo " $(srcdir)/$$image" >> $@; \
+ done )
+
+gimp-core-pixbufs.h: $(CORE_IMAGES) Makefile.am
+ $(AM_V_GEN) $(GDK_PIXBUF_CSOURCE) --raw --build-list $(CORE_VARIABLES) > $(@F)
+
+gimp-stock-pixbufs.h: stock-icons.list
+ $(AM_V_GEN) $(GDK_PIXBUF_CSOURCE) --raw --build-list `cat $<` > $(@F)
diff --git a/themes/Default/images/index.theme b/icons/index.theme
similarity index 100%
rename from themes/Default/images/index.theme
rename to icons/index.theme
diff --git a/themes/Default/images/tools/stock-tool-measure.svg b/icons/scalable/gimp-tool-measure.svg
similarity index 100%
rename from themes/Default/images/tools/stock-tool-measure.svg
rename to icons/scalable/gimp-tool-measure.svg
diff --git a/themes/Default/images/stock-channel-alpha.svg b/icons/scalable/stock-channel-alpha.svg
similarity index 100%
rename from themes/Default/images/stock-channel-alpha.svg
rename to icons/scalable/stock-channel-alpha.svg
diff --git a/themes/Default/images/stock-channel-indexed.svg b/icons/scalable/stock-channel-indexed.svg
similarity index 100%
rename from themes/Default/images/stock-channel-indexed.svg
rename to icons/scalable/stock-channel-indexed.svg
diff --git a/themes/Default/images/stock-dynamics.svg b/icons/scalable/stock-dynamics.svg
similarity index 100%
rename from themes/Default/images/stock-dynamics.svg
rename to icons/scalable/stock-dynamics.svg
diff --git a/themes/Default/images/stock-gegl.svg b/icons/scalable/stock-gegl.svg
similarity index 100%
rename from themes/Default/images/stock-gegl.svg
rename to icons/scalable/stock-gegl.svg
diff --git a/themes/Default/images/stock-layer-mask.svg b/icons/scalable/stock-layer-mask.svg
similarity index 100%
rename from themes/Default/images/stock-layer-mask.svg
rename to icons/scalable/stock-layer-mask.svg
diff --git a/themes/Default/images/stock-layer.svg b/icons/scalable/stock-layer.svg
similarity index 100%
rename from themes/Default/images/stock-layer.svg
rename to icons/scalable/stock-layer.svg
diff --git a/themes/Default/images/stock-text-layer.svg b/icons/scalable/stock-text-layer.svg
similarity index 100%
rename from themes/Default/images/stock-text-layer.svg
rename to icons/scalable/stock-text-layer.svg
diff --git a/themes/Default/images/stock-user-manual.svg b/icons/scalable/stock-user-manual.svg
similarity index 100%
rename from themes/Default/images/stock-user-manual.svg
rename to icons/scalable/stock-user-manual.svg
diff --git a/themes/Default/images/stock-wilber.svg b/icons/scalable/stock-wilber.svg
similarity index 100%
rename from themes/Default/images/stock-wilber.svg
rename to icons/scalable/stock-wilber.svg
diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c
index 1247013..1c4a6d0 100644
--- a/libgimpwidgets/gimpstock.c
+++ b/libgimpwidgets/gimpstock.c
@@ -27,7 +27,7 @@
#include "gimpstock.h"
-#include "themes/Default/images/gimp-stock-pixbufs.h"
+#include "icons/gimp-stock-pixbufs.h"
#include "libgimp/libgimp-intl.h"
@@ -840,8 +840,7 @@ gimp_stock_init (void)
gtk_stock_add_static (gimp_stock_items, G_N_ELEMENTS (gimp_stock_items));
- icons_dir = g_build_filename (gimp_data_directory (),
- "themes", "Default", "icons", NULL);
+ icons_dir = g_build_filename (gimp_data_directory (), "icons", NULL);
gtk_icon_theme_prepend_search_path (gtk_icon_theme_get_default (),
icons_dir);
g_free (icons_dir);
diff --git a/themes/Default/gtkrc b/themes/Default/gtkrc
index 5be1c6c..eb8a522 100644
--- a/themes/Default/gtkrc
+++ b/themes/Default/gtkrc
@@ -21,19 +21,19 @@ style "gimp-default-style"
{
stock["gtk-dialog-error"] =
{
- { "icons/hicolor/64x64/apps/gimp-error.png", *, *, "gtk-dialog" }
+ { "../../icons/hicolor/64x64/apps/gimp-error.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-info"] =
{
- { "icons/hicolor/64x64/apps/gimp-info.png", *, *, "gtk-dialog" }
+ { "../../icons/hicolor/64x64/apps/gimp-info.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-question"] =
{
- { "icons/hicolor/64x64/apps/gimp-question.png", *, *, "gtk-dialog" }
+ { "../../icons/hicolor/64x64/apps/gimp-question.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-warning"] =
{
- { "icons/hicolor/64x64/apps/gimp-warning.png", *, *, "gtk-dialog" }
+ { "../../icons/hicolor/64x64/apps/gimp-warning.png", *, *, "gtk-dialog" }
}
GtkPaned::handle-size = 6
diff --git a/themes/Default/images/.gitignore b/themes/Default/images/.gitignore
index d76fe7b..b336cc7 100644
--- a/themes/Default/images/.gitignore
+++ b/themes/Default/images/.gitignore
@@ -1,7 +1,2 @@
/Makefile
/Makefile.in
-/.xvpics
-/.thumbnails
-/stock-icons.list
-/gimp-core-pixbufs.h
-/gimp-stock-pixbufs.h
diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am
index fb953bf..7e3f35d 100644
--- a/themes/Default/images/Makefile.am
+++ b/themes/Default/images/Makefile.am
@@ -1,416 +1,3 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = preferences
-
-themedatadir = $(gimpdatadir)/themes/Default/images
-
-iconsdir = $(gimpdatadir)/themes/Default/icons/hicolor
-icons12dir = $(gimpdatadir)/themes/Default/icons/hicolor/12x12/apps
-icons16dir = $(gimpdatadir)/themes/Default/icons/hicolor/16x16/apps
-icons18dir = $(gimpdatadir)/themes/Default/icons/hicolor/18x18/apps
-icons20dir = $(gimpdatadir)/themes/Default/icons/hicolor/20x20/apps
-icons22dir = $(gimpdatadir)/themes/Default/icons/hicolor/22x22/apps
-icons24dir = $(gimpdatadir)/themes/Default/icons/hicolor/24x24/apps
-icons32dir = $(gimpdatadir)/themes/Default/icons/hicolor/32x32/apps
-icons48dir = $(gimpdatadir)/themes/Default/icons/hicolor/48x48/apps
-icons64dir = $(gimpdatadir)/themes/Default/icons/hicolor/64x64/apps
-
-
-## A warning Wilber that is used from the core
-
-CORE_IMAGES = \
- 64/gimp-question.png
-
-CORE_VARIABLES = \
- gimp_question_64 $(srcdir)/64/gimp-question.png
-
-
-## Compiled in stock icons
-
-icons_DATA = \
- index.theme
-
-icons12_DATA = \
- 12/gimp-close.png \
- 12/gimp-default-colors.png \
- 12/gimp-eye.png \
- 12/gimp-linked.png \
- 12/gimp-menu-left.png \
- 12/gimp-menu-right.png \
- 12/gimp-quick-mask-off.png \
- 12/gimp-quick-mask-on.png \
- 12/gimp-swap-colors.png \
- 12/gimp-zoom-follow-window.png
-
-icons16_DATA = \
- 16/gimp-anchor.png \
- 16/gimp-cap-butt.png \
- 16/gimp-cap-round.png \
- 16/gimp-cap-square.png \
- 16/gimp-center.png \
- 16/gimp-channel-alpha.png \
- 16/gimp-channel-blue.png \
- 16/gimp-channel-gray.png \
- 16/gimp-channel-green.png \
- 16/gimp-channel-indexed.png \
- 16/gimp-channel-red.png \
- 16/gimp-channel.png \
- 16/gimp-channels.png \
- 16/gimp-color-pick-from-screen.png \
- 16/gimp-color-triangle.png \
- 16/gimp-colormap.png \
- 16/gimp-controller-keyboard.png \
- 16/gimp-controller-linux-input.png \
- 16/gimp-controller-midi.png \
- 16/gimp-controller-wheel.png \
- 16/gimp-controller.png \
- 16/gimp-convert-grayscale.png \
- 16/gimp-convert-indexed.png \
- 16/gimp-convert-rgb.png \
- 16/gimp-cursor.png \
- 16/gimp-curve-free.png \
- 16/gimp-curve-smooth.png \
- 16/gimp-device-status.png \
- 16/gimp-display-filter-colorblind.png \
- 16/gimp-display-filter-contrast.png \
- 16/gimp-display-filter-gamma.png \
- 16/gimp-display-filter-lcms.png \
- 16/gimp-display-filter-proof.png \
- 16/gimp-display-filter.png \
- 16/gimp-duplicate.png \
- 16/gimp-dynamics.png \
- 16/gimp-edit.png \
- 16/gimp-flip-horizontal.png \
- 16/gimp-flip-vertical.png \
- 16/gimp-floating-selection.png \
- 16/gimp-gegl.png \
- 16/gimp-gradient-bilinear.png \
- 16/gimp-gradient-conical-asymmetric.png \
- 16/gimp-gradient-conical-symmetric.png \
- 16/gimp-gradient-linear.png \
- 16/gimp-gradient-radial.png \
- 16/gimp-gradient-shapeburst-angular.png \
- 16/gimp-gradient-shapeburst-dimpled.png \
- 16/gimp-gradient-shapeburst-spherical.png \
- 16/gimp-gradient-spiral-anticlockwise.png \
- 16/gimp-gradient-spiral-clockwise.png \
- 16/gimp-gradient-square.png \
- 16/gimp-grid.png \
- 16/gimp-histogram-linear.png \
- 16/gimp-histogram-logarithmic.png \
- 16/gimp-histogram.png \
- 16/gimp-image.png \
- 16/gimp-images.png \
- 16/gimp-info.png \
- 16/gimp-input-device.png \
- 16/gimp-invert.png \
- 16/gimp-join-bevel.png \
- 16/gimp-join-miter.png \
- 16/gimp-join-round.png \
- 16/gimp-landscape.png \
- 16/gimp-layer-mask.png \
- 16/gimp-layer-to-imagesize.png \
- 16/gimp-layer.png \
- 16/gimp-layers.png \
- 16/gimp-list.png \
- 16/gimp-merge-down.png \
- 16/gimp-move-to-screen.png \
- 16/gimp-navigation.png \
- 16/gimp-paste-as-new.png \
- 16/gimp-paste-into.png \
- 16/gimp-path-stroke.png \
- 16/gimp-path.png \
- 16/gimp-paths.png \
- 16/gimp-plugin.png \
- 16/gimp-portrait.png \
- 16/gimp-print-resolution.png \
- 16/gimp-reset.png \
- 16/gimp-reshow-filter.png \
- 16/gimp-resize.png \
- 16/gimp-rotate-180.png \
- 16/gimp-rotate-270.png \
- 16/gimp-rotate-90.png \
- 16/gimp-sample-point.png \
- 16/gimp-scale.png \
- 16/gimp-selection-add.png \
- 16/gimp-selection-all.png \
- 16/gimp-selection-border.png \
- 16/gimp-selection-grow.png \
- 16/gimp-selection-intersect.png \
- 16/gimp-selection-none.png \
- 16/gimp-selection-replace.png \
- 16/gimp-selection-shrink.png \
- 16/gimp-selection-stroke.png \
- 16/gimp-selection-subtract.png \
- 16/gimp-selection-to-channel.png \
- 16/gimp-selection-to-path.png \
- 16/gimp-selection.png \
- 16/gimp-shape-circle.png \
- 16/gimp-shape-diamond.png \
- 16/gimp-shape-square.png \
- 16/gimp-template.png \
- 16/gimp-text-layer.png \
- 16/gimp-toilet-paper.png \
- 16/gimp-tool-airbrush.png \
- 16/gimp-tool-align.png \
- 16/gimp-tool-blend.png \
- 16/gimp-tool-blur.png \
- 16/gimp-tool-brightness-contrast.png \
- 16/gimp-tool-bucket-fill.png \
- 16/gimp-tool-by-color-select.png \
- 16/gimp-tool-cage.png \
- 16/gimp-tool-clone.png \
- 16/gimp-tool-color-balance.png \
- 16/gimp-tool-color-picker.png \
- 16/gimp-tool-colorize.png \
- 16/gimp-tool-crop.png \
- 16/gimp-tool-curves.png \
- 16/gimp-tool-desaturate.png \
- 16/gimp-tool-dodge.png \
- 16/gimp-tool-ellipse-select.png \
- 16/gimp-tool-eraser.png \
- 16/gimp-tool-flip.png \
- 16/gimp-tool-foreground-select.png \
- 16/gimp-tool-free-select.png \
- 16/gimp-tool-fuzzy-select.png \
- 16/gimp-tool-heal.png \
- 16/gimp-tool-hue-saturation.png \
- 16/gimp-tool-ink.png \
- 16/gimp-tool-iscissors.png \
- 16/gimp-tool-levels.png \
- 16/gimp-tool-measure.png \
- 16/gimp-tool-move.png \
- 16/gimp-tool-options.png \
- 16/gimp-tool-paintbrush.png \
- 16/gimp-tool-path.png \
- 16/gimp-tool-pencil.png \
- 16/gimp-tool-perspective-clone.png \
- 16/gimp-tool-perspective.png \
- 16/gimp-tool-posterize.png \
- 16/gimp-tool-preset.png \
- 16/gimp-tool-rect-select.png \
- 16/gimp-tool-rotate.png \
- 16/gimp-tool-scale.png \
- 16/gimp-tool-shear.png \
- 16/gimp-tool-smudge.png \
- 16/gimp-tool-text.png \
- 16/gimp-tool-threshold.png \
- 16/gimp-tool-unified-transform.png \
- 16/gimp-tool-warp.png \
- 16/gimp-tool-zoom.png \
- 16/gimp-tools.png \
- 16/gimp-transparency.png \
- 16/gimp-undo-history.png \
- 16/gimp-user-manual.png \
- 16/gimp-video.png \
- 16/gimp-warning.png \
- 16/gimp-web.png \
- 16/gimp-wilber.png
-
-icons18_DATA = \
- 18/gimp-color-picker-black.png \
- 18/gimp-color-picker-gray.png \
- 18/gimp-color-picker-white.png
-
-icons20_DATA = \
- 20/gimp-eye.png \
- 20/gimp-linked.png
-
-icons22_DATA = \
- 22/gimp-char-picker.png \
- 22/gimp-dynamics.png \
- 22/gimp-gegl.png \
- 22/gimp-histogram.png \
- 22/gimp-input-device.png \
- 22/gimp-letter-spacing.png \
- 22/gimp-line-spacing.png \
- 22/gimp-path.png \
- 22/gimp-paths.png \
- 22/gimp-tool-airbrush.png \
- 22/gimp-tool-align.png \
- 22/gimp-tool-blend.png \
- 22/gimp-tool-blur.png \
- 22/gimp-tool-brightness-contrast.png \
- 22/gimp-tool-bucket-fill.png \
- 22/gimp-tool-by-color-select.png \
- 22/gimp-tool-cage.png \
- 22/gimp-tool-clone.png \
- 22/gimp-tool-color-balance.png \
- 22/gimp-tool-color-picker.png \
- 22/gimp-tool-colorize.png \
- 22/gimp-tool-crop.png \
- 22/gimp-tool-curves.png \
- 22/gimp-tool-desaturate.png \
- 22/gimp-tool-dodge.png \
- 22/gimp-tool-ellipse-select.png \
- 22/gimp-tool-eraser.png \
- 22/gimp-tool-flip.png \
- 22/gimp-tool-foreground-select.png \
- 22/gimp-tool-free-select.png \
- 22/gimp-tool-fuzzy-select.png \
- 22/gimp-tool-heal.png \
- 22/gimp-tool-hue-saturation.png \
- 22/gimp-tool-ink.png \
- 22/gimp-tool-iscissors.png \
- 22/gimp-tool-levels.png \
- 22/gimp-tool-measure.png \
- 22/gimp-tool-move.png \
- 22/gimp-tool-paintbrush.png \
- 22/gimp-tool-path.png \
- 22/gimp-tool-pencil.png \
- 22/gimp-tool-perspective-clone.png \
- 22/gimp-tool-perspective.png \
- 22/gimp-tool-posterize.png \
- 22/gimp-tool-preset.png \
- 22/gimp-tool-rect-select.png \
- 22/gimp-tool-rotate.png \
- 22/gimp-tool-scale.png \
- 22/gimp-tool-shear.png \
- 22/gimp-tool-smudge.png \
- 22/gimp-tool-text.png \
- 22/gimp-tool-threshold.png \
- 22/gimp-tool-unified-transform.png \
- 22/gimp-tool-warp.png \
- 22/gimp-tool-zoom.png \
- 22/gimp-wilber.png
-
-icons24_DATA = \
- 24/gimp-center.png \
- 24/gimp-channel-alpha.png \
- 24/gimp-channel-blue.png \
- 24/gimp-channel-gray.png \
- 24/gimp-channel-green.png \
- 24/gimp-channel-indexed.png \
- 24/gimp-channel-red.png \
- 24/gimp-channel.png \
- 24/gimp-channels.png \
- 24/gimp-colormap.png \
- 24/gimp-controller-keyboard.png \
- 24/gimp-controller-linux-input.png \
- 24/gimp-controller-midi.png \
- 24/gimp-controller-wheel.png \
- 24/gimp-controller.png \
- 24/gimp-cursor.png \
- 24/gimp-device-status.png \
- 24/gimp-display-filter-colorblind.png \
- 24/gimp-display-filter-contrast.png \
- 24/gimp-display-filter-gamma.png \
- 24/gimp-display-filter-lcms.png \
- 24/gimp-display-filter-proof.png \
- 24/gimp-display-filter.png \
- 24/gimp-floating-selection.png \
- 24/gimp-gravity-east.png \
- 24/gimp-gravity-north-east.png \
- 24/gimp-gravity-north-west.png \
- 24/gimp-gravity-north.png \
- 24/gimp-gravity-south-east.png \
- 24/gimp-gravity-south-west.png \
- 24/gimp-gravity-south.png \
- 24/gimp-gravity-west.png \
- 24/gimp-hcenter.png \
- 24/gimp-hchain-broken.png \
- 24/gimp-hchain.png \
- 24/gimp-hfill.png \
- 24/gimp-image.png \
- 24/gimp-images.png \
- 24/gimp-info.png \
- 24/gimp-layer-mask.png \
- 24/gimp-layer.png \
- 24/gimp-layers.png \
- 24/gimp-move-to-screen.png \
- 24/gimp-print-resolution.png \
- 24/gimp-sample-point.png \
- 24/gimp-template.png \
- 24/gimp-text-dir-ltr.png \
- 24/gimp-text-dir-rtl.png \
- 24/gimp-text-layer.png \
- 24/gimp-toilet-paper.png \
- 24/gimp-tool-options.png \
- 24/gimp-tools.png \
- 24/gimp-transparency.png \
- 24/gimp-undo-history.png \
- 24/gimp-user-manual.png \
- 24/gimp-vcenter.png \
- 24/gimp-vchain-broken.png \
- 24/gimp-vchain.png \
- 24/gimp-vfill.png \
- 24/gimp-video.png \
- 24/gimp-warning.png \
- 24/gimp-web.png
-
-icons32_DATA = \
- 32/gimp-channel-alpha.png \
- 32/gimp-channel-blue.png \
- 32/gimp-channel-gray.png \
- 32/gimp-channel-green.png \
- 32/gimp-channel-indexed.png \
- 32/gimp-channel-red.png \
- 32/gimp-channel.png \
- 32/gimp-floating-selection.png \
- 32/gimp-image.png \
- 32/gimp-layer-mask.png \
- 32/gimp-layer.png \
- 32/gimp-text-layer.png \
- 32/gimp-user-manual.png
-
-icons48_DATA = \
- 48/gimp-channel-alpha.png \
- 48/gimp-channel-blue.png \
- 48/gimp-channel-gray.png \
- 48/gimp-channel-green.png \
- 48/gimp-channel-indexed.png \
- 48/gimp-channel-red.png \
- 48/gimp-channel.png \
- 48/gimp-floating-selection.png \
- 48/gimp-image.png \
- 48/gimp-layer-mask.png \
- 48/gimp-layer.png \
- 48/gimp-text-layer.png
-
-icons64_DATA = \
- 64/gimp-error.png \
- 64/gimp-frame.png \
- 64/gimp-info.png \
- 64/gimp-question.png \
- 64/gimp-texture.png \
- 64/gimp-user-manual.png \
- 64/gimp-warning.png \
- 64/gimp-wilber-eek.png \
- 64/gimp-wilber.png
-
-ICON_IMAGES = \
- $(icons12_DATA) \
- $(icons16_DATA) \
- $(icons18_DATA) \
- $(icons20_DATA) \
- $(icons22_DATA) \
- $(icons24_DATA) \
- $(icons32_DATA) \
- $(icons48_DATA) \
- $(icons64_DATA)
-
-EXTRA_DIST = \
- $(icons_DATA) \
- $(ICON_IMAGES) \
- gimp-dialog-icons.xcf.gz
-
-noinst_DATA = \
- gimp-core-pixbufs.h \
- gimp-stock-pixbufs.h
-
-CLEANFILES = $(noinst_DATA) stock-icons.list
-
-
-stock-icons.list: $(ICON_IMAGES) Makefile.am
- $(AM_V_GEN) ( rm -f $@; \
- for image in $(ICON_IMAGES); do \
- echo $$image | \
- sed -e 's|\(.*\)/\(.*\).png|\2-\1.png|' -e 's|-|_|g' -e 's|\.png$$||' >> $@; \
- echo " $(srcdir)/$$image" >> $@; \
- done )
-
-gimp-core-pixbufs.h: $(CORE_IMAGES) Makefile.am
- $(AM_V_GEN) $(GDK_PIXBUF_CSOURCE) --raw --build-list $(CORE_VARIABLES) > $(@F)
-
-gimp-stock-pixbufs.h: stock-icons.list
- $(AM_V_GEN) $(GDK_PIXBUF_CSOURCE) --raw --build-list `cat $<` > $(@F)
diff --git a/themes/Small/gtkrc b/themes/Small/gtkrc
index c78d350..f3f0155 100644
--- a/themes/Small/gtkrc
+++ b/themes/Small/gtkrc
@@ -15,19 +15,19 @@ style "gimp-default-style"
{
stock["gtk-dialog-error"] =
{
- { "../Default/icons/hicolor/64x64/apps/gimp-error.png", *, *, "gtk-dialog" }
+ { "../../icons/hicolor/64x64/apps/gimp-error.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-info"] =
{
- { "../Default/icons/hicolor/64x64/apps/gimp-info.png", *, *, "gtk-dialog" }
+ { "../../icons/hicolor/64x64/apps/gimp-info.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-question"] =
{
- { "../Default/icons/hicolor/64x64/apps/gimp-question.png", *, *, "gtk-dialog" }
+ { "../../icons/hicolor/64x64/apps/gimp-question.png", *, *, "gtk-dialog" }
}
stock["gtk-dialog-warning"] =
{
- { "../Default/icons/hicolor/64x64/apps/gimp-warning.png", *, *, "gtk-dialog" }
+ { "../../icons/hicolor/64x64/apps/gimp-warning.png", *, *, "gtk-dialog" }
}
# Uncommenting this line allows to set a different (smaller) font for GIMP.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
