diff --git a/hydrus/client/gui/canvas/ClientGUICanvasHoverFrames.py b/hydrus/client/gui/canvas/ClientGUICanvasHoverFrames.py index fccfb8f7..eee8bbe3 100644 --- a/hydrus/client/gui/canvas/ClientGUICanvasHoverFrames.py +++ b/hydrus/client/gui/canvas/ClientGUICanvasHoverFrames.py @@ -958,37 +958,32 @@ class CanvasHoverFrameTop( CanvasHoverFrame ): has_human_readable_embedded_metadata = self._current_media.GetMediaResult().GetFileInfoManager().has_human_readable_embedded_metadata has_extra_rows = self._current_media.GetMime() == HC.IMAGE_JPEG - stuff_to_show = has_exif or has_human_readable_embedded_metadata or has_extra_rows + tt = 'show detailed file metadata' - if stuff_to_show: + tt_components = [] + + if has_exif: - tt_components = [] + tt_components.append( 'exif' ) - if has_exif: - - tt_components.append( 'exif' ) - + + if has_human_readable_embedded_metadata: - if has_human_readable_embedded_metadata: - - tt_components.append( 'non-exif embedded metadata' ) - + tt_components.append( 'non-exif embedded metadata' ) - if has_extra_rows: - - tt_components.append( 'extra info' ) - + + if has_extra_rows: - tt = 'show detailed file metadata' + tt_components.append( 'extra info' ) - if len( tt_components ) > 0: - - tt += ', including {}'.format( ' and '.join( tt_components ) ) - + + if len( tt_components ) > 0: - self._show_embedded_metadata_button.setToolTip( ClientGUIFunctions.WrapToolTip( tt ) ) + tt += ', including {}'.format( ' and '.join( tt_components ) ) + self._show_embedded_metadata_button.setToolTip( ClientGUIFunctions.WrapToolTip( tt ) ) + def _ResetText( self ): diff --git a/hydrus/client/gui/media/ClientGUIMediaModalActions.py b/hydrus/client/gui/media/ClientGUIMediaModalActions.py index 72631f5c..406743a8 100644 --- a/hydrus/client/gui/media/ClientGUIMediaModalActions.py +++ b/hydrus/client/gui/media/ClientGUIMediaModalActions.py @@ -1139,7 +1139,7 @@ def ShowFileEmbeddedMetadata( win: QW.QWidget, media: ClientMedia.MediaSingleton file_text = 'This file is not local to this computer!' - frame = ClientGUITopLevelWindowsPanels.FrameThatTakesScrollablePanel( win, 'Embedded Metadata' ) + frame = ClientGUITopLevelWindowsPanels.FrameThatTakesScrollablePanel( win, 'Detailed File Metadata' ) panel = ClientGUIScrolledPanelsReview.ReviewFileEmbeddedMetadata( frame, mime, top_line_text, exif_dict, file_text, extra_rows )