From kde-commits Thu Jan 31 22:07:44 2013 From: Montel Laurent Date: Thu, 31 Jan 2013 22:07:44 +0000 To: kde-commits Subject: [kdepim] composereditor-ng: Fix coding style. Improve list dialog Message-Id: <20130131220744.B4A17A6091 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=135967007516257 Git commit 5d3873b405b84307d01af694697b4962d680cb76 by Montel Laurent. Committed on 31/01/2013 at 23:07. Pushed by mlaurent into branch 'master'. Fix coding style. Improve list dialog M +7 -7 composereditor-ng/composerview.cpp M +1 -2 composereditor-ng/dialog/composerlinkdialog.cpp M +34 -3 composereditor-ng/dialog/composerlistdialog.cpp M +1 -1 composereditor-ng/image/composerimagedialog.cpp M +9 -9 composereditor-ng/image/composerimageresizewidget.cpp M +5 -5 composereditor-ng/pagecolor/pagecolorbackgrounddialog.cpp M +1 -1 composereditor-ng/pagecolor/pagecolorbackgroundwidget.cpp M +1 -1 composereditor-ng/table/composercellsizewidget.cpp M +1 -1 composereditor-ng/table/composertableformatdialog.cpp M +2 -2 composereditor-ng/widgets/findreplacebar.cpp http://commits.kde.org/kdepim/5d3873b405b84307d01af694697b4962d680cb76 diff --git a/composereditor-ng/composerview.cpp b/composereditor-ng/compose= rview.cpp index 9a48f3c..0b0ffd1 100644 --- a/composereditor-ng/composerview.cpp +++ b/composereditor-ng/composerview.cpp @@ -1022,20 +1022,20 @@ void ComposerViewPrivate::_k_slotAdjustActions() if (alignment =3D=3D QLatin1String("left")) { if (action_align_left) action_align_left->setChecked(true); - } else if(alignment =3D=3D QLatin1String("right")) { + } else if (alignment =3D=3D QLatin1String("right")) { if (action_align_right) action_align_right->setChecked(true); - } else if(alignment =3D=3D QLatin1String("center")) { + } else if (alignment =3D=3D QLatin1String("center")) { if (action_align_center) action_align_center->setChecked(true); - } else if(alignment =3D=3D QLatin1String("-webkit-auto")) { + } else if (alignment =3D=3D QLatin1String("-webkit-auto")) { if (action_align_justify) action_align_justify->setChecked(true); } = if (action_font_family) { const QString font =3D evaluateJavascript(QLatin1String("getFontFa= mily()")).toString(); - if(!font.isEmpty()) { + if (!font.isEmpty()) { action_font_family->setFont(font); } } @@ -1078,7 +1078,7 @@ void ComposerViewPrivate::_k_slotSpeakText() QDBusInterface ktts(QLatin1String("org.kde.kttsd"), QLatin1String("/KS= peech"), QLatin1String("org.kde.KSpeech")); = QString text =3D q->selectedText(); - if(text.isEmpty()) + if (text.isEmpty()) text =3D q->page()->mainFrame()->toPlainText(); = ktts.asyncCall(QLatin1String("say"), text, 0); @@ -1322,7 +1322,7 @@ void ComposerView::mousePressEvent(QMouseEvent * even= t) if (event->button() =3D=3D Qt::LeftButton) { d->contextMenuResult =3D page()->mainFrame()->hitTestContent(event= ->pos()); const bool imageSelected =3D !d->contextMenuResult.imageUrl().isEm= pty(); - if(imageSelected) { + if (imageSelected) { d->showImageResizeWidget(); } } else { @@ -1348,7 +1348,7 @@ void ComposerView::mouseDoubleClickEvent(QMouseEvent = * event) if (event->button() =3D=3D Qt::LeftButton) { d->contextMenuResult =3D page()->mainFrame()->hitTestContent(event= ->pos()); const bool imageSelected =3D !d->contextMenuResult.imageUrl().isEm= pty(); - if(imageSelected) { + if (imageSelected) { d->showImageResizeWidget(); d->_k_slotEditImage(); } diff --git a/composereditor-ng/dialog/composerlinkdialog.cpp b/composeredit= or-ng/dialog/composerlinkdialog.cpp index cfffbd5..4aa906f 100644 --- a/composereditor-ng/dialog/composerlinkdialog.cpp +++ b/composereditor-ng/dialog/composerlinkdialog.cpp @@ -134,7 +134,7 @@ QString ComposerLinkDialogPrivate::html() const if (url.isValid()) { const QString targetStr =3D target->itemData(target->currentIndex(= )).toString(); QString html =3D QString::fromLatin1( "%2" ).arg ( url.= toString() ).arg ( linkText->text() ); @@ -171,7 +171,6 @@ void ComposerLinkDialogPrivate::updateSettings() } } } - } = ComposerLinkDialog::ComposerLinkDialog(const QString& selectedText, QWidge= t *parent) diff --git a/composereditor-ng/dialog/composerlistdialog.cpp b/composeredit= or-ng/dialog/composerlistdialog.cpp index f6fd0d1..c2af52c 100644 --- a/composereditor-ng/dialog/composerlistdialog.cpp +++ b/composereditor-ng/dialog/composerlistdialog.cpp @@ -24,6 +24,7 @@ = #include #include +#include = #include #include @@ -38,7 +39,10 @@ class ComposerListDialogPrivate public: ComposerListDialogPrivate(const QWebElement& element, ComposerListDial= og *qq) : webElement(element), - q(qq) + listType(0), + listStyle(0), + q(qq), + type(ExtendAttributesDialog::ListUL) { initialize(); } @@ -55,9 +59,12 @@ public: void initialize(); void updateSettings(); void updateListHtml(); + void fillStyle(); QWebElement webElement; - QComboBox *listType; + KComboBox *listType; + KComboBox *listStyle; ComposerListDialog *q; + ExtendAttributesDialog::ExtendType type; }; = void ComposerListDialogPrivate::initialize() @@ -70,13 +77,18 @@ void ComposerListDialogPrivate::initialize() QLabel *lab =3D new QLabel(i18n("List Type")); vbox->addWidget(lab); = - listType =3D new QComboBox; + listType =3D new KComboBox; vbox->addWidget(listType); listType->addItem(i18n("None"), None); listType->addItem(i18n("Bullet List"), Bullet); listType->addItem(i18n("Numbered List"), Numbered); listType->addItem(i18n("Definition List"), Definition); = + //TODO + listStyle =3D new KComboBox; + vbox->addWidget(listStyle); + + KSeparator *sep =3D 0; if (!webElement.isNull()) { sep =3D new KSeparator; @@ -91,6 +103,25 @@ void ComposerListDialogPrivate::initialize() vbox->addWidget( sep ); = q->connect(q, SIGNAL(okClicked()), q, SLOT(_k_slotOkClicked())); + fillStyle(); +} + +void ComposerListDialogPrivate::fillStyle() +{ + listStyle->clear(); + if (type =3D=3D ExtendAttributesDialog::ListUL) { + listStyle->addItem(i18n("Automatic"),QString()); + listStyle->addItem(i18n("Solid circle"),QLatin1String("disc")); + listStyle->addItem(i18n("Open circle"),QLatin1String("circle")); + listStyle->addItem(i18n("Solid square"),QLatin1String("square")); + } else if (type =3D=3D ExtendAttributesDialog::ListOL) { + listStyle->addItem(i18n("Automatic"),QString()); + listStyle->addItem(i18n("1,2,3..."),QLatin1String("1")); + listStyle->addItem(i18n("A,B,C..."),QLatin1String("A")); + listStyle->addItem(i18n("a,b,c..."),QLatin1String("a")); + listStyle->addItem(i18n("I,II,III..."),QLatin1String("I")); + listStyle->addItem(i18n("i,ii,iii..."),QLatin1String("i")); + } } = void ComposerListDialogPrivate::updateSettings() diff --git a/composereditor-ng/image/composerimagedialog.cpp b/composeredit= or-ng/image/composerimagedialog.cpp index 9c25602..56ac529 100644 --- a/composereditor-ng/image/composerimagedialog.cpp +++ b/composereditor-ng/image/composerimagedialog.cpp @@ -175,7 +175,7 @@ void ComposerImageDialogPrivate::initialize() void ComposerImageDialogPrivate::updateSettings() { imageWidget->setImageUrl(webElement.attribute(QLatin1String("src"))); - if(webElement.hasAttribute(QLatin1String("height")) && webElement.hasA= ttribute(QLatin1String("width"))) { + if (webElement.hasAttribute(QLatin1String("height")) && webElement.has= Attribute(QLatin1String("width"))) { imageWidget->setImageWidth(webElement.attribute(QLatin1String("wid= th")).toInt()); imageWidget->setImageHeight(webElement.attribute(QLatin1String("he= ight")).toInt()); } diff --git a/composereditor-ng/image/composerimageresizewidget.cpp b/compos= ereditor-ng/image/composerimageresizewidget.cpp index 48a6b39..948018f 100644 --- a/composereditor-ng/image/composerimageresizewidget.cpp +++ b/composereditor-ng/image/composerimageresizewidget.cpp @@ -101,21 +101,21 @@ ComposerImageResizeWidgetPrivate::ResizeDirection Com= poserImageResizeWidgetPriva const QRect r(imageElement.geometry()); if (QRect(0,0,resizeSquareSize,resizeSquareSize).contains(pos)) { dir =3D TopLeft; - } else if(QRect(0,r.height()-resizeSquareSize,resizeSquareSize,resizeS= quareSize).contains(pos)) { + } else if (QRect(0,r.height()-resizeSquareSize,resizeSquareSize,resize= SquareSize).contains(pos)) { dir =3D BottomLeft; - } else if(QRect(r.width()-resizeSquareSize,r.height()-resizeSquareSize= ,resizeSquareSize,resizeSquareSize).contains(pos)) { + } else if (QRect(r.width()-resizeSquareSize,r.height()-resizeSquareSiz= e,resizeSquareSize,resizeSquareSize).contains(pos)) { dir =3D BottomRight; - } else if(QRect(r.width()-resizeSquareSize,0,resizeSquareSize,resizeSq= uareSize).contains(pos)) { + } else if (QRect(r.width()-resizeSquareSize,0,resizeSquareSize,resizeS= quareSize).contains(pos)) { dir =3D TopRight; - } else if(QRect(0,0,r.width(),resizeSquareSize).contains(pos)) { + } else if (QRect(0,0,r.width(),resizeSquareSize).contains(pos)) { dir =3D Top; - } else if(QRect(0,r.height()-resizeSquareSize,r.width(),resizeSquareSi= ze).contains(pos)) { + } else if (QRect(0,r.height()-resizeSquareSize,r.width(),resizeSquareS= ize).contains(pos)) { dir =3D Bottom; - } else if(QRect(0,0,resizeSquareSize,r.height()).contains(pos)) { + } else if (QRect(0,0,resizeSquareSize,r.height()).contains(pos)) { dir =3D Left; - } else if(QRect(r.width()-resizeSquareSize,0,resizeSquareSize,r.height= ()).contains(pos)) { + } else if (QRect(r.width()-resizeSquareSize,0,resizeSquareSize,r.heigh= t()).contains(pos)) { dir =3D Right; - } else if(QRect(r.width(),resizeSquareSize,resizeSquareSize,resizeSqua= reSize).contains(pos)) { + } else if (QRect(r.width(),resizeSquareSize,resizeSquareSize,resizeSqu= areSize).contains(pos)) { dir =3D TopLeft; } else { dir =3D None; @@ -189,7 +189,7 @@ void ComposerImageResizeWidget::mouseMoveEvent( QMouseE= vent * event ) { if (!d->mousePressed) { d->setResizeDirectionCursor(event->pos()); - } else if(d->direction!=3DComposerImageResizeWidgetPrivate::None){ + } else if (d->direction!=3DComposerImageResizeWidgetPrivate::None){ const QSize size =3D d->resizeImage(event->pos()); if (!d->imageSizetoolTip) { d->imageSizetoolTip =3D new ComposerImageResizeToolTip(this); diff --git a/composereditor-ng/pagecolor/pagecolorbackgrounddialog.cpp b/co= mposereditor-ng/pagecolor/pagecolorbackgrounddialog.cpp index bc3b3cd..a9c2b80 100644 --- a/composereditor-ng/pagecolor/pagecolorbackgrounddialog.cpp +++ b/composereditor-ng/pagecolor/pagecolorbackgrounddialog.cpp @@ -119,19 +119,19 @@ void PageColorBackgroundDialogPrivate::applyChanges() webElement.removeAttribute(QLatin1String("vlink")); } else { QColor col =3D pageColorWidget->pageBackgroundColor(); - if(col.isValid()) + if (col.isValid()) webElement.setAttribute(QLatin1String("bgcolor"),col.name(= )); col =3D pageColorWidget->textColor(); - if(col.isValid()) + if (col.isValid()) webElement.setAttribute(QLatin1String("text"),col.name()); col =3D pageColorWidget->linkColor(); - if(col.isValid()) + if (col.isValid()) webElement.setAttribute(QLatin1String("link"),col.name()); col =3D pageColorWidget->activeLinkColor(); - if(col.isValid()) + if (col.isValid()) webElement.setAttribute(QLatin1String("alink"),col.name()); col =3D pageColorWidget->visitedLinkColor(); - if(col.isValid()) + if (col.isValid()) webElement.setAttribute(QLatin1String("vlink"),col.name()); } if (pageColorWidget->backgroundImageUrl().isEmpty()) { diff --git a/composereditor-ng/pagecolor/pagecolorbackgroundwidget.cpp b/co= mposereditor-ng/pagecolor/pagecolorbackgroundwidget.cpp index e67378c..b941e6b 100644 --- a/composereditor-ng/pagecolor/pagecolorbackgroundwidget.cpp +++ b/composereditor-ng/pagecolor/pagecolorbackgroundwidget.cpp @@ -65,7 +65,7 @@ void PageColorBackgroundWidget::setTextColor(const QColor= &col) = void PageColorBackgroundWidget::setUseDefaultColor(bool b) { - if(b) + if (b) ui->defaultColor->setChecked(true); else ui->customColors->setChecked(true); diff --git a/composereditor-ng/table/composercellsizewidget.cpp b/composere= ditor-ng/table/composercellsizewidget.cpp index 65eb46b..b8364e0 100644 --- a/composereditor-ng/table/composercellsizewidget.cpp +++ b/composereditor-ng/table/composercellsizewidget.cpp @@ -94,7 +94,7 @@ void ComposerCellSizeWidgetPrivate::setValue(const QStrin= g& val) } else { check->setChecked(true); QString valStr(val); - if(valStr.endsWith(QLatin1Char('%'))) { + if (valStr.endsWith(QLatin1Char('%'))) { setType(Percentage); valStr.chop(1); size->setValue(valStr.toInt()); diff --git a/composereditor-ng/table/composertableformatdialog.cpp b/compos= ereditor-ng/table/composertableformatdialog.cpp index b1e5000..c9e2708 100644 --- a/composereditor-ng/table/composertableformatdialog.cpp +++ b/composereditor-ng/table/composertableformatdialog.cpp @@ -132,7 +132,7 @@ void ComposerTableFormatDialogPrivate::updateSettings() } if (webElement.hasAttribute(QLatin1String("width"))) { QString width =3D webElement.attribute(QLatin1String("width")); - if(width.endsWith(QLatin1Char('%'))) { + if (width.endsWith(QLatin1Char('%'))) { insertTableWidget->setTypeOfLength(QTextLength::Percentage= Length); width.chop(1); insertTableWidget->setLength(width.toInt()); diff --git a/composereditor-ng/widgets/findreplacebar.cpp b/composereditor-= ng/widgets/findreplacebar.cpp index 5a21aab..efdb0c0 100644 --- a/composereditor-ng/widgets/findreplacebar.cpp +++ b/composereditor-ng/widgets/findreplacebar.cpp @@ -286,7 +286,7 @@ bool FindReplaceBar::event(QEvent* e) if ( shortCutOverride || e->type() =3D=3D QEvent::KeyPress ) { QKeyEvent* kev =3D static_cast(e); if (kev->key() =3D=3D Qt::Key_Escape) { - if( shortCutOverride ) { + if ( shortCutOverride ) { e->accept(); return true; } @@ -296,7 +296,7 @@ bool FindReplaceBar::event(QEvent* e) } else if ( kev->key() =3D=3D Qt::Key_Enter || kev->key() =3D=3D Qt::Key_Return ) { e->accept(); - if( shortCutOverride ) { + if ( shortCutOverride ) { return true; } if ( kev->modifiers() & Qt::ShiftModifier )