← Back to branch summary

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

« back to all changes in this revision

Viewing changes to scribus/cpalette.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/cpalette.cpp
708
708
                gradEdit->Preview->fill_gradient = currentItem->fill_gradient;
709
709
                gradEdit->Preview->updateDisplay();
710
710
        }
711
 
        if (number > 0)
712
 
                blendMode->setEnabled(false);
713
 
        else
714
 
                blendMode->setEnabled(true);
 
711
        blendMode->setEnabled(number <= 0);
715
712
        emit NewGradient(number);
716
713
}
717
714
 
722
719
                gradientQCombo->setCurrentIndex(0);
723
720
                currentGradient = 0;
724
721
        }
 
722
 
 
723
        currentGradient = (number > 0) ? number : 0;
725
724
        //no need to disconnect as qcombobox only emits from user action
726
725
        /* PFJ - 29.02.04 - Removed GradGroup and Gradient mode from switch */
727
726
        GradientMode = number == 0 ? false : number == 8 ? false : true;
789
788
        disconnect(PM1, SIGNAL(valueChanged(int)), this, SLOT(setActShade()));
790
789
        // JG probably not needed at all and should probably not be here
791
790
        updateCList();
792
 
        switch (number)
 
791
        if (number == 0)
793
792
        {
794
 
        case 0:
795
793
                PM1->setValue(Shade3);
796
794
                updateBoxS(Color3);
797
 
                break;
798
 
        default:
 
795
                if (currentItem)
 
796
                {
 
797
                        setActTrans(currentItem->fillTransparency(), currentItem->lineTransparency());
 
798
                        setActBlend(currentItem->fillBlendmode(), currentItem->lineBlendmode());
 
799
                }
 
800
        }
 
801
        else
 
802
        {
799
803
                PM1->setValue(Shade);
800
804
                updateBoxS(Color);
801
 
                break;
802
805
        }
803
806
//      setFocus();
804
807
        repaint();