r15649 by jghali - merge trunk revisions upto 15648

scribus-commit scribus-commit at lists.scribus.net
Mon Oct 25 22:42:02 CEST 2010 

Author: jghali
Date: Mon Oct 25 20:42:01 2010
New Revision: 15649

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15649
Log:
merge trunk revisions upto 15648

Added:
    branches/ScribusOIF/resources/templates/buscard_coll/
      - copied from r15648, trunk/Scribus/resources/templates/buscard_coll/
    branches/ScribusOIF/scribus/ui/swatchcombo.cpp
      - copied unchanged from r15648, trunk/Scribus/scribus/ui/swatchcombo.cpp
    branches/ScribusOIF/scribus/ui/swatchcombo.h
      - copied unchanged from r15648, trunk/Scribus/scribus/ui/swatchcombo.h
Modified:
    branches/ScribusOIF/resources/templates/buscard1/Business_Card_1.png
    branches/ScribusOIF/resources/templates/buscard1/Business_Card_1tn.png
    branches/ScribusOIF/resources/templates/buscard10/Business_Card_10.png
    branches/ScribusOIF/resources/templates/buscard10/Business_Card_10tn.png
    branches/ScribusOIF/resources/templates/buscard11/Business_Card_11.png
    branches/ScribusOIF/resources/templates/buscard11/Business_Card_11tn.png
    branches/ScribusOIF/resources/templates/buscard2/Business_Card_2.png
    branches/ScribusOIF/resources/templates/buscard2/Business_Card_2tn.png
    branches/ScribusOIF/resources/templates/buscard3/Business_Card_3.png
    branches/ScribusOIF/resources/templates/buscard3/Business_Card_3tn.png
    branches/ScribusOIF/resources/templates/buscard4/Business_Card_4.png
    branches/ScribusOIF/resources/templates/buscard4/Business_Card_4tn.png
    branches/ScribusOIF/resources/templates/buscard5/Business_Card_5.png
    branches/ScribusOIF/resources/templates/buscard5/Business_Card_5tn.png
    branches/ScribusOIF/resources/templates/buscard6/Business_Card_6.png
    branches/ScribusOIF/resources/templates/buscard6/Business_Card_6tn.png
    branches/ScribusOIF/resources/templates/buscard7/Business_Card_7.png
    branches/ScribusOIF/resources/templates/buscard7/Business_Card_7tn.png
    branches/ScribusOIF/resources/templates/buscard8/Business_Card_8.png
    branches/ScribusOIF/resources/templates/buscard8/Business_Card_8tn.png
    branches/ScribusOIF/resources/templates/buscard9/Business_Card_9.png
    branches/ScribusOIF/resources/templates/buscard9/Business_Card_9tn.png
    branches/ScribusOIF/resources/templates/cc/Cheat_Cube.png
    branches/ScribusOIF/resources/templates/cc/Cheat_Cubetn.png
    branches/ScribusOIF/resources/templates/cover1/cover1.png
    branches/ScribusOIF/resources/templates/cover1/cover1tn.png
    branches/ScribusOIF/resources/templates/cover2/cover2.png
    branches/ScribusOIF/resources/templates/cover2/cover2tn.png
    branches/ScribusOIF/resources/templates/cover3/cover3.png
    branches/ScribusOIF/resources/templates/cover3/cover3tn.png
    branches/ScribusOIF/resources/templates/cover4/cover4.png
    branches/ScribusOIF/resources/templates/cover4/cover4tn.png
    branches/ScribusOIF/resources/templates/cover5/cover5.png
    branches/ScribusOIF/resources/templates/cover5/cover5tn.png
    branches/ScribusOIF/resources/templates/grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscape.png
    branches/ScribusOIF/resources/templates/grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscapetn.png
    branches/ScribusOIF/resources/templates/grid_br_100x210_p/Brochure_Grid_100x210_P.png
    branches/ScribusOIF/resources/templates/grid_br_100x210_p/Brochure_Grid_100x210_Ptn.png
    branches/ScribusOIF/resources/templates/grid_br_375x85_l/Brochure_Grid_375x85_in_Landscape.png
    branches/ScribusOIF/resources/templates/grid_br_375x85_l/Brochure_Grid_375x85_in_Landscapetn.png
    branches/ScribusOIF/resources/templates/grid_br_375x85_p/Brochure_Grid_375x85_in_P.png
    branches/ScribusOIF/resources/templates/grid_br_375x85_p/Brochure_Grid_375x85_in_Ptn.png
    branches/ScribusOIF/resources/templates/grid_br_55x85in_l/Brochure_Grid_55x85_in_L.png
    branches/ScribusOIF/resources/templates/grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png
    branches/ScribusOIF/resources/templates/grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoit.png
    branches/ScribusOIF/resources/templates/grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoittn.png
    branches/ScribusOIF/resources/templates/grid_br_975x85_p/Brochure_Grid_975x85_in_P.png
    branches/ScribusOIF/resources/templates/grid_br_975x85_p/Brochure_Grid_975x85_in_Ptn.png
    branches/ScribusOIF/resources/templates/grid_br_975x85in_l/Brochure_Grid_975x85_in_L.png
    branches/ScribusOIF/resources/templates/grid_br_975x85in_l/Brochure_Grid_975x85_in_Ltn.png
    branches/ScribusOIF/resources/templates/grid_br_a4_l/Brochure_Grid_A4_L.png
    branches/ScribusOIF/resources/templates/grid_br_a4_l/Brochure_Grid_A4_Ltn.png
    branches/ScribusOIF/resources/templates/grid_br_a4_p/Brochure_Grid_A4_P.png
    branches/ScribusOIF/resources/templates/grid_br_a4_p/Brochure_Grid_A4_Ptn.png
    branches/ScribusOIF/resources/templates/grid_br_a5_l/Brochure_Grid_A5_L.png
    branches/ScribusOIF/resources/templates/grid_br_a5_l/Brochure_Grid_A5_Ltn.png
    branches/ScribusOIF/resources/templates/grid_br_a5_p/Brochure_Grid_A5_Portrait.png
    branches/ScribusOIF/resources/templates/grid_br_a5_p/Brochure_Grid_A5_Portraittn.png
    branches/ScribusOIF/resources/templates/grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.png
    branches/ScribusOIF/resources/templates/grid_br_dinl_l/Brochure_Grid_DIN_LANG_Ltn.png
    branches/ScribusOIF/resources/templates/grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.png
    branches/ScribusOIF/resources/templates/grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png
    branches/ScribusOIF/resources/templates/grid_br_usl_l/Brochure_Grid_USL_L.png
    branches/ScribusOIF/resources/templates/grid_br_usl_l/Brochure_Grid_USL_Ltn.png
    branches/ScribusOIF/resources/templates/grid_br_usl_p/Brochure_Grid_USL_P.png
    branches/ScribusOIF/resources/templates/grid_br_usl_p/Brochure_Grid_USL_Ptn.png
    branches/ScribusOIF/resources/templates/grid_poster_a0/Poster_Grid_A0.png
    branches/ScribusOIF/resources/templates/grid_poster_a0/Poster_Grid_A0tn.png
    branches/ScribusOIF/resources/templates/grid_poster_a1/Poster_Grid_A1.png
    branches/ScribusOIF/resources/templates/grid_poster_a1/Poster_Grid_A1tn.png
    branches/ScribusOIF/resources/templates/grid_poster_a2/Poster_Grid_A2.png
    branches/ScribusOIF/resources/templates/grid_poster_a2/Poster_Grid_A2tn.png
    branches/ScribusOIF/resources/templates/grid_poster_a3/Poster_Grid_A3.png
    branches/ScribusOIF/resources/templates/grid_poster_a3/Poster_Grid_A3tn.png
    branches/ScribusOIF/resources/templates/mc/menu_template1.png
    branches/ScribusOIF/resources/templates/mc/menu_template1tn.png
    branches/ScribusOIF/resources/templates/nl2/kites-bw.png
    branches/ScribusOIF/resources/templates/template.de.xml
    branches/ScribusOIF/resources/templates/template.xml
    branches/ScribusOIF/scribus/CMakeLists.txt
    branches/ScribusOIF/scribus/colorsetmanager.cpp
    branches/ScribusOIF/scribus/colorsetmanager.h
    branches/ScribusOIF/scribus/pdf_analyzer.cpp
    branches/ScribusOIF/scribus/pluginmanager.cpp
    branches/ScribusOIF/scribus/plugins/tools/subdivide/subdivide.cpp
    branches/ScribusOIF/scribus/prefsmanager.cpp
    branches/ScribusOIF/scribus/scplugin.cpp
    branches/ScribusOIF/scribus/scplugin.h
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/ui/about.cpp
    branches/ScribusOIF/scribus/ui/cmykfw.cpp
    branches/ScribusOIF/scribus/ui/cmykfw.h
    branches/ScribusOIF/scribus/ui/paintmanager.cpp
    branches/ScribusOIF/scribus/ui/paintmanager.h
    branches/ScribusOIF/scribus/ui/paintmanagerbase.ui
    branches/ScribusOIF/win32/vc8/Scribus.vcproj

