Skip to content

Commit

Permalink
Merge remote branch 'origin/master' into #1912_CarvedParentTmpFile
Browse files Browse the repository at this point in the history
  • Loading branch information
wladimirleite committed Nov 12, 2023
2 parents 7c0756f + 34d1721 commit 09cffad
Show file tree
Hide file tree
Showing 130 changed files with 4,771 additions and 2,279 deletions.
7 changes: 7 additions & 0 deletions iped-api/src/main/java/iped/data/IBookmarks.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
package iped.data;

import java.awt.Color;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
Expand Down Expand Up @@ -91,6 +92,12 @@ public interface IBookmarks extends Serializable {

String getBookmarkComment(int bookmarkId);

void setBookmarkColor(int bookmarkId, Color color);

Color getBookmarkColor(int bookmarkId);

Set<Color> getUsedColors();

void setBookmarkKeyStroke(int bookmarkId, KeyStroke key);

KeyStroke getBookmarkKeyStroke(int bookmarkId);
Expand Down
7 changes: 7 additions & 0 deletions iped-api/src/main/java/iped/data/IMultiBookmarks.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
package iped.data;

import java.awt.Color;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
Expand Down Expand Up @@ -90,6 +91,12 @@ public interface IMultiBookmarks extends Serializable {

void setBookmarkComment(String texto, String comment);

Color getBookmarkColor(String bookmarkName);

void setBookmarkColor(String bookmarkName, Color color);

Set<Color> getUsedColors();

boolean isInReport(String bookmark);

void setInReport(String bookmark, boolean checked);
Expand Down
4 changes: 2 additions & 2 deletions iped-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
<artifactItem>
<groupId>org.imagemagick</groupId>
<artifactId>imagemagick-zip</artifactId>
<version>7.1.0-q8-x64</version>
<version>7.1.1-19-q8-x64+vcomp.dll</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${tools.dir}</outputDirectory>
Expand All @@ -320,7 +320,7 @@
<artifactItem>
<groupId>tesseract</groupId>
<artifactId>tesseract-zip</artifactId>
<version>5.0.0-alpha.extra.langs</version>
<version>5.3.2-24-g3922</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${tools.dir}</outputDirectory>
Expand Down
22 changes: 17 additions & 5 deletions iped-app/resources/localization/iped-desktop-messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,32 @@ BookmarksController.SaveSuccess.Title=Success
BookmarksManager.Add=Add
BookmarksManager.Add.Tip=Add items to selected bookmarks
BookmarksManager.AddDuplicates=Add duplicates (hash)
BookmarksManager.AlertMultipleSelectedBookmarks=Select just one bookmark!
BookmarksManager.AlertNoCheckedtems=No checked items!
BookmarksManager.AlertNoHighlightedItems=No highlighted items!
BookmarksManager.AlertNoSelectedBookmarks=No selected bookmarks!
BookmarksManager.Checked=Checked items
BookmarksManager.ConfirmDelete=Really want to delete selected bookmarks?
BookmarksManager.ConfirmDelTitle=Confirm
BookmarksManager.Dataset=Dataset:
BookmarksManager.Delete=Delete
BookmarksManager.Delete.Tip=Delete selected bookmarks
BookmarksManager.Edit=Edit
BookmarksManager.Edit.Color=Color
BookmarksManager.Edit.Name=Name
BookmarksManager.Edit.Tip=Edit selected bookmark name and color
BookmarksManager.Edit.Title=Edit Bookmark
BookmarksManager.Highlighted=Highlighted items
BookmarksManager.KeyStrokeBookmark=<html>Type a key (combination) to define a shortcut to 'Add'.<br>Alt+key always 'Remove'.</html>
BookmarksManager.KeyStrokeAlert1=Select just 1 bookmark to define key shortcut.
BookmarksManager.KeyStrokeAlert2=Alt is always used to remove from bookmark.
BookmarksManager.KeyStrokeBookmark=<html>Type a key (combination) to define a shortcut to 'Add'.<br>ALT+key always 'Remove'.</html>
BookmarksManager.KeyStrokeAlert1=Select just one bookmark to define key shortcut.
BookmarksManager.KeyStrokeAlert2=ALT is always used to remove from bookmark.
BookmarksManager.KeyStrokeAlert3=Key shortcut already used, change it first.
BookmarksManager.KeyStrokeAlert4=Key shortcut already used for other action.
BookmarksManager.New=New
BookmarksManager.New.Tip=New bookmark
BookmarksManager.NewBookmark.Tip=Enter bookmark name
BookmarksManager.NewName=New name to first selected bookmark
BookmarksManager.Remove=Remove
BookmarksManager.Remove.Tip=Remove items from selected bookmarks
BookmarksManager.Rename=Rename
BookmarksManager.SearchingDuplicates=Searching Duplicates...
BookmarksManager.Title=Bookmarks
BookmarksManager.CommentsTooltip=Bookmark comments
Expand Down Expand Up @@ -365,6 +372,7 @@ TimeLineGraph.donotBreak=Do not split chart
TimeLineGraph.breakByBookmark=Split chart by bookmark
TimeLineGraph.breakByMetadata=Split chart by metadata
TimeLineGraph.breakByCategory=Split chart by category
TimeLineGraph.checkingItemsProgressLabel=Checking items from time chart...
TimeLineGraph.highlightingItemsProgressLabel=Highlighting items from time chart...
TimeLineGraph.PeriodGranularity=Time Scale
TimeLineGraph.Timezone=Time Zone
Expand All @@ -376,6 +384,10 @@ TimeLineGraph.visibleZoominForGranularity=Max zoom in reached for the scale %s.\
TimeLineGraph.visibleZoomoutForGranularity=Max zoom out reached for the scale %s.\n Would you like to change the scale to %s and continue to zoom out?
TimeLineGraph.syncTableSelectionInChartView=Show table highlights in time chart
TimeLineGraph.resetZoom=Reset Zoom
TimeLineGraph.selectAllEventTypes=Select all event types
TimeLineGraph.unselectAllEventTypes=Unselect all event types
TimeLineGraph.checkEventItems=Check corresponding event type items
TimeLineGraph.uncheckEventItems=Uncheck corresponding event type items
IntervalDefinitionDialog.Title=Time line chart defined ranges
IntervalDefinitionDialog.dateFormat=MM/dd/yyyy
IntervalDefinitionDialog.hourFormat=HH:mm:ss
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,21 @@ BookmarksController.SaveSuccess.Title=Erfolg
BookmarksManager.Add=Hinzufügen
BookmarksManager.Add.Tip=Objekte zu ausgewählten Lesezeichen hinzufügen
BookmarksManager.AddDuplicates=Duplikate hinzufügen (Hash)
BookmarksManager.AlertMultipleSelectedBookmarks=Select just one bookmark![TBT]
BookmarksManager.AlertNoCheckedtems=No checked items![TBT]
BookmarksManager.AlertNoHighlightedItems=No highlighted items![TBT]
BookmarksManager.AlertNoSelectedBookmarks=No selected bookmarks![TBT]
BookmarksManager.Checked=ausgewählte Objekte
BookmarksManager.ConfirmDelete=Ausgewählte Lesezeichen wirklich löschen?
BookmarksManager.ConfirmDelTitle=Bestätigung
BookmarksManager.Dataset=Datensatz:
BookmarksManager.Delete=Löschen
BookmarksManager.Delete.Tip=lösche markierte Lesezeichen
BookmarksManager.Edit=Edit[TBT]
BookmarksManager.Edit.Color=Color[TBT]
BookmarksManager.Edit.Name=Name[TBT]
BookmarksManager.Edit.Tip=Edit selected bookmark name and color[TBT]
BookmarksManager.Edit.Title=Edit Bookmark[TBT]
BookmarksManager.Highlighted=markierte Objekte
BookmarksManager.KeyStrokeBookmark=<html>Drücke eine Taste(nkombination) um einen Kurzbefehl für das Hinzufügen zu erstellen.<br>Alt+key bedeutet 'Entfernen'.</html>
BookmarksManager.KeyStrokeAlert1=Bitte ein Lesezeichen wählen um einen Kurzbefehl zu definieren.
Expand All @@ -58,10 +67,8 @@ BookmarksManager.KeyStrokeAlert4=Kurzbefehl wird bereits für eine andere Aktion
BookmarksManager.New=Neu
BookmarksManager.New.Tip=Neues Lesezeichen
BookmarksManager.NewBookmark.Tip=Name für Lesezeichen eingeben
BookmarksManager.NewName=Neue Bezeichnung für erstes ausgewähltes Lesezeichen
BookmarksManager.Remove=Entfernen
BookmarksManager.Remove.Tip=Entferne Objekte von ausgewähltem Lesezeichen
BookmarksManager.Rename=Umbenennen
BookmarksManager.SearchingDuplicates=Suche Duplikate...
BookmarksManager.Title=Lesezeichen
BookmarksManager.CommentsTooltip=Kommentare zu Lesezeichen
Expand Down Expand Up @@ -365,6 +372,7 @@ TimeLineGraph.donotBreak=Chart nicht aufteilen
TimeLineGraph.breakByBookmark=Chart nach Lesezeichen aufteilen
TimeLineGraph.breakByMetadata=Chart nach Metadaten aufteilen
TimeLineGraph.breakByCategory=Chart nach Kategorie aufteilen
TimeLineGraph.checkingItemsProgressLabel=Checking items from time chart...[TBT]
TimeLineGraph.highlightingItemsProgressLabel=Elemente vom Zeit-Chart hervorheben...
TimeLineGraph.PeriodGranularity=Zeitskala
TimeLineGraph.Timezone=Zeitzone
Expand All @@ -376,6 +384,10 @@ TimeLineGraph.visibleZoominForGranularity=Maximale Vergrößerung für den Maßs
TimeLineGraph.visibleZoomoutForGranularity=Maximale Verkleinerung für die Skala %s erreicht.\n Möchten Sie die Skala auf %s ändern und mit der Verkleinerung fortfahren?
TimeLineGraph.syncTableSelectionInChartView=Tabellenauswahl im Zeitdiagramm anzeigen
TimeLineGraph.resetZoom=Zoom zurücksetzen
TimeLineGraph.selectAllEventTypes=Select all event types(TBT)
TimeLineGraph.unselectAllEventTypes=Unselect all event types(TBT)
TimeLineGraph.checkEventItems=Check corresponding event type items(TBT)
TimeLineGraph.uncheckEventItems=Uncheck corresponding event type items(TBT)
IntervalDefinitionDialog.Title=Zeitlininechart festgelegte Bereiche
IntervalDefinitionDialog.dateFormat=MM/dd/yyyy
IntervalDefinitionDialog.hourFormat=HH:mm:ss
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,21 @@ BookmarksController.SaveSuccess.Title=Éxito
BookmarksManager.Add=Añadir
BookmarksManager.Add.Tip=Añadir elementos a los marcadores seleccionados
BookmarksManager.AddDuplicates=Añadir duplicados (hash)
BookmarksManager.AlertMultipleSelectedBookmarks=Select just one bookmark![TBT]
BookmarksManager.AlertNoCheckedtems=No checked items![TBT]
BookmarksManager.AlertNoHighlightedItems=No highlighted items![TBT]
BookmarksManager.AlertNoSelectedBookmarks=No selected bookmarks![TBT]
BookmarksManager.Checked=Elementos marcados
BookmarksManager.ConfirmDelete=¿Realmente desea eliminar los marcadores seleccionados?
BookmarksManager.ConfirmDelTitle=Confirmar
BookmarksManager.Dataset=Conjunto de datos:
BookmarksManager.Delete=Eliminar
BookmarksManager.Delete.Tip=Eliminar marcadores seleccionados
BookmarksManager.Edit=Edit[TBT]
BookmarksManager.Edit.Color=Color[TBT]
BookmarksManager.Edit.Name=Name[TBT]
BookmarksManager.Edit.Tip=Edit selected bookmark name and color[TBT]
BookmarksManager.Edit.Title=Edit Bookmark[TBT]
BookmarksManager.Highlighted=Elementos resaltados
BookmarksManager.KeyStrokeBookmark=<html>Escriba (o combine) teclas para establecer un atajo para 'Añadir'.<br>Alt+tecla siempre activa 'Eliminar'.</html>
BookmarksManager.KeyStrokeAlert1=Seleccione solo 1 marcador para definir el atajo de teclas.
Expand All @@ -58,10 +67,8 @@ BookmarksManager.KeyStrokeAlert4=Tecla de método abreviado ya utilizada para ot
BookmarksManager.New=Nuevo
BookmarksManager.New.Tip=Nuevo marcador
BookmarksManager.NewBookmark.Tip=Ingrese el nombre del marcador
BookmarksManager.NewName=Nuevo nombre para el primer marcador seleccionado
BookmarksManager.Remove=Eliminar
BookmarksManager.Remove.Tip=Eliminar elementos de los marcadores seleccionados
BookmarksManager.Rename=Renombrar
BookmarksManager.SearchingDuplicates=Buscando duplicados...
BookmarksManager.Title=Marcadores
BookmarksManager.CommentsTooltip=Marcar comentarios
Expand Down Expand Up @@ -365,6 +372,7 @@ TimeLineGraph.donotBreak=No dividir gráfico
TimeLineGraph.breakByBookmark=Dividir gráfico por marcador
TimeLineGraph.breakByMetadata=Dividir gráfico por metadatos
TimeLineGraph.breakByCategory=Dividir gráfico por categoría
TimeLineGraph.checkingItemsProgressLabel=Checking items from time chart...[TBT]
TimeLineGraph.highlightingItemsProgressLabel=Resaltar elementos del gráfico de tiempos...
TimeLineGraph.PeriodGranularity=Escala de tiempo
TimeLineGraph.Timezone=Zona horaria
Expand All @@ -376,6 +384,10 @@ TimeLineGraph.visibleZoominForGranularity=Se ha alcanzado el zoom máximo para l
TimeLineGraph.visibleZoomoutForGranularity=Máximo zoom out alcanzado para la escala %s.\n ¿Desea cambiar la escala a %s y seguir reduciendo?
TimeLineGraph.syncTableSelectionInChartView=Mostrar lo más destacado de la tabla en el gráfico temporal
TimeLineGraph.resetZoom=Restablecer zoom
TimeLineGraph.selectAllEventTypes=Select all event types(TBT)
TimeLineGraph.unselectAllEventTypes=Unselect all event types(TBT)
TimeLineGraph.checkEventItems=Check corresponding event type items(TBT)
TimeLineGraph.uncheckEventItems=Uncheck corresponding event type items(TBT)
IntervalDefinitionDialog.Title=Rangos definidos en el gráfico de tiempo
IntervalDefinitionDialog.dateFormat=MM/dd/yyyy
IntervalDefinitionDialog.hourFormat=HH:mm:ss
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,21 @@ BookmarksController.SaveSuccess.Title=Eseguito
BookmarksManager.Add=Aggiungi
BookmarksManager.Add.Tip=Aggiungi elementi ai segnalibri selezionati
BookmarksManager.AddDuplicates=Aggiungi duplicati (hash)
BookmarksManager.AlertMultipleSelectedBookmarks=Select just one bookmark![TBT]
BookmarksManager.AlertNoCheckedtems=No checked items![TBT]
BookmarksManager.AlertNoHighlightedItems=No highlighted items![TBT]
BookmarksManager.AlertNoSelectedBookmarks=No selected bookmarks![TBT]
BookmarksManager.Checked=Elementi selezionati
BookmarksManager.ConfirmDelete=Vuoi davvero eliminare i segnalibri selezionati?
BookmarksManager.ConfirmDelTitle=Conferma
BookmarksManager.Dataset=Set di dati:
BookmarksManager.Delete=Elimina
BookmarksManager.Delete.Tip=Elimina i segnalibri selezionati
BookmarksManager.Edit=Edit[TBT]
BookmarksManager.Edit.Color=Color[TBT]
BookmarksManager.Edit.Name=Name[TBT]
BookmarksManager.Edit.Tip=Edit selected bookmark name and color[TBT]
BookmarksManager.Edit.Title=Edit Bookmark[TBT]
BookmarksManager.Highlighted=Elementi evidenziati
BookmarksManager.KeyStrokeBookmark=<html>Digita un tasto (combinazione) per definire una scorciatoia per 'Aggiungi'.<br>Alt+key 'Rimuovi' sempre.</html>
BookmarksManager.KeyStrokeAlert1=Seleziona solo un segnalibro per definire una scorciatoia.
Expand All @@ -58,10 +67,8 @@ BookmarksManager.KeyStrokeAlert4=Tasto di scelta rapida già usato per altre azi
BookmarksManager.New=Nuovo
BookmarksManager.New.Tip=Nuovo segnalibro
BookmarksManager.NewBookmark.Tip=Inserisci il nome del segnalibro
BookmarksManager.NewName=Nuovo nome al primo segnalibro selezionato
BookmarksManager.Remove=Rimuovi
BookmarksManager.Remove.Tip=Rimuovi elementi dai segnalibri selezionati
BookmarksManager.Rename=Rinomina
BookmarksManager.SearchingDuplicates=Trova duplicati...
BookmarksManager.Title=Segnalibri
BookmarksManager.CommentsTooltip=Commenti ai segnalibri
Expand Down Expand Up @@ -365,6 +372,7 @@ TimeLineGraph.donotBreak=Non dividere il grafico
TimeLineGraph.breakByBookmark=Dividi grafico per segnalibro
TimeLineGraph.breakByMetadata=Dividi grafico per metadati
TimeLineGraph.breakByCategory=Dividi grafico per categoria
TimeLineGraph.checkingItemsProgressLabel=Checking items from time chart...[TBT]
TimeLineGraph.highlightingItemsProgressLabel=Evidenzio gli elementi del grafico temporale...
TimeLineGraph.PeriodGranularity=Scala temporale
TimeLineGraph.Timezone=Fuso orario
Expand All @@ -376,6 +384,10 @@ TimeLineGraph.visibleZoominForGranularity=Zoom massimo raggiunto per la scala %s
TimeLineGraph.visibleZoomoutForGranularity=Zoom minimo raggiunto per la scala %s.\n Si desidera cambiare la scala in %s e continuare a rimpicciolire?
TimeLineGraph.syncTableSelectionInChartView=Mostra i punti salienti della tabella nel grafico temporale
TimeLineGraph.resetZoom=Reimposta Zoom
TimeLineGraph.selectAllEventTypes=Select all event types(TBT)
TimeLineGraph.unselectAllEventTypes=Unselect all event types(TBT)
TimeLineGraph.checkEventItems=Check corresponding event type items(TBT)
TimeLineGraph.uncheckEventItems=Uncheck corresponding event type items(TBT)
IntervalDefinitionDialog.Title=Grafico sequenza temporale con intervalli definiti
IntervalDefinitionDialog.dateFormat=dd/MM/yyyy
IntervalDefinitionDialog.hourFormat=HH:mm:ss
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,32 @@ BookmarksController.SaveSuccess.Title=Sucesso
BookmarksManager.Add=Adicionar
BookmarksManager.Add.Tip=Adicionar itens aos marcadores selecionados
BookmarksManager.AddDuplicates=Incluir duplicatas (hash)
BookmarksManager.AlertMultipleSelectedBookmarks=Selecione apenas um marcador!
BookmarksManager.AlertNoCheckedtems=Nenhum item marcado!
BookmarksManager.AlertNoHighlightedItems=Nenhum item destacado!
BookmarksManager.AlertNoSelectedBookmarks=Nenhum marcador selecionado!
BookmarksManager.Checked=Itens Marcados
BookmarksManager.ConfirmDelete=Deseja realmente apagar os marcadores selecionados?
BookmarksManager.ConfirmDelTitle=Confirmar
BookmarksManager.Dataset=Conjunto de dados:
BookmarksManager.Delete=Apagar
BookmarksManager.Delete.Tip=Apagar marcadores selecionados
BookmarksManager.Edit=Editar
BookmarksManager.Edit.Color=Cor
BookmarksManager.Edit.Name=Nome
BookmarksManager.Edit.Tip=Editar nome e cor do marcador selecionado
BookmarksManager.Edit.Title=Editar Marcador
BookmarksManager.Highlighted=Itens Destacados
BookmarksManager.KeyStrokeBookmark=<html>Digite (ou combine) teclas para definir atalho p/ 'Adicionar'.<br>Alt+key sempre aciona 'Remover'.</html>
BookmarksManager.KeyStrokeAlert1=Selecione apenas 1 marcador para definir a tecla de atalho.
BookmarksManager.KeyStrokeAlert2=Alt é sempre usado para remover do marcador.
BookmarksManager.KeyStrokeBookmark=<html>Digite (ou combine) teclas para definir atalho p/ 'Adicionar'.<br>ALT+tecla sempre aciona 'Remover'.</html>
BookmarksManager.KeyStrokeAlert1=Selecione apenas um marcador para definir a tecla de atalho.
BookmarksManager.KeyStrokeAlert2=Tecla ALT é sempre usada para remover do marcador.
BookmarksManager.KeyStrokeAlert3=Tecla de atalho já utilizada, substitua ela primeiro.
BookmarksManager.KeyStrokeAlert4=Tecla de atalho já utilizada para outra ação.
BookmarksManager.New=Criar novo
BookmarksManager.New.Tip=Novo marcador
BookmarksManager.NewBookmark.Tip=Novo marcador
BookmarksManager.NewName=Novo nome para o primeiro marcador selecionado
BookmarksManager.Remove=Remover
BookmarksManager.Remove.Tip=Remover itens dos marcadores selecionados
BookmarksManager.Rename=Renomear
BookmarksManager.SearchingDuplicates=Pesquisando duplicatas...
BookmarksManager.Title=Marcadores
BookmarksManager.CommentsTooltip=Comentários do marcador
Expand Down Expand Up @@ -365,6 +372,7 @@ TimeLineGraph.donotBreak=Não separar gráfico
TimeLineGraph.breakByBookmark=Separar gráfico por marcador
TimeLineGraph.breakByMetadata=Separar gráfico por metadado
TimeLineGraph.breakByCategory=Separar gráfico por categoria
TimeLineGraph.checkingItemsProgressLabel=Marcando itens do timeline...
TimeLineGraph.highlightingItemsProgressLabel=Destacando itens do timeline...
TimeLineGraph.PeriodGranularity=Granularidade da periodicidade
TimeLineGraph.Timezone=Time Zone
Expand All @@ -376,6 +384,10 @@ TimeLineGraph.visibleZoominForGranularity=Máximo zoom alcançado para a contabi
TimeLineGraph.visibleZoomoutForGranularity=Máximo intervalo de visualização alcançado para a contabilização por %s.\n Gostaria de mudar para contabilização por %s e continuar a operação de zoom out?
TimeLineGraph.syncTableSelectionInChartView=Sincroniza destacamento no gráfico de linha do tempo
TimeLineGraph.resetZoom=Resetar Zoom
TimeLineGraph.selectAllEventTypes=Selecionar todos os eventos
TimeLineGraph.unselectAllEventTypes=Deselecionar todos os eventos
TimeLineGraph.checkEventItems=Marcar os itens dos eventos selecionados
TimeLineGraph.uncheckEventItems=Desmarcar os itens dos eventos selecionados
IntervalDefinitionDialog.Title=Intervalos definidos no gráfico
IntervalDefinitionDialog.dateFormat=MM/dd/yyyy
IntervalDefinitionDialog.hourFormat=HH:mm:ss
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void output(String line) {
}

@Override
protected Boolean doInBackground() throws IOException {
protected Boolean doInBackground() throws Exception {
try {
List<File> csvParents = cases.stream().map(c -> new File(c.getModuleDir(), GraphTask.CSVS_PATH))
.collect(Collectors.toList());
Expand Down
Loading

0 comments on commit 09cffad

Please sign in to comment.