Skip to content

Commit

Permalink
修复BUG以及增加功能
Browse files Browse the repository at this point in the history
修复MacOS/Linux下Setting.json文件生成位置在程序根目录问题
增加双击复制功能
  • Loading branch information
0Chencc committed Aug 18, 2019
1 parent 2d76f21 commit 78a004e
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules/CTFCrackToolsKt.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions .idea/modules/CTFCrackToolsKt_main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions .idea/modules/CTFCrackToolsKt_test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group 'org.mstsec'
version '3.1.6'
version '3.2.0'

buildscript {
ext.kotlin_version = '1.2.31'
Expand Down
86 changes: 80 additions & 6 deletions src/main/Core.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.python.core.*

import com.google.gson.JsonObject
import com.google.gson.JsonParser
import org.fusesource.jansi.internal.Kernel32
import java.awt.*
import java.awt.event.*

Expand Down Expand Up @@ -50,6 +51,13 @@ class Core : JFrame() {
* Create the frame.
*/
init {
val im:InputMap = UIManager.get("TextArea.focusInputMap") as InputMap
val os = System.getProperty("os.name")
if (os.startsWith("Mac OS")){
im.put(KeyStroke.getKeyStroke(KeyEvent.VK_C,KeyEvent.META_DOWN_MASK), DefaultEditorKit.copyAction)
im.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.META_DOWN_MASK), DefaultEditorKit.pasteAction)
im.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.META_DOWN_MASK), DefaultEditorKit.cutAction)
}
title="CTFCrackTools$Version$Note"
defaultCloseOperation=JFrame.EXIT_ON_CLOSE
setBounds(100, 100, 906, 755)
Expand Down Expand Up @@ -161,15 +169,85 @@ class Core : JFrame() {
val menu=JPopupMenu()

addPopup(Item0, menu)
Item0.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
addPopup(Item1, menu)
Item1.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
addPopup(Item2, menu)
Item2.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
addPopup(Item3, menu)
Item3.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
addPopup(Item4, menu)
Item4.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
addPopup(Item5, menu)
Item5.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
addPopup(Item6, menu)
Item6.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
addPopup(Item7, menu)
Item7.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
addPopup(Item8, menu)
Item8.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
addPopup(Item9, menu)
Item9.addMouseListener(object:MouseAdapter(){
override fun mouseClicked(e: MouseEvent?) {
if(e!!.clickCount==2){
textArea.paste()
}
}
})
//PopupMenu
val Decrypt=JMenu("Decrypt")
menu.add(Decrypt)
Expand Down Expand Up @@ -203,9 +281,6 @@ class Core : JFrame() {

val Decode=JMenu("Decode")
menu.add(Decode)
val Base64DecodeGBK=JMenuItem("Base64DecodeGBK")
Base64DecodeGBK.addActionListener { textArea.text=f.Base64de(textArea.text) }
Decode.add(Base64DecodeGBK)
val Base64DecodeUTF8=JMenuItem("Base64DecodeUTF8")
Base64DecodeUTF8.addActionListener { textArea.text=f.Base64de(textArea.text) }
Decode.add(Base64DecodeUTF8)
Expand Down Expand Up @@ -357,7 +432,6 @@ class Core : JFrame() {

val TPlugins=JMenu("Plugins")
topmenu.add(TPlugins)

/* addPluginEvent */
addPlugins.addActionListener {
val py_suf=arrayOf("py")
Expand Down Expand Up @@ -851,9 +925,9 @@ class Core : JFrame() {

companion object {
private var textArea=JTextArea()
private val JsonPath=String(StringBuilder(System.getProperty("user.dir")+"\\Setting.json"))
private val JsonPath=String(StringBuilder(System.getProperty("user.dir")+"/Setting.json"))
private val Version="-v3.1.8"
private val Note="高考后"
private val Note=""
/**
* Launch the application.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/Json.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import java.io.File
import java.io.IOException
import java.io.FileNotFoundException
class Json{
val PLUGINSJSONPATH =System.getProperty("user.dir")+"\\Setting.json"
val PLUGINSJSONPATH =System.getProperty("user.dir")+"/Setting.json"
fun getType(title:String): String? {
val JsonFile = FileInputStream(PLUGINSJSONPATH)
val JsonReadCoding = InputStreamReader(JsonFile,"UTF-8")
Expand Down

0 comments on commit 78a004e

Please sign in to comment.