Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 11644 → Rev 11645

/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
53,7 → 53,7
 
void CanvasMode_NodeEdit::drawControls(QPainter* p)
{
qDebug() << "NodeEdit::drawControls";
// qDebug() << "NodeEdit::drawControls";
// void Canvas::MarkClip(QPainter *p, PageItem *currItem, FPointArray cli, bool)
double x, y;
if (m_doc->m_Selection->count() == 0)
265,7 → 265,7
m->accept();
npf = m_canvas->globalToCanvas(m->globalPos());
#ifdef MODEDEBUG
qDebug() << "nodedit move event:" << m->x() << m->y() << "canvas:" << npf.x() << npf.y() << "@" << m_canvas->scale();
// qDebug() << "nodedit move event:" << m->x() << m->y() << "canvas:" << npf.x() << npf.y() << "@" << m_canvas->scale();
#endif
/* if (m_doc->guidesSettings.guidesShown)
{
295,7 → 295,7
&& (m->buttons() & Qt::LeftButton) && (!currItem->locked()))
{
#ifdef MODEDEBUG
qDebug() << "node edit drag 1";
// qDebug() << "node edit drag 1";
#endif
m_view->stopDragTimer();
handleNodeEditDrag(m, currItem);
310,8 → 310,8
handleNodeEditMove(m, mpo, currItem, p);
}
}
else
qDebug() << "node edit drag 9:" << (m->buttons() & Qt::LeftButton);
// else
// qDebug() << "node edit drag 9:" << (m->buttons() & Qt::LeftButton);
 
}
else // shouldnt be in nodeedit mode now, should it??
1215,7 → 1215,7
else
Clip = currItem->PoLine;
#ifdef MODEDEBUG
qDebug() << "handle nodeedit move:" << m_doc->nodeEdit.submode << m_doc->nodeEdit.EdPoints;
// qDebug() << "handle nodeedit move:" << m_doc->nodeEdit.submode << m_doc->nodeEdit.EdPoints;
#endif
if ((m_doc->nodeEdit.submode == NodeEditContext::DEL_POINT) ||
(m_doc->nodeEdit.submode == NodeEditContext::MOVE_POINT) ||
/trunk/Scribus/scribus/helpbrowser.cpp
29,7 → 29,7
#include "helpbrowser.h"
 
#include <QAction>
#include <QDebug>
// #include <QDebug>
#include <QDir>
#include <QDomDocument>
#include <QEvent>
/trunk/Scribus/scribus/fonts/ftface.cpp
268,8 → 268,7
if ( pos >= stream->size )
{
qDebug( "ftIOFunc: invalid i/o; pos = 0x%lx, size = 0x%lx\n",
pos, stream->size );
qDebug( "ftIOFunc: invalid i/o; pos = 0x%lx, size = 0x%lx\n", pos, stream->size );
return FT_Err_Invalid_Stream_Operation;
}
289,8 → 288,7
if ( read_bytes < count )
{
qDebug( "ftIOFunc: invalid read; expected %lu bytes, got %lu\n",
count, read_bytes );
qDebug( "ftIOFunc: invalid read; expected %lu bytes, got %lu\n", count, read_bytes );
error = FT_Err_Invalid_Stream_Operation;
}
/trunk/Scribus/scribus/canvas.h
25,7 → 25,7
#define CANVAS_H
 
#include <QApplication>
#include <QDebug>
//#include <QDebug>
#include <QPolygon>
#include <QRect>
#include <QWidget>
/trunk/Scribus/scribus/canvasgesture_rectselect.cpp
90,7 → 90,7
 
void RectSelect::mouseReleaseEvent(QMouseEvent *m)
{
qDebug() << "RectSelect::mouseRelease" << m->globalPos();
// qDebug() << "RectSelect::mouseRelease" << m->globalPos();
setEnd(m->globalPos());
m->accept();
m_view->stopGesture();
/trunk/Scribus/scribus/pageitem.cpp
34,6 → 34,7
#include <QPolygon>
#include <cmath>
#include <cassert>
#include <QDebug>
 
#include "canvas.h"
#include "scpaths.h"
1293,6 → 1294,7
{
if (!m_Doc->m_Selection->isEmpty())
{
// qDebug() << "Item: " << ItemNr << "W: " << Width << "H: " << Height;
if (Groups.count() == 0)
{
//Locked line colour selection
/trunk/Scribus/scribus/scribusview.cpp
419,7 → 419,7
{
if (!Doc->isLoading() && !m_ScMW->ScriptRunning)
{
qDebug() << "ScribusView-changed(): changed region:" << re;
// qDebug() << "ScribusView-changed(): changed region:" << re;
m_canvas->m_viewMode.forceRedraw = true;
updateCanvas(re);
}
427,9 → 427,9
 
void ScribusView::startGesture(CanvasGesture* gesture)
{
qDebug() << "start gesture" << typeid(*m_canvasMode).name()
<< "---->"
<< typeid(*gesture).name();
// qDebug() << "start gesture" << typeid(*m_canvasMode).name()
// << "---->"
// << typeid(*gesture).name();
m_canvasMode->deactivate(true);
gesture->setDelegate(m_canvasMode);
m_canvasMode = gesture;
440,7 → 440,7
 
void ScribusView::stopGesture()
{
qDebug() << "stop gesture" << typeid(*m_canvasMode).name() << (m_canvasMode->delegate() != 0);
// qDebug() << "stop gesture" << typeid(*m_canvasMode).name() << (m_canvasMode->delegate() != 0);
if (m_canvasMode->delegate())
{
m_canvasMode->deactivate(false);
469,7 → 469,7
void ScribusView::requestMode(int appMode)
{
bool updateNecessary = false;
qDebug() << "request mode:" << appMode;
// qDebug() << "request mode:" << appMode;
switch(appMode) // filter submodes
{
case submodePaintingDone: // return to normal mode
521,7 → 521,7
default:
if (appMode < 0 || appMode > submodeFirstSubmode)
{
qDebug() << "request mode: UNKNOWN" << appMode;
// qDebug() << "request mode: UNKNOWN" << appMode;
appMode = modeNormal;
}
m_previousMode = appMode;
528,7 → 528,7
break;
}
 
qDebug() << "request mode" << Doc->appMode << "-->" << appMode;
// qDebug() << "request mode" << Doc->appMode << "-->" << appMode;
if (Doc->appMode != appMode)
{
m_ScMW->setAppMode(appMode);
540,7 → 540,7
}
if (newCanvasMode)
{
qDebug() << "request canvas mode" << typeid(*newCanvasMode).name();
// qDebug() << "request canvas mode" << typeid(*newCanvasMode).name();
m_canvasMode->deactivate(false);
m_canvasMode = newCanvasMode;
m_canvasMode->activate(false);
805,7 → 805,7
url = e->mimeData()->urls().at(0);
text = "";
}
qDebug() << "ScribusView::contentsDropEvent" << e->mimeData()->formats() << url;
// qDebug() << "ScribusView::contentsDropEvent" << e->mimeData()->formats() << url;
if (!url.isEmpty())
{
e->acceptProposedAction();
2510,9 → 2510,9
qRound(Doc->maxCanvasCoordinate.x() * scale) - maxViewport.width());
verticalScrollBar()->setRange(qRound(Doc->minCanvasCoordinate.y() * scale),
qRound(Doc->maxCanvasCoordinate.y() * scale) - maxViewport.height());
qDebug() << "adjustCanvas" << width << height << dX << dY
<< "(" << Doc->minCanvasCoordinate.x() << Doc->minCanvasCoordinate.y() << ") - ("
<< Doc->maxCanvasCoordinate.x() << Doc->maxCanvasCoordinate.y() << ") @" << scale << maxViewport;
// qDebug() << "adjustCanvas" << width << height << dX << dY
// << "(" << Doc->minCanvasCoordinate.x() << Doc->minCanvasCoordinate.y() << ") - ("
// << Doc->maxCanvasCoordinate.x() << Doc->maxCanvasCoordinate.y() << ") @" << scale << maxViewport;
widget()->resize(qRound((Doc->maxCanvasCoordinate.x()-Doc->minCanvasCoordinate.x())*scale),
qRound((Doc->maxCanvasCoordinate.y()-Doc->minCanvasCoordinate.y())*scale));
2687,7 → 2687,7
return;
QPoint nx = m_canvas->canvasToLocal(FPoint(x, y));
QSize viewsize = viewport()->size();
qDebug() << "setCCPo" << nx << viewsize;
// qDebug() << "setCCPo" << nx << viewsize;
setContentsPos(nx.x() - viewsize.width() / 2, nx.y() - viewsize.height() / 2);
}
 
3245,7 → 3245,7
double h = Buffer->Height;
double pw = Buffer->Pwidth;
int z = 0;
qDebug() << "Pasting frame of type " << Buffer->PType;
// qDebug() << "Pasting frame of type " << Buffer->PType;
switch (Buffer->PType)
{
// OBSOLETE CR 2005-02-06
4451,7 → 4451,7
 
void ScribusView::resizeContents(int w, int h) // deprecated
{
qDebug() << "ScribusView::resizeContents(" << w << "," << h << ")";
// qDebug() << "ScribusView::resizeContents(" << w << "," << h << ")";
int originX = qRound(Doc->minCanvasCoordinate.x() * scale());
int originY = qRound(Doc->minCanvasCoordinate.y() * scale());
widget()->resize(w - 0*originX, h - 0*originY);
/trunk/Scribus/scribus/text/sctext_shared.cpp
1,6 → 1,6
#include <cassert> //added to make Fedora-5 happy
 
#include <QDebug>
//#include <QDebug>
 
#include "fpoint.h"
#include "scfonts.h"
/trunk/Scribus/scribus/scribus.cpp
6085,7 → 6085,7
nodePalette->HaveNode(false, false);
nodePalette->MoveNode->setChecked(true);
nodePalette->show();
qDebug() << "nodepalette show:" << nodePalette->geometry();
// qDebug() << "nodepalette show:" << nodePalette->geometry();
connect(view, SIGNAL(HavePoint(bool, bool)), nodePalette, SLOT(HaveNode(bool, bool)));
doc->nodeEdit.reset();
//done elsewhere now doc->appMode = modeEditClip;
6161,7 → 6161,7
actionManager->disconnectModeActions();
nodePalette->setDoc(0,0);
nodePalette->hide();
qDebug() << "nodepalette hide";
// qDebug() << "nodepalette hide";
scrActions["toolsSelect"]->setEnabled(true);
scrActions["toolsSelect"]->setChecked(true);
scrActions["toolsRotate"]->setEnabled(true);
9280,7 → 9280,7
 
void ScribusMainWindow::languageChange()
{
qDebug() << "void ScribusMainWindow::languageChange()";
// qDebug() << "void ScribusMainWindow::languageChange()";
if (ScCore->initialized())
{
CommonStrings::languageChange();
/trunk/Scribus/scribus/exif.cpp
252,7 → 252,7
if ( a >= 6 )
{
 
qDebug ( "too many padding bytes" );
// qDebug ( "too many padding bytes" );
return false;
 
}
329,7 → 329,7
return true;
 
case M_EOI: // in case it's a tables-only JPEG stream
qDebug ( "No image in jpeg!" );
// qDebug ( "No image in jpeg!" );
return false;
 
case M_COM: // Comment section
782,7 → 782,7
// Jhead 1.3 or earlier would crop the whole directory!
// As Jhead produces this form of format incorrectness,
// I'll just let it pass silently
qDebug ( "Thumbnail removed with Jhead 1.3 or earlier" );
// qDebug ( "Thumbnail removed with Jhead 1.3 or earlier" );
}
else
{
/trunk/Scribus/scribus/vruler.cpp
22,7 → 22,7
***************************************************************************/
 
#include <QCursor>
#include <QDebug>
//#include <QDebug>
#include <QMouseEvent>
#include <QPaintEvent>
#include <QPainter>
/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
110,7 → 110,7
 
void FreehandMode::activate(bool flag)
{
qDebug() << "FreehandMode::activate" << flag;
// qDebug() << "FreehandMode::activate" << flag;
GxM = GyM = -1;
Mxp = Myp = -1;
Dxp = Dyp = -1;
126,7 → 126,7
 
void FreehandMode::deactivate(bool flag)
{
qDebug() << "FreehandMode::deactivate" << flag;
// qDebug() << "FreehandMode::deactivate" << flag;
m_view->redrawMarker->hide();
}
 
/trunk/Scribus/scribus/hruler.cpp
23,7 → 23,7
 
#include <QCursor>
#include <QMouseEvent>
#include <QDebug>
// #include <QDebug>
#include <QPaintEvent>
#include <QPainter>
#include <QPixmap>
/trunk/Scribus/scribus/chartablemodel.cpp
119,8 → 119,8
int val = s.toInt(&ok, base);
if (!ok)
{
qDebug("void CharTableModel::appendUnicode(QString s, uint base) 'base' conversion error");
qDebug((QString("s: %1 base: %2").arg(s).arg(base).toAscii()));
// qDebug("void CharTableModel::appendUnicode(QString s, uint base) 'base' conversion error");
// qDebug((QString("s: %1 base: %2").arg(s).arg(base).toAscii()));
return;
}
if (ok && !m_characters.contains(val))
147,7 → 147,7
reset();
return true;
}
qDebug("CharTable::deleteOwnCharacter: no char deleted - logical error probably");
// qDebug("CharTable::deleteOwnCharacter: no char deleted - logical error probably");
return false;
}
 