Modified: branches/ScribusOIF/resources/templates/buscard1/Business_Card_1.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard1/Business_Card_1.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard1/Business_Card_1tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard1/Business_Card_1tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard10/Business_Card_10.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard10/Business_Card_10.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard10/Business_Card_10tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard10/Business_Card_10tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard11/Business_Card_11.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard11/Business_Card_11.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard11/Business_Card_11tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard11/Business_Card_11tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard2/Business_Card_2.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard2/Business_Card_2.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard2/Business_Card_2tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard2/Business_Card_2tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard3/Business_Card_3.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard3/Business_Card_3.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard3/Business_Card_3tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard3/Business_Card_3tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard4/Business_Card_4.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard4/Business_Card_4.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard4/Business_Card_4tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard4/Business_Card_4tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard5/Business_Card_5.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard5/Business_Card_5.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard5/Business_Card_5tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard5/Business_Card_5tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard6/Business_Card_6.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard6/Business_Card_6.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard6/Business_Card_6tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard6/Business_Card_6tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard7/Business_Card_7.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard7/Business_Card_7.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard7/Business_Card_7tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard7/Business_Card_7tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard8/Business_Card_8.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard8/Business_Card_8.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard8/Business_Card_8tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard8/Business_Card_8tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard9/Business_Card_9.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard9/Business_Card_9.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/buscard9/Business_Card_9tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/buscard9/Business_Card_9tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cc/Cheat_Cube.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cc/Cheat_Cube.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cc/Cheat_Cubetn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cc/Cheat_Cubetn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover1/cover1.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover1/cover1.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover1/cover1tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover1/cover1tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover2/cover2.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover2/cover2.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover2/cover2tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover2/cover2tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover3/cover3.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover3/cover3.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover3/cover3tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover3/cover3tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover4/cover4.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover4/cover4.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover4/cover4tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover4/cover4tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover5/cover5.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover5/cover5.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/cover5/cover5tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/cover5/cover5tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscape.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscape.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscapetn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscapetn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_100x210_p/Brochure_Grid_100x210_P.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_100x210_p/Brochure_Grid_100x210_P.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_100x210_p/Brochure_Grid_100x210_Ptn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_100x210_p/Brochure_Grid_100x210_Ptn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_375x85_l/Brochure_Grid_375x85_in_Landscape.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_375x85_l/Brochure_Grid_375x85_in_Landscape.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_375x85_l/Brochure_Grid_375x85_in_Landscapetn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_375x85_l/Brochure_Grid_375x85_in_Landscapetn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_375x85_p/Brochure_Grid_375x85_in_P.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_375x85_p/Brochure_Grid_375x85_in_P.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_375x85_p/Brochure_Grid_375x85_in_Ptn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_375x85_p/Brochure_Grid_375x85_in_Ptn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_55x85in_l/Brochure_Grid_55x85_in_L.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_55x85in_l/Brochure_Grid_55x85_in_L.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoit.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoit.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoittn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoittn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_975x85_p/Brochure_Grid_975x85_in_P.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_975x85_p/Brochure_Grid_975x85_in_P.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_975x85_p/Brochure_Grid_975x85_in_Ptn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_975x85_p/Brochure_Grid_975x85_in_Ptn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_975x85in_l/Brochure_Grid_975x85_in_L.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_975x85in_l/Brochure_Grid_975x85_in_L.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_975x85in_l/Brochure_Grid_975x85_in_Ltn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_975x85in_l/Brochure_Grid_975x85_in_Ltn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_a4_l/Brochure_Grid_A4_L.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_a4_l/Brochure_Grid_A4_L.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_a4_l/Brochure_Grid_A4_Ltn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_a4_l/Brochure_Grid_A4_Ltn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_a4_p/Brochure_Grid_A4_P.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_a4_p/Brochure_Grid_A4_P.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_a4_p/Brochure_Grid_A4_Ptn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_a4_p/Brochure_Grid_A4_Ptn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_a5_l/Brochure_Grid_A5_L.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_a5_l/Brochure_Grid_A5_L.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_a5_l/Brochure_Grid_A5_Ltn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_a5_l/Brochure_Grid_A5_Ltn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_a5_p/Brochure_Grid_A5_Portrait.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_a5_p/Brochure_Grid_A5_Portrait.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_a5_p/Brochure_Grid_A5_Portraittn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_a5_p/Brochure_Grid_A5_Portraittn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_dinl_l/Brochure_Grid_DIN_LANG_Ltn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_dinl_l/Brochure_Grid_DIN_LANG_Ltn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_usl_l/Brochure_Grid_USL_L.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_usl_l/Brochure_Grid_USL_L.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_usl_l/Brochure_Grid_USL_Ltn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_usl_l/Brochure_Grid_USL_Ltn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_usl_p/Brochure_Grid_USL_P.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_usl_p/Brochure_Grid_USL_P.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_br_usl_p/Brochure_Grid_USL_Ptn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_br_usl_p/Brochure_Grid_USL_Ptn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_poster_a0/Poster_Grid_A0.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_poster_a0/Poster_Grid_A0.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_poster_a0/Poster_Grid_A0tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_poster_a0/Poster_Grid_A0tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_poster_a1/Poster_Grid_A1.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_poster_a1/Poster_Grid_A1.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_poster_a1/Poster_Grid_A1tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_poster_a1/Poster_Grid_A1tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_poster_a2/Poster_Grid_A2.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_poster_a2/Poster_Grid_A2.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_poster_a2/Poster_Grid_A2tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_poster_a2/Poster_Grid_A2tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_poster_a3/Poster_Grid_A3.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_poster_a3/Poster_Grid_A3.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/grid_poster_a3/Poster_Grid_A3tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/grid_poster_a3/Poster_Grid_A3tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/mc/menu_template1.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/mc/menu_template1.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/mc/menu_template1tn.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/mc/menu_template1tn.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/nl2/kites-bw.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/nl2/kites-bw.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/resources/templates/template.de.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/template.de.xml
==============================================================================
--- branches/ScribusOIF/resources/templates/template.de.xml (original)
+++ branches/ScribusOIF/resources/templates/template.de.xml Mon Oct 25 20:42:01 2010
@@ -168,7 +168,6 @@
 		<author>vectorportal.com</author>
 		<email></email>
 	</template>
