← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/tabtools.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/tabtools.cpp
640
640
                }
641
641
        }
642
642
 
643
 
        
 
643
        int index;
644
644
        ColorList::Iterator itc, endOfColorList;
645
645
        ColorList* colorList = (docu != 0) ? (&docu->PageColors) : prefsManager->colorSetPtr();
646
 
        colorComboText->clear();
647
 
        colorComboText->addItem(CommonStrings::tr_NoneColor);
 
646
        colorComboText->updateBox(*colorList, ColorCombo::fancyPixmaps);
648
647
        if (prefsData->dPenText == CommonStrings::None)
649
 
                colorComboText->setCurrentIndex(colorComboText->count()-1);
650
 
        endOfColorList=colorList->end();
651
 
        for (itc = colorList->begin(); itc != endOfColorList; ++itc)
652
 
        {
653
 
                colorComboText->insertFancyItem( itc.value(), docu, itc.key() );
654
 
                if (itc.key() == prefsData->dPenText)
655
 
                        colorComboText->setCurrentIndex(colorComboText->count()-1);
656
 
        }
657
 
 
 
648
                colorComboText->setCurrentIndex(0);
 
649
        else if((index = colorComboText->findText(prefsData->dPenText)) >= 0)
 
650
                colorComboText->setCurrentIndex(index);
658
651
        shadingText->setValue(prefsData->dTextPenShade);
659
652
 
660
 
        colorComboStrokeText->clear();
661
 
        colorComboStrokeText->addItem(CommonStrings::tr_NoneColor);
 
653
        colorComboStrokeText->updateBox(*colorList, ColorCombo::fancyPixmaps);
662
654
        if (prefsData->dStrokeText == CommonStrings::None)
663
 
                colorComboStrokeText->setCurrentIndex(colorComboStrokeText->count()-1);
664
 
        endOfColorList=colorList->end();
665
 
        for (itc = colorList->begin(); itc != endOfColorList; ++itc)
666
 
        {
667
 
                colorComboStrokeText->insertFancyItem( itc.value(), docu, itc.key() );
668
 
                if (itc.key() == prefsData->dStrokeText)
669
 
                        colorComboStrokeText->setCurrentIndex(colorComboStrokeText->count()-1);
670
 
        }
 
655
                colorComboStrokeText->setCurrentIndex(0);
 
656
        else if((index = colorComboStrokeText->findText(prefsData->dStrokeText)) >= 0)
 
657
                colorComboStrokeText->setCurrentIndex(index);
671
658
        shadingTextStroke->setValue(prefsData->dTextStrokeShade);
672
659
 
673
 
        colorComboTextBackground->clear();
674
 
        colorComboTextBackground->addItem(CommonStrings::tr_NoneColor);
 
660
        colorComboTextBackground->updateBox(*colorList, ColorCombo::fancyPixmaps);
675
661
        if (prefsData->dTextBackGround == CommonStrings::None)
676
 
                colorComboTextBackground->setCurrentIndex(colorComboTextBackground->count()-1);
677
 
        endOfColorList=colorList->end();
678
 
        for (itc = colorList->begin(); itc != endOfColorList; ++itc)
679
 
        {
680
 
                colorComboTextBackground->insertFancyItem( itc.value(), docu, itc.key() );
681
 
                if (itc.key() == prefsData->dTextBackGround)
682
 
                        colorComboTextBackground->setCurrentIndex(colorComboTextBackground->count()-1);
683
 
        }
 
662
                colorComboTextBackground->setCurrentIndex(0);
 
663
        else if((index = colorComboTextBackground->findText(prefsData->dTextBackGround)) >= 0)
 
664
                colorComboTextBackground->setCurrentIndex(index);
684
665
        shadingTextBack->setValue(prefsData->dTextBackGroundShade);
685
666
 
686
 
        colorComboTextLine->clear();
687
 
        colorComboTextLine->addItem(CommonStrings::tr_NoneColor);
 
667
        colorComboTextLine->updateBox(*colorList, ColorCombo::fancyPixmaps);
688
668
        if (prefsData->dTextLineColor == CommonStrings::None)
689
 
                colorComboTextLine->setCurrentIndex(colorComboTextLine->count()-1);
690
 
        endOfColorList=colorList->end();
691
 
        for (itc = colorList->begin(); itc != endOfColorList; ++itc)
692
 
        {
693
 
                colorComboTextLine->insertFancyItem( itc.value(), docu, itc.key() );
694
 
                if (itc.key() == prefsData->dTextLineColor)
695
 
                        colorComboTextLine->setCurrentIndex(colorComboTextLine->count()-1);
696
 
        }
 
669
                colorComboTextLine->setCurrentIndex(0);
 
670
        else if((index = colorComboTextLine->findText(prefsData->dTextLineColor)) >= 0)
 
671
                colorComboTextLine->setCurrentIndex(index);
697
672
        shadingTextLine->setValue(prefsData->dTextLineShade);
698
673
 
699
674
        tabFillCombo->clear();
730
705
        columnsText->setValue(prefsData->dCols);
