X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgtk2%2Fmainwnd.desc;h=6bd07ad453fb741546703d552af8b3a08e409c84;hb=e8fe0ad5ef548071e34697960c43fa3fff127a91;hp=337227c85bf75d6f8a6980a51e251ea7bbb82649;hpb=07644ebede47751a05615a016800fb0c149d21ba;p=doldaconnect.git

diff --git a/clients/gtk2/mainwnd.desc b/clients/gtk2/mainwnd.desc
index 337227c..6bd07ad 100644
--- a/clients/gtk2/mainwnd.desc
+++ b/clients/gtk2/mainwnd.desc
@@ -12,6 +12,7 @@ end
 :menu name: trpopup var: y
 	$menuitem name: trhash label: "Search for this hash" sig: activate var: y
 	$menuitem name: trcopy label: "Copy this hash to clipboard" sig: activate var: y
+	$menuitem name: trreset label: "Reset transfer" sig: activate
 	$menuitem name: trcancel label: "Cancel transfer" sig: activate
 end
 :wnd name: wnd title: "Dolda Connect" var: y sig(delete_event):initdeath
@@ -29,6 +30,7 @@ end
 			:menuitem label: Op_tions
 				:menu
 					$smenuitem name: prefmenu stock: PREFERENCES sig: activate
+					$menuitem name: lsres label: "_List resumable files" sig: activate
 				end
 			end
 		end
@@ -112,12 +114,12 @@ end
 					:sw expand: TRUE fill: TRUE
 						:treeview name: srchres var: y rules: TRUE searchcol: 3 sig(row-activated): cb_main_srchres_activate sig(popup-menu): cb_main_srpopup sig(button-release-event): cb_main_srpopup
 							:tvcol title: "#" sortcol: 7 resizable: FALSE
-								$textrend func: hidezerofunc funcdata: "(gpointer)7"
+								$textrend func: hidezerofunc funcdata: "GINT_TO_POINTER(7)"
 							end
 							$tvcol title: "Peer name" text: 2 sortcol: 2 resizable: TRUE
 							$tvcol title: "File name" text: 3 sortcol: 3 resizable: TRUE expander: y
 							:tvcol title: "Size" sortcol: 4 resizable: TRUE
-								$textrend func: transnicebytefunc funcdata: "(gpointer)4"
+								$textrend func: transnicebytefunc funcdata: "GINT_TO_POINTER(4)"
 							end
 							$tvcol title: "Slots" text: 5 sortcol: 5 resizable: TRUE
 							:tvcol title: "Known speed" sortcol: 8 resizable: TRUE
@@ -140,15 +142,18 @@ end
 							end
 							$tvcol title: "File Name" text: 5
 							:tvcol title: "Size"
-								$textrend func: transnicebytefunc funcdata: "(gpointer)6"
+								$textrend func: transnicebytefunc funcdata: "GINT_TO_POINTER(6)"
 							end
 							:tvcol title: "Position"
 #ifdef ENABLE_GTK2PBAR
 								$custrend newfunc: custom_cell_renderer_progress_new attr(percentage): 9
 #else
-								$textrend func: percentagefunc funcdata: "(gpointer)9" expand: FALSE
+								$textrend func: percentagefunc funcdata: "GINT_TO_POINTER(9)" expand: FALSE
 #endif
-								$textrend func: transnicebytefunc funcdata: "(gpointer)7"
+								$textrend func: transnicebytefunc funcdata: "GINT_TO_POINTER(7)"
+							end
+							:tvcol title: "Speed"
+								$textrend func: transspeedinfo
 							end
 							:tvcol title: "Error"
 								$textrend func: transerrorinfo
@@ -167,15 +172,18 @@ end
 							end
 							$tvcol title: "File Name" text: 5
 							:tvcol title: "Size"
-								$textrend func: transnicebytefunc funcdata: "(gpointer)6"
+								$textrend func: transnicebytefunc funcdata: "GINT_TO_POINTER(6)"
 							end
 							:tvcol title: "Position"
 #ifdef ENABLE_GTK2PBAR
 								$custrend newfunc: custom_cell_renderer_progress_new attr(percentage): 9
 #else
-								$textrend func: percentagefunc funcdata: "(gpointer)9" expand: FALSE
+								$textrend func: percentagefunc funcdata: "GINT_TO_POINTER(9)" expand: FALSE
 #endif
-								$textrend func: transnicebytefunc funcdata: "(gpointer)7"
+								$textrend func: transnicebytefunc funcdata: "GINT_TO_POINTER(7)"
+							end
+							:tvcol title: "Speed"
+								$textrend func: transspeedinfo
 							end
 						end
 					end