remove offset in file tab - plisk

po/ar.po

@@ -571,10 +571,6 @@ msgstr "معدل الرفع"
 msgid "Filename"
 msgstr "اسم‌الملف"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "إزاحة"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "المنجز"

po/ast.po

@@ -562,10 +562,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/bg.po

@@ -561,10 +561,6 @@ msgstr "качено съотношение"
 msgid "Filename"
 msgstr "файл име"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/ca.po

@@ -584,10 +584,6 @@ msgstr "Velocitat de pujada"
 msgid "Filename"
 msgstr "Nom del fitxer"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Desplaçament"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Progrés"
@@ -775,9 +771,6 @@ msgstr "Seleccioneu un directori per a les baixades"
 #~ msgid "size"
 #~ msgstr "mida"
 
-#~ msgid "offset"
-#~ msgstr "desplaçament"
-
 #~ msgid "download?"
 #~ msgstr "baixa?"
 

po/cs.po

@@ -561,10 +561,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/da.po

@@ -570,10 +570,6 @@ msgstr "Sendehastighed"
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Justering"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Fremskridt"

po/de.po

@@ -570,10 +570,6 @@ msgstr "Upload-Rate"
 msgid "Filename"
 msgstr "Dateiname"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Absatz"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Fortschritt"

po/deluge.pot

@@ -725,10 +725,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:635
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:636
 msgid "Progress"
 msgstr ""

po/el.po

@@ -569,10 +569,6 @@ msgstr "Ρυθμός ανεβάσματος"
 msgid "Filename"
 msgstr "'Ονομα αρχείου"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Μετατόπιση"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Πρόοδος"

po/en_AU.po

@@ -562,10 +562,6 @@ msgstr "Up Speed"
 msgid "Filename"
 msgstr "Filename"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Offset"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/en_CA.po

@@ -562,10 +562,6 @@ msgstr "Up Speed"
 msgid "Filename"
 msgstr "Filename"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Offset"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/en_GB.po

@@ -575,10 +575,6 @@ msgstr "Up Speed"
 msgid "Filename"
 msgstr "Filename"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Offset"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Progress"

po/es.po

@@ -590,10 +590,6 @@ msgstr "Velocidad de Subida"
 msgid "Filename"
 msgstr "Nombre del archivo"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Compensar"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "En proceso"

po/et.po

@@ -561,10 +561,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/eu.po

@@ -563,10 +563,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/fi.po

@@ -561,10 +561,6 @@ msgstr "Lähetysnopeus"
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Siirtymä"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Eteneminen"

po/fr.po

@@ -760,10 +760,6 @@ msgstr "Vitesse d'envoi"
 msgid "Filename"
 msgstr "Nom de Fichier"
 
-#: src/interface.py:630
-msgid "Offset"
-msgstr "Décalage"
-
 #: src/interface.py:631
 msgid "Progress"
 msgstr "Avancement"

po/gl.po

@@ -561,10 +561,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/he.po

@@ -562,10 +562,6 @@ msgstr "קצב העלאה"
 msgid "Filename"
 msgstr "שם קובץ"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "היסט"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/hr.po

@@ -561,10 +561,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/hu.po

@@ -561,10 +561,6 @@ msgstr "Feltöltési korlát"
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Fájlpozíció"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/id.po

@@ -562,10 +562,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/it.po

@@ -586,11 +586,6 @@ msgstr "Velocità di invio"
 msgid "Filename"
 msgstr "Nome file"
 
-#: src/interface.py:486
-#, fuzzy
-msgid "Offset"
-msgstr "Scostamento"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Avanzamento"

po/ja.po

@@ -561,10 +561,6 @@ msgstr "アップロードの率"
 msgid "Filename"
 msgstr "ファイル名"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/ko.po

@@ -561,10 +561,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/la.po

@@ -561,10 +561,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/lt.po

@@ -562,10 +562,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/lv.po

@@ -563,10 +563,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/nb.po

@@ -564,10 +564,6 @@ msgstr "Opplastingsrate"
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Forskyvning:"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/nl.po

@@ -563,10 +563,6 @@ msgstr "Upload ratio"
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Verschuiving"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Voortgang"

po/pl.po

@@ -562,10 +562,6 @@ msgstr "Wysyłanie"
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Offset"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Status"

po/pt.po

@@ -563,10 +563,6 @@ msgstr "Velocidade de upload"
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Deslocamento"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Evolução"

po/pt_BR.po

@@ -569,10 +569,6 @@ msgstr "Taxa de envio"
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Sem configuração"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Progresso"

po/ro.po