731
706
        gapText->setValue(prefsData->dGap * unitRatio);
732
707
 
733
 
        colorComboLineShape->clear();
734
 
        colorComboLineShape->addItem(CommonStrings::tr_NoneColor);
 
708
        colorComboLineShape->updateBox(*colorList, ColorCombo::fancyPixmaps);
735
709
        if (prefsData->dPen == CommonStrings::None)
736
 
                colorComboLineShape->setCurrentIndex(colorComboLineShape->count()-1);
737
 
        endOfColorList=colorList->end();
738
 
        for (itc = colorList->begin(); itc != endOfColorList; ++itc)
739
 
        {
740
 
                colorComboLineShape->insertFancyItem( itc.value(), docu, itc.key() );
741
 
                if (itc.key() == prefsData->dPen)
742
 
                        colorComboLineShape->setCurrentIndex(colorComboLineShape->count()-1);
743
 
        }
 
710
                colorComboLineShape->setCurrentIndex(0);
 
711
        else if((index = colorComboLineShape->findText(prefsData->dPen)) >= 0)
 
712
                colorComboLineShape->setCurrentIndex(index);
744
713
        shadingLineShape->setValue(prefsData->dShade2);
745
714
 
746
 
        comboFillShape->clear();
747
 
        comboFillShape->addItem(CommonStrings::tr_NoneColor);
 
715
        comboFillShape->updateBox(*colorList, ColorCombo::fancyPixmaps);
748
716
        if (prefsData->dBrush == CommonStrings::None)
749
 
                comboFillShape->setCurrentIndex(comboFillShape->count()-1);
750
 
        endOfColorList=colorList->end();
751
 
        for (itc = colorList->begin(); itc != endOfColorList; ++itc)
752
 
        {
753
 
                comboFillShape->insertFancyItem( itc.value(), docu, itc.key() );
754
 
                if (itc.key() == prefsData->dBrush)
755
 
                        comboFillShape->setCurrentIndex(comboFillShape->count()-1);
756
 
        }
757
 
 
 
717
                comboFillShape->setCurrentIndex(0);
 
718
        else if((index = comboFillShape->findText(prefsData->dBrush)) >= 0)
 
719
                comboFillShape->setCurrentIndex(index);
758
720
        shadingFillShape->setValue(prefsData->dShade);
 
721
 
759
722
        comboStyleShape->setCurrentIndex(static_cast<int>(prefsData->dLineArt) - 1);
760
723
        lineWidthShape->setValue(prefsData->dWidth);
761
724
 
762
 
        colorComboLine->clear();
763
 
        colorComboLine->addItem(CommonStrings::tr_NoneColor);
 
725
        colorComboLine->updateBox(*colorList, ColorCombo::fancyPixmaps);
764
726
        if (prefsData->dPenLine == CommonStrings::None)
765
 
                colorComboLine->setCurrentIndex(colorComboLine->count()-1);
766
 
        endOfColorList=colorList->end();
767
 
        for (itc = colorList->begin(); itc != endOfColorList; ++itc)
768
 
        {
769
 
                colorComboLine->insertFancyItem( itc.value(), docu, itc.key() );
770
 
                if (itc.key() == prefsData->dPenLine)
771
 
                        colorComboLine->setCurrentIndex(colorComboLine->count()-1);
772
 
        }
773
 
 
 
727
                colorComboLine->setCurrentIndex(0);
 
728
        else if((index = colorComboLine->findText(prefsData->dPenLine)) >= 0)
 
729
                colorComboLine->setCurrentIndex(index);
774
730
        shadingLine->setValue(prefsData->dShadeLine);
775
731
 
776
732
        comboStyleLine->setCurrentIndex(static_cast<int>(prefsData->dLstyleLine) - 1);
794
750
        buttonGroup5->setChecked( !prefsData->scaleType );
795
751
        checkRatioImage->setChecked(prefsData->aspectRatio);
796
752
 
797
 
        comboFillImage->clear();
798
 
        comboFillImage->addItem(CommonStrings::tr_NoneColor);
 
753
        comboFillImage->updateBox(*colorList, ColorCombo::fancyPixmaps);
799
754
        if (prefsData->dBrushPict == CommonStrings::None)
800
 
                comboFillImage->setCurrentIndex(comboFillImage->count()-1);
801
 
        endOfColorList=colorList->end();
802
 
        for (itc = colorList->begin(); itc != endOfColorList; ++itc)
803
 
        {
804
 
                comboFillImage->insertFancyItem( itc.value(), docu, itc.key() );
805
 
                if (itc.key() == prefsData->dBrushPict)
806
 
                        comboFillImage->setCurrentIndex(comboFillImage->count()-1);
807
 
        }
 
755
                comboFillImage->setCurrentIndex(0);
 
756
        else if((index = comboFillImage->findText(prefsData->dBrushPict)) >= 0)
 
757
                comboFillImage->setCurrentIndex(index);
808
758
 
809
759
        shadingFillImage->setValue( prefsData->shadePict );
810
760
        embeddedPath->setChecked(prefsData->useEmbeddedPath);