Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 234 → Rev 235

/trunk/Scribus/scribus/cmsprefs.cpp
196,6 → 196,16
Layout1->addItem( spacer_3 );
CMSPrefsLayout->addLayout( Layout1 );
 
QToolTip::add( InputP, tr( "Default color profile for imported images" ) );
QToolTip::add( InputP2, tr( "Default color profile for solid colors on the page" ) );
QToolTip::add( MonitorP, tr( "Color profile that you have generated or received from the manufacturer.\nThis profile should be specific to your monitor and not a generic profile (i.e. sRGB)." ) );
QToolTip::add( PrinterP, tr( "Color profile for your printer model from the manufacturer.\nThis profile should be specific to your printer and not a generic profile (i.e. sRGB)." ) );
QToolTip::add( MonitorI, tr( "Choose the default rendering intent for your monitor. Unless you know why to change it,\nRelative Colorimetric or Perceptual should be chosen." ) );
QToolTip::add( PrinterI, tr( "Choose the default rendering intent for your printer. Unless you know why to change it,\nRelative Colorimetric or Perceptual should be chosen." ) );
QToolTip::add( Simulate, tr( "This enables 'soft proofing' of how your document colors will print,\nbased on the chosen printer profile." ) );
QToolTip::add( GamutC, tr( "This is a method of showing colors on the screen which may not print properly.\nThis requires very accurate profiles and serves only as a warning." ) );
QToolTip::add( BlackP, tr( "Black Point Compensation is a method of improving contrast in photos.\nIt is recommended that you enable this if you have photos in your document." ) );
 
// signals and slots connections
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( OK, SIGNAL( clicked() ), this, SLOT( SetValues() ) );
/trunk/Scribus/scribus/scribus.cpp
1018,6 → 1018,7
QString uc = k->text();
QString cr, Tcha, Twort;
uint Tcoun;
int len;
if (keyrep)
return;
keyrep = true;
1136,6 → 1137,7
}
if (!b->Locked)
doc->ActPage->moveGroup(0, 1);
break;
default:
if (b->PType == 4)
{
1172,6 → 1174,47
doc->ActPage->slotDoCurs(false);
switch (kk)
{
case Key_Prior:
// go to begin of line
// position of character before the cursor
if ( b->CPos == 0 )
break; // at begin of frame
len = static_cast<int>(b->Ptext.count());
if ( b->CPos > 0 )
{
alty = b->Ptext.at(b->CPos-1)->yp;
// check for yp at actual position
if ( b->CPos < len )
{
altx = b->Ptext.at(b->CPos)->yp;
if ( altx > alty )
{
// we was at begin of line
break;
}
}
else if ( b->CPos != len )
{
break;
}
}
len = static_cast<int>(b->Ptext.count());
while ( b->CPos > 0 && b->Ptext.at(b->CPos-1)->yp == alty )
b->CPos--;
if ( buttonState & ShiftButton )
doc->ActPage->ExpandSel(b, -1, oldPos);
break;
case Key_Next:
// go to end of line
len = static_cast<int>(b->Ptext.count());
if ( b->CPos >= len )
break; // at end of frame
alty = b->Ptext.at(b->CPos)->yp;
while ( b->CPos < len-1 && b->Ptext.at(b->CPos+1)->yp == alty )
b->CPos++;
if ( buttonState & ShiftButton )
doc->ActPage->ExpandSel(b, 1, oldPos);
break;
case Key_Down:
if (b->CPos != static_cast<int>(b->Ptext.count()))
{