From 238fe17df031452e70f78f993c3437aeca3ccfa7 Mon Sep 17 00:00:00 2001 From: Skylot Date: Mon, 18 Dec 2023 17:56:45 +0000 Subject: [PATCH] fix(gui): add hint for class renaming (#1590) --- .../src/main/java/jadx/gui/ui/dialog/RenameDialog.java | 9 ++++++--- .../src/main/resources/i18n/Messages_de_DE.properties | 2 ++ .../src/main/resources/i18n/Messages_en_US.properties | 4 +++- .../src/main/resources/i18n/Messages_es_ES.properties | 2 ++ .../src/main/resources/i18n/Messages_id_ID.properties | 2 ++ .../src/main/resources/i18n/Messages_ko_KR.properties | 2 ++ .../src/main/resources/i18n/Messages_pt_BR.properties | 2 ++ .../src/main/resources/i18n/Messages_ru_RU.properties | 2 ++ .../src/main/resources/i18n/Messages_zh_CN.properties | 2 ++ .../src/main/resources/i18n/Messages_zh_TW.properties | 2 ++ 10 files changed, 25 insertions(+), 4 deletions(-) diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java index 795d43eb6..f88fb9676 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java @@ -21,6 +21,7 @@ import org.jetbrains.annotations.NotNull; import jadx.api.metadata.ICodeNodeRef; import jadx.api.plugins.events.types.NodeRenamedByUser; +import jadx.gui.treemodel.JClass; import jadx.gui.treemodel.JNode; import jadx.gui.treemodel.JPackage; import jadx.gui.treemodel.JRenameNode; @@ -155,13 +156,15 @@ public class RenameDialog extends JDialog { renamePane.setLayout(new FlowLayout(FlowLayout.LEFT)); renamePane.add(lbl); renamePane.add(nodeLabel); - renamePane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + renamePane.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10)); JPanel textPane = new JPanel(); textPane.setLayout(new BoxLayout(textPane, BoxLayout.PAGE_AXIS)); - textPane.add(Box.createRigidArea(new Dimension(0, 5))); textPane.add(renameField); - textPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + if (node instanceof JClass) { + textPane.add(new JLabel(NLS.str("rename_dialog.class_help"))); + } + textPane.setBorder(BorderFactory.createEmptyBorder(5, 10, 10, 10)); JPanel buttonPane = initButtonsPanel(); diff --git a/jadx-gui/src/main/resources/i18n/Messages_de_DE.properties b/jadx-gui/src/main/resources/i18n/Messages_de_DE.properties index fd078261b..7e5c4c1c0 100644 --- a/jadx-gui/src/main/resources/i18n/Messages_de_DE.properties +++ b/jadx-gui/src/main/resources/i18n/Messages_de_DE.properties @@ -149,6 +149,8 @@ comment_dialog.title.update=Code-Kommentar aktualisieren comment_dialog.label=Kommentar: comment_dialog.usage=Shift + Enter verwenden, um eine neue Zeile zu beginnen +#rename_dialog.class_help=Enter full name to move class to another package. Start with '.' to move to default (empty) package + log_viewer.title=Log-Anzeige log_viewer.log_level=Log-Level: #log_viewer.mode=Mode: diff --git a/jadx-gui/src/main/resources/i18n/Messages_en_US.properties b/jadx-gui/src/main/resources/i18n/Messages_en_US.properties index fa6bd9489..d9e8e1072 100644 --- a/jadx-gui/src/main/resources/i18n/Messages_en_US.properties +++ b/jadx-gui/src/main/resources/i18n/Messages_en_US.properties @@ -147,7 +147,9 @@ usage_dialog.label=Usage for: comment_dialog.title.add=Add code comment comment_dialog.title.update=Update code comment comment_dialog.label=Comment: -comment_dialog.usage=Use Shift + Enter for start a new line +comment_dialog.usage=Use 'Shift + Enter' to start a new line + +rename_dialog.class_help=Enter full name to move class to another package. Start with '.' to move to default (empty) package log_viewer.title=Log Viewer log_viewer.log_level=Log level: diff --git a/jadx-gui/src/main/resources/i18n/Messages_es_ES.properties b/jadx-gui/src/main/resources/i18n/Messages_es_ES.properties index 766e8417c..712d617bb 100644 --- a/jadx-gui/src/main/resources/i18n/Messages_es_ES.properties +++ b/jadx-gui/src/main/resources/i18n/Messages_es_ES.properties @@ -149,6 +149,8 @@ usage_dialog.label=Usage for: #comment_dialog.label=Comment: #comment_dialog.usage= +#rename_dialog.class_help=Enter full name to move class to another package. Start with '.' to move to default (empty) package + log_viewer.title=Visor log log_viewer.log_level=Nivel log: #log_viewer.mode=Mode: diff --git a/jadx-gui/src/main/resources/i18n/Messages_id_ID.properties b/jadx-gui/src/main/resources/i18n/Messages_id_ID.properties index 890b10c45..3e26b3860 100644 --- a/jadx-gui/src/main/resources/i18n/Messages_id_ID.properties +++ b/jadx-gui/src/main/resources/i18n/Messages_id_ID.properties @@ -149,6 +149,8 @@ comment_dialog.title.update=Perbarui komentar kode comment_dialog.label=Komentar: comment_dialog.usage=Gunakan Shift + Enter untuk memulai baris baru +#rename_dialog.class_help=Enter full name to move class to another package. Start with '.' to move to default (empty) package + log_viewer.title=Pemantau Log log_viewer.log_level=Tingkat log: log_viewer.mode=Mode: diff --git a/jadx-gui/src/main/resources/i18n/Messages_ko_KR.properties b/jadx-gui/src/main/resources/i18n/Messages_ko_KR.properties index f9795e611..1f84699d0 100644 --- a/jadx-gui/src/main/resources/i18n/Messages_ko_KR.properties +++ b/jadx-gui/src/main/resources/i18n/Messages_ko_KR.properties @@ -149,6 +149,8 @@ comment_dialog.title.update=주석 업데이트 comment_dialog.label=주석: comment_dialog.usage=Shift + Enter 를 입력해 새 라인에 입력 +#rename_dialog.class_help=Enter full name to move class to another package. Start with '.' to move to default (empty) package + log_viewer.title=로그 뷰어 log_viewer.log_level=로그 레벨: #log_viewer.mode=Mode: diff --git a/jadx-gui/src/main/resources/i18n/Messages_pt_BR.properties b/jadx-gui/src/main/resources/i18n/Messages_pt_BR.properties index da7ae5ecc..cd9a22451 100644 --- a/jadx-gui/src/main/resources/i18n/Messages_pt_BR.properties +++ b/jadx-gui/src/main/resources/i18n/Messages_pt_BR.properties @@ -149,6 +149,8 @@ comment_dialog.title.update=Atualizar comentário do código comment_dialog.label=Comentário: comment_dialog.usage=Use Shift + Enter para pular uma linha +#rename_dialog.class_help=Enter full name to move class to another package. Start with '.' to move to default (empty) package + log_viewer.title=Visualizador de log log_viewer.log_level=Nível do log: #log_viewer.mode=Mode: diff --git a/jadx-gui/src/main/resources/i18n/Messages_ru_RU.properties b/jadx-gui/src/main/resources/i18n/Messages_ru_RU.properties index f19454b7f..ed6179f19 100644 --- a/jadx-gui/src/main/resources/i18n/Messages_ru_RU.properties +++ b/jadx-gui/src/main/resources/i18n/Messages_ru_RU.properties @@ -149,6 +149,8 @@ comment_dialog.title.update=Обновить comment_dialog.label=Комментарий: comment_dialog.usage=Используйте Shift + Enter для переноса строки +#rename_dialog.class_help=Enter full name to move class to another package. Start with '.' to move to default (empty) package + log_viewer.title=Просмотр логов log_viewer.log_level=Уровень лога: #log_viewer.mode=Mode: diff --git a/jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties b/jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties index ba7b5518a..d0d55eb1f 100644 --- a/jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties +++ b/jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties @@ -149,6 +149,8 @@ comment_dialog.title.update=更新代码注释 comment_dialog.label=注释: comment_dialog.usage=使用 Shift + Enter 换行 +#rename_dialog.class_help=Enter full name to move class to another package. Start with '.' to move to default (empty) package + log_viewer.title=日志查看器 log_viewer.log_level=日志等级： log_viewer.mode=模式： diff --git a/jadx-gui/src/main/resources/i18n/Messages_zh_TW.properties b/jadx-gui/src/main/resources/i18n/Messages_zh_TW.properties index 8ed0d7dbd..23def1018 100644 --- a/jadx-gui/src/main/resources/i18n/Messages_zh_TW.properties +++ b/jadx-gui/src/main/resources/i18n/Messages_zh_TW.properties @@ -149,6 +149,8 @@ comment_dialog.title.update=更新程式碼註解 comment_dialog.label=註解： comment_dialog.usage=按下 Shift + Enter 來換行 +#rename_dialog.class_help=Enter full name to move class to another package. Start with '.' to move to default (empty) package + log_viewer.title=記錄檔檢視器 log_viewer.log_level=記錄層級： log_viewer.mode=模式：