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

List:       kde-commits
Subject:    KDE/kdepim/blogilo/src/composer
From:       Mehrdad Momeny <mehrdad.momeny () gmail ! com>
Date:       2010-11-20 21:47:58
Message-ID: 20101120214758.4C972AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199159 by momeny:

Delete dialogs after close / fix a crash and some other improvements

 M  +14 -0     TextEditorInitialHtml  
 M  +2 -0      dialogs/addeditimage.cpp  
 M  +3 -0      dialogs/addeditlink.cpp  
 M  +7 -0      texteditor.cpp  


--- trunk/KDE/kdepim/blogilo/src/composer/TextEditorInitialHtml #1199158:1199159
@@ -93,6 +93,20 @@
     replaceHtml(res);
 }
 
+function insertLink(href, target, title)
+{
+    if (window.getSelection)
+    {
+        var userSelection = window.getSelection();
+        var lnk = document.createElement("a");
+        lnk.href = href;
+        lnk.target = target;
+        lnk.title = title;
+        var range = userSelection.getRangeAt(0);
+        range.surroundContents(lnk);
+    } else
+        alert("Select something");
+}
 </script>
 
 </head>
--- trunk/KDE/kdepim/blogilo/src/composer/dialogs/addeditimage.cpp #1199158:1199159
@@ -91,6 +91,8 @@
     path = KFileDialog::getImageOpenUrl( KUrl(), this, i18n("Choose a file") \
).path();  #endif
     QImage img(path);
+    if(path.isEmpty() || img.isNull())
+        return;
     ui.urlReqLineEdit->setText(path);
     editImageWidgetUi.btnKeepRatio->setChecked(true);
     ratio = img.width()/img.height();
--- trunk/KDE/kdepim/blogilo/src/composer/dialogs/addeditlink.cpp #1199158:1199159
@@ -38,6 +38,9 @@
         : KDialog( parent ), d(new Private)
 {
     initUi();
+    d->ui.txtAddress->insertUrl(0, QString());
+    d->ui.txtAddress->setCurrentIndex(0);
+//     this->setWindowTitle( i18nc( "verb, to insert a link into the text", "Add \
Link" ) );//TODO uncomment  }
 
 AddEditLink::AddEditLink(const QString& address, const QString& title, const \
                QString& target,
--- trunk/KDE/kdepim/blogilo/src/composer/texteditor.cpp #1199158:1199159
@@ -169,6 +169,7 @@
                 elm.replace(tmpLink);
             }*/
         }
+        dlg->deleteLater();
     } else if(res == actRemoveImage){
         elm.removeFromDocument();
     } else if(res == actEditLink){
@@ -190,6 +191,7 @@
                 linkElm.setAttribute("title", lnk.title);
             }
         }
+        dlg->deleteLater();
     } else if(res == actRemoveLink) {
         page()->mainFrame()->evaluateJavaScript("document.execCommand(\"unLink\", \
false, null)");  }
@@ -659,11 +661,16 @@
         QUrl url = guessUrlFromString(lnk.address);
         if(url.isValid()){
             execCommand( "createLink", url.toString() );
+            ///=====
 //             QString target = lnk.target.isEmpty() ? QString() : \
QString("target=\"%1\"").arg(lnk.target);  //             QString title = \
lnk.title.isEmpty() ? QString() : QString( "title=\"%1\"").arg(lnk.title);  //        \
QString html = QString ( "<a href=\"%1\" %2 %3>%4</a>" )  //                          \
.arg ( url.toString() ).arg ( target ).arg( title ).arg ( selection ); +//            \
kDebug()<<html;  //             execCommand ( "insertHTML", html );//FIXME Can't \
understand why do this code doesn't work!? :| +            ///=====
+//             kDebug();
+//             execCommand( QString("insertLink(%1, %2, \
%3)").arg(url.toString()).arg(lnk.target).arg(lnk.title) );  }
     }
     addLinkDlg->deleteLater();


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