← Back to branch summary

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

« back to all changes in this revision

Viewing changes to scribus/charselectenhanced.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/charselectenhanced.cpp
33
33
        // signals and slots connections
34
34
        connect(deleteButton, SIGNAL(clicked()), this, SLOT(delEdit()));
35
35
        connect(insertButton, SIGNAL(clicked()), this, SLOT(insChar()));
36
 
        connect(m_charTable, SIGNAL(selectChar(uint)), this, SLOT(newChar(uint)));
 
36
        connect(m_charTable, SIGNAL(selectChar(uint, QString)), this, SLOT(newChar(uint, QString)));
37
37
        connect(fontSelector, SIGNAL(activated(int)), this, SLOT(newFont(int)));
38
38
        connect(rangeSelector, SIGNAL(activated(int)), this, SLOT(newCharClass(int)));
39
39
        connect(hexLineEdit, SIGNAL(returnPressed()),
66
66
//     tDebug("CharSelectEnhanced setDoc end");
67
67
}
68
68
 
 
69
QString CharSelectEnhanced::getUsedFont()
 
70
{
 
71
        return m_fontInUse;
 
72
}
 
73
 
69
74
void CharSelectEnhanced::scanFont()
70
75
{
71
76
//     tDebug("scanFont start");
410
415
//     tDebug("newFont end");
411
416
}
412
417
 
413
 
void CharSelectEnhanced::newChar(uint i)
 
418
void CharSelectEnhanced::newChar(uint i, QString)
414
419
{
415
420
        chToIns += QChar(i);
416
421
        sample->setPixmap(FontSample((*m_doc->AllFonts)[m_fontInUse], 28, chToIns, palette().color(QPalette::Window), true));
456
461
        bool ok = false;
457
462
        uint code = tx.arg(hexLineEdit->text()).toUInt(&ok, 16);
458
463
        if ((ok) && (code > 31))
459
 
                newChar(code);
 
464
                newChar(code, m_fontInUse);
460
465
}
461
466
 
462
467
void CharSelectEnhanced::changeEvent(QEvent *e)