From a18f72c43fb336e6a6a13a3992d074b3c61aaa51 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 28 Feb 2023 07:22:42 +0100 Subject: [PATCH] updates and cleans messages --- .../minres/scviewer/e4/application/Messages.java | 10 ---------- .../scviewer/e4/application/messages.properties | 14 ++------------ .../e4/application/parts/WaveformViewer.java | 3 ++- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java index 991dd29..e2e8142 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java @@ -25,10 +25,6 @@ public class Messages extends NLS { public static String SCViewerPreferencesPage_1; public static String SCViewerPreferencesPage_2; public static String SCViewerPreferencesPage_3; - public static String StatusBarControl_1; - public static String StatusBarControl_2; - public static String StatusBarControl_3; - public static String StatusBarControl_4; public static String SWTResourceManager_0; public static String TransactionDetails_0; public static String TransactionDetails_1; @@ -56,19 +52,13 @@ public class Messages extends NLS { public static String WaveformPopupMenuContribution_7; public static String WaveformPreferencesPage_description; public static String WaveformPreferencesPage_1; - public static String WaveformViewer_13; public static String WaveformViewer_14; public static String WaveformViewer_15; public static String WaveformViewer_16; public static String WaveformViewer_17; public static String WaveformViewer_18; - public static String WaveformViewer_19; - public static String WaveformViewer_20; - public static String WaveformViewer_21; - public static String WaveformViewer_22; public static String WaveformViewer_37; public static String WaveformViewer_38; - public static String WaveformViewer_39; public static String WaveStatusBarControl_10; public static String WaveStatusBarControl_12; public static String WaveStatusBarControl_5; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties index 460b23a..140b8a3 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties @@ -1,5 +1,5 @@ AboutDialog_0=\nSCViewer - a SystemC waveform viewer\n\nVersion: {0}\n -AboutDialog_1=\nCopyright (c) 2015, 2019, 2020, 2021 MINRES Technologies GmbH and others.\n\nAll rights reserved. MINRES and the MINRES logo are trademarks of MINRES Technologies GmbH, http://www.minres.com/. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html\n\nParts of the software are governed by the Apache License Version 2.0 available at http://www.apache.org/licenses/. These are namely org.mapdb and org.sqlite JDBC driver\n\nSource code is hosted at https://git.minres.com/VP-Tools/SCViewer and the master branch is mirrored to GitHub: https://github.com/minres/SCViewer\n +AboutDialog_1=\nCopyright (c) 2015 - 2023 MINRES Technologies GmbH and others.\n\nAll rights reserved. MINRES and the MINRES logo are trademarks of MINRES Technologies GmbH, http://www.minres.com/. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html\n\nParts of the software are governed by the MIT License available at https://mit-license.org/ and the Apache License Version 2.0 available at http://www.apache.org/licenses/. These are namely the sources of the FST C library, JACOB, org.mapdb, and org.sqlite JDBC driver\n\nSource code is hosted at https://git.minres.com/VP-Tools/SCViewer and the master branch is mirrored to GitHub: https://github.com/minres/SCViewer\n DesignBrowser_12=Append all after DesignBrowser_16=Insert all before DesignBrowser_2=Enter text to filter waveforms @@ -19,10 +19,6 @@ SCViewerPreferencesPage_0=Check for changed database SCViewerPreferencesPage_1=Show hover window in waveform SCViewerPreferencesPage_2=Waveform track height SCViewerPreferencesPage_3=Show tx details in waveform -StatusBarControl_1=Currently running: -StatusBarControl_2=\nLast task: -StatusBarControl_3=Currently running: -StatusBarControl_4=No background progress running. SWTResourceManager_0=Wrong decorate corner TransactionDetails_0=Enter text to filter attributes TransactionDetails_1=Name @@ -50,19 +46,13 @@ WaveformPopupMenuContribution_12=Render {0} WaveformPopupMenuContribution_15=No command found\! WaveformPreferencesPage_description=Default Waveform Window Settings WaveformPreferencesPage_1=Color for -WaveformViewer_13=Database Load Status WaveformViewer_14=Database Load Cancelled WaveformViewer_15=Database Load Job WaveformViewer_16=Loading WaveformViewer_17=Database re-load WaveformViewer_18=Would you like to reload the database? -WaveformViewer_19=vcd -WaveformViewer_20=txdb -WaveformViewer_21=txlog -WaveformViewer_22=fbrdb WaveformViewer_37=Database open -WaveformViewer_38=Would you like to open the adjacent database -WaveformViewer_39=\ as well? +WaveformViewer_38=Would you like to open the adjacent database {0} as well? WaveStatusBarControl_10=\ selected WaveStatusBarControl_12=\ Elements WaveStatusBarControl_5=C: diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java index e3d60f1..7983dd6 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java @@ -57,6 +57,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.events.DisposeEvent; @@ -894,7 +895,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis */ protected boolean askIfToLoad(File txFile) { return txFile.exists() && MessageDialog.openQuestion(myParent.getDisplay().getActiveShell(), Messages.WaveformViewer_37, - Messages.WaveformViewer_38 + txFile.getName() + Messages.WaveformViewer_39); + NLS.bind(Messages.WaveformViewer_38, txFile.getName())); } /**