-	</template>
 	<template category="Broschüren">
 		<name>Brochure_Grid_A4_L</name>
 		<file>grid_br_a4_l/Brochure_Grid_A4_L.sla.gz</file>
@@ -295,7 +294,7 @@
 		<email></email>
 	</template>
 	<template category="Broschüren">
-		<name>Brochure_Grid_5.5x8.5in_L</name>
+		<name>Brochure_Grid_55x85in_L</name>
 		<file>grid_br_55x85in_l/Brochure_Grid_55x85in_L.sla.gz</file>
 		<tnail>grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png</tnail>
 		<img>grid_br_55x85in_l/Brochure_Grid_55x85_in_L.png</img>
@@ -393,7 +392,7 @@
 		<email></email>
 	</template>
 	<template category="Broschüren">
-		<name>Brochure_Grid_DIN_LANG P</name>
+		<name>Brochure_Grid_DIN_LANG_P</name>
 		<file>grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.sla.gz</file>
 		<tnail>grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png</tnail>
 		<img>grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.png</img>
@@ -448,7 +447,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Business Cards">
+	<template category="Visitenkarten">
 		<name>Business_Card_Collection</name>
 		<file>business_card_collection.sla.gz</file>
 		<tnail>Business_Card_Collectiontn.png</tnail>
@@ -546,7 +545,7 @@
 		<author>vectorportal.com</author>
 		<email></email>
 	</template>
-	<template category="Business Cards">
+	<template category="Visitenkarten">
 		<name>Visitenkarte_7</name>
 		<file>buscard7/buscard7.sla.gz</file>
 		<tnail>buscard7/Business_Card_7tn.png</tnail>

Modified: branches/ScribusOIF/resources/templates/template.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/resources/templates/template.xml
==============================================================================
--- branches/ScribusOIF/resources/templates/template.xml (original)
+++ branches/ScribusOIF/resources/templates/template.xml Mon Oct 25 20:42:01 2010
@@ -295,10 +295,10 @@
 		<email></email>
 	</template>
 	<template category="Brochures">
-		<name>Brochure_Grid_5.5x8.5in_L</name>
+		<name>Brochure_Grid_55x85in_L</name>
 		<file>grid_br_55x85in_l/Brochure_Grid_55x85in_L.sla.gz</file>
-		<tnail>grid_br_55x85in_l/Brochure Grid_55x85_in_Ltn.png</tnail>
-		<img>grid_br_55x85in_l/Brochure Grid_55x85_in_L.png</img>
+		<tnail>grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png</tnail>
+		<img>grid_br_55x85in_l/Brochure_Grid_55x85_in_L.png</img>
 		<psize>custom, 1224x396</psize>
 		<color>RGB</color>
 		<descr>A design grid for a 5.5x8.5 in brochure</descr>

Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Mon Oct 25 20:42:01 2010
@@ -396,6 +396,7 @@
   ui/stylemanager.h
   ui/styleselect.h
   ui/styleview.h
+  ui/swatchcombo.h
   ui/symbolpalette.h
   ui/tabcheckdoc.h
   ui/tabdisplay.h
@@ -801,6 +802,7 @@
   ui/stylemanager.cpp
   ui/styleselect.cpp
   ui/styleview.cpp
+  ui/swatchcombo.cpp
   ui/symbolpalette.cpp
   ui/tabcheckdoc.cpp
   ui/tabdisplay.cpp

Modified: branches/ScribusOIF/scribus/colorsetmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/colorsetmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/colorsetmanager.cpp (original)
+++ branches/ScribusOIF/scribus/colorsetmanager.cpp Mon Oct 25 20:42:01 2010
@@ -134,22 +134,63 @@
 	}
 }
 
