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

List:       kde-commits
Subject:    KDE/kdenetwork/kget
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2011-08-06 9:47:15
Message-ID: 20110806094715.B3170AC86E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1245215 by lappelhans:

Fix enums, fix ui, show destination without file://


 M  +9 -9      core/transfer.h  
 M  +1 -1      core/transferhistorystore.cpp  
 M  +18 -69    ui/history/transferhistory.ui  


--- trunk/KDE/kdenetwork/kget/core/transfer.h #1245214:1245215
@@ -52,18 +52,18 @@
             Tc_Status         = 0x00000002,
             Tc_TotalSize      = 0x00000004,
             Tc_Percent        = 0x00000008,
-            Tc_DownloadSpeed  = 0x00000010,
-            Tc_RemainingTime  = 0x00000020,
+            Tc_DownloadSpeed  = 0x00000016,
+            Tc_RemainingTime  = 0x00000032,
             // Misc
             Tc_UploadSpeed    = 0x00000100,
             Tc_UploadLimit    = 0x00000200,
             Tc_DownloadLimit  = 0x00000400,
             Tc_CanResume      = 0x00000800,
-            Tc_DownloadedSize = 0x00001000,
-            Tc_UploadedSize   = 0x00002000,
-            Tc_Log            = 0x00004000,
-            Tc_Group          = 0x00008000,
-            Tc_Selection      = 0x00010000
+            Tc_DownloadedSize = 0x00001600,
+            Tc_UploadedSize   = 0x00003200,
+            Tc_Log            = 0x00006400,
+            Tc_Group          = 0x00012800,
+            Tc_Selection      = 0x00025600
         };
 
         enum Capability
@@ -72,8 +72,8 @@
             Cap_MultipleMirrors = 0x00000002,
             Cap_Resuming = 0x00000004,
             Cap_Renaming = 0x00000008,
-            Cap_Moving = 0x00000010,
-            Cap_FindFilesize = 0x00000020
+            Cap_Moving = 0x00000016,
+            Cap_FindFilesize = 0x00000032
         };
         Q_DECLARE_FLAGS(Capabilities, Capability)
 
--- trunk/KDE/kdenetwork/kget/core/transferhistorystore.cpp #1245214:1245215
@@ -44,7 +44,7 @@
 
 TransferHistoryItem::TransferHistoryItem(const Transfer &transfer) : QObject()
 {
-    setDest(transfer.dest().url());
+    setDest(transfer.dest().pathOrUrl());
     setSource(transfer.source().url());
     setSize(transfer.totalSize());
     setDateTime(QDateTime::currentDateTime());
--- trunk/KDE/kdenetwork/kget/ui/history/transferhistory.ui #1245214:1245215
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0" >
  <class>TransferHistory</class>
  <widget class="QWidget" name="TransferHistory" >
@@ -5,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>579</width>
-    <height>80</height>
+    <width>708</width>
+    <height>41</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
@@ -41,32 +42,12 @@
         </spacer>
        </item>
        <item>
-        <widget class="KButtonGroup" name="viewmodesgroup" >
-         <property name="title" >
-          <string comment="View modes" >View Modes</string>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>View Modes:</string>
          </property>
-         <property name="flat" >
-          <bool>false</bool>
-         </property>
-         <property name="checkable" >
-          <bool>false</bool>
-         </property>
-         <property name="checked" >
-          <bool>false</bool>
-         </property>
-         <property name="current" stdset="0" >
-          <number>-1</number>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout" >
-          <property name="spacing" >
-           <number>2</number>
-          </property>
-          <property name="sizeConstraint" >
-           <enum>QLayout::SetMinimumSize</enum>
-          </property>
-          <property name="margin" >
-           <number>2</number>
-          </property>
+        </widget>
+       </item>
           <item>
            <widget class="KPushButton" name="bt_iconview" >
             <property name="checkable" >
@@ -90,25 +71,14 @@
             </property>
            </widget>
           </item>
-         </layout>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Select Ranges:</string>
+         </property>
         </widget>
        </item>
        <item>
-        <widget class="KButtonGroup" name="kbuttongroup_2" >
-         <property name="title" >
-          <string>Select Ranges</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_2" >
-          <property name="spacing" >
-           <number>2</number>
-          </property>
-          <property name="sizeConstraint" >
-           <enum>QLayout::SetMinimumSize</enum>
-          </property>
-          <property name="margin" >
-           <number>2</number>
-          </property>
-          <item>
            <widget class="KComboBox" name="rangeType" >
             <item>
              <property name="text" >
@@ -127,39 +97,24 @@
             </item>
            </widget>
           </item>
-         </layout>
-        </widget>
-       </item>
        <item>
-        <widget class="KButtonGroup" name="kbuttongroup_3" >
-         <property name="title" >
-          <string>Filter History</string>
+        <widget class="KLineEdit" name="searchBar">
+         <property name="inputMask">
+          <string/>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_3" >
-          <property name="spacing" >
-           <number>2</number>
+         <property name="placeholderText">
+          <string>Filter history</string>
           </property>
-          <property name="sizeConstraint" >
-           <enum>QLayout::SetMinimumSize</enum>
-          </property>
-          <property name="margin" >
-           <number>2</number>
-          </property>
-          <item>
-           <widget class="KLineEdit" name="searchBar" >
             <property name="showClearButton" stdset="0" >
              <bool>true</bool>
             </property>
            </widget>
           </item>
          </layout>
-        </widget>
        </item>
       </layout>
      </item>
     </layout>
-   </item>
-  </layout>
   <action name="actionDelete_Selected" >
    <property name="text" >
     <string comment="delete selected transfer" >Delete Selected</string>
@@ -173,12 +128,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KButtonGroup</class>
-   <extends>QGroupBox</extends>
-   <header>kbuttongroup.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
[prev in list] [next in list] [prev in thread] [next in thread]