~ubuntu-branches/ubuntu/trusty/scribus/trusty

chs = qRound(10 * ((m_Doc->typographicSettings.valueBaseGrid * (style.dropCapLines()-1) + (charStyle.font().ascent(style.charStyle().fontSize() / 10.0))) / charStyle.font().realCharHeight(chstr0, 10)));

2733

else

2734

{

2735

if (style.lineSpacingMode() == ParagraphStyle::FixedLineSpacing)

2736

chs = qRound(10 * ((style.lineSpacing() * (style.dropCapLines()-1)+(charStyle.font().ascent(style.charStyle().fontSize() / 10.0))) / charStyle.font().realCharHeight(chstr0, 10)));

2737

else

2738

{

2739

double currasce = charStyle.font().height(style.charStyle().fontSize() / 10.0);

2740

chs = qRound(10 * ((currasce * (style.dropCapLines()-1)+(charStyle.font().ascent(style.charStyle().fontSize() / 10.0))) / charStyle.font().realCharHeight(chstr0, 10)));

2741

}

2742

}

2743

}

2744

if (chstr0 == SpecialChars::TAB)

2745

tabCc++;

2746

2770

2747

2771

if (!m_Doc->RePos)

2748

2772

{

2785

2809

else

2786

2810

CurX += hl->glyph.wide();

2787

2811

}

2788

tabDist = CurX;

2789

2812

}

2790

2813

}

2791

2814

// else {

2851

2874

if ((!isEmbedded) && (!m_Doc->RePos))

2852

2875

{

2853

2876

// added to prevent fat frame outline due to antialiasing and considering you can’t pass a cosmetic pen to scpainter - pm

2854

double aestheticFactor(5.0);

2855

double scpInv = 1.0 / (qMax(view->scale(), 1.0) * aestheticFactor);

2877

double aestheticFactor(3.33);

2878

double scpInv = 1.0 / (view->scale() * aestheticFactor);

2856

2879

if ((Frame) && (m_Doc->guidesSettings.framesShown))

2857

2880

{

2858

2881

p->setPen(PrefsManager::instance()->appPrefs.DFrameNormColor, scpInv, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);

2902

2925

drawColumnBorders(p);

2903

2926

if ((m_Doc->guidesSettings.layerMarkersShown) && (m_Doc->layerCount() > 1) && (!m_Doc->layerOutline(LayerNr)) && (!view->m_canvas->isPreviewMode()))

2904

2927

{

2905

p->setPen(Qt::black, 0.5/ m_Doc->view()->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);

2928

p->setPen(Qt::black, 0.5 / m_Doc->view()->scale(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);

2906

2929

p->setPenOpacity(1.0);

2907

2930

p->setBrush(m_Doc->layerMarker(LayerNr));

2908

2931

p->setBrushOpacity(1.0);

2974

2997

}

2975

2998

int oldPos = itemText.cursorPosition(); // 15-mar-2004 jjsa for cursor movement with Shift + Arrow key

2976

2999

int kk = k->key();

2977

int as = k->text()[0].unicode();

2978

3000

QString uc = k->text();

3001

#ifdef Q_OS_HAIKU

3002

if (kk == Qt::Key_Return)

3003

uc = "\r";

3004

#endif

3005

int as = uc[0].unicode();

2979

3006

QString cr, Tcha, Twort;

2980

3007

uint Tcoun;

2981

3008

int len, pos;

2991

3018

//<< ISO 14755

2992

3019

//Check if we are trying to enter Unicode sequence mode first

2993

3020

QKeySequence currKeySeq = QKeySequence(k->key() | keyModifiers);

2994

if(currKeySeq.matches(doc()->scMW()->scrActions["specialUnicodeSequenceBegin"]->shortcut())==QKeySequence::ExactMatch)

3021

if (currKeySeq.matches(doc()->scMW()->scrActions["specialUnicodeSequenceBegin"]->shortcut())==QKeySequence::ExactMatch)

2995

3022

{

2996

3023

unicodeTextEditMode = true;

2997

3024

unicodeInputCount = 0;

3110

3137

case Qt::Key_End:

3111

3138

// go to end of line

3112

3139

len = lastInFrame();

3113

if ( itemText.cursorPosition() >= len )

3140

if (itemText.cursorPosition() >= (len + 1))

3114

3141

break; // at end of frame

3115

if ( (buttonModifiers & Qt::ControlModifier) == 0 )

3142

if ((buttonModifiers & Qt::ControlModifier) == 0)

3116

3143

{

3117

3144

itemText.setCursorPosition( itemText.endOfLine(itemText.cursorPosition()) );

3118

3145

}

3121

3148

//Control End for end of frame text

3122

3149

itemText.setCursorPosition( itemText.endOfFrame(itemText.cursorPosition()) );

3123

3150

}

3124

if ( buttonModifiers & Qt::ShiftModifier )

3151

if (buttonModifiers & Qt::ShiftModifier)

3125

3152

ExpandSel(1, oldPos);

3126

// if ( this->itemText.lengthOfSelection() > 0 )

3153

// if (this->itemText.lengthOfSelection() > 0)

3127

3154

// view->RefreshItem(this);

3128

3155

m_Doc->scMW()->setTBvals(this);

3129

3156

break;

3182

3209

break; // at begin of frame

3183

3210

len = itemText.length();

3184

3211

itemText.setCursorPosition( itemText.prevParagraph(itemText.cursorPosition()) );

3185

if ( buttonModifiers & Qt::ShiftModifier )

3212

if (buttonModifiers & Qt::ShiftModifier)

3186

3213

ExpandSel(-1, oldPos);

3187

3214

}

3188

3215

else

3802

3829

p->drawLine(FPoint(0, TExtra + lineCorr), FPoint(Width, TExtra + lineCorr));

3803

3830

if (BExtra + lineCorr!=0.0)

3804

3831

p->drawLine(FPoint(0, Height - BExtra - lineCorr), FPoint(Width, Height - BExtra - lineCorr));

3805

double oldColRightX = Extra + lineCorr;

3806

3832

while(curCol < Cols)

3807

3833

{

3808

3834

colLeft=(colWidth + ColGap) * curCol + Extra + lineCorr;

3810

3836

p->drawLine(FPoint(colLeft, 0), FPoint(colLeft, 0+Height));

3811

3837

if (colLeft + colWidth != Width)

3812

3838

p->drawLine(FPoint(colLeft+colWidth, 0), FPoint(colLeft+colWidth, 0+Height));

3813

oldColRightX=colLeft+colWidth;

3814

3839

++curCol;

3815

3840

}

3816

3841

Older »