-void ColorSetManager::findPalettes()
+void ColorSetManager::searchDir(QString path, QTreeWidgetItem* parent)
+{
+	QStringList exts;
+	exts << "xml" << "gpl" << "eps" << "ai" << "sla" << "soc";
+	QDir dirs(path, "*", QDir::Name,  QDir::Dirs | QDir::NoDotAndDotDot | QDir::Files | QDir::NoSymLinks);
+	dirs.setSorting(QDir::Name | QDir::DirsFirst);
+	if ((dirs.exists()) && (dirs.count() != 0))
+	{
+		for (uint dc = 0; dc < dirs.count(); ++dc)
+		{
+			QFileInfo fi(path + dirs[dc]);
+			if (fi.isDir())
+			{
+				QString setName = fi.baseName();
+				setName.replace("_", " ");
+				QTreeWidgetItem* item = new QTreeWidgetItem(parent);
+				item->setFlags(Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+				item->setText(0, setName);
+				searchDir(path + dirs[dc] + "/", item);
+			}
+			else
+			{
+				if (exts.contains(fi.suffix().toLower()))
+				{
+					QString setName = fi.baseName();
+					setName.replace("_", " ");
+					palettes.insert(setName, fi.absoluteFilePath());
+					QTreeWidgetItem* item = new QTreeWidgetItem(parent);
+					item->setFlags(Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
+					item->setText(0, setName);
+				}
+			}
+		}
+	}
+}
+
+void ColorSetManager::findPalettes(QTreeWidgetItem* parent)
 {
 	palettes.clear();
 	QString path;
 	for ( QStringList::Iterator it = paletteLocations.begin(); it != paletteLocations.end(); ++it )
 	{
-		path=(*it);
-		QDir dir(path , "*.xml *.gpl *.eps *.ai *.sla *.soc", QDir::Name, QDir::Files | QDir::NoSymLinks);
-		if (dir.exists() && (dir.count() != 0))
-		{
-			for (uint i = 0; i < dir.count(); ++i) 
-			{
-				QFileInfo file(path + dir[i]);
-				QString setName=file.baseName();
-				setName.replace("_", " ");
-				palettes.insert(setName, file.absoluteFilePath());
+		path = (*it);
+		if (parent != NULL)
+			searchDir(path, parent);
+		else
+		{
+			QDir dir(path , "*.xml *.gpl *.eps *.ai *.sla *.soc", QDir::Name, QDir::Files | QDir::NoSymLinks);
+			if (dir.exists() && (dir.count() != 0))
+			{
+				for (uint i = 0; i < dir.count(); ++i) 
+				{
+					QFileInfo file(path + dir[i]);
+					QString setName=file.baseName();
+					setName.replace("_", " ");
+					palettes.insert(setName, file.absoluteFilePath());
+				}
 			}
 		}
 	}

Modified: branches/ScribusOIF/scribus/colorsetmanager.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/colorsetmanager.h
==============================================================================
--- branches/ScribusOIF/scribus/colorsetmanager.h (original)
+++ branches/ScribusOIF/scribus/colorsetmanager.h Mon Oct 25 20:42:01 2010
@@ -16,6 +16,7 @@
 #include <QMap>
 #include <QString>
 #include <QStringList>
+#include <QTreeWidget>
 
 struct ApplicationPrefs;
 
@@ -27,7 +28,8 @@
 		
 		void initialiseDefaultPrefs(struct ApplicationPrefs& appPrefs);
 		void findPaletteLocations();
-		void findPalettes();
+		void searchDir(QString path, QTreeWidgetItem* parent = NULL);
+		void findPalettes(QTreeWidgetItem* parent = NULL);
 		QStringList paletteNames();
 		QString paletteFileFromName(const QString& paletteName);
 		bool paletteLocationLocked(const QString& palettePath);

Modified: branches/ScribusOIF/scribus/pdf_analyzer.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/pdf_analyzer.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pdf_analyzer.cpp (original)
+++ branches/ScribusOIF/scribus/pdf_analyzer.cpp Mon Oct 25 20:42:01 2010
@@ -743,11 +743,13 @@
 	PdfObject* dObj = extGStateObj->GetIndirectKey("D");
 	if (dObj)
 	{
-		PdfArray dashArr = dObj->GetArray()[0];
+		PdfObject dObjA = dObj->GetArray()[0];
+		PdfArray dashArr = dObjA.GetArray();
 		currGS.dashPattern.first.clear();
 		for (uint i=0; i<dashArr.GetSize(); ++i)
 			currGS.dashPattern.first.append(dashArr[i].GetNumber());
-		currGS.dashPattern.second = dObj->GetArray()[1].GetNumber();
+		PdfObject dObjB = dObj->GetArray()[1];
+		currGS.dashPattern.second = dObjB.GetNumber();
 	}
 }
 PDFFont PDFAnalyzer::getFontInfo(PdfObject* fontObj)

Modified: branches/ScribusOIF/scribus/pluginmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/pluginmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pluginmanager.cpp (original)
+++ branches/ScribusOIF/scribus/pluginmanager.cpp Mon Oct 25 20:42:01 2010
@@ -295,6 +295,8 @@
 			ScActionPlugin::ActionInfo ai(plugin->actionInfo());
 			ScrAction* action = new ScrAction(ScrAction::ActionDLL, ai.icon1, ai.icon2, ai.text, ai.keySequence, mw);
 			Q_CHECK_PTR(action);
+			action->setStatusTip(ai.helpText);
+			action->setToolTip(ai.helpText);
 			mw->scrActions.insert(ai.name, action);
 
 			// then enable and connect up the action

Modified: branches/ScribusOIF/scribus/plugins/tools/subdivide/subdivide.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/plugins/tools/subdivide/subdivide.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/tools/subdivide/subdivide.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/tools/subdivide/subdivide.cpp Mon Oct 25 20:42:01 2010
@@ -66,6 +66,7 @@
 	m_actionInfo.name = "Subdivide";
 	// Action text for menu, including accel
 	m_actionInfo.text = tr("Subdivide Path");
+	m_actionInfo.helpText = tr("Subdivide a path by inserting new Nodes.");
 	// Menu
 	m_actionInfo.menu = "ItemPathOps";
 	m_actionInfo.parentMenu = "Item";

Modified: branches/ScribusOIF/scribus/prefsmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/prefsmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/prefsmanager.cpp (original)
+++ branches/ScribusOIF/scribus/prefsmanager.cpp Mon Oct 25 20:42:01 2010
@@ -146,8 +146,6 @@
 
 	ColorSetManager csm;
 	csm.initialiseDefaultPrefs(appPrefs);
-	csm.findPaletteLocations();
-	csm.findPalettes();
 
 	appPrefs.uiPrefs.wheelJump = 40;
 	/** Set Default window position and size to sane default values which should work on every screen */

Modified: branches/ScribusOIF/scribus/scplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/scplugin.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scplugin.cpp (original)
+++ branches/ScribusOIF/scribus/scplugin.cpp Mon Oct 25 20:42:01 2010
@@ -94,6 +94,7 @@
 {
 	m_actionInfo.name = "";
 	m_actionInfo.text = "";
+	m_actionInfo.helpText = "";
 	m_actionInfo.keySequence = "";
 	m_actionInfo.menu = "";
 	m_actionInfo.menuAfterName = "";

Modified: branches/ScribusOIF/scribus/scplugin.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/scplugin.h
==============================================================================
--- branches/ScribusOIF/scribus/scplugin.h (original)
+++ branches/ScribusOIF/scribus/scplugin.h Mon Oct 25 20:42:01 2010
@@ -262,15 +262,16 @@
 
 		// Information about actions, to be returned by actionInfo()
 		struct ActionInfo {
-			QString name;  // name of action
-			QString text;  // text to display to user
+			QString name;					// name of action
+			QString text;					// text to display to user
+			QString helpText;				// help text for ToolTips and StatusTips
 			QString keySequence;
 			QString menu;
 			QString menuAfterName;
 			QString parentMenu;
 			QString subMenuName;
-			QString toolbar;			// Name of the ToolBar the action is to be inserted, if that toolbar doesn't exits it will be created
-			QString toolBarName;		// translateable ToolBar title
+			QString toolbar;				// Name of the ToolBar the action is to be inserted, if that toolbar doesn't exits it will be created
+			QString toolBarName;			// translateable ToolBar title
 			QPixmap icon1;
 			QPixmap icon2;
 			QList<int> notSuitableFor;		// a list of PageItem type values which the plugin can *not* handle

Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Mon Oct 25 20:42:01 2010
@@ -9933,10 +9933,9 @@
 			propertiesPalette->Cpal->SetColors(prefsManager->colorSet());
 			prefsManager->appPrefs.defaultGradients = dia->dialogGradients;
 		}
-	}
-	prefsManager->setColorSetName(dia->getColorSetName());
-//	if (!HaveDoc)
-	prefsManager->appPrefs.colorPrefs.CustomColorSets = dia->customColSet;
+		prefsManager->setColorSetName(dia->getColorSetName());
+		prefsManager->appPrefs.colorPrefs.CustomColorSets = dia->customColSet;
+	}
 	delete dia;
 	undoManager->setUndoEnabled(true);
 }

Modified: branches/ScribusOIF/scribus/ui/about.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/ui/about.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/about.cpp (original)
+++ branches/ScribusOIF/scribus/ui/about.cpp Mon Oct 25 20:42:01 2010
@@ -114,7 +114,7 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "4";
+	QString BUILD_DAY = "24";
 	QString BUILD_MONTH = CommonStrings::october;
 	QString BUILD_YEAR = "2010";
 	QString BUILD_TIME = "";

Modified: branches/ScribusOIF/scribus/ui/cmykfw.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/ui/cmykfw.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/cmykfw.cpp (original)
+++ branches/ScribusOIF/scribus/ui/cmykfw.cpp Mon Oct 25 20:42:01 2010
@@ -30,6 +30,7 @@
 #include <QByteArray>
 #include <QPixmap>
 #include <QAction>
+#include <QTreeWidget>
 #include <cstdlib>
 
 #include "colorchart.h"
@@ -41,6 +42,7 @@
 #include "scpaths.h"
 #include "scribusdoc.h"
 #include "scrspinbox.h"
+#include "swatchcombo.h"
 #include "util.h"
 #include "util_color.h"
 #include "util_formats.h"
@@ -125,12 +127,6 @@
 	Separations->setText( tr( "Is Spot Color" ) );
 	Separations->setChecked(orig.isSpotColor());
 	Layout23->addWidget( Separations );
-/*
-	Regist = new QCheckBox( this );
-	Regist->setText( tr( "Is Registration Color" ) );
-	Regist->setChecked(orig.isRegistrationColor());
-	Layout23->addWidget( Regist );
-*/
 	QSpacerItem* spacer = new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding );
 	Layout23->addItem( spacer );
 
@@ -192,42 +188,35 @@
 	Frame4Layout->setSpacing( 5 );
 	Frame4Layout->setMargin( 0 );
 
-	Swatches = new ScComboBox( Frame4 );
-	Swatches->addItem( tr( "HSV Color Map" ) );
-/*
-	Swatches->insertItem("X11 RGB-Set");
-	Swatches->insertItem("X11 Grey-Set");
-	Swatches->insertItem("Gnome-Set");
-	Swatches->insertItem("SVG-Set");
-	Swatches->insertItem("OpenOffice.org-Set");
-*/
+	Swatches = new SwatchCombo( Frame4 );
+	hsvSelector = Swatches->addTopLevelItem( tr( "HSV Color Map" ) );
+	hsvSelector->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
 	csm.findPaletteLocations();
-	csm.findPalettes();
-	QStringList allSets(csm.paletteNames());
-	for ( QStringList::Iterator it = allSets.begin(); it != allSets.end(); ++it )
-	{
-		Swatches->addItem((*it));
-	}
-	customSetStartIndex=Swatches->count();
-
+	systemSwatches = Swatches->addTopLevelItem( tr("Scribus Swatches"));
+	csm.findPalettes(systemSwatches);
+	Swatches->addSubItem("Scribus Small", systemSwatches);
+	systemSwatches->setExpanded(true);
+	userSwatches = Swatches->addTopLevelItem( tr("User Swatches"));
 	if (Cust.count() != 0)
 	{
 		QStringList realEx;
 		realEx.clear();
 		for (int m = 0; m < Cust.count(); ++m)
 		{
-			QString Cpfad = QDir::convertSeparators( ScPaths::getApplicationDataDir() + Cust[m]);
+			QString Cpfad = QDir::convertSeparators(ScPaths::getApplicationDataDir() + Cust[m] + ".xml");
 			QFileInfo cfi(Cpfad);
 			if (cfi.exists())
 			{
 				QString setName = cfi.baseName();
 				setName.replace("_", " ");
-				Swatches->addItem(setName);
+				Swatches->addSubItem(setName, userSwatches);
 				realEx.append(Cust[m]);
 			}
 		}
 		CColSet = realEx;
 	}
+	userSwatches->setExpanded(true);
+	Swatches->setCurrentComboItem( tr( "HSV Color Map" ));
 	Frame4Layout->addWidget( Swatches );
 
 	TabStack = new QStackedWidget( Frame4 );
@@ -404,7 +393,8 @@
 	connect( BlackSL, SIGNAL( valueChanged(int) ), this, SLOT( setColor() ) );
 	connect( ColorMap, SIGNAL( ColorVal(int, int, bool)), this, SLOT( setColor2(int, int, bool)));
 	connect( ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(SelModel(const QString&)));
-	connect( Swatches, SIGNAL(activated(int)), this, SLOT(SelSwatch(int)));
+//	connect( Swatches, SIGNAL(activated(int)), this, SLOT(SelSwatch(int)));
+	connect(Swatches, SIGNAL(activated(const QString &)), this, SLOT(SelSwatch()));
 	connect(ColorSwatch, SIGNAL( itemClicked(QListWidgetItem*) ), this, SLOT( SelFromSwatch(QListWidgetItem*) ) );
 	connect(Separations, SIGNAL(clicked()), this, SLOT(setSpot()));
 //	connect(Regist, SIGNAL(clicked()), this, SLOT(setRegist()));
@@ -594,44 +584,42 @@
 	return image0;
 }
 
