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 337227c..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
@@ -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
@@ -57,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
@@ -112,12 +118,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 +146,13 @@ 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
-#endif
-                                                               $textrend func: transnicebytefunc funcdata: "(gpointer)7"
+                                                               $progrend func: progressfunc funcdata: "GINT_TO_POINTER((6 << 8) | 7)" expand: TRUE
+                                                       end
+                                                       :tvcol title: "Speed"
+                                                               $textrend func: transspeedinfo
                                                        end
                                                        :tvcol title: "Error"
                                                                $textrend func: transerrorinfo
@@ -167,15 +171,13 @@ 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
-#endif
-                                                               $textrend func: transnicebytefunc funcdata: "(gpointer)7"
+                                                               $progrend func: progressfunc funcdata: "GINT_TO_POINTER((6 << 8) | 7)" expand: TRUE
+                                                       end
+                                                       :tvcol title: "Speed"
+                                                               $textrend func: transspeedinfo
                                                        end
                                                end
                                        end