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

List:       kde-commits
Subject:    KDE/kdenetwork/kget
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2008-03-31 21:23:43
Message-ID: 1206998623.742457.5031.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 792357 by uwolfer:

Improve Webinterface:
* respect default folder settings
* add combobox to select group

 M  +14 -1     extensions/webinterface/httpserver.cpp  
 M  +12 -3     extensions/webinterface/www/index.htm  
 M  +1 -0      ui/history/rangetreewidget.h  


--- trunk/KDE/kdenetwork/kget/extensions/webinterface/httpserver.cpp #792356:792357
@@ -95,6 +95,7 @@
         if (!args.isEmpty()) {
             QString action;
             QString data;
+            QString group;
             QStringList argList = args.split('&');
             foreach (const QString &s, argList) {
                 QStringList map = s.split('=');
@@ -102,10 +103,14 @@
                     action = map.at(1);
                 else if (map.at(0) == "data")
                     data = \
KUrl::fromPercentEncoding(QByteArray(map.at(1).toUtf8())); +                // action \
specific parameters +                else if (map.at(0) == "group")
+                    group = \
KUrl::fromPercentEncoding(QByteArray(map.at(1).toUtf8()));  }
             kDebug(5001) << action << data;
             if (action == "add") {
-                KGet::addTransfer(data, QDir::homePath(), "My Downloads"); //TODO: \
folders and groups.. +                // take first item of default folder list \
(which should be the best one) +                KGet::addTransfer(data, \
KGet::defaultFolders(data, group).at(0), group);  data.append(QString("Ok, %1 \
added!").arg(data).toUtf8());  } else if (action == "start") {
                 TransferHandler *transfer = KGet::findTransfer(data);
@@ -169,6 +174,14 @@
             data.replace("#{Downloads}", i18nc("@title", "Downloads").toUtf8());
             data.replace("#{KGet Webinterface | Valid XHTML 1.0 Strict &amp; CSS}",
                          i18nc("@label text in footer", "KGet Webinterface | Valid \
XHTML 1.0 Strict &amp; CSS").toUtf8()); +
+            // delegate group combobox
+            QString groupOptions;
+            QStringList groupsList(KGet::transferGroupNames());
+            QStringList::const_iterator it;
+            for (it = groupsList.constBegin(); it != groupsList.constEnd(); ++it)
+                groupOptions += QString("<option>%1</option>").arg(*it);
+            data.replace("#{groups}", groupOptions.toUtf8());
         }
     }
     }
--- trunk/KDE/kdenetwork/kget/extensions/webinterface/www/index.htm #792356:792357
@@ -38,12 +38,21 @@
 
     function doAction(action, data) {
         var log = $('log-res').empty().addClass('ajax-loading');
+        var parameters = new Object();
+
+        if (data.constructor.toString().indexOf('Object') == -1) // a single string
+            parameters['data'] = data;
+        else
+            parameters = data;
+
+        parameters['action'] = action;
+
         var addRequest = new Request.HTML({url: 'do',
                 update: log,
                 onComplete: function() {
                 log.removeClass('ajax-loading');
                 refreshList();
-            }}).get({'action': action, 'data': data})
+            }}).get(parameters)
     }
 
     var listDownloads = function(downloads) {
@@ -108,7 +117,7 @@
 
     $('new-download-form').addEvent('submit', function(e) {
         new Event(e).stop();
-        doAction('add', $('url').value);
+        doAction('add', {'data': $('url').value, 'group': $('group').value});
         $('url').value = '';
     });
 
@@ -353,7 +362,7 @@
     </div>
     <div id="new-download">
         <form id="new-download-form" action="do" method="post">
-            <p><label for="url">#{Enter URL: }</label><input type="text" name="url" \
id="url" value="" />&nbsp;<input type="submit" value="#{OK}" class="input-button" \
/></p> +            <p><label for="url">#{Enter URL: }</label><input type="text" \
name="url" id="url" value="" />&nbsp;<select name="group" \
id="group">#{groups}</select>&nbsp;<input type="submit" value="#{OK}" \
class="input-button" /></p>  </form>
         <div id="log">
             <div id="log-res"></div>
--- trunk/KDE/kdenetwork/kget/ui/history/rangetreewidget.h #792356:792357
@@ -115,6 +115,7 @@
 */
 class HostRangeDelegate : public RangeDelegate
 {
+Q_OBJECT
     public:
         HostRangeDelegate(QObject *parent = 0);
         ~HostRangeDelegate();


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