@@ -567,10 +567,6 @@ msgstr "Viteza Donare"
 msgid "Filename"
 msgstr "Nume fişier"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Decalaj"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/ru.po

@@ -574,10 +574,6 @@ msgstr "Скорость раздачи"
 msgid "Filename"
 msgstr "Файл"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Смещение"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Состояние"

po/sk.po

@@ -560,10 +560,6 @@ msgstr "Rýchlosť odosielania"
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Odstup"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Priebeh"

po/sl.po

@@ -561,10 +561,6 @@ msgstr "Hitrost Oddajanja"
 msgid "Filename"
 msgstr "Ime datoteke"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Odmik"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Opravljeno"

po/sr.po

@@ -562,10 +562,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/sv.po

@@ -584,10 +584,6 @@ msgstr "Sändningshastighet"
 msgid "Filename"
 msgstr "Filnamn"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Position"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "Förlopp"

po/ta.po

@@ -561,10 +561,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "முன்னேற்றம்"

po/tlh.po

@@ -561,10 +561,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/tr.po

@@ -563,10 +563,6 @@ msgstr "Gönderme Hızı"
 msgid "Filename"
 msgstr "Dosya adı"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "Konum"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "İlerleme"

po/uk.po

@@ -561,10 +561,6 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr ""
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/zh_CN.po

@@ -565,10 +565,6 @@ msgstr "上传速度"
 msgid "Filename"
 msgstr "文件名"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "偏移量"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr ""

po/zh_TW.po

@@ -564,10 +564,6 @@ msgstr "上傳頻寬"
 msgid "Filename"
 msgstr "檔案名稱"
 
-#: src/interface.py:486
-msgid "Offset"
-msgstr "偏移量"
-
 #: src/interface.py:487
 msgid "Progress"
 msgstr "進度"
@@ -663,9 +659,6 @@ msgstr "請選取一個下載目錄"
 #~ msgid "size"
 #~ msgstr "大小"
 
-#~ msgid "offset"
-#~ msgstr "前置量"
-
 #~ msgid "download?"
 #~ msgstr "確定要下載？"
 

src/deluge_core.cpp

@@ -959,7 +959,6 @@ static PyObject *torrent_get_file_info(PyObject *self, PyObject *args)
         file_info = Py_BuildValue(
             "{s:s,s:d,s:d,s:f}",
             "path",     currFile.path.string().c_str(),
-            "offset",   double(currFile.offset),
             "size",     double(currFile.size),
             "progress", progresses[i - start]*100.0
             );

src/interface.py

@@ -519,7 +519,7 @@ class DelugeGTK:
         i=0
         for f in all_files:
                         self.file_store.append([not file_filter[i], f['path'], common.fsize(f['size']),
-                                        f['offset'], round(f['progress'],2)])
+                                        round(f['progress'],2)])
                         i=i+1
         
         return True
@@ -642,7 +642,7 @@ class DelugeGTK:
                             "check_selected": self.file_check_selected,
                             "uncheck_selected": self.file_uncheck_selected,
                             })
-        self.file_store = gtk.ListStore(bool, str, str, str, float)
+        self.file_store = gtk.ListStore(bool, str, str, float)
         self.file_view.set_model(self.file_store)
         self.file_view.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
         self.file_view.get_selection().set_select_function(self.file_clicked)
@@ -652,8 +652,7 @@ class DelugeGTK:
         dgtk.add_toggle_column(self.file_view, _("Download"), 0, toggled_signal=self.file_toggled)
         dgtk.add_text_column(self.file_view, _("Filename"), 1).set_expand(True)
         dgtk.add_text_column(self.file_view, _("Size"), 2)
-        dgtk.add_text_column(self.file_view, _("Offset"), 3)
+        dgtk.add_func_column(self.file_view, _("Progress"), percent, 3) 
-        dgtk.add_func_column(self.file_view, _("Progress"), percent, 4) 
     
     def file_select_all(self, widget):
         self.file_view.get_selection().select_all()
@@ -1091,8 +1090,9 @@ class DelugeGTK:
             new_file_info = self.manager.get_torrent_file_info(unique_id)
             for file in new_file_info:
                 iter = self.file_get_iter_from_name(file['path'])
-                if (iter != None) and (round(self.file_store.get_value(iter, 4),2) != round(file['progress'],2)):
+                if iter != None and \
-                    self.file_store.set_value(iter, 4, round(file['progress'],2))
+                    round(self.file_store.get_value(iter, 3), 2) != round(file['progress'], 2):
+                        self.file_store.set_value(iter, 3, round(file['progress'], 2))
             return True
 
         else: