mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

pair request alert tweaks

Browse source
This commit is contained in:
Joey Hess 2012-09-09 15:16:17 -04:00
parent 690b424cad
commit ded8517545
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Alert.hs
View file

@ -288,10 +288,10 @@ sanityCheckFixAlert msg = Alert
pairRequestAlert :: String -> String -> AlertButton -> Alert pairRequestAlert :: String -> String -> AlertButton -> Alert
pairRequestAlert repo msg button = Alert pairRequestAlert repo msg button = Alert
{ alertClass = Message { alertClass = Message
, alertHeader = Just $ tenseWords ["Pair request"] , alertHeader = Nothing
, alertMessageRender = tenseWords , alertMessageRender = tenseWords
, alertData = [UnTensed $ T.pack msg] , alertData = [UnTensed $ T.pack msg]
, alertBlockDisplay = True , alertBlockDisplay = False
, alertPriority = High , alertPriority = High
, alertClosable = True , alertClosable = True
, alertIcon = Just InfoIcon , alertIcon = Just InfoIcon

10
Assistant/Threads/PairListener.hs
View file

@ -78,13 +78,13 @@ pairReqAlert dstatus urlrenderer msg = unlessM myreq $ do
- can verify using the secrets of any of them. -} - can verify using the secrets of any of them. -}
myreq = any (verified v . inProgressSecret) . pairingInProgress myreq = any (verified v . inProgressSecret) . pairingInProgress
<$> getDaemonStatus dstatus <$> getDaemonStatus dstatus
{- Remove the button when it's clicked, and convert the {- Remove the button when it's clicked, and change the
- alert to filler. It cannot be entirely removed since - alert to be in progress. This alert cannot be entirely
- more pair request messages are coming in and would - removed since more pair request messages are coming in
- re-add it. -} - and would re-add it. -}
onclick i = updateAlert dstatus i $ \alert -> Just $ alert onclick i = updateAlert dstatus i $ \alert -> Just $ alert
{ alertButton = Nothing { alertButton = Nothing
, alertPriority = Filler , alertIcon = Just ActivityIcon
, alertData = [UnTensed $ T.pack $ "pair request with " ++ repo ++ " in progress"] , alertData = [UnTensed $ T.pack $ "pair request with " ++ repo ++ " in progress"]
} }