/trunk/Scribus/scribus/scribusdoc.cpp
25,7 → 25,7
#include <utility>
 
#include <QByteArray>
#include <QDebug>
//#include <QDebug>
#include <QEventLoop>
#include <QFile>
#include <QList>
3443,7 → 3443,7
Q_ASSERT(frameType==PageItem::Rectangle || frameType==PageItem::Unspecified);
break;
default:
qDebug("unknown item type");
// qDebug("unknown item type");
assert (false);
}
Q_CHECK_PTR(newItem);
9269,7 → 9269,7
double gx, gy, gh, gw;
m_Selection->setGroupRect();
m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
qDebug("doc, emit w&h, when was this used?");
// qDebug("doc, emit w&h, when was this used?");
emit widthAndHeight(gw, gh);
}
}
9601,8 → 9601,8
void ScribusDoc::itemSelection_GroupObjects(bool changeLock, bool lock, Selection* customSelection)
{
Selection* itemSelection = (customSelection!=0) ? customSelection : m_Selection;
// if (itemSelection->count() < 2)
// return;
if (itemSelection->count() < 1)
return;
PageItem *currItem;
PageItem* bb;
double x, y, w, h;
/trunk/Scribus/scribus/charselect.cpp
5,7 → 5,7
for which a new license (GPL+exception) is in place.
*/
 
#include <QDebug>
//#include <QDebug>
#include <QFileDialog>
#include <QMessageBox>
 
/trunk/Scribus/scribus/canvasgesture_linemove.cpp
15,7 → 15,7
 
#include "canvasgesture_linemove.h"
 
#include <QDebug>
//#include <QDebug>
#include <QMouseEvent>
#include <QPainter>
#include <QPen>
97,7 → 97,7
 
void LineMove::activate(bool flag)
{
qDebug() << "LineMove::activate" << flag << m_bounds;
// qDebug() << "LineMove::activate" << flag << m_bounds;
}
 
 
104,7 → 104,7
 
void LineMove::deactivate(bool flag)
{
qDebug() << "LineMove::deactivate" << flag;
// qDebug() << "LineMove::deactivate" << flag;
m_haveLineItem = false;
}
 
136,7 → 136,7
}
m->accept();
m_canvas->update();
qDebug() << "LineMove::mouseRelease" << m_line->xPos() << "," << m_line->yPos() << "@" << m_line->rotation() << m_line->width() << "x" << m_line->height();
// qDebug() << "LineMove::mouseRelease" << m_line->xPos() << "," << m_line->yPos() << "@" << m_line->rotation() << m_line->width() << "x" << m_line->height();
m_view->stopGesture();
}
 
