<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14306] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14306">14306</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-20 23:48:55 -0500 (Mon, 20 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Finally, pastebin working.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludepastebindialogh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/pastebindialog.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpastebindialogcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/pastebindialog.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludepastebindialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/pastebindialog.h (14305 => 14306)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/pastebindialog.h 2009-07-21 00:18:20 UTC (rev 14305)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/pastebindialog.h 2009-07-21 04:48:55 UTC (rev 14306)
</span><span class="lines">@@ -9,6 +9,8 @@
</span><span class="cx">
</span><span class="cx"> class QHttp;
</span><span class="cx"> class QString;
</span><ins>+class QProgressDialog;
+class QHttpResponseHeader;
</ins><span class="cx">
</span><span class="cx"> class pastebinDialog : public QDialog {
</span><span class="cx"> Q_OBJECT
</span><span class="lines">@@ -24,11 +26,16 @@
</span><span class="cx"> private:
</span><span class="cx"> Ui::pastebinDialog *m_ui;
</span><span class="cx"> QString text;
</span><ins>+ QString pasteURL;
</ins><span class="cx"> QHttp * pastebinHttp;
</span><ins>+ int postId;
+ QProgressDialog *progressDialog;
</ins><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> void pastebinFinished(int, bool);
</span><span class="cx"> void pasteIt();
</span><ins>+ void readResponseHeader(const QHttpResponseHeader &);
+ void updateDataSendProgress(int, int);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // PASTEBINDIALOG_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpastebindialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/pastebindialog.cpp (14305 => 14306)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/pastebindialog.cpp 2009-07-21 00:18:20 UTC (rev 14305)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/pastebindialog.cpp 2009-07-21 04:48:55 UTC (rev 14306)
</span><span class="lines">@@ -5,7 +5,8 @@
</span><span class="cx">
</span><span class="cx"> pastebinDialog::pastebinDialog(QWidget *parent) :
</span><span class="cx"> QDialog(parent),
</span><del>- m_ui(new Ui::pastebinDialog)
</del><ins>+ m_ui(new Ui::pastebinDialog),
+ progressDialog(new QProgressDialog(this))
</ins><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><span class="cx">
</span><span class="lines">@@ -29,22 +30,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-void pastebinDialog::pastebinFinished(int req, bool isError)
-{
- QMessageBox msgBox;
- if (isError)
- {
- msgBox.setText(QString("Error on pastebin: %1").arg(pastebinHttp->errorString()));
- msgBox.setIcon(QMessageBox::Critical);
- msgBox.exec();
- }
- else
- {
- msgBox.setText("Pastebin correctly pasted!");
- msgBox.setIcon(QMessageBox::Information);
- msgBox.exec();
- }
-}
</del><span class="cx"> void pastebinDialog::pasteIt()
</span><span class="cx"> {
</span><span class="cx">
</span><span class="lines">@@ -53,6 +38,10 @@
</span><span class="cx"> /* TODO: Make a progress thing? */
</span><span class="cx"> connect(pastebinHttp, SIGNAL(requestFinished(int,bool)),
</span><span class="cx"> this, SLOT(pastebinFinished(int,bool)));
</span><ins>+ connect(pastebinHttp, SIGNAL(dataSendProgress(int, int)),
+ this, SLOT(updateDataSendProgress(int, int)));
+ connect(pastebinHttp, SIGNAL(responseHeaderReceived(const QHttpResponseHeader &)),
+ this, SLOT(readResponseHeader(const QHttpResponseHeader &)));
</ins><span class="cx">
</span><span class="cx"> QHttpRequestHeader header( "POST", "/pastebin.php") ;
</span><span class="cx"> header.setValue( "Host", "pastebin.freeswitch.org" ) ;
</span><span class="lines">@@ -61,19 +50,78 @@
</span><span class="cx"> pastebinHttp->setHost(m_ui->lineURL->text(), QHttp::ConnectionModeHttp, m_ui->linePort->text().toInt());
</span><span class="cx"> pastebinHttp->setUser(m_ui->lineUsername->text(), m_ui->linePassword->text());
</span><span class="cx"> header.setValue( "User-Agent", "FsGUI");
</span><del>- QString params("parent_pid=&format=fslog");
- params.append("&code2=%1").arg(text);
- if (m_ui->lineName->text().trimmed() == "")
- params.append("&poster=%1&paste=Send&remember=0").arg(tr("Anonymous"));
</del><ins>+ QString params = QString("parent_pid=&format=fslog&code2=%1").arg(QString(QUrl::toPercentEncoding(text)));
+
+ /* Set the paste user identification */
+ if (m_ui->lineName->text().trimmed().isEmpty())
+ {
+ params += QString("&poster=%1&paste=Send&remember=0").arg(QString(QUrl::toPercentEncoding(tr("Anonymous"))));
+ }
+ else
+ {
+ params += QString("&poster=%1&paste=Send&remember=0").arg(QString(QUrl::toPercentEncoding(m_ui->lineName->text())));
+ }
+
+ /* Set the duration of the paste */
</ins><span class="cx"> if (m_ui->radioDay->isChecked())
</span><del>- params.append("&expiry=%1").arg("d");
</del><ins>+ {
+ params += QString("&expiry=%1").arg("d");
+ }
</ins><span class="cx"> if (m_ui->radioMonth->isChecked())
</span><del>- params.append("&expiry=%1").arg("m");
</del><ins>+ {
+ params += QString("&expiry=%1").arg("m");
+ }
</ins><span class="cx"> if (m_ui->radioForever->isChecked())
</span><del>- params.append("&expiry=%1").arg("f");
- pastebinHttp->request(header, params.toUtf8());
</del><ins>+ {
+ params += QString("&expiry=%1").arg("f");
+ }
+ /* Paste it! */
+ postId = pastebinHttp->request(header, params.toAscii());
+ progressDialog->setWindowTitle(tr("Pastebin"));
+ progressDialog->setLabelText(tr("Pasting..."));
</ins><span class="cx"> }
</span><span class="cx"> void pastebinDialog::setText(QString consoleText)
</span><span class="cx"> {
</span><span class="cx"> text = consoleText;
</span><span class="cx"> }
</span><ins>+void pastebinDialog::pastebinFinished(int req, bool isError)
+{
+ if (req == postId)
+ {
+ progressDialog->hide();
+ QMessageBox::information(this, tr("Sucess"),
+ tr("You pastebin was successful"
+ " and copied to clipboard: %1.")
+ .arg(pasteURL));
+ QApplication::clipboard()->setText(pasteURL);
+ }
+
+}
+void pastebinDialog::updateDataSendProgress(int bytesRead, int totalBytes)
+{
+ progressDialog->setMaximum(totalBytes);
+ progressDialog->setValue(bytesRead);
+}
+void pastebinDialog::readResponseHeader(const QHttpResponseHeader &responseHeader)
+{
+ switch (responseHeader.statusCode())
+ {
+ case 200: // Ok
+ case 301: // Moved Permanently
+ case 303: // See Other
+ case 307: // Temporary Redirect
+ // these are not error conditions
+ break;
+
+ case 302: // Found
+ pasteURL = responseHeader.value("Location");
+ break;
+
+ default:
+ QMessageBox::information(this, tr("HTTP"),
+ tr("Pastebin Failed: %1.")
+ .arg(responseHeader.reasonPhrase()));
+ progressDialog->hide();
+ pastebinHttp->abort();
+ }
+}
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>