← Back to branch summary

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

« back to all changes in this revision

Viewing changes to scribus/colorcombo.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/colorcombo.cpp
41
41
        setView( lb );
42
42
}
43
43
 
44
 
 
45
44
QString ColorCombo::currentColor() const
46
45
{
47
 
                return currentText();
 
46
        return currentText();
48
47
}
49
48
 
50
49
void ColorCombo::updateBox(ColorList& list, ColorCombo::PixmapType pixType , bool insertNone)
54
53
        {
55
54
                clb->clear();
56
55
                if ( insertNone )
 
56
                {
57
57
                        clb->addItem(CommonStrings::tr_NoneColor);
 
58
                        clb->item(0)->setData(Qt::UserRole, CommonStrings::None);
 
59
                }
58
60
                if ( pixType == ColorCombo::fancyPixmaps )
59
61
                        clb->insertItems(list, ColorListBox::fancyPixmap);
60
62
                else if ( pixType == ColorCombo::widePixmaps )