X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgtk2%2Fmainwnd.desc;h=9bb2220eaca8f0e62ab2573acad5c2d2bc84ab0f;hb=dbdb91fa4abf642a9699b1381abf8bcbb05b202c;hp=9111d4fb2eb9d9b58ffbc64b4e0952ce210e8250;hpb=e5fc6b8cff14b7afe47072f7ccfb0798bd893a51;p=doldaconnect.git

diff --git a/clients/gtk2/mainwnd.desc b/clients/gtk2/mainwnd.desc
index 9111d4f..9bb2220 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
@@ -58,6 +59,10 @@ end
 								$tvcol title: "Description" text: 2 sortcol: 2 resizable: TRUE
 							end
 						end
+						:hbox name: pubhubbarbox var: y noshow: y
+							$pbar name: pubhubbar var: y expand: TRUE fill: TRUE
+							$sbtn stock: CANCEL name: pubhubabort sig: clicked
+						end
 						:table rows: 2 cols: 3 fill: TRUE
 							$mlbl label: "_Filter:" tx: 0 ty: 0 mwidget: pubhubfilter
 							$text name: pubhubfilter var: y expand: y fill: y sig: activate tx: 1 ty: 0
@@ -144,12 +149,7 @@ end
 								$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: "GINT_TO_POINTER(9)" expand: FALSE
-#endif
-								$textrend func: transnicebytefunc funcdata: "GINT_TO_POINTER(7)"
+								$progrend func: progressfunc funcdata: "GINT_TO_POINTER((6 << 8) | 7)" expand: TRUE
 							end
 							:tvcol title: "Speed"
 								$textrend func: transspeedinfo
@@ -174,12 +174,7 @@ end
 								$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: "GINT_TO_POINTER(9)" expand: FALSE
-#endif
-								$textrend func: transnicebytefunc funcdata: "GINT_TO_POINTER(7)"
+								$progrend func: progressfunc funcdata: "GINT_TO_POINTER((6 << 8) | 7)" expand: TRUE
 							end
 							:tvcol title: "Speed"
 								$textrend func: transspeedinfo