12819-Patch.diff (3,657 bytes)
Index: scribus/canvasmode_framelinks.cpp
===================================================================
--- scribus/canvasmode_framelinks.cpp (revisione 19635)
+++ scribus/canvasmode_framelinks.cpp (copia locale)
@@ -189,7 +189,7 @@
if (bb->prevInChain() != NULL)
{
ScMessageBox msgBox(QMessageBox::Question, tr("Linking Text Frames"),
- "<qt>" + ScribusView::tr("You are trying to insert a frame into an existing text chain, where would you like to insert it?") + "<qt>");
+ "<qt>" + tr("You are trying to insert a frame into an existing text chain, where would you like to insert it?") + "</qt>");
QPushButton *cancelButton = msgBox.addButton(CommonStrings::tr_Cancel, QMessageBox::RejectRole);
QPushButton *beforeButton = msgBox.addButton(tr("Before"), QMessageBox::AcceptRole);
QPushButton *afterButton = msgBox.addButton(tr("After"), QMessageBox::AcceptRole);
@@ -248,15 +248,15 @@
{
//CB Mouse is released when this messagebox takes focus
m_canvas->m_viewMode.m_MouseButtonPressed = false;
- ScMessageBox::warning(m_view, ScribusView::tr("Linking Text Frames"),
- "<qt>" + ScribusView::tr("You are trying to link a frame to itself.") + "</qt>");
+ ScMessageBox::warning(m_view, tr("Linking Text Frames"),
+ "<qt>" + tr("You are trying to link a frame to itself.") + "</qt>");
}
else
{
//CB Mouse is released when this messagebox takes focus
m_canvas->m_viewMode.m_MouseButtonPressed = false;
- ScMessageBox::warning(m_view, ScribusView::tr("Linking Text Frames"),
- "<qt>" + ScribusView::tr("You are trying to link a non-empty frame to frame which is already linked.") + "</qt>");
+ ScMessageBox::warning(m_view, tr("Linking Text Frames"),
+ "<qt>" + tr("You are trying to link a non-empty frame to frame which is already linked.") + "</qt>");
}
}
else
Index: scribus/canvasmode_eyedropper.cpp
===================================================================
--- scribus/canvasmode_eyedropper.cpp (revisione 19635)
+++ scribus/canvasmode_eyedropper.cpp (copia locale)
@@ -166,7 +166,7 @@
{
bool ok;
bool nameFound=false;
- QString questionString="<qt>"+ tr("The selected color does not exist in the document's color set. Please enter a name for this new color.")+"</qt>";
+ QString questionString="<qt>" + tr("The selected color does not exist in the document's color set. Please enter a name for this new color.") + "</qt>";
do
{
colorName = QInputDialog::getText(m_ScMW, tr("Color Not Found"), questionString, QLineEdit::Normal, QString::null, &ok);
@@ -173,7 +173,7 @@
if (ok)
{
if (m_doc->PageColors.contains(colorName))
- questionString="<qt>"+ tr("The name you have selected already exists. Please enter a different name for this new color.")+"</qt>";
+ questionString="<qt>" + tr("The name you have selected already exists. Please enter a different name for this new color.") + "</qt>";
else
nameFound=true;
}
Index: scribus/canvasmode_edit.cpp
===================================================================
--- scribus/canvasmode_edit.cpp (revisione 19635)
+++ scribus/canvasmode_edit.cpp (copia locale)
@@ -66,11 +66,11 @@
Dxp = Dyp = -1;
oldCp = Cp = -1;
frameResizeHandle = -1;
- m_blinker = new QTimer(view);
+ m_blinker = new QTimer(view);
connect(m_blinker, SIGNAL(timeout()), this, SLOT(blinkTextCursor()));
connect(view->horizRuler, SIGNAL(MarkerMoved(double, double)), this, SLOT(rulerPreview(double, double)));
mRulerGuide = -1;
- m_longCursorTime=false;
+ m_longCursorTime = false;
m_keyRepeat = false;
}