[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] composereditor-ng: Fix coding style. Improve list dialog
From: Montel Laurent <montel () kde ! org>
Date: 2013-01-31 22:07:44
Message-ID: 20130131220744.B4A17A6091 () git ! kde ! org
[Download RAW message or body]
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/composerview.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 == QLatin1String("left")) {
if (action_align_left)
action_align_left->setChecked(true);
- } else if(alignment == QLatin1String("right")) {
+ } else if (alignment == QLatin1String("right")) {
if (action_align_right)
action_align_right->setChecked(true);
- } else if(alignment == QLatin1String("center")) {
+ } else if (alignment == QLatin1String("center")) {
if (action_align_center)
action_align_center->setChecked(true);
- } else if(alignment == QLatin1String("-webkit-auto")) {
+ } else if (alignment == QLatin1String("-webkit-auto")) {
if (action_align_justify)
action_align_justify->setChecked(true);
}
if (action_font_family) {
const QString font = \
evaluateJavascript(QLatin1String("getFontFamily()")).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("/KSpeech"), \
QLatin1String("org.kde.KSpeech"));
QString text = q->selectedText();
- if(text.isEmpty())
+ if (text.isEmpty())
text = q->page()->mainFrame()->toPlainText();
ktts.asyncCall(QLatin1String("say"), text, 0);
@@ -1322,7 +1322,7 @@ void ComposerView::mousePressEvent(QMouseEvent * event)
if (event->button() == Qt::LeftButton) {
d->contextMenuResult = page()->mainFrame()->hitTestContent(event->pos());
const bool imageSelected = !d->contextMenuResult.imageUrl().isEmpty();
- if(imageSelected) {
+ if (imageSelected) {
d->showImageResizeWidget();
}
} else {
@@ -1348,7 +1348,7 @@ void ComposerView::mouseDoubleClickEvent(QMouseEvent * event)
if (event->button() == Qt::LeftButton) {
d->contextMenuResult = page()->mainFrame()->hitTestContent(event->pos());
const bool imageSelected = !d->contextMenuResult.imageUrl().isEmpty();
- if(imageSelected) {
+ if (imageSelected) {
d->showImageResizeWidget();
d->_k_slotEditImage();
}
diff --git a/composereditor-ng/dialog/composerlinkdialog.cpp \
b/composereditor-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 = \
target->itemData(target->currentIndex()).toString(); QString html = \
QString::fromLatin1( "<a ");
- if(!targetStr.isEmpty()) {
+ if (!targetStr.isEmpty()) {
html += QString::fromLatin1("target=\'%1\'").arg(targetStr);
}
html += QString::fromLatin1( "href=\'%1\'>%2</a>" ).arg ( url.toString() \
).arg ( linkText->text() ); @@ -171,7 +171,6 @@ void \
ComposerLinkDialogPrivate::updateSettings() }
}
}
-
}
ComposerLinkDialog::ComposerLinkDialog(const QString& selectedText, QWidget *parent)
diff --git a/composereditor-ng/dialog/composerlistdialog.cpp \
b/composereditor-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 <KLocale>
#include <KSeparator>
+#include <KComboBox>
#include <QVBoxLayout>
#include <QWebElement>
@@ -38,7 +39,10 @@ class ComposerListDialogPrivate
public:
ComposerListDialogPrivate(const QWebElement& element, ComposerListDialog *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 = new QLabel(i18n("List Type"));
vbox->addWidget(lab);
- listType = new QComboBox;
+ listType = 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 = new KComboBox;
+ vbox->addWidget(listStyle);
+
+
KSeparator *sep = 0;
if (!webElement.isNull()) {
sep = 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 == 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 == 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/composereditor-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.hasAttribute(QLatin1String("width"))) { + if \
(webElement.hasAttribute(QLatin1String("height")) && \
webElement.hasAttribute(QLatin1String("width"))) {
imageWidget->setImageWidth(webElement.attribute(QLatin1String("width")).toInt());
imageWidget->setImageHeight(webElement.attribute(QLatin1String("height")).toInt());
}
diff --git a/composereditor-ng/image/composerimageresizewidget.cpp \
b/composereditor-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 \
ComposerImageResizeWidgetPriva const QRect r(imageElement.geometry());
if (QRect(0,0,resizeSquareSize,resizeSquareSize).contains(pos)) {
dir = TopLeft;
- } else if(QRect(0,r.height()-resizeSquareSize,resizeSquareSize,resizeSquareSize).contains(pos)) \
{ + } else if (QRect(0,r.height()-resizeSquareSize,resizeSquareSize,resizeSquareSize).contains(pos)) \
{ dir = BottomLeft;
- } else if(QRect(r.width()-resizeSquareSize,r.height()-resizeSquareSize,resizeSquareSize,resizeSquareSize).contains(pos)) \
{ + } else if (QRect(r.width()-resizeSquareSize,r.height()-resizeSquareSize,resizeSquareSize,resizeSquareSize).contains(pos)) \
{ dir = BottomRight;
- } else if(QRect(r.width()-resizeSquareSize,0,resizeSquareSize,resizeSquareSize).contains(pos)) \
{ + } else if (QRect(r.width()-resizeSquareSize,0,resizeSquareSize,resizeSquareSize).contains(pos)) \
{ dir = TopRight;
- } else if(QRect(0,0,r.width(),resizeSquareSize).contains(pos)) {
+ } else if (QRect(0,0,r.width(),resizeSquareSize).contains(pos)) {
dir = Top;
- } else if(QRect(0,r.height()-resizeSquareSize,r.width(),resizeSquareSize).contains(pos)) \
{ + } else if (QRect(0,r.height()-resizeSquareSize,r.width(),resizeSquareSize).contains(pos)) \
{ dir = Bottom;
- } else if(QRect(0,0,resizeSquareSize,r.height()).contains(pos)) {
+ } else if (QRect(0,0,resizeSquareSize,r.height()).contains(pos)) {
dir = Left;
- } else if(QRect(r.width()-resizeSquareSize,0,resizeSquareSize,r.height()).contains(pos)) \
{ + } else if (QRect(r.width()-resizeSquareSize,0,resizeSquareSize,r.height()).contains(pos)) \
{ dir = Right;
- } else if(QRect(r.width(),resizeSquareSize,resizeSquareSize,resizeSquareSize).contains(pos)) \
{ + } else if (QRect(r.width(),resizeSquareSize,resizeSquareSize,resizeSquareSize).contains(pos)) \
{ dir = TopLeft;
} else {
dir = None;
@@ -189,7 +189,7 @@ void ComposerImageResizeWidget::mouseMoveEvent( QMouseEvent * \
event ) {
if (!d->mousePressed) {
d->setResizeDirectionCursor(event->pos());
- } else if(d->direction!=ComposerImageResizeWidgetPrivate::None){
+ } else if (d->direction!=ComposerImageResizeWidgetPrivate::None){
const QSize size = d->resizeImage(event->pos());
if (!d->imageSizetoolTip) {
d->imageSizetoolTip = new ComposerImageResizeToolTip(this);
diff --git a/composereditor-ng/pagecolor/pagecolorbackgrounddialog.cpp \
b/composereditor-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 = pageColorWidget->pageBackgroundColor();
- if(col.isValid())
+ if (col.isValid())
webElement.setAttribute(QLatin1String("bgcolor"),col.name());
col = pageColorWidget->textColor();
- if(col.isValid())
+ if (col.isValid())
webElement.setAttribute(QLatin1String("text"),col.name());
col = pageColorWidget->linkColor();
- if(col.isValid())
+ if (col.isValid())
webElement.setAttribute(QLatin1String("link"),col.name());
col = pageColorWidget->activeLinkColor();
- if(col.isValid())
+ if (col.isValid())
webElement.setAttribute(QLatin1String("alink"),col.name());
col = 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/composereditor-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/composereditor-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 QString& 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/composereditor-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 = webElement.attribute(QLatin1String("width"));
- if(width.endsWith(QLatin1Char('%'))) {
+ if (width.endsWith(QLatin1Char('%'))) {
insertTableWidget->setTypeOfLength(QTextLength::PercentageLength);
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() == QEvent::KeyPress ) {
QKeyEvent* kev = static_cast<QKeyEvent* >(e);
if (kev->key() == Qt::Key_Escape) {
- if( shortCutOverride ) {
+ if ( shortCutOverride ) {
e->accept();
return true;
}
@@ -296,7 +296,7 @@ bool FindReplaceBar::event(QEvent* e)
} else if ( kev->key() == Qt::Key_Enter ||
kev->key() == Qt::Key_Return ) {
e->accept();
- if( shortCutOverride ) {
+ if ( shortCutOverride ) {
return true;
}
if ( kev->modifiers() & Qt::ShiftModifier )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic