From 61b2313320c726fee750e555a3af3bec933f4445 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 25 Dec 2015 23:24:43 +0100 Subject: [PATCH] GTK: add refresh button --- data/Gtk/builder.xml | 18 +++++++++++++++--- src/GUI/Gtk.hs | 2 ++ src/GUI/Gtk/Callbacks.hs | 4 ++++ src/GUI/Gtk/Data.hs | 1 + 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/data/Gtk/builder.xml b/data/Gtk/builder.xml index e5d6f03..916e14a 100644 --- a/data/Gtk/builder.xml +++ b/data/Gtk/builder.xml @@ -262,9 +262,6 @@ True False - - - True @@ -274,6 +271,21 @@ True True + 0 + + + + + gtk-refresh + True + True + True + True + + + False + True + 5 1 diff --git a/src/GUI/Gtk.hs b/src/GUI/Gtk.hs index 4766b11..58b14ab 100644 --- a/src/GUI/Gtk.hs +++ b/src/GUI/Gtk.hs @@ -207,6 +207,8 @@ startMainWindow startdir = do "rcFilePaste" rcFileDelete <- builderGetObject builder castToImageMenuItem "rcFileDelete" + refreshView <- builderGetObject builder castToButton + "refreshView" -- create initial list store model with unsorted data rawModel <- newTVarIO =<< listStoreNew diff --git a/src/GUI/Gtk/Callbacks.hs b/src/GUI/Gtk/Callbacks.hs index 6d7d402..b89793d 100644 --- a/src/GUI/Gtk/Callbacks.hs +++ b/src/GUI/Gtk/Callbacks.hs @@ -111,6 +111,10 @@ setCallbacks mygui myview = do "v" <- fmap glibToString eventKeyName liftIO $ operationFinal mygui myview + _ <- refreshView mygui `on` buttonActivated $ do + cdir <- liftIO $ getCurrentDir myview + refreshTreeView' mygui myview cdir + -- menubar-file _ <- menubarFileQuit mygui `on` menuItemActivated $ mainQuit _ <- menubarFileOpen mygui `on` menuItemActivated $ diff --git a/src/GUI/Gtk/Data.hs b/src/GUI/Gtk/Data.hs index 4ea4344..a4f5666 100644 --- a/src/GUI/Gtk/Data.hs +++ b/src/GUI/Gtk/Data.hs @@ -63,6 +63,7 @@ data MyGUI = MkMyGUI { , rcFileMove :: ImageMenuItem , rcFilePaste :: ImageMenuItem , rcFileDelete :: ImageMenuItem + , refreshView :: Button , urlBar :: Entry , statusBar :: Statusbar , treeView :: TreeView