diff --git a/Bustle/Loader/Pcap.hs b/Bustle/Loader/Pcap.hs --- a/Bustle/Loader/Pcap.hs +++ b/Bustle/Loader/Pcap.hs @@ -28,16 +28,12 @@ import Data.Maybe (fromMaybe) import Data.Either (partitionEithers) -import Data.List (isSuffixOf) import qualified Data.Map as Map import Data.Map (Map) -import Control.Exception (try, tryJust) +import Control.Exception (try) import Control.Monad.State import System.IO.Error ( mkIOError , userErrorType - , isUserError - , ioeGetErrorString - , ioeSetErrorString ) import Network.Pcap @@ -47,7 +43,6 @@ import qualified Data.ByteString as BS import qualified Bustle.Types as B -import Bustle.Translation (__) -- Conversions from dbus-core's types into Bustle's more stupid types. This -- whole section is pretty upsetting. diff --git a/Bustle/Renderer.hs b/Bustle/Renderer.hs --- a/Bustle/Renderer.hs +++ b/Bustle/Renderer.hs @@ -42,8 +42,8 @@ import Data.List.NonEmpty (NonEmpty(..)) import qualified Data.Set as Set import Data.Set (Set) -import qualified Data.Map as Map -import Data.Map (Map) +import qualified Data.Map.Strict as Map +import Data.Map.Strict (Map) import Control.Arrow (first) import Control.Monad @@ -59,10 +59,6 @@ | SystemBus deriving (Show, Eq, Ord) -describeBus :: Bus -> String -describeBus SessionBus = "session" -describeBus SystemBus = "system" - -- We keep the column in the map to allow the Monoid instance to preserve the -- ordering returned by sessionParticipants, which is the only view on this -- type exported. @@ -142,8 +138,8 @@ instance Monoid apps => Monoid (RendererResult apps) where mempty = RendererResult 0 0 [] [] mempty [] -processWithFilters :: (Log, Set UniqueName) - -> (Log, Set UniqueName) +processWithFilters :: (Log, NameFilter) + -> (Log, NameFilter) -> RendererResult () processWithFilters (sessionBusLog, sessionFilter) (systemBusLog, systemFilter ) = @@ -159,7 +155,7 @@ -- Doesn't let you filter rendererStateNew :: RendererState -rendererStateNew = initialState Set.empty Set.empty +rendererStateNew = initialState emptyNameFilter emptyNameFilter buildResult :: RendererOutput -> RendererState @@ -243,7 +239,8 @@ , nextColumn :: Double , columnsInUse :: Set Double , pending :: Pending - , bsIgnoredNames :: Set UniqueName + , bsFilter :: NameFilter + , nextFakeName :: Integer } data RendererState = @@ -254,7 +251,7 @@ , startTime :: Microseconds } -initialBusState :: Set UniqueName +initialBusState :: NameFilter -> Double -> BusState initialBusState ignore x = @@ -263,17 +260,18 @@ , nextColumn = x , columnsInUse = Set.empty , pending = Map.empty - , bsIgnoredNames = ignore + , bsFilter = ignore + , nextFakeName = 0 } -initialSessionBusState, initialSystemBusState :: Set UniqueName -> BusState +initialSessionBusState, initialSystemBusState :: NameFilter -> BusState initialSessionBusState f = initialBusState f $ timestampAndMemberWidth + firstColumnOffset initialSystemBusState f = initialBusState f $ negate firstColumnOffset -initialState :: Set UniqueName - -> Set UniqueName +initialState :: NameFilter + -> NameFilter -> RendererState initialState sessionFilter systemFilter = RendererState { sessionBusState = initialSessionBusState sessionFilter @@ -359,18 +357,12 @@ case filter (Set.member o . aiCurrentNames . snd) (Map.assocs as) of [details] -> return details - -- No matches indicates a corrupt log, which we try to recover from … + -- No known owner for the well-known name. This happens in many cases, + -- especially when a method call causes service activation. [] -> do - warn $ concat [ "'" - , unOtherName o - , "' appeared unheralded on the " - , describeBus bus - , " bus; making something up..." - ] - let namesInUse = Map.keys as - candidates = map (fakeUniqueName . show) - ([1..] :: [Integer]) - u = head $ filter (not . (`elem` namesInUse)) candidates + n <- getsBusState nextFakeName bus + modifyBusState bus $ \bs -> bs { nextFakeName = n + 1 } + let u = fakeUniqueName (show n) addUnique bus u addOther bus o u ai <- lookupUniqueName bus u @@ -648,9 +640,12 @@ -> Message -> Renderer Bool shouldShow bus m = do - ignored <- getsBusState bsIgnoredNames bus + nameFilter <- getsBusState bsFilter bus names <- mapM (fmap fst . lookupApp bus) (mentionedNames m) - return $ Set.null (ignored `Set.intersection` Set.fromList names) + return $ + not (any (flip Set.member $ nfNever nameFilter) names) + && (Set.null (nfOnly nameFilter) + || any (flip Set.member $ nfOnly nameFilter) names) processOne :: Bus -> Detailed Event diff --git a/Bustle/Types.hs b/Bustle/Types.hs --- a/Bustle/Types.hs +++ b/Bustle/Types.hs @@ -38,6 +38,12 @@ , unOtherName , unBusName + , NameFilter(..) + , emptyNameFilter + , nameFilterAddOnly + , nameFilterAddNever + , nameFilterRemove + , dbusName , dbusInterface @@ -68,6 +74,8 @@ ) import Data.Maybe (maybeToList) import Data.Either (partitionEithers) +import Data.Set (Set) +import qualified Data.Set as Set type Serial = Word32 @@ -94,6 +102,33 @@ unBusName :: TaggedBusName -> String unBusName (U (UniqueName x)) = formatBusName x unBusName (O (OtherName x)) = formatBusName x + +data NameFilter = + NameFilter { nfOnly :: Set UniqueName + , nfNever :: Set UniqueName + } + deriving + (Show, Eq, Ord) + +emptyNameFilter :: NameFilter +emptyNameFilter = NameFilter Set.empty Set.empty + +nameFilterModify :: (Set UniqueName -> Set UniqueName) + -> (Set UniqueName -> Set UniqueName) + -> NameFilter + -> NameFilter +nameFilterModify updateOnly updateNever nf = + nf { nfOnly = updateOnly $ nfOnly nf + , nfNever = updateNever $ nfNever nf + } + +nameFilterAddOnly, nameFilterAddNever, nameFilterRemove + :: UniqueName + -> NameFilter + -> NameFilter +nameFilterAddOnly u = nameFilterModify (Set.insert u) (Set.delete u) +nameFilterAddNever u = nameFilterModify (Set.delete u) (Set.insert u) +nameFilterRemove u = nameFilterModify (Set.delete u) (Set.delete u) -- These useful constants disappeared from dbus in the grand removing of the -- -core suffix. diff --git a/Bustle/UI.hs b/Bustle/UI.hs --- a/Bustle/UI.hs +++ b/Bustle/UI.hs @@ -30,7 +30,6 @@ import Data.IORef import qualified Data.Map as Map -import qualified Data.Set as Set import Data.List (intercalate) import Data.Time import Data.Tuple (swap) @@ -672,7 +671,7 @@ rr = io $ void $ do wiSetLogDetails wi logDetails - hiddenRef <- newIORef Set.empty + nameFilterRef <- newIORef emptyNameFilter updateDisplayedLog wi rr @@ -697,13 +696,12 @@ widgetHide sidebarHeader widgetSetSensitivity filterNames True - onMenuItemActivate filterNames $ do - hidden <- readIORef hiddenRef - hidden' <- runFilterDialog window (sessionParticipants $ rrApplications rr) hidden - writeIORef hiddenRef hidden' - let rr' = processWithFilters (sessionMessages, hidden') (systemMessages, Set.empty) - - updateDisplayedLog wi rr' + onMenuItemActivate filterNames $ + -- FIXME: also allow filtering system bus in two-bus case + runFilterDialog window (sessionParticipants $ rrApplications rr) nameFilterRef $ do + nameFilter <- readIORef nameFilterRef + let rr' = processWithFilters (sessionMessages, nameFilter) (systemMessages, emptyNameFilter) + updateDisplayedLog wi rr' showOpenDialog :: Window -> B () diff --git a/Bustle/UI/DetailsView.hs b/Bustle/UI/DetailsView.hs --- a/Bustle/UI/DetailsView.hs +++ b/Bustle/UI/DetailsView.hs @@ -93,23 +93,19 @@ getErrorName :: Detailed a -> Maybe String getErrorName (Detailed _ _ _ rm) = case rm of - (D.ReceivedMethodError _ (MethodError { methodErrorName = ErrorName en})) -> Just en - _ -> Nothing - -getErrorMessage :: Detailed a - -> Maybe String -getErrorMessage (Detailed _ _ _ (D.ReceivedMethodError _ (MethodError _ _ _ _ body))) = - case D.fromVariant <$> body of - [message] -> message - _ -> Nothing -getErrorMessage _ = Nothing + D.ReceivedMethodError _ MethodError{ methodErrorName = ErrorName en} -> Just en + _ -> Nothing formatMessage :: Detailed Message -> String formatMessage (Detailed _ _ _ rm) = - formatArgs $ D.receivedMessageBody rm + case (rm, D.fromVariant <$> body) of + -- Special-case errors, which (are supposed to) have a single + -- human-readable string argument + (D.ReceivedMethodError _ _, [Just message]) -> message + _ -> formatted where - formatArgs = intercalate "\n" . map (format_Variant VariantStyleSignature) --- TODO: suppress escaping and type sig for errors, which are always (s) + body = D.receivedMessageBody rm + formatted = intercalate "\n" $ map (format_Variant VariantStyleSignature) body detailsViewGetTop :: DetailsView -> Widget detailsViewGetTop = toWidget . detailsGrid @@ -117,15 +113,13 @@ setOptionalRow :: OptionalRow -> Maybe String -> IO () -setOptionalRow (caption, label) s_ = do - case s_ of - Just s -> do - labelSetText label s - widgetShow label - widgetShow caption - Nothing -> do - widgetHide label - widgetHide caption +setOptionalRow (caption, label) (Just s) = do + labelSetText label s + widgetShow label + widgetShow caption +setOptionalRow (caption, label) Nothing = do + widgetHide label + widgetHide caption detailsViewUpdate :: DetailsView -> Detailed Message @@ -143,8 +137,6 @@ labelSetText (detailsPath d) (maybe unknown (D.formatObjectPath . path) member_) labelSetMarkup (detailsMember d) (maybe unknown getMemberMarkup member_) - textBufferSetText buf $ case getErrorMessage m of - Just message -> message - Nothing -> formatMessage m + textBufferSetText buf (formatMessage m) where unknown = "" diff --git a/Bustle/UI/FilterDialog.hs b/Bustle/UI/FilterDialog.hs --- a/Bustle/UI/FilterDialog.hs +++ b/Bustle/UI/FilterDialog.hs @@ -1,8 +1,8 @@ -{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleContexts #-} {- Bustle.UI.FilterDialog: allows the user to filter the displayed log Copyright © 2011 Collabora Ltd. +Copyright © 2019 Will Thompson This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -23,28 +23,52 @@ ) where -import Data.List (intercalate, groupBy, elemIndices) +import Control.Monad (forM_) +import Data.List (intercalate, groupBy, elemIndices, elemIndex) import qualified Data.Set as Set import Data.Set (Set) import qualified Data.Function as F +import Data.IORef import Graphics.UI.Gtk +import Graphics.UI.Gtk.ModelView.CellRendererCombo (cellComboTextModel) import Bustle.Translation (__) import Bustle.Types +import Paths_bustle + +data NameVisibility = NameVisibilityDefault + | NameVisibilityOnly + | NameVisibilityNever + deriving (Show, Eq, Ord, Enum, Bounded) + +nameVisibilityName :: NameVisibility + -> String +nameVisibilityName v = case v of + NameVisibilityDefault -> __ "Default" + NameVisibilityOnly -> __ "Only this" + NameVisibilityNever -> __ "Hidden" + +data NameEntry = NameEntry { neUniqueName :: UniqueName + , neOtherNames :: Set OtherName + , neVisibility :: NameVisibility + } + namespace :: String -> (String, String) namespace name = case reverse (elemIndices '.' name) of [] -> ("", name) (i:_) -> splitAt (i + 1) name -formatNames :: (UniqueName, Set OtherName) +formatNames :: NameEntry -> String -formatNames (u, os) - | Set.null os = unUniqueName u +formatNames ne + | Set.null os = unUniqueName (neUniqueName ne) | otherwise = intercalate "\n" . map (formatGroup . groupGroup) $ groups where + os = neOtherNames ne + groups = groupBy ((==) `F.on` fst) . map (namespace . unOtherName) $ Set.toAscList os groupGroup [] = error "unpossible empty group from groupBy" @@ -53,89 +77,128 @@ formatGroup (ns, [y]) = ns ++ y formatGroup (ns, ys) = ns ++ "{" ++ intercalate "," ys ++ "}" -type NameStore = ListStore (Bool, (UniqueName, Set OtherName)) +type NameStore = ListStore NameEntry makeStore :: [(UniqueName, Set OtherName)] - -> Set UniqueName + -> NameFilter -> IO NameStore -makeStore names currentlyHidden = - listStoreNew $ map toPair names +makeStore names nameFilter = + listStoreNew $ map toNameEntry names where - toPair name@(u, _) = (not (Set.member u currentlyHidden), name) - -makeView :: NameStore - -> IO ScrolledWindow -makeView nameStore = do - nameView <- treeViewNewWithModel nameStore - -- We want rules because otherwise it's tough to see where each group - -- starts and ends - treeViewSetRulesHint nameView True - treeViewSetHeadersVisible nameView False - widgetSetSizeRequest nameView 600 371 - - tickyCell <- cellRendererToggleNew - tickyColumn <- treeViewColumnNew - treeViewColumnPackStart tickyColumn tickyCell True - treeViewAppendColumn nameView tickyColumn + toNameEntry (u, os) = NameEntry { neUniqueName = u + , neOtherNames = os + , neVisibility = toVisibility u + } + toVisibility u | Set.member u (nfOnly nameFilter) = NameVisibilityOnly + | Set.member u (nfNever nameFilter) = NameVisibilityNever + | otherwise = NameVisibilityDefault - cellLayoutSetAttributes tickyColumn tickyCell nameStore $ \(ticked, _) -> - [ cellToggleActive := ticked ] +nameStoreUpdate :: NameStore + -> Int + -> (NameEntry -> NameEntry) + -> IO () +nameStoreUpdate nameStore i f = do + ne <- listStoreGetValue nameStore i + listStoreSetValue nameStore i $ f ne - on tickyCell cellToggled $ \pathstr -> do - let [i] = stringToTreePath pathstr - (v, ns) <- listStoreGetValue nameStore i - listStoreSetValue nameStore i (not v, ns) +makeView :: NameStore + -> TreeView + -> IO () +makeView nameStore nameView = do + treeViewSetModel nameView (Just nameStore) + -- Bus name column nameCell <- cellRendererTextNew nameColumn <- treeViewColumnNew + nameColumn `set` [ treeViewColumnTitle := __ "Bus Name" + , treeViewColumnExpand := True + ] treeViewColumnPackStart nameColumn nameCell True treeViewAppendColumn nameView nameColumn - cellLayoutSetAttributes nameColumn nameCell nameStore $ \(_, ns) -> - [ cellText := formatNames ns ] + cellLayoutSetAttributes nameColumn nameCell nameStore $ \ne -> + [ cellText := formatNames ne ] - sw <- scrolledWindowNew Nothing Nothing - scrolledWindowSetPolicy sw PolicyAutomatic PolicyAutomatic - containerAdd sw nameView + -- TreeStore of possible visibility states + let nameVisibilities = [minBound..] + let nameVisibilityNames = map nameVisibilityName nameVisibilities + visibilityModel <- listStoreNew nameVisibilityNames + let visibilityNameCol = makeColumnIdString 1 + treeModelSetColumn visibilityModel visibilityNameCol id - return sw + -- Visibility column + comboCell <- cellRendererComboNew + comboCell `set` [ cellTextEditable := True + , cellComboHasEntry := False + ] + comboColumn <- treeViewColumnNew + comboColumn `set` [ treeViewColumnTitle := __ "Visibility" + , treeViewColumnExpand := False + ] + treeViewColumnPackStart comboColumn comboCell True + treeViewAppendColumn nameView comboColumn + + cellLayoutSetAttributes comboColumn comboCell nameStore $ \ne -> + [ cellComboTextModel := (visibilityModel, visibilityNameCol) + , cellText :=> do + let Just j = elemIndex (neVisibility ne) nameVisibilities + listStoreGetValue visibilityModel j + ] + comboCell `on` edited $ \[i] str -> do + let (Just j) = elemIndex str nameVisibilityNames + nameStoreUpdate nameStore i $ \ne -> + ne { neVisibility = nameVisibilities !! j } + + return () + runFilterDialog :: WindowClass parent => parent -- ^ The window to which to attach the dialog -> [(UniqueName, Set OtherName)] -- ^ Names, in order of appearance - -> Set UniqueName -- ^ Currently-hidden names - -> IO (Set UniqueName) -- ^ The set of names to *hide* -runFilterDialog parent names currentlyHidden = do - d <- dialogNew - (windowWidth, windowHeight) <- windowGetSize parent - windowSetDefaultSize d (windowWidth * 7 `div` 8) (windowHeight `div` 2) + -> IORef NameFilter -- ^ Current filter + -> IO () -- ^ Callback when filter changes + -> IO () +runFilterDialog parent names filterRef callback = do + builder <- builderNew + builderAddFromFile builder =<< getDataFileName "data/FilterDialog.ui" + + d <- builderGetObject builder castToDialog ("filterDialog" :: String) + (_, windowHeight) <- windowGetSize parent + windowSetDefaultSize d (-1) (windowHeight * 3 `div` 4) d `set` [ windowTransientFor := parent ] - dialogAddButton d stockClose ResponseClose - vbox <- castToBox <$> dialogGetContentArea d - boxSetSpacing vbox 6 - nameStore <- makeStore names currentlyHidden - sw <- makeView nameStore + nameStore <- makeStore names =<< readIORef filterRef + makeView nameStore =<< builderGetObject builder castToTreeView ("filterTreeView" :: String) - instructions <- labelNew (Nothing :: Maybe String) - widgetSetSizeRequest instructions 600 (-1) - labelSetMarkup instructions - (__ "Unticking a service hides its column in the diagram, \ - \and all messages it is involved in. That is, all methods it calls \ - \or are called on it, the corresponding returns, and all signals it \ - \emits will be hidden.") - labelSetLineWrap instructions True - boxPackStart vbox instructions PackNatural 0 + resetButton <- builderGetObject builder castToButton ("resetButton" :: String) + resetButton `on` buttonActivated $ do + n <- listStoreGetSize nameStore + forM_ [0..n-1] $ \i -> do + ne <- listStoreGetValue nameStore i + case neVisibility ne of + NameVisibilityDefault -> return () + _ -> listStoreSetValue nameStore i $ + ne { neVisibility = NameVisibilityDefault } - boxPackStart vbox sw PackGrow 0 - widgetShowAll vbox + let updateResetSensitivity = do + nf <- readIORef filterRef + let isEmpty = Set.null (nfOnly nf) && Set.null (nfNever nf) + widgetSetSensitive resetButton $ not isEmpty + updateResetSensitivity + nameStore `on` rowChanged $ \[i] _iter -> do + ne <- listStoreGetValue nameStore i + let u = neUniqueName ne + -- Should we smush this into nameFilterModify, move the enum into + -- Bustle.Types? + let f = case neVisibility ne of + NameVisibilityDefault -> nameFilterRemove + NameVisibilityOnly -> nameFilterAddOnly + NameVisibilityNever -> nameFilterAddNever + modifyIORef' filterRef $ f u + updateResetSensitivity + callback + _ <- dialogRun d widgetDestroy d - - results <- listStoreToList nameStore - return $ Set.fromList [ u - | (ticked, (u, _)) <- results - , not ticked - ] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,6 @@ * Ideally, automate the steps below * Write news in `NEWS.md` and `data/org.freedesktop.Bustle.appdata.xml.in` -* Update `po/messages.pot` * Update version number in `bustle.cabal` ```sh diff --git a/INSTALL.md b/INSTALL.md --- a/INSTALL.md +++ b/INSTALL.md @@ -1,47 +1,37 @@ -Building from source -==================== - -First, make sure the Haskell Platform is installed, preferably along with the -Gtk+ bindings for Haskell, and some other dependencies. On Debian-flavoured -systems, well, actually just `apt-get build-dep bustle`, but: - - sudo apt-get install \ - pkg-config \ - libdbus-1-dev \ - libglib2.0-dev \ - libpcap0.8-dev \ - haskell-platform \ - libghc-mtl-dev \ - libghc-cairo-dev \ - libghc-gtk-dev \ - libghc-glade-dev \ - libghc-dbus-dev \ - libghc-pcap-dev \ - help2man +Installing from Flathub +======================= -(If you can't get the Haskell Platform via your package manager, see -. If you can't get the Gtk+ binding for -Haskell via your package manager, you'll need to run: +If you don't want to modify Bustle, by far the easiest way to install it is to +[get it from Flathub](https://gitlab.freedesktop.org/bustle/bustle). - cabal install gtk2hs-buildtools +Download on Flathub -and ensure that ~/.cabal/bin is in your PATH before continuing.) +Building from source +==================== -Got that? Great! +I recommend using Stack; see the instructions in +[CONTRIBUTING.md](./CONTRIBUTING.md). You can also build a Git checkout using +Flatpak: - export PREFIX=/opt/bustle +``` +flatpak-builder --install --user --force-clean app flatpak/org.freedesktop.Bustle.yaml +``` - # Build and install Bustle itself. - cabal install --prefix=$PREFIX +On exotic platforms with no Haskell toolchain +============================================= - # Build and install the stand-alone logger binary, plus the icons, desktop - # file, etc. etc. - make install PREFIX=$PREFIX +If you're working on an embedded platform, you may have D-Bus but no Haskell +toolchain, and you may not want to bootstrap everything just to run Bustle on +the target device. That's fine: Bustle was originally written for exactly this +situation! -If the Haskell Platform is not available on the platform you want to do -some D-Bus profiling on, that's fine: the logger is written in C, and -you can view logs generated on your fancy embedded hardware on your more -pedestrian Linux laptop. The logger only depends on a few widely-available -libraries: +First, install Bustle on your (x86_64) development system as above. You then +have two options to monitor D-Bus traffic on the target device: - sudo apt-get install libglib2.0-dev libpcap-dev +1. On the target device, run `dbus-monitor --pcap --session >session.pcap`, and + hit `Ctrl+C` when you're done. Then copy `session.pcap` to your development + system, and open it in Bustle. +2. On the target device, arrange for D-Bus to be accessible via TCP or via some + kind of socket forwarding. On your development system, run Bustle, choose + _Record → Record Address_, and enter the remote address in the same form + accepted by `dbus-monitor`. diff --git a/NEWS.md b/NEWS.md --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,17 @@ +Bustle 0.7.5 (2019-03-08) +------------------------- + +User-facing changes: + +* As well as being able to filter out messages involving certain + services, you can now also filter messages to only show certain + services. + +Internal changes: + +* SVGs are now 256×256px to placate flatpak-validate-icon +* Add Nix compatibility (Daniel Firth) + Bustle 0.7.4 (2018-12-07) ------------------------- diff --git a/bustle.cabal b/bustle.cabal --- a/bustle.cabal +++ b/bustle.cabal @@ -1,6 +1,6 @@ Name: bustle Category: Network, Desktop -Version: 0.7.4 +Version: 0.7.5 Cabal-Version: 2.0 Tested-With: GHC == 8.4.3 Synopsis: Draw sequence diagrams of D-Bus traffic @@ -11,6 +11,7 @@ Maintainer: Will Thompson Homepage: https://gitlab.freedesktop.org/bustle/bustle#readme Data-files: data/bustle.ui, + data/FilterDialog.ui, data/OpenTwoDialog.ui, data/RecordAddressDialog.ui, LICENSE @@ -36,7 +37,6 @@ -- wow many translate , po/*.po - , po/*.pot -- intl bits , data/org.freedesktop.Bustle.appdata.xml.in diff --git a/data/FilterDialog.ui b/data/FilterDialog.ui new file mode 100644 --- /dev/null +++ b/data/FilterDialog.ui @@ -0,0 +1,77 @@ + + + + + + False + dialog + + + True + False + Filter Visible Services + False + True + + + _Reset + True + True + True + True + + + + + + + False + vertical + + 0 + + + False + end + + + + + + + + + False + False + 0 + + + + + True + True + 0 + never + in + + + True + True + False + True + + + + + + + + True + True + 1 + + + + + + diff --git a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg --- a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg +++ b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg @@ -9,12 +9,12 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="600" - height="600" + width="256" + height="256" id="svg2" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="bustle-symbolic.svg"> + inkscape:version="0.92.4 5da689c313, 2019-01-14" + sodipodi:docname="org.freedesktop.Bustle-symbolic.svg"> + originx="-228.94108" + originy="-779.84559" + spacingx="1" + spacingy="1" /> @@ -67,38 +69,41 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-56.941089,12.819102)"> - - - - - + transform="translate(-228.94108,-16.516576)"> + + + + + + + diff --git a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg --- a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg +++ b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg @@ -9,12 +9,12 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="605.06" - height="605.06" + width="256" + height="256" id="svg2" version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="bustle.svg"> + inkscape:version="0.92.4 5da689c313, 2019-01-14" + sodipodi:docname="org.freedesktop.Bustle.svg"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> @@ -179,8 +179,10 @@ visible="true" enabled="true" snapvisiblegridlinesonly="true" - originx="-56.941089px" - originy="-465.18127px" /> + originx="-232.64974" + originy="-799.15823" + spacingx="1" + spacingy="1" /> @@ -190,7 +192,7 @@ image/svg+xml - + @@ -198,56 +200,53 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-56.941089,17.879098)"> - - - - - - + transform="translate(-232.64974,2.7960645)"> + + + + + + + + diff --git a/data/org.freedesktop.Bustle.appdata.xml.in b/data/org.freedesktop.Bustle.appdata.xml.in --- a/data/org.freedesktop.Bustle.appdata.xml.in +++ b/data/org.freedesktop.Bustle.appdata.xml.in @@ -41,6 +41,11 @@ bustle.desktop + + +

As well as being able to filter out messages involving certain services, you can now also filter messages to only show certain services.

+ +

In the details for an error reply, the error name is now shown, and the error message is formatted more legibly.

@@ -54,7 +59,7 @@ -

You can now explore messages while they're being recorded. (Filtering, statistics and exporting are still only available once you stop recording.)

+

You can now explore messages while they're being recorded. Filtering, statistics and exporting are still only available once you stop recording.

The raw sender and destination for each message is now shown in the details pane.

Bytestrings with embedded NULs which are otherwise ASCII are now shown as ASCII strings.

 diff --git a/po/messages.pot b/po/messages.pot deleted file mode 100644 --- a/po/messages.pot +++ /dev/null @@ -1,326 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-07 09:43+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: Bustle/StatisticsPane.hs:189 Bustle/StatisticsPane.hs:192 -msgid "%.1f ms" -msgstr "" - -#: Bustle/Noninteractive.hs:55 -msgid "(no interface)" -msgstr "" - -#: Bustle/UI/AboutDialog.hs:46 data/bustle.ui:101 -#: data/org.freedesktop.Bustle.desktop.in:3 -#: data/org.freedesktop.Bustle.appdata.xml.in:9 -msgid "Bustle" -msgstr "" - -#: Bustle/StatisticsPane.hs:190 -msgid "Calls" -msgstr "" - -#: Bustle/UI.hs:456 -msgid "Close _Without Saving" -msgstr "" - -#: Bustle/UI.hs:226 -msgid "Could not read '%s'" -msgstr "" - -#: Bustle/UI.hs:763 -msgid "Couldn't export log as PDF: " -msgstr "" - -#: Bustle/Noninteractive.hs:48 -msgid "Couldn't parse '%s': %s" -msgstr "" - -#: Bustle/UI.hs:431 -msgid "Couldn't save log: " -msgstr "" - -#: Bustle/StatisticsPane.hs:222 data/bustle.ui:787 data/bustle.ui:896 -msgid "Error" -msgstr "" - -#: Bustle/StatisticsPane.hs:150 -msgid "Frequency" -msgstr "" - -#: Bustle/UI.hs:455 -msgid "If you don't save, this log will be lost forever." -msgstr "" - -#: Bustle/StatisticsPane.hs:229 -msgid "Largest" -msgstr "" - -#: Bustle/UI.hs:239 -msgid "Logged %u messages" -msgstr "" - -#: Bustle/StatisticsPane.hs:191 Bustle/StatisticsPane.hs:228 -msgid "Mean" -msgstr "" - -#: Bustle/StatisticsPane.hs:135 Bustle/StatisticsPane.hs:213 data/bustle.ui:688 -msgid "Member" -msgstr "" - -#: Bustle/StatisticsPane.hs:142 Bustle/StatisticsPane.hs:179 -msgid "Method" -msgstr "" - -#: Bustle/StatisticsPane.hs:220 data/bustle.ui:762 -msgid "Method call" -msgstr "" - -#: Bustle/StatisticsPane.hs:221 data/bustle.ui:774 -msgid "Method return" -msgstr "" - -#: Bustle/UI.hs:348 -msgid "Recording %s…" -msgstr "" - -#: Bustle/UI.hs:448 -msgid "Save log '%s' before closing?" -msgstr "" - -#: Bustle/StatisticsPane.hs:143 Bustle/StatisticsPane.hs:223 data/bustle.ui:800 -msgid "Signal" -msgstr "" - -#: Bustle/StatisticsPane.hs:227 -msgid "Smallest" -msgstr "" - -#: Bustle/UI/AboutDialog.hs:48 -msgid "Someone's favourite D-Bus profiler" -msgstr "" - -#: Bustle/StatisticsPane.hs:188 -msgid "Total" -msgstr "" - -#: Bustle/UI/FilterDialog.hs:123 -msgid "" -"Unticking a service hides its column in the diagram, and all messages it is " -"involved in. That is, all methods it calls or are called on it, the " -"corresponding returns, and all signals it emits will be hidden." -msgstr "" - -#: Bustle/Util.hs:48 -msgid "Warning: " -msgstr "" - -#: Bustle/UI.hs:433 -msgid "" -"You might want to manually recover the log from the temporary file at \"%s\"." -msgstr "" - -#: data/bustle.ui:14 -msgid "_Filter Visible Services…" -msgstr "" - -#: data/bustle.ui:24 -msgid "_Statistics" -msgstr "" - -#: data/bustle.ui:62 -msgid "" -"Display two logs—one for the session bus, one for the system bus—side by " -"side." -msgstr "" - -#: data/bustle.ui:63 -msgid "O_pen a Pair of Logs…" -msgstr "" - -#: data/bustle.ui:75 -msgid "Record S_ession Bus" -msgstr "" - -#: data/bustle.ui:84 -msgid "Record S_ystem Bus" -msgstr "" - -#: data/bustle.ui:93 -msgid "Record _Address…" -msgstr "" - -#: data/bustle.ui:138 -msgid "Record a new log" -msgstr "" - -#: data/bustle.ui:149 -msgid "_Record" -msgstr "" - -#: data/bustle.ui:182 -msgid "_Stop" -msgstr "" - -#: data/bustle.ui:200 -msgid "Open an existing log" -msgstr "" - -#: data/bustle.ui:310 -msgid "Export as PDF" -msgstr "" - -#: data/bustle.ui:334 -msgid "Save" -msgstr "" - -#: data/bustle.ui:493 -msgid "" -"Start recording D-Bus activity with the Record button above\n" -" You can also run dbus-monitor --pcap from the command line" -msgstr "" - -#: data/bustle.ui:512 -msgid "Welcome to Bustle" -msgstr "" - -#: data/bustle.ui:537 -msgid "Waiting for D-Bus traffic; please hold…" -msgstr "" - -#: data/bustle.ui:564 -msgid "Frequencies" -msgstr "" - -#: data/bustle.ui:578 -msgid "Durations" -msgstr "" - -#: data/bustle.ui:593 -msgid "Sizes" -msgstr "" - -#: data/bustle.ui:640 -msgid "Type" -msgstr "" - -#: data/bustle.ui:656 -msgid "Path" -msgstr "" - -#: data/bustle.ui:720 -msgid "Arguments" -msgstr "" - -#: data/bustle.ui:813 -msgid "Directed signal" -msgstr "" - -#: data/bustle.ui:832 -msgid "Sender" -msgstr "" - -#: data/bustle.ui:848 -msgid "Destination" -msgstr "" - -#: data/org.freedesktop.Bustle.desktop.in:4 -#: data/org.freedesktop.Bustle.appdata.xml.in:10 -msgid "Draw sequence diagrams of D-Bus activity" -msgstr "" - -#: data/org.freedesktop.Bustle.desktop.in:6 -msgid "org.freedesktop.Bustle" -msgstr "" - -#: data/org.freedesktop.Bustle.desktop.in:11 -msgid "debug;profile;d-bus;dbus;sequence;monitor;" -msgstr "" - -#. Translators: These are the application description paragraphs in the AppData file. -#: data/org.freedesktop.Bustle.appdata.xml.in:13 -msgid "" -"Bustle draws sequence diagrams of D-Bus activity. It shows signal emissions, " -"method calls and their corresponding returns, with time stamps for each " -"individual event and the duration of each method call. This can help you " -"check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based " -"application is not performing as well as you like. It also provides " -"statistics like signal frequencies and average method call times." -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:26 -msgid "Explore sequence diagrams of D-Bus activity" -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:30 -msgid "See statistics summarizing the log" -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:34 -msgid "Relax with this soothing greyscale welcome page" -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:46 -msgid "" -"In the details for an error reply, the error name is now shown, and the " -"error message is formatted more legibly." -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:47 -msgid "" -"The default file extension for log files is now ‘.pcap’, reflecting what " -"they actually are." -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:52 -msgid "" -"Bustle now handles the application/vnd.tcpdump.pcap MIME type, which in " -"practice means that your file manager will offer to open pcap files with " -"Bustle." -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:57 -msgid "" -"You can now explore messages while they're being recorded. (Filtering, " -"statistics and exporting are still only available once you stop recording.)" -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:58 -msgid "" -"The raw sender and destination for each message is now shown in the details " -"pane." -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:59 -msgid "" -"Bytestrings with embedded NULs which are otherwise ASCII are now shown as " -"ASCII strings." -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:64 -msgid "" -"It's now possible to monitor the system bus (from the user interface and " -"with the bustle-pcap command-line tool), with no need to reconfigure the " -"system bus. It's also possible to monitor an arbitrary bus by address." -msgstr "" - -#: data/org.freedesktop.Bustle.appdata.xml.in:65 -msgid "" -"Bustle now requires that dbus-monitor (≥ 1.9.10) and pkexec are installed on " -"your system." -msgstr ""