From dfa18b99d2236c2642d1a6ea427bd12db1511a5e Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Wed, 22 Jul 2009 13:03:28 +0000 Subject: [PATCH] reindent svn path=/trunk/kdenlive/; revision=3755 --- src/kthumb.cpp | 10 ++-- src/titledocument.cpp | 48 +++++++-------- src/titlewidget.cpp | 132 +++++++++++++++++++++--------------------- src/titlewidget.h | 4 +- 4 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/kthumb.cpp b/src/kthumb.cpp index 36a97e0a..ffbeec99 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -191,12 +191,12 @@ void KThumb::extractImage(int frame, int frame2) const int theight = KdenliveSettings::trackheight(); if (frame != -1) { - QPixmap pix=getFrame(m_producer,frame,twidth,theight); - emit thumbReady(frame, pix); - } + QPixmap pix = getFrame(m_producer, frame, twidth, theight); + emit thumbReady(frame, pix); + } if (frame2 != -1) { - QPixmap pix=getFrame(m_producer,frame2,twidth,theight); - emit thumbReady(frame2, pix); + QPixmap pix = getFrame(m_producer, frame2, twidth, theight); + emit thumbReady(frame2, pix); } } diff --git a/src/titledocument.cpp b/src/titledocument.cpp index df7c5c88..73b57b0d 100644 --- a/src/titledocument.cpp +++ b/src/titledocument.cpp @@ -124,15 +124,15 @@ QDomDocument TitleDocument::xml(QGraphicsPolygonItem* startv, QGraphicsPolygonIt if (startv && endv) { QDomElement endp = doc.createElement("endviewport"); QDomElement startp = doc.createElement("startviewport"); - endp.setAttribute("x", endv->data(0).toString() ); - endp.setAttribute("y", endv->data(1).toString() ); + endp.setAttribute("x", endv->data(0).toString()); + endp.setAttribute("y", endv->data(1).toString()); endp.setAttribute("size", endv->data(2).toString()); - endp.setAttribute("rect",rectFToString(endv->boundingRect())); + endp.setAttribute("rect", rectFToString(endv->boundingRect())); - startp.setAttribute("x", startv->data(0).toString() ); + startp.setAttribute("x", startv->data(0).toString()); startp.setAttribute("y", startv->data(1).toString()); startp.setAttribute("size", startv->data(2).toString()); - startp.setAttribute("rect",rectFToString(startv->boundingRect())); + startp.setAttribute("rect", rectFToString(startv->boundingRect())); startp.setAttribute("z-index", startv->zValue()); endp.setAttribute("z-index", endv->zValue()); @@ -301,25 +301,25 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, Q } } } else if (items.item(i).nodeName() == "startviewport" && startv) { - QString rect = items.item(i).attributes().namedItem("rect").nodeValue(); - startv->setPolygon(stringToRect(rect)); - int x = items.item(i).attributes().namedItem("x").nodeValue().toInt(); - int y = items.item(i).attributes().namedItem("y").nodeValue().toInt(); - int size = items.item(i).attributes().namedItem("size").nodeValue().toInt(); - startv->setData(0,x); - startv->setData(1,y); - startv->setData(2,size); - //startv->setPos(p); - } else if (items.item(i).nodeName() == "endviewport" && endv) { - QString rect = items.item(i).attributes().namedItem("rect").nodeValue(); - endv->setPolygon(stringToRect(rect)); - int x = items.item(i).attributes().namedItem("x").nodeValue().toInt(); - int y = items.item(i).attributes().namedItem("y").nodeValue().toInt(); - int size = items.item(i).attributes().namedItem("size").nodeValue().toInt(); - endv->setData(0,x); - endv->setData(1,y); - endv->setData(2,size); - } + QString rect = items.item(i).attributes().namedItem("rect").nodeValue(); + startv->setPolygon(stringToRect(rect)); + int x = items.item(i).attributes().namedItem("x").nodeValue().toInt(); + int y = items.item(i).attributes().namedItem("y").nodeValue().toInt(); + int size = items.item(i).attributes().namedItem("size").nodeValue().toInt(); + startv->setData(0, x); + startv->setData(1, y); + startv->setData(2, size); + //startv->setPos(p); + } else if (items.item(i).nodeName() == "endviewport" && endv) { + QString rect = items.item(i).attributes().namedItem("rect").nodeValue(); + endv->setPolygon(stringToRect(rect)); + int x = items.item(i).attributes().namedItem("x").nodeValue().toInt(); + int y = items.item(i).attributes().namedItem("y").nodeValue().toInt(); + int size = items.item(i).attributes().namedItem("size").nodeValue().toInt(); + endv->setData(0, x); + endv->setData(1, y); + endv->setData(2, size); + } } } return maxZValue; diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 8da43320..72c5ff98 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -41,7 +41,7 @@ int settingUp = false; const int IMAGEITEM = 7; const int RECTITEM = 3; const int TEXTITEM = 8; -static bool insertingValues=false; +static bool insertingValues = false; TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWidget *parent) : QDialog(parent), @@ -316,14 +316,14 @@ void TitleWidget::slotTextTool() { m_scene->setTool(TITLE_TEXT); showToolbars(TITLE_TEXT); - checkButton(TITLE_TEXT); + checkButton(TITLE_TEXT); } void TitleWidget::slotRectTool() { m_scene->setTool(TITLE_RECTANGLE); showToolbars(TITLE_RECTANGLE); - checkButton(TITLE_RECTANGLE); + checkButton(TITLE_RECTANGLE); } void TitleWidget::slotSelectTool() @@ -355,7 +355,7 @@ void TitleWidget::slotSelectTool() updateRotZoom(l.at(0)); } - checkButton(TITLE_SELECT); + checkButton(TITLE_SELECT); } void TitleWidget::slotImageTool() @@ -380,14 +380,14 @@ void TitleWidget::slotImageTool() } m_scene->setTool(TITLE_SELECT); showToolbars(TITLE_SELECT); - checkButton(TITLE_NONE); + checkButton(TITLE_NONE); } void TitleWidget::showToolbars(TITLETOOL toolType) { bool bText = false; bool bRect = false; - bool bImage = false; + bool bImage = false; bool bNone = false; switch (toolType) { @@ -399,14 +399,14 @@ void TitleWidget::showToolbars(TITLETOOL toolType) break; case TITLE_IMAGE: bImage = true; - break; + break; default: - bNone = true; + bNone = true; break; } text_properties->setHidden(!bText); rect_properties->setHidden(!bRect); - image_properties->setHidden(!bImage); + image_properties->setHidden(!bImage); no_properties->setHidden(!bNone); } @@ -416,7 +416,7 @@ void TitleWidget::enableToolbars(TITLETOOL toolType) bool bFrame = false; bool bText = false; bool bRect = false; - bool bImage = false; + bool bImage = false; bool bValue_w = false; bool bValue_h = false; @@ -437,7 +437,7 @@ void TitleWidget::enableToolbars(TITLETOOL toolType) bFrame = true; bValue_w = true; bValue_h = true; - bImage = true; + bImage = true; break; default: break; @@ -445,39 +445,39 @@ void TitleWidget::enableToolbars(TITLETOOL toolType) frame_properties->setEnabled(bFrame); text_properties->setEnabled(bText); rect_properties->setEnabled(bRect); - image_properties->setEnabled(bImage); + image_properties->setEnabled(bImage); value_w->setEnabled(bValue_w); value_h->setEnabled(bValue_h); } void TitleWidget::checkButton(TITLETOOL toolType) { - bool bSelect = false; - bool bText = false; - bool bRect = false; - bool bImage = false; - - switch (toolType) { - case TITLE_SELECT: - bSelect = true; - break; - case TITLE_TEXT: - bText = true; - break; - case TITLE_RECTANGLE: - bRect = true; - break; - case TITLE_IMAGE: - bImage = true; - break; - case TITLE_NONE: - break; - } - - m_buttonCursor->setChecked(bSelect); - m_buttonText->setChecked(bText); - m_buttonRect->setChecked(bRect); - m_buttonImage->setChecked(bImage); + bool bSelect = false; + bool bText = false; + bool bRect = false; + bool bImage = false; + + switch (toolType) { + case TITLE_SELECT: + bSelect = true; + break; + case TITLE_TEXT: + bText = true; + break; + case TITLE_RECTANGLE: + bRect = true; + break; + case TITLE_IMAGE: + bImage = true; + break; + case TITLE_NONE: + break; + } + + m_buttonCursor->setChecked(bSelect); + m_buttonText->setChecked(bText); + m_buttonRect->setChecked(bRect); + m_buttonImage->setChecked(bImage); } void TitleWidget::displayBackgroundFrame() @@ -562,8 +562,8 @@ void TitleWidget::slotZoomOneToOne() void TitleWidget::slotNewRect(QGraphicsRectItem * rect) { - updateAxisButtons(rect); // back to default - + updateAxisButtons(rect); // back to default + QColor f = rectFColor->color(); f.setAlpha(rectFAlpha->value()); QPen penf(f); @@ -579,8 +579,8 @@ void TitleWidget::slotNewRect(QGraphicsRectItem * rect) void TitleWidget::slotNewText(QGraphicsTextItem *tt) { - updateAxisButtons(tt); // back to default - + updateAxisButtons(tt); // back to default + QFont font = font_family->currentFont(); font.setPixelSize(font_size->value()); // mbd: issue 551: @@ -711,8 +711,8 @@ void TitleWidget::selectionChanged() enableToolbars(TITLE_RECTANGLE); } else if (l.at(0)->type() == IMAGEITEM) { - showToolbars(TITLE_IMAGE); - + showToolbars(TITLE_IMAGE); + updateCoordinates(l.at(0)); updateDimension(l.at(0)); @@ -720,7 +720,7 @@ void TitleWidget::selectionChanged() } else { //toolBox->setCurrentIndex(0); - showToolbars(TITLE_NONE); + showToolbars(TITLE_NONE); enableToolbars(TITLE_NONE); /*frame_properties->setEnabled(false); text_properties->setEnabled(false); @@ -1253,24 +1253,24 @@ void TitleWidget::itemVCenter() void TitleWidget::setupViewports() { //double aspect_ratio = 4.0 / 3.0;//read from project - //better zoom centered, but render uses only the created rect, so no problem to change the zoom function - QRectF sp(0, 0, startViewportSize->value() * m_frameWidth/100.0 ,startViewportSize->value()* m_frameHeight/100.0); - QRectF ep(0, 0, endViewportSize->value() * m_frameWidth/100.0,endViewportSize->value() * m_frameHeight/100.0); + //better zoom centered, but render uses only the created rect, so no problem to change the zoom function + QRectF sp(0, 0, startViewportSize->value() * m_frameWidth / 100.0 , startViewportSize->value()* m_frameHeight / 100.0); + QRectF ep(0, 0, endViewportSize->value() * m_frameWidth / 100.0, endViewportSize->value() * m_frameHeight / 100.0); // use a polygon thiat uses 16:9 and 4:3 rects forpreview the size in all aspect ratios ? QPolygonF spoly(sp); QPolygonF epoly(ep); - spoly.translate( startViewportX->value(), startViewportY->value() ); - epoly.translate( endViewportX->value(), endViewportY->value() ); + spoly.translate(startViewportX->value(), startViewportY->value()); + epoly.translate(endViewportX->value(), endViewportY->value()); m_startViewport->setPolygon(spoly); m_endViewport->setPolygon(epoly); - if (! insertingValues){ - m_startViewport->setData(0,startViewportX->value()); - m_startViewport->setData(1,startViewportY->value()); - m_startViewport->setData(2,startViewportSize->value()); - - m_endViewport->setData(0,endViewportX->value()); - m_endViewport->setData(1,endViewportY->value()); - m_endViewport->setData(2,endViewportSize->value()); + if (! insertingValues) { + m_startViewport->setData(0, startViewportX->value()); + m_startViewport->setData(1, startViewportY->value()); + m_startViewport->setData(2, startViewportSize->value()); + + m_endViewport->setData(0, endViewportX->value()); + m_endViewport->setData(1, endViewportY->value()); + m_endViewport->setData(2, endViewportSize->value()); } } @@ -1283,14 +1283,14 @@ void TitleWidget::loadTitle() if (items.at(i)->zValue() > -1000) delete items.at(i); } m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport) + 1; - insertingValues=true; - startViewportX->setValue(m_startViewport->data(0).toInt()); - startViewportY->setValue(m_startViewport->data(1).toInt()); - startViewportSize->setValue(m_startViewport->data(2).toInt()); - endViewportX->setValue(m_endViewport->data(0).toInt()); - endViewportY->setValue(m_endViewport->data(1).toInt()); - endViewportSize->setValue(m_endViewport->data(2).toInt()); - insertingValues=false; + insertingValues = true; + startViewportX->setValue(m_startViewport->data(0).toInt()); + startViewportY->setValue(m_startViewport->data(1).toInt()); + startViewportSize->setValue(m_startViewport->data(2).toInt()); + endViewportX->setValue(m_endViewport->data(0).toInt()); + endViewportY->setValue(m_endViewport->data(1).toInt()); + endViewportSize->setValue(m_endViewport->data(2).toInt()); + insertingValues = false; slotSelectTool(); } } diff --git a/src/titlewidget.h b/src/titlewidget.h index 08a96505..ecbc8876 100644 --- a/src/titlewidget.h +++ b/src/titlewidget.h @@ -132,8 +132,8 @@ private: void enableToolbars(TITLETOOL toolType); /** \brief Shows the toolbars suiting to toolType */ void showToolbars(TITLETOOL toolType); - /** \brief Check a tool button. */ - void checkButton(TITLETOOL toolType); + /** \brief Check a tool button. */ + void checkButton(TITLETOOL toolType); public slots: void slotNewText(QGraphicsTextItem *tt); -- 2.39.2