-void CMYKChoose::SelSwatch(int n)
-{
-	if (n == 0)
+void CMYKChoose::SelSwatch()
+{
+	QTreeWidgetItem *c = Swatches->currentItem();
+	if (c == hsvSelector)
 		TabStack->setCurrentIndex(0);
 	else
 	{
 		CurrSwatch.clear();
 		QString pfadC2 = "";
-		if (n < customSetStartIndex)
-			pfadC2 = csm.paletteFileFromName(Swatches->itemText(n));
+		if ( c->parent() != userSwatches)
+			pfadC2 = csm.paletteFileFromName(c->text(0));
 		else
 		{
-			QString listText = Swatches->itemText(n);
+			QString listText = c->text(0);
 			listText.replace(" ", "_");
 			listText += ".xml";
 			pfadC2 = QDir::convertSeparators(ScPaths::getApplicationDataDir() + listText);
 		}
-		if (n != 0)
-		{
-			if (importColorsFromFile(pfadC2, CurrSwatch))
-			{
-				CurrSwatch.insert("White", ScColor(0, 0, 0, 0));
-				CurrSwatch.insert("Black", ScColor(0, 0, 0, 255));
-			}
-			else
-			{
-				CurrSwatch.insert("White", ScColor(0, 0, 0, 0));
-				CurrSwatch.insert("Black", ScColor(0, 0, 0, 255));
-				ScColor cc = ScColor(255, 255, 255, 255);
-				cc.setRegistrationColor(true);
-				CurrSwatch.insert("Registration", cc);
-				CurrSwatch.insert("Blue", ScColor(255, 255, 0, 0));
-				CurrSwatch.insert("Cyan", ScColor(255, 0, 0, 0));
-				CurrSwatch.insert("Green", ScColor(255, 0, 255, 0));
-				CurrSwatch.insert("Red", ScColor(0, 255, 255, 0));
-				CurrSwatch.insert("Yellow", ScColor(0, 0, 255, 0));
-				CurrSwatch.insert("Magenta", ScColor(0, 255, 0, 0));
-			}
+		if (importColorsFromFile(pfadC2, CurrSwatch))
+		{
+			CurrSwatch.insert("White", ScColor(0, 0, 0, 0));
+			CurrSwatch.insert("Black", ScColor(0, 0, 0, 255));
+		}
+		else
+		{
+			CurrSwatch.insert("White", ScColor(0, 0, 0, 0));
+			CurrSwatch.insert("Black", ScColor(0, 0, 0, 255));
+			ScColor cc = ScColor(255, 255, 255, 255);
+			cc.setRegistrationColor(true);
+			CurrSwatch.insert("Registration", cc);
+			CurrSwatch.insert("Blue", ScColor(255, 255, 0, 0));
+			CurrSwatch.insert("Cyan", ScColor(255, 0, 0, 0));
+			CurrSwatch.insert("Green", ScColor(255, 0, 255, 0));
+			CurrSwatch.insert("Red", ScColor(0, 255, 255, 0));
+			CurrSwatch.insert("Yellow", ScColor(0, 0, 255, 0));
+			CurrSwatch.insert("Magenta", ScColor(0, 255, 0, 0));
 		}
 		ColorSwatch->clear();
 		ColorSwatch->insertFancyPixmapItems(CurrSwatch);
@@ -639,19 +627,7 @@
 		TabStack->setCurrentIndex(1);
 	}
 }
-/*
-void CMYKChoose::setRegist()
-{
-	disconnect( ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(SelModel(const QString&)));
-	if (Regist->isChecked())
-	{
-		ComboBox1->setCurrentIndex( 0 );
-		Separations->setChecked(false);
-		SelModel( tr("CMYK"));
-	}
-	connect( ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(SelModel(const QString&)));
-}
-*/
+
 void CMYKChoose::setSpot()
 {
 	disconnect( ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(SelModel(const QString&)));
@@ -709,10 +685,6 @@
 		MagentaP->setPixmap(SliderPix(300));
 		YellowP->setPixmap(SliderPix(60));
 		BlackP->setPixmap(SliderBlack());
-/*		BlackP->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
-		BlackSL->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
-		BlackSp->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
-		BlackT->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); */
 		BlackP->show();
 		BlackSL->show();
 		BlackSp->show();
@@ -721,7 +693,6 @@
 		setValues();
 	}
 	else
-		//	if (mod == tr("RGB"))
 	{
 		CMYKmode = false;
 		Wsave = false;
@@ -753,10 +724,6 @@
 		MagentaP->setPixmap(SliderPix(120));
 		YellowP->setPixmap(SliderPix(240));
 		Layout2x->setSizeConstraint(QLayout::SetFixedSize);
-/*		BlackP->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
-		BlackSL->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
-		BlackSp->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
-		BlackT->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored)); */
 		BlackP->hide();
 		BlackSL->hide();
 		BlackSp->hide();

Modified: branches/ScribusOIF/scribus/ui/cmykfw.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/ui/cmykfw.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/cmykfw.h (original)
+++ branches/ScribusOIF/scribus/ui/cmykfw.h Mon Oct 25 20:42:01 2010
@@ -20,6 +20,7 @@
 class QSlider;
 class QPixmap;
 class QListWidgetItem;
+class QTreeWidget;
 
 #include "colorsetmanager.h"
 #include "sccolor.h"
@@ -29,6 +30,7 @@
 class ScribusDoc;
 class ScrSpinBox;
 class ScComboBox;
+class SwatchCombo;
 class ColorListBox;
 class ColorChart;
 
@@ -44,8 +46,7 @@
 	QLabel* TextLabel3;
 	ScComboBox* ComboBox1;
 	QCheckBox* Separations;
-//	QCheckBox* Regist;
-	ScComboBox* Swatches;
+	SwatchCombo* Swatches;
 	QLabel* TextLabel5_2;
 	QLabel* OldC;
 	QLabel* TextLabel5;
@@ -96,9 +97,8 @@
 	void ToggleSL();
 	QPixmap SliderPix(int farbe);
 	QPixmap SliderBlack();
-	void SelSwatch(int n);
+	void SelSwatch();
 	void setSpot();
-//	void setRegist();
 	void SelModel(const QString& mod);
 	void setColor();
 	void setColor2(int h, int s, bool ende);
@@ -121,8 +121,10 @@
 	QVBoxLayout* Layout1_2_4;
 	
 	ColorSetManager csm;
-	int customSetStartIndex;
 	ScribusDoc* m_doc;
+	QTreeWidgetItem *systemSwatches;
+	QTreeWidgetItem *userSwatches;
+	QTreeWidgetItem *hsvSelector;
 };
 
 #endif // CMYKFARBEN_H

Modified: branches/ScribusOIF/scribus/ui/paintmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/ui/paintmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/paintmanager.cpp (original)
+++ branches/ScribusOIF/scribus/ui/paintmanager.cpp Mon Oct 25 20:42:01 2010
@@ -52,8 +52,6 @@
 #include "util_formats.h"
 #include "util_icon.h"
 
-#include <QDebug>
-
 PaintManagerDialog::PaintManagerDialog(QWidget* parent, QMap<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QStringList custColSet, ScribusDoc *doc, ScribusMainWindow *scMW) : QDialog(parent)
 {
 	setupUi(this);
@@ -75,13 +73,13 @@
 	}
 	origGradients = docGradients->keys();
 	customColSet = custColSet;
-	
-	int setCount = 1;
+
 	csm.findPaletteLocations();
-	csm.findPalettes();
-	QStringList allSets(csm.paletteNames());
-	LoadColSet->addItems(allSets);
-	customSetStartIndex = setCount+allSets.count();
+	systemSwatches = LoadColSet->addTopLevelItem( tr("Scribus Swatches"));
+	csm.findPalettes(systemSwatches);
+	LoadColSet->addSubItem("Scribus Small", systemSwatches);
+	systemSwatches->setExpanded(true);
+	userSwatches = LoadColSet->addTopLevelItem( tr("User Swatches"));
 	if (custColSet.count() != 0)
 	{
 		QStringList realEx;
@@ -94,13 +92,16 @@
 			{
 				QString setName = cfi.baseName();
 				setName.replace("_", " ");
-				LoadColSet->addItem(setName);
+				LoadColSet->addSubItem(setName, userSwatches);
 				realEx.append(custColSet[m]);
 			}
 		}
 		customColSet = realEx;
 	}
-	setCurrentComboItem(LoadColSet, docColSet);
+	userSwatches->setExpanded(true);
+	LoadColSet->setCurrentComboItem(docColSet);
+	if (m_doc != 0)
+		m_doc->getUsedColors(inDocUsedColors);
 
 	importButton->setEnabled(false);
 	newButton->setEnabled(false);
@@ -112,8 +113,10 @@
 	updateColorList();
 	dataTree->expandItem(colorItems);
 	dataTree->expandItem(gradientItems);
+	dataTree->setSelectionMode(QAbstractItemView::ExtendedSelection);
 	connect(dataTree, SIGNAL(itemClicked(QTreeWidgetItem*, int)), this, SLOT(itemSelected(QTreeWidgetItem*)));
 	connect(dataTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(selEditColor(QTreeWidgetItem*)));
+	connect(dataTree, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged()));
 	connect(newButton, SIGNAL(clicked()), this, SLOT(createNew()));
 	connect(editButton, SIGNAL(clicked()), this, SLOT(editColorItem()));
 	connect(duplicateButton, SIGNAL(clicked()), this, SLOT(duplicateColorItem()));
