[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/blogilo/src
From:       Mehrdad Momeny <mehrdad.momeny () gmail ! com>
Date:       2010-11-05 11:35:02
Message-ID: 20101105113502.820ACAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1193273 by momeny:

Do not store temp post when its empty (Actually detection of emptiness improved)

 M  +5 -0      composer/bilboeditor.cpp  
 M  +2 -1      composer/bilboeditor.h  
 M  +5 -0      composer/texteditor/texteditor.cpp  
 M  +3 -37     composer/texteditor/texteditor.h  
 M  +1 -1      postentry.cpp  


--- trunk/KDE/kdepim/blogilo/src/composer/bilboeditor.cpp #1193272:1193273
@@ -212,6 +212,11 @@
     d->prev_index = index;
 }
 
+QString BilboEditor::plainTextContent()
+{
+    return d->wysiwygEditor->plainTextContent();
+}
+
 QString BilboEditor::htmlContent()
 {
     if ( this->currentIndex() == 0 ) {
--- trunk/KDE/kdepim/blogilo/src/composer/bilboeditor.h #1193272:1193273
@@ -81,9 +81,10 @@
      * then copies the content of HtmlEditor into the variable mHtmlContent, and returns it.
      * @return an String which contains html text
      */
-//   const QString& htmlContent();
     QString htmlContent();
 
+    QString plainTextContent();
+
     /**
      * Sets the given string as the HtmlEditor and VisualEditor content.
      * @param content
--- trunk/KDE/kdepim/blogilo/src/composer/texteditor/texteditor.cpp #1193272:1193273
@@ -533,6 +533,11 @@
     return getHtml();
 }
 
+QString TextEditor::plainTextContent()
+{
+    return webView->page()->mainFrame()->toPlainText();
+}
+
 void TextEditor::setHtmlContent ( const QString& arg1 )
 {
     QString txt = arg1;
--- trunk/KDE/kdepim/blogilo/src/composer/texteditor/texteditor.h #1193272:1193273
@@ -161,9 +161,6 @@
     bool insertImage ( const QString& );
     bool insertImage ( const QByteArray& );
 
-//     void setFontFamily ( const QString& );
-//     QString getFontFamily() const;
-
     //the range of font size is between 0 and 6
     // (xx-small to xx-large)
     void setFontSize ( int );
@@ -190,6 +187,9 @@
 
     void replaceImageSrc(const QString& src, const QString& dest);
 
+    QString plainTextContent();
+    QString htmlContent();
+
 public slots:
     QList<BilboMedia*> getLocalImages();
 //       void finishEditing(); //emits editingFinished signal if anything have been edited
@@ -198,28 +198,10 @@
     void startEditing();
     void setCurrentTitle ( const QString& title );
     void setHtmlContent ( const QString &arg1 );
-    QString htmlContent();
     bool updateMediaPaths();
 
-//     void styleParagraph();
-//     void styleHeading1();
-//     void styleHeading2();
-//     void styleHeading3();
-//     void styleHeading4();
-//     void styleHeading5();
-//     void styleHeading6();
-//     void stylePreformatted();
-//     void styleAddress();
-//     void formatStrikeThrough();
-//     void formatAlignLeft();
-//     void formatAlignCenter();
-//     void formatAlignRight();
-//     void formatAlignJustify();
     void formatIncreaseIndent();
     void formatDecreaseIndent();
-//     void formatNumberedList();
-//     void formatBulletedList();
-
     void slotToggleCode(bool);
     void slotChangeFormatType(const QString& formatText);
     void slotIncreaseFontSize();
@@ -232,23 +214,7 @@
     void slotChangeLayoutDirection(bool rightToLeft);
     void slotAddPostSplitter();
     void slotToggleSpellChecking(bool);
-    /*
-    void alignLeftSlot();
-    void alignCenterSlot();
-    void alignRightSlot();
-    void alignJustifySlot();
-    void strikeThroughSlot();
-    void numberedListSlot();
-    void bulletedListSlot();
 
-    void alignLeftSlot();
-    void alignRightSlot();
-    void alignCenterSlot();
-    void alignJustifySlot();
-    void strikeThroughSlot();
-    void numberedListSlot();
-    void bulletedListSlot();*/
-
 signals:
     void editingFinished();
     void editingFinishKeyPressed();
--- trunk/KDE/kdepim/blogilo/src/postentry.cpp #1193272:1193273
@@ -379,7 +379,7 @@
 
 void PostEntry::saveTemporary( bool force )
 {
-    if( d->isPostContentModified || ( !currentPost()->content().isEmpty() && force ) ) {
+    if( d->isPostContentModified || ( !d->editPostWidget->plainTextContent().isEmpty() && force ) ) {
         d->mCurrentPost.setId( DBMan::self()->saveTempEntry( *currentPost(), d->mCurrentPostBlogId) );
         emit postSavedTemporary();
         kDebug()<<"Temporary saved";
[prev in list] [next in list] [prev in thread] [next in thread]