/trunk/Scribus/scribus/colorcombo.cpp
15,7 → 15,7
 
#include "colorcombo.h"
#include "commonstrings.h"
#include "qdebug.h"
// #include "qdebug.h"
 
ColorCombo::ColorCombo( QWidget* parent ) : QComboBox(parent)
{
/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
110,7 → 110,7
 
void BezierMode::activate(bool flag)
{
qDebug() << "DrawBezierMode::activate" << flag;
// qDebug() << "DrawBezierMode::activate" << flag;
GxM = GyM = -1;
Mxp = Myp = -1;
Dxp = Dyp = -1;
126,7 → 126,7
 
void BezierMode::deactivate(bool flag)
{
qDebug() << "BezierMode::deactivate" << flag;
// qDebug() << "BezierMode::deactivate" << flag;
m_view->redrawMarker->hide();
}
 
/trunk/Scribus/scribus/pageitem_imageframe.cpp
21,7 → 21,7
* *
***************************************************************************/
 
#include <QDebug>
// #include <QDebug>
#include <QGridLayout>
#include <QKeyEvent>
 
324,10 → 324,10
}
break;
case 11:
if (menuResolution != 0) {
qDebug() << "New context menu created before old was destroyed."
"Loosing some bytes of memory!";
}
// if (menuResolution != 0) {
// qDebug() << "New context menu created before old was destroyed."
// "Loosing some bytes of memory!";
// }
menuResolution = new QMenu();
act = menu->addMenu(menuResolution);
act->setText(tr("Preview Settings"));
/trunk/Scribus/scribus/plugins/xfigimplugin/importxfig.cpp
1403,10 → 1403,10
processArc(ts, data);
break;
case 6:
qDebug() << "Xfig-Import:: Unsupported Compound object";
// qDebug() << "Xfig-Import:: Unsupported Compound object";
break;
case -6:
qDebug() << "Xfig-Import:: Unsupported End of Compound object";
// qDebug() << "Xfig-Import:: Unsupported End of Compound object";
break;
}
}
/trunk/Scribus/scribus/autoformbuttongroup.cpp
8,7 → 8,7
#include <QLayout>
#include <QBitmap>
#include <QPixmap>
#include <QDebug>
// #include <QDebug>
 