@@ -204,8 +207,16 @@
 	}
 }
 
+void PaintManagerDialog::itemSelectionChanged()
+{
+	QList<QTreeWidgetItem *> selItems = dataTree->selectedItems();
+	if (selItems.count() > 1)
+		deleteButton->setEnabled(true);
+}
+
 void PaintManagerDialog::itemSelected(QTreeWidgetItem* it)
 {
+	QList<QTreeWidgetItem *> selItems = dataTree->selectedItems();
 	if ((it) && (!paletteLocked))
 	{
 		if ((it->parent() == colorItems) || (it->parent() == gradientItems))
@@ -236,7 +247,10 @@
 			newButton->setEnabled(true);
 			editButton->setEnabled(false);
 			duplicateButton->setEnabled(false);
-			deleteButton->setEnabled(it->childCount() > 0);
+			if (selItems.count() < 2)
+				deleteButton->setEnabled(it->childCount() > 0);
+			else
+				deleteButton->setEnabled(true);
 			deleteUnusedButton->setEnabled((it == colorItems) && (it->childCount() > 0));
 		}
 	}
@@ -438,59 +452,61 @@
 {
 	if (paletteLocked)
 		return;
-	QTreeWidgetItem* it = dataTree->currentItem();
-	if (it)
-	{
-		if ((it->parent() == gradientItems) || (it == gradientItems))
-		{
+	QList<QTreeWidgetItem *> selItems = dataTree->selectedItems();
+	if (selItems.count() > 1)
+	{
+		QStringList usedColors;
+		QStringList colors;
+		QStringList gradients;
+		for (int a = 0; a < selItems.count(); a++)
+		{
+			QTreeWidgetItem* it = selItems[a];
 			if (it == gradientItems)
-			{
-				int t = QMessageBox::warning(this, CommonStrings::trWarning, tr("Do you really want to clear all your gradients?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
-				if (t == QMessageBox::No)
-					return;
-				replaceMap.clear();
-				for (QMap<QString, VGradient>::Iterator it = dialogGradients.begin(); it != dialogGradients.end(); ++it)
-				{
-					replaceMap.insert(it.key(), "");
-				}
-				dialogGradients.clear();
-			}
-			else
-			{
-				dialogGradients.remove(it->text(0));
-				replaceMap.insert(it->text(0), "");
-			}
-			updateGradientList();
-			itemSelected(0);
-		}
-		else if ((it->parent() == colorItems) || (it == colorItems))
-		{
+				continue;
 			if (it == colorItems)
-			{
-				int t = QMessageBox::warning(this, CommonStrings::trWarning, tr("Do you really want to clear all your colors and gradients?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
-				if (t == QMessageBox::No)
-					return;
-				replaceMap.clear();
-				for (QMap<QString, VGradient>::Iterator it = dialogGradients.begin(); it != dialogGradients.end(); ++it)
-				{
-					replaceMap.insert(it.key(), "");
-				}
-				replaceColorMap.clear();
-				for (ColorList::Iterator it = m_colorList.begin(); it != m_colorList.end(); ++it)
-				{
-					replaceColorMap.insert(it.key(), "Black");
-				}
-				dialogGradients.clear();
-				m_colorList.clear();
-				m_colorList.ensureBlackAndWhite();
-			}
-			else
-			{
-				QString dColor = it->text(0);
-				DelColor *dia = new DelColor(this, m_colorList, dColor, (m_doc!=0));
-				if (dia->exec())
-				{
-					QString replacementColor(dia->getReplacementColor());
+				continue;
+			if (it->text(0) == "Black")
+				continue;
+			if (it->text(0) == "White")
+				continue;
+			if (m_colorList[it->text(0)].isRegistrationColor())
+				continue;
+			if (it->parent() == gradientItems)
+				gradients.append(it->text(0));
+			if (it->parent() == colorItems)
+				colors.append(it->text(0));
+		}
+		for (int a = 0; a < gradients.count(); a++)
+		{
+			dialogGradients.remove(gradients[a]);
+			replaceMap.insert(gradients[a], "");
+		}
+		bool hasUsed = false;
+		ColorList UsedCG = getGradientColors();
+		for (int a = 0; a < colors.count(); a++)
+		{
+			if (UsedCG.contains(colors[a]) || inDocUsedColors.contains(colors[a]))
+			{
+				hasUsed = true;
+				usedColors.append(colors[a]);
+			}
+		}
+		if (hasUsed)
+		{
+			ColorList dCols = m_colorList;
+			QString dColor = tr("Selected Colors");
+			for (int a = 0; a < usedColors.count(); a++)
+			{
+				dCols.remove(usedColors[a]);
+			}
+			dCols.insert(dColor , ScColor());
+			DelColor *dia = new DelColor(this, dCols, dColor, (m_doc!=0));
+			if (dia->exec())
+			{
+				QString replacementColor(dia->getReplacementColor());
+				for (int a = 0; a < colors.count(); a++)
+				{
+					dColor = colors[a];
 					if (replacementColor == CommonStrings::tr_NoneColor)
 						replacementColor = CommonStrings::None;
 					if (replaceColorMap.values().contains(dColor))
@@ -506,11 +522,106 @@
 					m_colorList.remove(dColor);
 					updateGradientColors(replacementColor, dColor);
 				}
-				delete dia;
-			}
-			updateGradientList();
-			updateColorList();
-			itemSelected(0);
+			}
+			delete dia;
+		}
+		else
+		{
+			for (int a = 0; a < colors.count(); a++)
+			{
+				replaceColorMap.insert(colors[a], "Black");
+				m_colorList.remove(colors[a]);
+			}
+		}
+		updateGradientList();
+		updateColorList();
+		itemSelected(0);
+	}
+	else
+	{
+		QTreeWidgetItem* it = dataTree->currentItem();
+		if (it)
+		{
+			if ((it->parent() == gradientItems) || (it == gradientItems))
+			{
+				if (it == gradientItems)
+				{
+					int t = QMessageBox::warning(this, CommonStrings::trWarning, tr("Do you really want to clear all your gradients?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+					if (t == QMessageBox::No)
+						return;
+					replaceMap.clear();
+					for (QMap<QString, VGradient>::Iterator it = dialogGradients.begin(); it != dialogGradients.end(); ++it)
+					{
+						replaceMap.insert(it.key(), "");
+					}
+					dialogGradients.clear();
+				}
+				else
+				{
+					dialogGradients.remove(it->text(0));
+					replaceMap.insert(it->text(0), "");
+				}
+				updateGradientList();
+				itemSelected(0);
+			}
+			else if ((it->parent() == colorItems) || (it == colorItems))
+			{
+				if (it == colorItems)
+				{
+					int t = QMessageBox::warning(this, CommonStrings::trWarning, tr("Do you really want to clear all your colors and gradients?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+					if (t == QMessageBox::No)
+						return;
+					replaceMap.clear();
+					for (QMap<QString, VGradient>::Iterator it = dialogGradients.begin(); it != dialogGradients.end(); ++it)
+					{
+						replaceMap.insert(it.key(), "");
+					}
+					replaceColorMap.clear();
+					for (ColorList::Iterator it = m_colorList.begin(); it != m_colorList.end(); ++it)
+					{
+						replaceColorMap.insert(it.key(), "Black");
+					}
+					dialogGradients.clear();
+					m_colorList.clear();
+					m_colorList.ensureBlackAndWhite();
+				}
+				else
+				{
+					QString dColor = it->text(0);
+					ColorList UsedCG = getGradientColors();
+					if (inDocUsedColors.contains(dColor) || UsedCG.contains(dColor))
+					{
+						DelColor *dia = new DelColor(this, m_colorList, dColor, (m_doc!=0));
+						if (dia->exec())
+						{
+							QString replacementColor(dia->getReplacementColor());
+							if (replacementColor == CommonStrings::tr_NoneColor)
+								replacementColor = CommonStrings::None;
+							if (replaceColorMap.values().contains(dColor))
+							{
+								QMap<QString,QString>::Iterator itt;
+								for (itt = replaceColorMap.begin(); itt != replaceColorMap.end(); ++itt)
+								{
+									if (itt.value() == dColor)
+										itt.value() = replacementColor;
+								}
+							}
+							replaceColorMap.insert(dColor, replacementColor);
+							m_colorList.remove(dColor);
+							updateGradientColors(replacementColor, dColor);
+						}
+						delete dia;
+					}
+					else
+					{
+						replaceColorMap.insert(dColor, "Black");
+						m_colorList.remove(dColor);
+					}
+				}
+				updateGradientList();
+				updateColorList();
+				itemSelected(0);
+			}
 		}
 	}
 }
@@ -542,8 +653,7 @@
 			ColorList UsedCG = getGradientColors();
 			if (m_doc != 0)
 			{
-				m_doc->getUsedColors(UsedC);
-				m_colorList = UsedC;
+				m_colorList = inDocUsedColors;
 				for (it = UsedCG.begin(); it != UsedCG.end(); ++it)
 				{
 					if (!m_colorList.contains(it.key()))
@@ -893,8 +1003,7 @@
 
 void PaintManagerDialog::loadDefaults(const QString &txt)
 {
-	int c = LoadColSet->currentIndex();
-	setCurrentComboItem(LoadColSet, txt);
+	QTreeWidgetItem *c = LoadColSet->currentItem();
 	if (m_doc == NULL)
 	{
 		m_colorList.clear();
@@ -903,7 +1012,6 @@
 	QString pfadC2 = "";
 	if (txt == "Scribus Small")
 	{
-		setCurrentComboItem(LoadColSet, "Scribus Small");
 		m_colorList.insert("White", ScColor(0, 0, 0, 0));
 		m_colorList.insert("Black", ScColor(0, 0, 0, 255));
 		ScColor cc = ScColor(255, 255, 255, 255);
@@ -919,7 +1027,7 @@
 	}
 	else
 	{
-		if ( c < customSetStartIndex)
+		if ( c->parent() != userSwatches)
 			pfadC2 = csm.paletteFileFromName(txt);
 		else
 		{
@@ -941,7 +1049,6 @@
 		}
 		else
 		{
-			setCurrentComboItem(LoadColSet, "Scribus Small");
 			m_colorList.insert("White", ScColor(0, 0, 0, 0));
 			m_colorList.insert("Black", ScColor(0, 0, 0, 255));
 			ScColor cc = ScColor(255, 255, 255, 255);
@@ -963,7 +1070,7 @@
 void PaintManagerDialog::saveDefaults()
 {
 	QString Cpfad = QDir::convertSeparators(ScPaths::getApplicationDataDir());
-	QString Name = LoadColSet->currentText();
+	QString Name = LoadColSet->text();
 	Query* dia = new Query(this, "Name", 1, 0, tr("&Name:"), tr("Choose a Name"));
 	if ((Name == "Scribus Basic") || (Name == "Scribus Small") || (Name == "X11 RGB-Set") || (Name == "OpenOffice.org-Set")
 	        || (Name == "X11 Grey-Set") || (Name == "Gnome-Set") || (Name == "SVG-Set"))
@@ -1027,8 +1134,10 @@
 				nameC.replace(" ", "_");
 				nameC += ".xml";
 				customColSet.append(nameC);
-				LoadColSet->addItem(dia->getEditText());
-				setCurrentComboItem(LoadColSet, dia->getEditText());
+				LoadColSet->addSubItem(dia->getEditText(), userSwatches);
+				disconnect(LoadColSet, SIGNAL(activated(const QString &)), this, SLOT(loadDefaults(const QString&)));
+				LoadColSet->setCurrentComboItem(dia->getEditText());
+				connect(LoadColSet, SIGNAL(activated(const QString &)), this, SLOT(loadDefaults(const QString&)));
 			}
 		}
 	}
@@ -1036,7 +1145,7 @@
 
 QString PaintManagerDialog::getColorSetName()
 {
-	return LoadColSet->currentText();
+	return LoadColSet->text();
 }
 
 ScColor PaintManagerDialog::selectedColor()

Modified: branches/ScribusOIF/scribus/ui/paintmanager.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/ui/paintmanager.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/paintmanager.h (original)
+++ branches/ScribusOIF/scribus/ui/paintmanager.h Mon Oct 25 20:42:01 2010
@@ -64,6 +64,7 @@
 		bool hasImportedColors;
 	private slots:
 		void selEditColor(QTreeWidgetItem *it);
+		void itemSelectionChanged();
 		void itemSelected(QTreeWidgetItem* it);
 		void createNew();
 		void editColorItem();
@@ -82,10 +83,12 @@
 		void addGimpColor(QString &colorName, double r, double g, double b);
 		void loadScribusFormat(QString fileName);
 		ColorSetManager csm;
-		int customSetStartIndex;
 		bool paletteLocked;
 		QTreeWidgetItem *colorItems;
 		QTreeWidgetItem *gradientItems;
+		QTreeWidgetItem *systemSwatches;
+		QTreeWidgetItem *userSwatches;
+		ColorList inDocUsedColors;
 };
 
 #endif

Modified: branches/ScribusOIF/scribus/ui/paintmanagerbase.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/scribus/ui/paintmanagerbase.ui
==============================================================================
--- branches/ScribusOIF/scribus/ui/paintmanagerbase.ui (original)
+++ branches/ScribusOIF/scribus/ui/paintmanagerbase.ui Mon Oct 25 20:42:01 2010
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>411</height>
+    <width>412</width>
+    <height>412</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,6 +20,9 @@
    <bool>true</bool>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
+   <property name="spacing">
+    <number>5</number>
+   </property>
    <property name="margin">
     <number>5</number>
    </property>
@@ -46,10 +49,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetDefaultConstraint</enum>
-     </property>
+    <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
       <widget class="QPushButton" name="importButton">
        <property name="toolTip">
@@ -121,7 +121,7 @@
        <property name="title">
         <string>Color Sets</string>
        </property>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
+       <layout class="QVBoxLayout" name="verticalLayout">
         <property name="spacing">
          <number>5</number>
         </property>
@@ -136,15 +136,19 @@
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="LoadColSet">
-          <property name="toolTip">
-           <string>Choose a color set to load</string>
-          </property>
-          <item>
-           <property name="text">
-            <string>Scribus Small</string>
-           </property>
-          </item>
+         <widget class="SwatchCombo" name="LoadColSet">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="popupMode">
+           <enum>QToolButton::MenuButtonPopup</enum>
+          </property>
          </widget>
         </item>
         <item>
@@ -201,6 +205,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SwatchCombo</class>
+   <extends>QToolButton</extends>
+   <header>ui/swatchcombo.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>

Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15649&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Mon Oct 25 20:42:01 2010
@@ -2043,6 +2043,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\swatchcombo.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\symbolpalette.cpp"
 				>
 			</File>
@@ -11096,6 +11100,38 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\swatchcombo.h"
+				>
+				<FileConfiguration
+					Name="Debug-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug-arthur|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-arthur|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\symbolpalette.h"
 				>
 				<FileConfiguration
@@ -13462,6 +13498,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\moc_swatchcombo.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\moc_symbolpalette.cpp"
 				>
 			</File>

More information about the scribus-commit mailing list