Use real Gtk TreeView progress bars, finally!

[doldaconnect.git] / clients / gtk2 / mainwnd.desc

diff --git a/clients/gtk2/mainwnd.desc b/clients/gtk2/mainwnd.desc
index 9111d4f..9bb2220 100644 (file)
--- 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