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 c5d653e..9bb2220 100644 (file)
--- a/clients/gtk2/mainwnd.desc
+++ b/clients/gtk2/mainwnd.desc
@@ -5,6 +5,16 @@
 ;hasaccels: y
 ;hascolumns: y
 ;hasrenderers: y
+:menu name: srpopup var: y
+       $menuitem name: srhash label: "Search for this hash" sig: activate var: y
+       $menuitem name: srcopy label: "Copy this hash to clipboard" sig: activate var: y
+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
        :vbox
                :menubar
@@ -20,6 +30,7 @@
                        :menuitem label: Op_tions
                                :menu
                                        $smenuitem name: prefmenu stock: PREFERENCES sig: activate
+                                       $menuitem name: lsres label: "_List resumable files" sig: activate
                                end
                        end
                end
@@ -48,6 +59,10 @@
                                                                $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
@@ -101,20 +116,21 @@
                                        $hr pad: 5
                                        $mlbl label: "Search _results:" mwidget: srchres
                                        :sw expand: TRUE fill: TRUE
-                                               :treeview name: srchres var: y rules: TRUE searchcol: 3 sig(row-activated): cb_main_srchres_activate
+                                               :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
                                                                $textrend func: speedtimefunc
                                                        end
                                                        $tvcol title: "Rsp. time" text: 6 sortcol: 6 resizable: TRUE
+                                                       $tvcol title: "Hash" text: 9 sortcol: 9 resizable: TRUE
                                                end
                                        end
                                end
@@ -123,26 +139,25 @@
                                :vbox nblabel: "_Downloads"
                                        $mlbl label: "_List of downloads:" mwidget: downloads
                                        :sw fill: TRUE expand: TRUE
-                                               :treeview name: downloads var: y sig(key-press-event): cb_main_trlist_keypress
+                                               :treeview name: downloads var: y sig(key-press-event): cb_main_trlist_keypress sig(popup-menu): cb_main_trpopup sig(button-release-event): cb_main_trpopup
                                                        :tvcol title: "User Name"
                                                                $pixbufrend stock_id: 8
                                                                $textrend text: 4
                                                        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
                                                        end
+                                                       $tvcol title: "Hash" text: 12
                                                end
                                        end
                                end
@@ -156,15 +171,13 @@
                                                        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