#include "autoformbuttongroup.h"
#include "fpointarray.h"
/trunk/Scribus/scribus/canvasgesture_resize.cpp
65,7 → 65,7
m_handle = Canvas::OUTSIDE;
if (m_transactionStarted)
{
qDebug() << "ResizeGesture::clear: cancel transaction" << m_transactionStarted;
// qDebug() << "ResizeGesture::clear: cancel transaction" << m_transactionStarted;
m_transactionStarted->cancel();
delete m_transactionStarted;
m_transactionStarted = NULL;
74,7 → 74,7
 
void ResizeGesture::activate(bool flag)
{
qDebug() << "ResizeGesture::activate" << flag;
// qDebug() << "ResizeGesture::activate" << flag;
}
 
 
81,7 → 81,7
 
void ResizeGesture::deactivate(bool forgesture)
{
qDebug() << "ResizeGesture::deactivate" << forgesture;
// qDebug() << "ResizeGesture::deactivate" << forgesture;
if (!forgesture)
clear();
}
130,7 → 130,7
if (m_doc->m_Selection->count() != 0)
{
PageItem* currItem = m_doc->m_Selection->itemAt(0);
qDebug() << "ResizeGesture::release: new bounds" << m_bounds;
// qDebug() << "ResizeGesture::release: new bounds" << m_bounds;
doResize(m->modifiers() & Qt::AltModifier);
m_doc->setRedrawBounding(currItem);
if (currItem->asImageFrame())
252,8 → 252,8
{
FPoint snappedPoint = m_doc->ApplyGridF(docPoint);
double x = snappedPoint.x(), y = snappedPoint.y();
if (m_doc->ApplyGuides(&x, &y))
qDebug() << "guides applied:" << snappedPoint.x() << snappedPoint.y() << "to" << x << y;
// if (m_doc->ApplyGuides(&x, &y))
// qDebug() << "guides applied:" << snappedPoint.x() << snappedPoint.y() << "to" << x << y;
if (m_handle == Canvas::NORTH || m_handle == Canvas::SOUTH)
// only snap on y-axis
docPoint = FPoint(docPoint.x(), y);
262,7 → 262,7
docPoint = FPoint(x, docPoint.y());
else
docPoint = FPoint(x,y);
qDebug() << "resize snap grid/guides:" << m->globalPos() << "-->" << m_canvas->canvasToGlobal(docPoint);
// qDebug() << "resize snap grid/guides:" << m->globalPos() << "-->" << m_canvas->canvasToGlobal(docPoint);
}
// un-rotate point
319,7 → 319,7
double newRatio = double(m_bounds.width()) / double(m_bounds.height());
if (constrainRatio && m_origRatio != newRatio)
{
qDebug() << "constrain ratio:" << m_bounds << newRatio << "to" << m_origRatio;
// qDebug() << "constrain ratio:" << m_bounds << newRatio << "to" << m_origRatio;
int newWidth = qRound(m_bounds.height() * m_origRatio);
int newHeight = qRound(m_bounds.width() / m_origRatio);
switch (m_handle)
385,7 → 385,7
default:
break;
}
qDebug() << "constrained:" << m_bounds << double(m_bounds.width()) / m_bounds.height();
// qDebug() << "constrained:" << m_bounds << double(m_bounds.width()) / m_bounds.height();
}
 
// re-rotate: if top left has changed, then it needs rotation
/trunk/Scribus/scribus/contextmenu.cpp
13,7 → 13,7
* *
***************************************************************************/
 
#include <QDebug>
//#include <QDebug>
#include <QFrame>
#include <QGridLayout>
#include <QLabel>