Compare commits
11 Commits
v1.5-alpha
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
8aa53b6ece
|
|||
|
2a04398863
|
|||
|
df376249f0
|
|||
|
63ffafb7b8
|
|||
|
8704aff67e
|
|||
|
b43da72604 | ||
|
|
ca8d2fd8e6 | ||
|
|
2d12e5ad91 | ||
|
|
f1d67bf8c7 | ||
|
|
f7366f0fee | ||
|
|
8b2e038551 |
8
.idea/.gitignore
generated
vendored
Normal file
8
.idea/.gitignore
generated
vendored
Normal file
@@ -0,0 +1,8 @@
|
||||
# 默认忽略的文件
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# 基于编辑器的 HTTP 客户端请求
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
3
.idea/artifacts/StegSolve.xml
generated
3
.idea/artifacts/StegSolve.xml
generated
@@ -1,11 +1,12 @@
|
||||
<component name="ArtifactManager">
|
||||
<artifact type="jar" name="StegSolve">
|
||||
<artifact type="jar" build-on-make="true" name="StegSolve">
|
||||
<output-path>$PROJECT_DIR$/out/artifacts/StegSolve</output-path>
|
||||
<root id="archive" name="StegSolve.jar">
|
||||
<element id="directory" name="META-INF">
|
||||
<element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
|
||||
</element>
|
||||
<element id="module-output" name="stegsolve" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/flatlaf-3.1.1.jar" path-in-jar="/" />
|
||||
</root>
|
||||
</artifact>
|
||||
</component>
|
||||
4
.idea/misc.xml
generated
4
.idea/misc.xml
generated
@@ -1,8 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectPlainTextFileTypeManager">
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="jbrsdk_jcef-17" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
127
.idea/uiDesigner.xml
generated
127
.idea/uiDesigner.xml
generated
@@ -1,127 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Palette2">
|
||||
<group name="Swing">
|
||||
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||
</item>
|
||||
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||
</item>
|
||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||
</item>
|
||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
|
||||
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||
</item>
|
||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||
<initial-values>
|
||||
<property name="text" value="Button" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||
<initial-values>
|
||||
<property name="text" value="RadioButton" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||
<initial-values>
|
||||
<property name="text" value="CheckBox" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||
<initial-values>
|
||||
<property name="text" value="Label" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||
<preferred-size width="150" height="-1" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||
<preferred-size width="150" height="-1" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||
<preferred-size width="150" height="-1" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||
<preferred-size width="200" height="200" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||
<preferred-size width="200" height="200" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||
</item>
|
||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||
<preferred-size width="-1" height="20" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||
</item>
|
||||
</group>
|
||||
</component>
|
||||
<component name="uidesigner-configuration">
|
||||
<option name="DEFAULT_LAYOUT_MANAGER" value="FlowLayout" />
|
||||
</component>
|
||||
</project>
|
||||
23
README.md
23
README.md
@@ -1,11 +1,26 @@
|
||||
# StegSolve
|
||||
# StegSolve Legacy
|
||||
|
||||
A modifed version of stegsolve
|
||||
合并统一基于[原作者 Caesum 的 Java 代码](http://www.caesum.com/handbook/Stegsolve.jar)的各主要流传版本 StegSolve，并进一步优化使用体验。
|
||||
|
||||
可在本仓库的 tags 中找到各版本的原始提交记录，以便对比。
|
||||
|
||||
## 1.4 changes
|
||||
## Todo (PRs welcome)
|
||||
|
||||
- [ ] 新增选项：图像缩放适应窗口大小（即拖动窗口边缘时始终让图像占满）
|
||||
- [ ] 默认焦点放在切换图像而不是缩放（键盘方向键符合跟随焦点的惯例，但默认应该是切换图像）
|
||||
- [ ] 子窗口添加缩放条
|
||||
- [ ] 鼠标拖拽调整视图位置，滚轮缩放
|
||||
- [ ] 十六进制文本域默认滚动至顶部，新增选项：仅显示十六进制/仅显示不带空格的文本，以便无需导出直接复制
|
||||
|
||||
## 1.5 changes [(by @souno-io, 2023-06-21)](https://github.com/souno-io/Stegsolve)
|
||||
|
||||
- 汉化部分内容
|
||||
- 美化界面为 JetBrains 风格
|
||||
- 修复原来 1.4 版本的帧浏览器、合并图片等功能的不显示图片 bug
|
||||
|
||||
## 1.4 changes [(by @Giotino, 2018-12-11)](https://github.com/Giotino/stegsolve)
|
||||
|
||||
- Added zoom to image
|
||||
- Added drag&drop zone for files
|
||||
- Added "all" option to channel planes in "Data Extract"
|
||||
- Added horizontal scrolling (Shift+Mousewheel)
|
||||
- Added horizontal scrolling (Shift+Mousewheel)
|
||||
|
||||
BIN
flatlaf-3.1.1.jar
Normal file
BIN
flatlaf-3.1.1.jar
Normal file
Binary file not shown.
@@ -1,11 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/stegsolve" isTestSource="false" packagePrefix="stegsolve" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="flatlaf-3.1.1" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -43,7 +43,7 @@ public class AboutFrame extends javax.swing.JFrame {
|
||||
|
||||
jEditorPane1.setContentType("text/html");
|
||||
jEditorPane1.setEditable(false);
|
||||
jEditorPane1.setText("<html>\n<center><b>Stegsolve v1.4 by Caesum<br>Mod by Giotino</b></center>\n<br>\nStegsolve is a stegano solver for challenges. It provides these main functions:\n<ul>\n<li>A quick view of different bit planes and some simple transformations.</li>\n<li>Data extraction from planes. This can be row order or column order, with bits treated as a bitstream and converted into bytes.</li>\n<li>Some simple checking of file formats and reporting on the filesize, additional bytes, file holes, etc. This is highly dependent upon the type of image.</li>\n<li>Stereogram solver - simply change the offset until the image becomes visible.</li>\n<li>Frame browser for animated images. This should also work for viewing layers in multi-layered PNG files.</li>\n<li>Image combiner to combine two images in a variety of ways and browse through the different combinations.</li>\n</ul>\n<p>Copy/Cut and paste is available from most text using CTRL-C to copy, CTRL-V to paste and CTRL-X for cut.\n<p>If an image fails to load, for example because it is corrupt, then file analysis will still open the file that you just tried to view. It may, however, crash out before reporting the information that you want to know. This will work though on images where the PNG has corrupted CRC values for example.\n</html>\n");
|
||||
jEditorPane1.setText("<html>\n<center><b>Stegsolve Legacy</b></center>\n<br>\nStegsolve is a stegano solver for challenges. It provides these main functions:\n<ul>\n<li>A quick view of different bit planes and some simple transformations.</li>\n<li>Data extraction from planes. This can be row order or column order, with bits treated as a bitstream and converted into bytes.</li>\n<li>Some simple checking of file formats and reporting on the filesize, additional bytes, file holes, etc. This is highly dependent upon the type of image.</li>\n<li>Stereogram solver - simply change the offset until the image becomes visible.</li>\n<li>Frame browser for animated images. This should also work for viewing layers in multi-layered PNG files.</li>\n<li>Image combiner to combine two images in a variety of ways and browse through the different combinations.</li>\n</ul>\n<p>Copy/Cut and paste is available from most text using CTRL-C to copy, CTRL-V to paste and CTRL-X for cut.\n<p>If an image fails to load, for example because it is corrupt, then file analysis will still open the file that you just tried to view. It may, however, crash out before reporting the information that you want to know. This will work though on images where the PNG has corrupted CRC values for example.\n</html>\n");
|
||||
jEditorPane1.setMinimumSize(new java.awt.Dimension(150, 150));
|
||||
jEditorPane1.setPreferredSize(new java.awt.Dimension(150, 150));
|
||||
jScrollPane1.setViewportView(jEditorPane1);
|
||||
|
||||
@@ -192,7 +192,7 @@ public class Combiner extends JFrame
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
JOptionPane.showMessageDialog(this, "Failed to write file: "+e.toString());
|
||||
JOptionPane.showMessageDialog(this, "写入文件失败: "+e.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -222,8 +222,10 @@ public class Combiner extends JFrame
|
||||
dp.setPreferredSize(new Dimension(transform.getImage().getWidth(),transform.getImage().getHeight()));
|
||||
this.setMaximumSize(getToolkit().getScreenSize());
|
||||
pack();
|
||||
dp.apply(100);
|
||||
scrollPane.revalidate();
|
||||
repaint();
|
||||
this.setSize(500, 600);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -39,9 +39,9 @@ public class FileAnalysis extends javax.swing.JFrame {
|
||||
{
|
||||
rep = new StringBuilder();
|
||||
rep.append("<html><center><b>");
|
||||
rep.append("File format report");
|
||||
rep.append("文件格式报告");
|
||||
rep.append("</b></center>");
|
||||
rep.append(("<br>File: "+ifile.getName()));
|
||||
rep.append(("<br>文件: "+ifile.getName()));
|
||||
try{
|
||||
FileInputStream fis = new FileInputStream(ifile);
|
||||
f = new byte[(int)ifile.length()];
|
||||
@@ -51,7 +51,7 @@ public class FileAnalysis extends javax.swing.JFrame {
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
rep.append(("Error reading file: "+e.toString()));
|
||||
rep.append(("读取文件时出错: "+e.toString()));
|
||||
}
|
||||
rep.append("</html>");
|
||||
report.setText(rep.toString());
|
||||
@@ -66,7 +66,7 @@ public class FileAnalysis extends javax.swing.JFrame {
|
||||
// analyse f, write report to rep
|
||||
if(f.length<4)
|
||||
{
|
||||
rep.append("<br>file too short?");
|
||||
rep.append("<br>文件太短？");
|
||||
return;
|
||||
}
|
||||
if(f[0] == 'B' && f[1] == 'M')
|
||||
@@ -78,7 +78,7 @@ public class FileAnalysis extends javax.swing.JFrame {
|
||||
analyse_gif();
|
||||
else if(f[0]==(byte)0xff && f[1]==(byte)0xd8)
|
||||
analyse_jpg();
|
||||
else rep.append("<br>File format analysis code not done yet!");
|
||||
else rep.append("<br>文件格式分析代码尚未完成！");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -90,8 +90,8 @@ public class FileAnalysis extends javax.swing.JFrame {
|
||||
cpos = analyse_jpg_sections(cpos);
|
||||
if(cpos<f.length)
|
||||
{
|
||||
rep.append(("<br>Additional bytes at end of file = " +(f.length-cpos)));
|
||||
rep.append("<br>Dump of additional bytes:");
|
||||
rep.append(("<br>文件末尾的附加字节数 = " +(f.length-cpos)));
|
||||
rep.append("<br>转储附加字节:");
|
||||
fdump(cpos, f.length);
|
||||
}
|
||||
}
|
||||
@@ -105,12 +105,12 @@ public class FileAnalysis extends javax.swing.JFrame {
|
||||
{
|
||||
if(f[pos]==(byte)0xff && f[pos+1]==(byte)0xd8)
|
||||
{
|
||||
rep.append("<br>Start of Image");
|
||||
rep.append("<br>图像的开头");
|
||||
pos+=2;
|
||||
}
|
||||
else if(f[pos] == (byte) 0xff && f[pos + 1] == (byte) 0xd9)
|
||||
{
|
||||
rep.append("<br><br>End of Image");
|
||||
rep.append("<br><br>图像结尾");
|
||||
pos+=2;
|
||||
return pos;
|
||||
}
|
||||
@@ -932,7 +932,7 @@ public class FileAnalysis extends javax.swing.JFrame {
|
||||
OKButton = new javax.swing.JButton();
|
||||
|
||||
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
|
||||
setTitle("File Format Analysis");
|
||||
setTitle("文件格式分析");
|
||||
|
||||
jPanel1.setMinimumSize(new java.awt.Dimension(400, 300));
|
||||
jPanel1.setPreferredSize(new java.awt.Dimension(400, 350));
|
||||
@@ -941,7 +941,7 @@ public class FileAnalysis extends javax.swing.JFrame {
|
||||
jScrollPane1.setPreferredSize(new java.awt.Dimension(400, 260));
|
||||
|
||||
report.setContentType("text/html");
|
||||
report.setFont(new java.awt.Font("Courier New", 0, 14)); // NOI18N
|
||||
report.setFont(new java.awt.Font("微软雅黑", 0, 14)); // NOI18N
|
||||
jScrollPane1.setViewportView(report);
|
||||
|
||||
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
|
||||
@@ -960,7 +960,7 @@ public class FileAnalysis extends javax.swing.JFrame {
|
||||
jPanel2.setMinimumSize(new java.awt.Dimension(400, 35));
|
||||
jPanel2.setPreferredSize(new java.awt.Dimension(400, 35));
|
||||
|
||||
OKButton.setText("OK");
|
||||
OKButton.setText("确认");
|
||||
OKButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
|
||||
OKButton.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
|
||||
@@ -97,7 +97,7 @@ public class FrameBrowser extends JFrame
|
||||
frames.add(bnext);
|
||||
numframes++;
|
||||
}
|
||||
System.out.println("total frames " + numframes);
|
||||
System.out.println("总帧数 " + numframes);
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
@@ -253,8 +253,10 @@ public class FrameBrowser extends JFrame
|
||||
dp.setPreferredSize(new Dimension(bi.getWidth(),bi.getHeight()));
|
||||
this.setMaximumSize(getToolkit().getScreenSize());
|
||||
pack();
|
||||
dp.apply(100);
|
||||
scrollPane.revalidate();
|
||||
repaint();
|
||||
this.setSize(500, 600);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
package stegsolve;
|
||||
|
||||
import com.formdev.flatlaf.FlatIntelliJLaf;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.border.Border;
|
||||
import javax.swing.event.ChangeEvent;
|
||||
@@ -22,10 +24,10 @@ import java.awt.*;
|
||||
|
||||
/**
|
||||
* StegSolve
|
||||
*
|
||||
* @author Caesum
|
||||
*/
|
||||
public class StegSolve extends JFrame
|
||||
{
|
||||
public class StegSolve extends JFrame {
|
||||
static StegSolve that;
|
||||
/**
|
||||
* Menu option - about
|
||||
@@ -118,16 +120,17 @@ public class StegSolve extends JFrame
|
||||
*/
|
||||
private Transform transform = null;
|
||||
|
||||
/** Creates new form stegsolve */
|
||||
private StegSolve()
|
||||
{
|
||||
/**
|
||||
* Creates new form stegsolve
|
||||
*/
|
||||
private StegSolve() {
|
||||
that = this;
|
||||
initComponents();
|
||||
}
|
||||
|
||||
// <editor-fold defaultstate="collapsed" desc="Initcomponents()">
|
||||
private void initComponents() {
|
||||
|
||||
FlatIntelliJLaf.install();
|
||||
menuBar = new JMenuBar();
|
||||
menuFile = new JMenu();
|
||||
fileOpen = new JMenuItem();
|
||||
@@ -145,52 +148,52 @@ public class StegSolve extends JFrame
|
||||
|
||||
setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
|
||||
|
||||
menuFile.setText("File");
|
||||
menuFile.setText("文件");
|
||||
|
||||
fileOpen.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, 0));
|
||||
fileOpen.setText("Open");
|
||||
fileOpen.setText("打开");
|
||||
fileOpen.addActionListener(this::fileOpenActionPerformed);
|
||||
menuFile.add(fileOpen);
|
||||
|
||||
fileSave.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, 0));
|
||||
fileSave.setText("Save As");
|
||||
fileSave.setText("另存为");
|
||||
fileSave.addActionListener(this::fileSaveActionPerformed);
|
||||
menuFile.add(fileSave);
|
||||
|
||||
fileExit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, 0));
|
||||
fileExit.setText("Exit");
|
||||
fileExit.setText("退出");
|
||||
fileExit.addActionListener(this::fileExitActionPerformed);
|
||||
menuFile.add(fileExit);
|
||||
|
||||
menuBar.add(menuFile);
|
||||
|
||||
menuAnalyse.setText("Analyse");
|
||||
menuAnalyse.setText("分析");
|
||||
|
||||
analyseFormat.setText("File Format");
|
||||
analyseFormat.setText("文件格式");
|
||||
analyseFormat.addActionListener(this::analyseFormatActionPerformed);
|
||||
menuAnalyse.add(analyseFormat);
|
||||
|
||||
analyseExtract.setText("Data Extract");
|
||||
analyseExtract.setText("数据提取");
|
||||
analyseExtract.addActionListener(this::analyseExtractActionPerformed);
|
||||
menuAnalyse.add(analyseExtract);
|
||||
|
||||
stereoSolve.setText("Stereogram Solver");
|
||||
stereoSolve.setText("立体视图");
|
||||
stereoSolve.addActionListener(this::stereoSolveActionPerformed);
|
||||
menuAnalyse.add(stereoSolve);
|
||||
|
||||
frameBrowse.setText("Frame Browser");
|
||||
frameBrowse.setText("帧浏览器");
|
||||
frameBrowse.addActionListener(this::frameBrowseActionPerformed);
|
||||
menuAnalyse.add(frameBrowse);
|
||||
|
||||
imageCombine.setText("Image Combiner");
|
||||
imageCombine.setText("图像合成器");
|
||||
imageCombine.addActionListener(this::imageCombineActionPerformed);
|
||||
menuAnalyse.add(imageCombine);
|
||||
|
||||
menuBar.add(menuAnalyse);
|
||||
|
||||
menuHelp.setText("Help");
|
||||
menuHelp.setText("帮助");
|
||||
|
||||
about.setText("About");
|
||||
about.setText("关于");
|
||||
about.addActionListener(this::aboutActionPerformed);
|
||||
menuHelp.add(about);
|
||||
|
||||
@@ -234,44 +237,46 @@ public class StegSolve extends JFrame
|
||||
frame.addKeyListener(new KeyListener() {
|
||||
@Override
|
||||
public void keyPressed(KeyEvent e) {
|
||||
// TODO Auto-generated method stub
|
||||
if(e.isShiftDown()) {
|
||||
frame.addMouseWheelListener(arg01 -> {
|
||||
// TODO Auto-generated method stub
|
||||
scrollPane.getHorizontalScrollBar().setValue(scrollPane.getHorizontalScrollBar().getValue()+ arg01.getWheelRotation());
|
||||
});
|
||||
// TODO Auto-generated method stub
|
||||
if (e.isShiftDown()) {
|
||||
frame.addMouseWheelListener(arg01 -> {
|
||||
// TODO Auto-generated method stub
|
||||
scrollPane.getHorizontalScrollBar().setValue(scrollPane.getHorizontalScrollBar().getValue() + arg01.getWheelRotation());
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void keyReleased(KeyEvent e) {
|
||||
if(!e.isShiftDown()) {
|
||||
if (!e.isShiftDown()) {
|
||||
frame.removeMouseWheelListener(frame.getMouseWheelListeners()[0]);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void keyTyped(KeyEvent e) {}
|
||||
public void keyTyped(KeyEvent e) {
|
||||
}
|
||||
});
|
||||
|
||||
add(scrollPane, BorderLayout.CENTER);
|
||||
|
||||
backwardButton.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT,0), "back");
|
||||
backwardButton.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), "back");
|
||||
backwardButton.getActionMap().put("back", backButtonPress);
|
||||
forwardButton.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT,0), "forward");
|
||||
forwardButton.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0), "forward");
|
||||
forwardButton.getActionMap().put("forward", forwardButtonPress);
|
||||
|
||||
this.setTitle("StegSolve 1.4 by Caesum (Mod by Giotino)");
|
||||
|
||||
this.setTitle("StegSolve Legacy");
|
||||
this.setMaximumSize(getToolkit().getScreenSize());
|
||||
|
||||
pack();
|
||||
|
||||
this.setSize(500, 600);
|
||||
this.setSize(800, 600);
|
||||
//setResizable(false);
|
||||
}// </editor-fold>
|
||||
|
||||
/**
|
||||
* Close the form on file exit
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void fileExitActionPerformed(ActionEvent evt) {
|
||||
@@ -281,18 +286,19 @@ public class StegSolve extends JFrame
|
||||
/**
|
||||
* This is used to map the left arrow key to the back button
|
||||
*/
|
||||
private Action backButtonPress = new AbstractAction()
|
||||
{
|
||||
public void actionPerformed(ActionEvent e)
|
||||
{ backwardButtonActionPerformed(e);}
|
||||
private Action backButtonPress = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
backwardButtonActionPerformed(e);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Move back by one image
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void backwardButtonActionPerformed(ActionEvent evt) {
|
||||
if(transform == null) return;
|
||||
if (transform == null) return;
|
||||
transform.back();
|
||||
updateImage();
|
||||
}
|
||||
@@ -300,24 +306,26 @@ public class StegSolve extends JFrame
|
||||
/**
|
||||
* This is used to map the right arrow key to the forward button
|
||||
*/
|
||||
private Action forwardButtonPress = new AbstractAction()
|
||||
{
|
||||
public void actionPerformed(ActionEvent e)
|
||||
{ forwardButtonActionPerformed(e);}
|
||||
private Action forwardButtonPress = new AbstractAction() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
forwardButtonActionPerformed(e);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Move forward by one image
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void forwardButtonActionPerformed(ActionEvent evt) {
|
||||
if(bi == null) return;
|
||||
if (bi == null) return;
|
||||
transform.forward();
|
||||
updateImage();
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the help/about frame
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void aboutActionPerformed(ActionEvent evt) {
|
||||
@@ -326,6 +334,7 @@ public class StegSolve extends JFrame
|
||||
|
||||
/**
|
||||
* Open the file format analyser
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void analyseFormatActionPerformed(ActionEvent evt) {
|
||||
@@ -334,6 +343,7 @@ public class StegSolve extends JFrame
|
||||
|
||||
/**
|
||||
* Open the stereogram solver
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void stereoSolveActionPerformed(ActionEvent evt) {
|
||||
@@ -342,6 +352,7 @@ public class StegSolve extends JFrame
|
||||
|
||||
/**
|
||||
* Open the frame browser
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void frameBrowseActionPerformed(ActionEvent evt) {
|
||||
@@ -350,33 +361,31 @@ public class StegSolve extends JFrame
|
||||
|
||||
/**
|
||||
* Open the image combiner
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void imageCombineActionPerformed(ActionEvent evt) {
|
||||
JFileChooser fileChooser = new JFileChooser(System.getProperty("user.dir"));
|
||||
FileNameExtensionFilter filter = new FileNameExtensionFilter("Images", "jpg", "jpeg", "gif", "bmp", "png");
|
||||
fileChooser.setFileFilter(filter);
|
||||
fileChooser.setDialogTitle("Select image to combine with");
|
||||
fileChooser.setDialogTitle("选择要合并的图像");
|
||||
int rVal = fileChooser.showOpenDialog(this);
|
||||
System.setProperty("user.dir", fileChooser.getCurrentDirectory().getAbsolutePath());
|
||||
if(rVal == JFileChooser.APPROVE_OPTION)
|
||||
{
|
||||
if (rVal == JFileChooser.APPROVE_OPTION) {
|
||||
sfile = fileChooser.getSelectedFile();
|
||||
try
|
||||
{
|
||||
try {
|
||||
BufferedImage bi2 = null;
|
||||
bi2 = ImageIO.read(sfile);
|
||||
new Combiner(bi, bi2).setVisible(true);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
JOptionPane.showMessageDialog(this, "Failed to load file: " +e.toString());
|
||||
} catch (Exception e) {
|
||||
JOptionPane.showMessageDialog(this, "加载文件失败: " + e.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Open the data extractor
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void analyseExtractActionPerformed(ActionEvent evt) {
|
||||
@@ -385,35 +394,32 @@ public class StegSolve extends JFrame
|
||||
|
||||
/**
|
||||
* Save the current transformed image
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void fileSaveActionPerformed(ActionEvent evt)
|
||||
{
|
||||
private void fileSaveActionPerformed(ActionEvent evt) {
|
||||
JFileChooser fileChooser = new JFileChooser(System.getProperty("user.dir"));
|
||||
fileChooser.setSelectedFile(new File("solved.bmp"));
|
||||
int rVal = fileChooser.showSaveDialog(this);
|
||||
System.setProperty("user.dir", fileChooser.getCurrentDirectory().getAbsolutePath());
|
||||
if(rVal == JFileChooser.APPROVE_OPTION)
|
||||
{
|
||||
if (rVal == JFileChooser.APPROVE_OPTION) {
|
||||
sfile = fileChooser.getSelectedFile();
|
||||
try
|
||||
{
|
||||
try {
|
||||
bi = transform.getImage();
|
||||
int rns = sfile.getName().lastIndexOf(".")+1;
|
||||
if(rns==0)
|
||||
ImageIO.write(bi, "bmp", sfile);
|
||||
int rns = sfile.getName().lastIndexOf(".") + 1;
|
||||
if (rns == 0)
|
||||
ImageIO.write(bi, "bmp", sfile);
|
||||
else
|
||||
ImageIO.write(bi, sfile.getName().substring(rns), sfile);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
JOptionPane.showMessageDialog(this, "Failed to write file: "+e.toString());
|
||||
ImageIO.write(bi, sfile.getName().substring(rns), sfile);
|
||||
} catch (Exception e) {
|
||||
JOptionPane.showMessageDialog(this, "写入文件失败: " + e.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Open a file
|
||||
*
|
||||
* @param evt Event
|
||||
*/
|
||||
private void fileOpenActionPerformed(ActionEvent evt) {
|
||||
@@ -422,8 +428,7 @@ public class StegSolve extends JFrame
|
||||
fileChooser.setFileFilter(filter);
|
||||
int rVal = fileChooser.showOpenDialog(this);
|
||||
System.setProperty("user.dir", fileChooser.getCurrentDirectory().getAbsolutePath());
|
||||
if(rVal == JFileChooser.APPROVE_OPTION)
|
||||
{
|
||||
if (rVal == JFileChooser.APPROVE_OPTION) {
|
||||
sfile = fileChooser.getSelectedFile();
|
||||
loadImage(sfile);
|
||||
}
|
||||
@@ -436,28 +441,24 @@ public class StegSolve extends JFrame
|
||||
|
||||
void loadImage(File sfile) {
|
||||
this.sfile = sfile;
|
||||
try
|
||||
{
|
||||
try {
|
||||
bi = ImageIO.read(sfile);
|
||||
transform = new Transform(bi);
|
||||
newImage();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
JOptionPane.showMessageDialog(this, "Failed to load file: " +e.toString());
|
||||
JOptionPane.showMessageDialog(this, "加载文件失败: " + e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset settings for a new image
|
||||
*/
|
||||
private void newImage()
|
||||
{
|
||||
private void newImage() {
|
||||
nowShowing.setText(transform.getText());
|
||||
dp.setImage(transform.getImage());
|
||||
dp.setSize(transform.getImage().getWidth(), transform.getImage().getHeight());
|
||||
dp.setPreferredSize(new Dimension(transform.getImage().getWidth(),transform.getImage().getHeight()));
|
||||
dp.setPreferredSize(new Dimension(transform.getImage().getWidth(), transform.getImage().getHeight()));
|
||||
this.setMaximumSize(getToolkit().getScreenSize());
|
||||
zoomSlider.setValue(100);
|
||||
dp.apply(100);
|
||||
@@ -468,16 +469,15 @@ public class StegSolve extends JFrame
|
||||
/**
|
||||
* Update the image being shown for new transform
|
||||
*/
|
||||
private void updateImage()
|
||||
{
|
||||
private void updateImage() {
|
||||
nowShowing.setText(transform.getText());
|
||||
dp.setImage(transform.getImage());
|
||||
repaint();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param args the command line arguments
|
||||
*/
|
||||
* @param args the command line arguments
|
||||
*/
|
||||
public static void main(String args[]) {
|
||||
EventQueue.invokeLater(() -> new StegSolve().setVisible(true));
|
||||
}
|
||||
|
||||
@@ -214,7 +214,9 @@ public class Stereo extends JFrame
|
||||
this.setMaximumSize(getToolkit().getScreenSize());
|
||||
pack();
|
||||
scrollPane.revalidate();
|
||||
dp.apply(100);
|
||||
repaint();
|
||||
this.setSize(500, 600);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ public class StereoTransform {
|
||||
*/
|
||||
public String getText()
|
||||
{
|
||||
return "Offset: "+transNum;
|
||||
return "偏移量: "+transNum;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -375,9 +375,9 @@ public class Transform {
|
||||
switch(transNum)
|
||||
{
|
||||
case 0:
|
||||
return "Normal Image";
|
||||
return "正常图像";
|
||||
case 1:
|
||||
return "Colour Inversion (Xor)";
|
||||
return "颜色反转 (Xor)";
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
@@ -429,7 +429,7 @@ public class Transform {
|
||||
case 40:
|
||||
return "Random colour map 3";
|
||||
case 41:
|
||||
return "Gray bits";
|
||||
return "灰度";
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ public class ZoomSlider extends JPanel {
|
||||
private List<SliderChangeListener> changeListeners = new ArrayList<>();
|
||||
|
||||
ZoomSlider(int min, int max, int defaultValue) {
|
||||
JLabel tip = new JLabel("Zoom:");
|
||||
JLabel tip = new JLabel("缩放:");
|
||||
|
||||
add(tip);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user