diff options
| author | fschmid <fschmid@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-04 23:06:22 +0000 |
|---|---|---|
| committer | fschmid <fschmid@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-04 23:06:22 +0000 |
| commit | f9ea35cd2131feb62f6157f79c4d453cf0307d94 (patch) | |
| tree | 335d58c319ced927bd982291ca46913ae70179a1 /scribus/storyeditor.cpp | |
| parent | b4bb54811720a94c8b31370c04b61ac51f66d120 (diff) | |
| download | scribus-f9ea35cd2131feb62f6157f79c4d453cf0307d94.tar.gz scribus-f9ea35cd2131feb62f6157f79c4d453cf0307d94.tar.xz scribus-f9ea35cd2131feb62f6157f79c4d453cf0307d94.zip | |
Fixed Bug 10336: "Inserted glyph is not of the requested font" by backporting the relevant changes from 1.5.0svn
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17279 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/storyeditor.cpp')
| -rw-r--r-- | scribus/storyeditor.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/scribus/storyeditor.cpp b/scribus/storyeditor.cpp index 4fb4b8b..3859a25 100644 --- a/scribus/storyeditor.cpp +++ b/scribus/storyeditor.cpp @@ -1570,12 +1570,11 @@ StoryEditor::~StoryEditor() void StoryEditor::showEvent(QShowEvent *) { charSelect = new CharSelect(this); - charSelect->userTableModel()->setCharacters( - ScCore->primaryMainWindow()->charPalette->userTableModel()->characters()); + charSelect->userTableModel()->setCharactersAndFonts(ScCore->primaryMainWindow()->charPalette->userTableModel()->characters(), ScCore->primaryMainWindow()->charPalette->userTableModel()->fonts()); connect(charSelect, SIGNAL(insertSpecialChar()), this, SLOT(slot_insertSpecialChar())); - connect(charSelect, SIGNAL(insertUserSpecialChar(QChar)), - this, SLOT(slot_insertUserSpecialChar(QChar))); + connect(charSelect, SIGNAL(insertUserSpecialChar(QChar, QString)), + this, SLOT(slot_insertUserSpecialChar(QChar, QString))); } void StoryEditor::hideEvent(QHideEvent *) @@ -1584,15 +1583,14 @@ void StoryEditor::hideEvent(QHideEvent *) { if (charSelectUsed) { - ScCore->primaryMainWindow()->charPalette->userTableModel()->setCharacters( - charSelect->userTableModel()->characters()); + ScCore->primaryMainWindow()->charPalette->userTableModel()->setCharactersAndFonts(charSelect->userTableModel()->characters(), charSelect->userTableModel()->fonts()); } if (charSelect->isVisible()) charSelect->close(); disconnect(charSelect, SIGNAL(insertSpecialChar()), this, SLOT(slot_insertSpecialChar())); - disconnect(charSelect, SIGNAL(insertUserSpecialChar(QChar)), - this, SLOT(slot_insertUserSpecialChar(QChar))); + disconnect(charSelect, SIGNAL(insertUserSpecialChar(QChar, QString)), + this, SLOT(slot_insertUserSpecialChar(QChar, QString))); delete charSelect; charSelect = NULL; } @@ -2684,7 +2682,7 @@ void StoryEditor::slot_insertSpecialChar() blockUpdate = false; } -void StoryEditor::slot_insertUserSpecialChar(QChar c) +void StoryEditor::slot_insertUserSpecialChar(QChar c, QString) { blockUpdate = true; Editor->insertPlainText(c); |