Skip to content

Commit e2ab898

Browse files
committed
Add log view support
1 parent 9f3cd07 commit e2ab898

File tree

16 files changed

+58
-9
lines changed

16 files changed

+58
-9
lines changed

filescanner-gtk-linux-x86_64/shared-src/main/java/de/carne/filescanner/swt/main/MainI18N.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -342,22 +342,22 @@ public static String i18nMenuHelpAbout(Object... arguments) {
342342
}
343343

344344
/**
345-
* Resource key {@code I18N_MENU_HELP_LOGS}
345+
* Resource key {@code I18N_MENU_HELP_LOG}
346346
* <p>
347-
* &#38;Logs&#8230;
347+
* &#38;Log&#8230;
348348
*/
349-
public static final String I18N_MENU_HELP_LOGS = "I18N_MENU_HELP_LOGS";
349+
public static final String I18N_MENU_HELP_LOG = "I18N_MENU_HELP_LOG";
350350

351351
/**
352-
* Resource string {@code I18N_MENU_HELP_LOGS}
352+
* Resource string {@code I18N_MENU_HELP_LOG}
353353
* <p>
354-
* &#38;Logs&#8230;
354+
* &#38;Log&#8230;
355355
*
356356
* @param arguments Format arguments.
357357
* @return The formatted string.
358358
*/
359-
public static String i18nMenuHelpLogs(Object... arguments) {
360-
return format(I18N_MENU_HELP_LOGS, arguments);
359+
public static String i18nMenuHelpLog(Object... arguments) {
360+
return format(I18N_MENU_HELP_LOG, arguments);
361361
}
362362

363363
/**

filescanner-gtk-linux-x86_64/shared-src/main/java/de/carne/filescanner/swt/main/MainUI.java

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import de.carne.boot.Exceptions;
5555
import de.carne.boot.check.Check;
5656
import de.carne.boot.logging.Log;
57+
import de.carne.boot.logging.LogLevel;
5758
import de.carne.filescanner.ModuleManifestInfos;
5859
import de.carne.filescanner.engine.FileScannerProgress;
5960
import de.carne.filescanner.engine.FileScannerResult;
@@ -84,6 +85,7 @@
8485
import de.carne.swt.widgets.ToolBarBuilder;
8586
import de.carne.swt.widgets.aboutinfo.AboutInfoDialog;
8687
import de.carne.swt.widgets.heapinfo.HeapInfo;
88+
import de.carne.swt.widgets.logview.LogViewDialog;
8789
import de.carne.swt.widgets.notification.Notification;
8890
import de.carne.text.MemoryUnitFormat;
8991
import de.carne.util.Debug;
@@ -577,6 +579,28 @@ private void onGotoStartSelected() {
577579
}
578580
}
579581

582+
private void onLogSelected() {
583+
try {
584+
LogViewDialog log = LogViewDialog.build(root(), Log.root());
585+
586+
log.withLogo(LogLevel.LEVEL_NOTICE,
587+
Objects.requireNonNull(Images.class.getResource(Images.IMAGE_LOG_NOTICE16)));
588+
log.withLogo(LogLevel.LEVEL_ERROR,
589+
Objects.requireNonNull(Images.class.getResource(Images.IMAGE_LOG_ERROR16)));
590+
log.withLogo(LogLevel.LEVEL_WARNING,
591+
Objects.requireNonNull(Images.class.getResource(Images.IMAGE_LOG_WARNING16)));
592+
log.withLogo(LogLevel.LEVEL_INFO,
593+
Objects.requireNonNull(Images.class.getResource(Images.IMAGE_LOG_INFO16)));
594+
log.withLogo(LogLevel.LEVEL_DEBUG,
595+
Objects.requireNonNull(Images.class.getResource(Images.IMAGE_LOG_DEBUG16)));
596+
log.withLogo(LogLevel.LEVEL_TRACE,
597+
Objects.requireNonNull(Images.class.getResource(Images.IMAGE_LOG_TRACE16)));
598+
log.open();
599+
} catch (Exception e) {
600+
unexpectedException(e);
601+
}
602+
}
603+
580604
private static final String[] RESOURCES_COPYRIGHT = { "Copyright1.txt", "Copyright2.txt" };
581605

582606
private void onAboutSelected() {
@@ -826,7 +850,8 @@ private void buildMenuBar(ShellBuilder rootBuilder) {
826850
menu.endMenu();
827851
menu.addItem(SWT.CASCADE).withText(MainI18N.i18nMenuHelp());
828852
menu.beginMenu();
829-
menu.addItem(SWT.PUSH).withText(MainI18N.i18nMenuHelpLogs());
853+
menu.addItem(SWT.PUSH).withText(MainI18N.i18nMenuHelpLog());
854+
menu.onSelected(this::onLogSelected);
830855
if (PlatformIntegration.isCocoa()) {
831856
PlatformIntegration.cocoaAddAboutSelectionAction(display, this::onAboutSelected);
832857
} else {

filescanner-gtk-linux-x86_64/shared-src/main/java/de/carne/filescanner/swt/resources/Images.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,29 @@ private Images() {
120120
* copy_default16.png
121121
*/
122122
public static final String IMAGE_COPY_DEFAULT16 = "copy_default16.png";
123+
/**
124+
* log_notice16.png
125+
*/
126+
public static final String IMAGE_LOG_NOTICE16 = "log_notice16.png";
127+
/**
128+
* log_error16.png
129+
*/
130+
public static final String IMAGE_LOG_ERROR16 = "log_error16.png";
131+
/**
132+
* log_warning16.png
133+
*/
134+
public static final String IMAGE_LOG_WARNING16 = "log_warning16.png";
135+
/**
136+
* log_info16.png
137+
*/
138+
public static final String IMAGE_LOG_INFO16 = "log_info16.png";
139+
/**
140+
* log_debug16.png
141+
*/
142+
public static final String IMAGE_LOG_DEBUG16 = "log_debug16.png";
143+
/**
144+
* log_trace16.png
145+
*/
146+
public static final String IMAGE_LOG_TRACE16 = "log_trace16.png";
123147

124148
}

filescanner-gtk-linux-x86_64/shared-src/main/resources/de/carne/filescanner/swt/main/MainI18N.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ I18N_MENU_GOTO_PREVIOUS = Search &previous
1515
I18N_MENU_GOTO_START = Result &start
1616
I18N_MENU_GOTO_END = Result &end
1717
I18N_MENU_HELP = &Help
18-
I18N_MENU_HELP_LOGS = &Logs\u2026
18+
I18N_MENU_HELP_LOG = &Log\u2026
1919
I18N_MENU_HELP_ABOUT = &About\u2026
2020

2121
I18N_TOOLTIP_FILE_OPEN = Open and scan a file
558 Bytes
Loading
1.49 KB
Loading
504 Bytes
Loading
1.02 KB
Loading
237 Bytes
Loading
485 Bytes
Loading

0 commit comments

Comments
 (0)