diff --git a/APKToolGUI/ApkTool/Adb.cs b/APKToolGUI/ApkTool/Adb.cs index 767d5db..4f09ae4 100644 --- a/APKToolGUI/ApkTool/Adb.cs +++ b/APKToolGUI/ApkTool/Adb.cs @@ -19,7 +19,7 @@ namespace APKToolGUI public const string Serial = " -s"; // use device with given serial (overrides $ANDROID_SERIAL) public const string Vendor = " -i"; //Vendor public const string ApkPath = " -r"; - public const string Abi = " --abi armeabi-v7a"; + public const string Abi = " --abi"; //override platform's default ABI } public event DataReceivedEventHandler OutputDataReceived @@ -79,11 +79,29 @@ namespace APKToolGUI Regex regex = new Regex(@"^(\S+)\s+.*model:(\w+).*"); Match mdevice = regex.Match(device); - string setVendor = null; + string setVendor = null, abi = null; if (Settings.Default.Adb_SetVendor) setVendor = $"{Keys.Vendor} com.android.vending {Keys.ApkPath}"; + if (Settings.Default.Adb_SetOverrideAbi) + { + switch (Settings.Default.Adb_OverrideAbi) + { + case 0: + abi = Keys.Abi + " arm64-v8a"; + break; + case 1: + abi = Keys.Abi + " armeabi-v7a"; + break; + case 2: + abi = Keys.Abi + " x86"; + break; + case 3: + abi = Keys.Abi + " x86_64"; + break; + } + } - string args = String.Format($"{Keys.Serial} {mdevice.Groups[1].Value} install {setVendor} \"{inputApk}\""); + string args = String.Format($"{Keys.Serial} {mdevice.Groups[1].Value} install {setVendor} {abi} \"{inputApk}\""); Log.d("ADB: " + adbFileName + " " + args); Debug.WriteLine("Adb: " + args); diff --git a/APKToolGUI/Forms/FormMain.Designer.cs b/APKToolGUI/Forms/FormMain.Designer.cs index 570654a..9db1e28 100644 --- a/APKToolGUI/Forms/FormMain.Designer.cs +++ b/APKToolGUI/Forms/FormMain.Designer.cs @@ -34,7 +34,6 @@ this.tabPageMain = new System.Windows.Forms.TabPage(); this.mergePanel = new System.Windows.Forms.Panel(); this.splitApkTxt = new System.Windows.Forms.Label(); - this.splitApkPathTxtBox = new System.Windows.Forms.TextBox(); this.selSplitApkBtn = new System.Windows.Forms.Button(); this.mergeApkBtn = new System.Windows.Forms.Button(); this.comApkOpenDir = new System.Windows.Forms.Button(); @@ -48,22 +47,18 @@ this.openAndroidMainfestBtn = new System.Windows.Forms.Button(); this.signPanel = new System.Windows.Forms.Panel(); this.label4 = new System.Windows.Forms.Label(); - this.textBox_SIGN_InputFile = new System.Windows.Forms.TextBox(); this.button_SIGN_BrowseInputFile = new System.Windows.Forms.Button(); this.button_SIGN_Sign = new System.Windows.Forms.Button(); this.zipalignPanel = new System.Windows.Forms.Panel(); this.label3 = new System.Windows.Forms.Label(); this.button_ZIPALIGN_Align = new System.Windows.Forms.Button(); this.button_ZIPALIGN_BrowseInputFile = new System.Windows.Forms.Button(); - this.textBox_ZIPALIGN_InputFile = new System.Windows.Forms.TextBox(); this.comPanel = new System.Windows.Forms.Panel(); this.label2 = new System.Windows.Forms.Label(); this.button_BUILD_BrowseInputProjectDir = new System.Windows.Forms.Button(); this.button_BUILD_Build = new System.Windows.Forms.Button(); - this.textBox_BUILD_InputProjectDir = new System.Windows.Forms.TextBox(); this.decPanel = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); - this.textBox_DECODE_InputAppPath = new System.Windows.Forms.TextBox(); this.button_DECODE_Decode = new System.Windows.Forms.Button(); this.button_DECODE_BrowseInputAppPath = new System.Windows.Forms.Button(); this.tabPageApkInfo = new System.Windows.Forms.TabPage(); @@ -112,49 +107,10 @@ this.fullInfoTextBox = new System.Windows.Forms.RichTextBox(); this.tabPageDecode = new System.Windows.Forms.TabPage(); this.groupBox_DECODE_Options = new System.Windows.Forms.GroupBox(); - this.checkBox7 = new System.Windows.Forms.CheckBox(); - this.decApiLvlUpDown = new System.Windows.Forms.NumericUpDown(); - this.decSetApiLvlChkBox = new System.Windows.Forms.CheckBox(); - this.checkBox_DECODE_FixError = new System.Windows.Forms.CheckBox(); - this.checkBox_DECODE_OnlyMainClasses = new System.Windows.Forms.CheckBox(); - this.textBox_DECODE_FrameDir = new System.Windows.Forms.TextBox(); - this.button_DECODE_BrowseOutputDirectory = new System.Windows.Forms.Button(); - this.checkBox_DECODE_UseFramework = new System.Windows.Forms.CheckBox(); - this.button_DECODE_BrowseFrameDir = new System.Windows.Forms.Button(); - this.checkBox_DECODE_MatchOriginal = new System.Windows.Forms.CheckBox(); - this.checkBox_DECODE_OutputDirectory = new System.Windows.Forms.CheckBox(); - this.textBox_DECODE_OutputDirectory = new System.Windows.Forms.TextBox(); - this.checkBox_DECODE_KeepBrokenRes = new System.Windows.Forms.CheckBox(); - this.checkBox_DECODE_NoSrc = new System.Windows.Forms.CheckBox(); - this.checkBox_DECODE_Force = new System.Windows.Forms.CheckBox(); - this.checkBox_DECODE_NoRes = new System.Windows.Forms.CheckBox(); - this.checkBox_DECODE_NoDebugInfo = new System.Windows.Forms.CheckBox(); this.tabPageBuild = new System.Windows.Forms.TabPage(); this.groupBox_BUILD_Options = new System.Windows.Forms.GroupBox(); - this.checkBox_BUILD_NetSecConf = new System.Windows.Forms.CheckBox(); - this.useAapt2ChkBox = new System.Windows.Forms.CheckBox(); - this.buildApiLvlUpDown = new System.Windows.Forms.NumericUpDown(); - this.buildSetApiLvlChkBox = new System.Windows.Forms.CheckBox(); - this.createUnsignApkChkBox = new System.Windows.Forms.CheckBox(); - this.signAfterBuildChkBox = new System.Windows.Forms.CheckBox(); - this.zipalignAfterBuildChkBox = new System.Windows.Forms.CheckBox(); - this.checkBox_BUILD_NoCrunch = new System.Windows.Forms.CheckBox(); - this.button_BUILD_BrowseOutputAppPath = new System.Windows.Forms.Button(); - this.checkBox_BUILD_ForceAll = new System.Windows.Forms.CheckBox(); - this.button_BUILD_BrowseFrameDir = new System.Windows.Forms.Button(); - this.button_BUILD_BrowseAaptPath = new System.Windows.Forms.Button(); - this.checkBox_BUILD_OutputAppPath = new System.Windows.Forms.CheckBox(); - this.checkBox_BUILD_CopyOriginal = new System.Windows.Forms.CheckBox(); - this.textBox_BUILD_OutputAppPath = new System.Windows.Forms.TextBox(); - this.checkBox_BUILD_UseAapt = new System.Windows.Forms.CheckBox(); - this.textBox_BUILD_AaptPath = new System.Windows.Forms.TextBox(); - this.textBox_BUILD_FrameDir = new System.Windows.Forms.TextBox(); - this.checkBox_BUILD_UseFramework = new System.Windows.Forms.CheckBox(); this.tabPageSign = new System.Windows.Forms.TabPage(); this.groupBox_SIGN_Options = new System.Windows.Forms.GroupBox(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.autoDelIdsigChkBox = new System.Windows.Forms.CheckBox(); this.schemev4ComboBox = new System.Windows.Forms.ComboBox(); this.label27 = new System.Windows.Forms.Label(); this.schemev3ComboBox = new System.Windows.Forms.ComboBox(); @@ -163,76 +119,45 @@ this.label25 = new System.Windows.Forms.Label(); this.schemev1ComboBox = new System.Windows.Forms.ComboBox(); this.label24 = new System.Windows.Forms.Label(); - this.textBox3 = new System.Windows.Forms.TextBox(); this.selectKeyStoreFileBtn = new System.Windows.Forms.Button(); - this.aliasTxtBox = new System.Windows.Forms.TextBox(); - this.useAliasChkBox = new System.Windows.Forms.CheckBox(); this.label22 = new System.Windows.Forms.Label(); - this.keyStoreFileTxtBox = new System.Windows.Forms.TextBox(); this.label21 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label(); - this.useKeyStoreChkBox = new System.Windows.Forms.CheckBox(); - this.useSigningOutputDir = new System.Windows.Forms.CheckBox(); this.label_SIGN_PrivateKey = new System.Windows.Forms.Label(); this.label_SIGN_PublicKey = new System.Windows.Forms.Label(); this.button_SIGN_BrowseOutputFile = new System.Windows.Forms.Button(); - this.textBox_SIGN_OutputFile = new System.Windows.Forms.TextBox(); this.button_SIGN_BrowsePublicKey = new System.Windows.Forms.Button(); this.button_SIGN_BrowsePrivateKey = new System.Windows.Forms.Button(); - this.textBox_SIGN_PublicKey = new System.Windows.Forms.TextBox(); - this.textBox_SIGN_PrivateKey = new System.Windows.Forms.TextBox(); this.tabPageZipAlign = new System.Windows.Forms.TabPage(); this.groupBox_ZIPALIGN_Options = new System.Windows.Forms.GroupBox(); - this.zipalignOutputDirChkBox = new System.Windows.Forms.CheckBox(); - this.signAfterZipalignChkBox = new System.Windows.Forms.CheckBox(); - this.checkBox_ZIPALIGN_Recompress = new System.Windows.Forms.CheckBox(); this.label_ZIPALIGN_AlignmentBytes = new System.Windows.Forms.Label(); this.button_ZIPALIGN_BrowseOutputFile = new System.Windows.Forms.Button(); - this.checkBox_ZIPALIGN_CheckAlignment = new System.Windows.Forms.CheckBox(); - this.textBox_ZIPALIGN_OutputFile = new System.Windows.Forms.TextBox(); - this.checkBox_ZIPALIGN_VerboseOutput = new System.Windows.Forms.CheckBox(); - this.numericUpDown_ZIPALIGN_AlignmentBytes = new System.Windows.Forms.NumericUpDown(); - this.checkBox_ZIPALIGN_OverwriteOutputFile = new System.Windows.Forms.CheckBox(); this.tabPageInstallFramework = new System.Windows.Forms.TabPage(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.openFwFolderBtn = new System.Windows.Forms.Button(); this.clearFwBtn = new System.Windows.Forms.Button(); - this.clearFwBeforeDecodeChkBox = new System.Windows.Forms.CheckBox(); this.groupBox_IF_Options = new System.Windows.Forms.GroupBox(); - this.checkBox_IF_Tag = new System.Windows.Forms.CheckBox(); - this.checkBox_IF_FramePath = new System.Windows.Forms.CheckBox(); - this.textBox_IF_Tag = new System.Windows.Forms.TextBox(); this.button_IF_InstallFramework = new System.Windows.Forms.Button(); - this.button_IF_BrowseFrameDir = new System.Windows.Forms.Button(); this.button_IF_BrowseInputFramePath = new System.Windows.Forms.Button(); - this.textBox_IF_InputFramePath = new System.Windows.Forms.TextBox(); - this.textBox_IF_FrameDir = new System.Windows.Forms.TextBox(); this.tabPageBaksmali = new System.Windows.Forms.TabPage(); this.smaliGroupBox = new System.Windows.Forms.GroupBox(); this.label29 = new System.Windows.Forms.Label(); - this.smaliUseOutputChkBox = new System.Windows.Forms.CheckBox(); this.comSmaliBtn = new System.Windows.Forms.Button(); this.smaliBrowseOutputBtn = new System.Windows.Forms.Button(); - this.smaliBrowseInputDirTxtBox = new System.Windows.Forms.TextBox(); - this.smaliBrowseOutputTxtBox = new System.Windows.Forms.TextBox(); this.smaliBrowseInputDirBtn = new System.Windows.Forms.Button(); this.bakSmaliGroupBox = new System.Windows.Forms.GroupBox(); this.label28 = new System.Windows.Forms.Label(); - this.baksmaliUseOutputChkBox = new System.Windows.Forms.CheckBox(); this.baksmaliBrowseOutputBtn = new System.Windows.Forms.Button(); - this.baksmaliBrowseOutputTxtBox = new System.Windows.Forms.TextBox(); this.decSmaliBtn = new System.Windows.Forms.Button(); this.baksmaliBrowseInputDexBtn = new System.Windows.Forms.Button(); - this.baksmaliBrowseInputDexTxtBox = new System.Windows.Forms.TextBox(); this.tabPageAdb = new System.Windows.Forms.TabPage(); + this.overrideAbiComboBox = new System.Windows.Forms.ComboBox(); this.selAdbDeviceLbl = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label(); this.killAdbBtn = new System.Windows.Forms.Button(); this.installApkBtn = new System.Windows.Forms.Button(); this.refreshDevicesBtn = new System.Windows.Forms.Button(); this.selApkAdbBtn = new System.Windows.Forms.Button(); - this.setVendorChkBox = new System.Windows.Forms.CheckBox(); - this.apkPathAdbTxtBox = new System.Windows.Forms.TextBox(); this.label32 = new System.Windows.Forms.Label(); this.devicesListBox = new System.Windows.Forms.ListBox(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); @@ -253,7 +178,6 @@ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.useAPKEditorForDecompilingItem = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.checkForUpdateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -262,6 +186,84 @@ this.baksmaliIssuesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.useAPKEditorForDecompilingItem = new System.Windows.Forms.ToolStripMenuItem(); + this.splitApkPathTxtBox = new System.Windows.Forms.TextBox(); + this.textBox_SIGN_InputFile = new System.Windows.Forms.TextBox(); + this.textBox_ZIPALIGN_InputFile = new System.Windows.Forms.TextBox(); + this.textBox_BUILD_InputProjectDir = new System.Windows.Forms.TextBox(); + this.textBox_DECODE_InputAppPath = new System.Windows.Forms.TextBox(); + this.checkBox7 = new System.Windows.Forms.CheckBox(); + this.decApiLvlUpDown = new System.Windows.Forms.NumericUpDown(); + this.decSetApiLvlChkBox = new System.Windows.Forms.CheckBox(); + this.checkBox_DECODE_FixError = new System.Windows.Forms.CheckBox(); + this.checkBox_DECODE_OnlyMainClasses = new System.Windows.Forms.CheckBox(); + this.textBox_DECODE_FrameDir = new System.Windows.Forms.TextBox(); + this.button_DECODE_BrowseOutputDirectory = new System.Windows.Forms.Button(); + this.checkBox_DECODE_UseFramework = new System.Windows.Forms.CheckBox(); + this.button_DECODE_BrowseFrameDir = new System.Windows.Forms.Button(); + this.checkBox_DECODE_MatchOriginal = new System.Windows.Forms.CheckBox(); + this.checkBox_DECODE_OutputDirectory = new System.Windows.Forms.CheckBox(); + this.textBox_DECODE_OutputDirectory = new System.Windows.Forms.TextBox(); + this.checkBox_DECODE_KeepBrokenRes = new System.Windows.Forms.CheckBox(); + this.checkBox_DECODE_NoSrc = new System.Windows.Forms.CheckBox(); + this.checkBox_DECODE_Force = new System.Windows.Forms.CheckBox(); + this.checkBox_DECODE_NoRes = new System.Windows.Forms.CheckBox(); + this.checkBox_DECODE_NoDebugInfo = new System.Windows.Forms.CheckBox(); + this.checkBox_BUILD_NetSecConf = new System.Windows.Forms.CheckBox(); + this.useAapt2ChkBox = new System.Windows.Forms.CheckBox(); + this.buildApiLvlUpDown = new System.Windows.Forms.NumericUpDown(); + this.buildSetApiLvlChkBox = new System.Windows.Forms.CheckBox(); + this.createUnsignApkChkBox = new System.Windows.Forms.CheckBox(); + this.signAfterBuildChkBox = new System.Windows.Forms.CheckBox(); + this.zipalignAfterBuildChkBox = new System.Windows.Forms.CheckBox(); + this.checkBox_BUILD_NoCrunch = new System.Windows.Forms.CheckBox(); + this.button_BUILD_BrowseOutputAppPath = new System.Windows.Forms.Button(); + this.checkBox_BUILD_ForceAll = new System.Windows.Forms.CheckBox(); + this.button_BUILD_BrowseFrameDir = new System.Windows.Forms.Button(); + this.button_BUILD_BrowseAaptPath = new System.Windows.Forms.Button(); + this.checkBox_BUILD_OutputAppPath = new System.Windows.Forms.CheckBox(); + this.checkBox_BUILD_CopyOriginal = new System.Windows.Forms.CheckBox(); + this.textBox_BUILD_OutputAppPath = new System.Windows.Forms.TextBox(); + this.checkBox_BUILD_UseAapt = new System.Windows.Forms.CheckBox(); + this.textBox_BUILD_AaptPath = new System.Windows.Forms.TextBox(); + this.textBox_BUILD_FrameDir = new System.Windows.Forms.TextBox(); + this.checkBox_BUILD_UseFramework = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.autoDelIdsigChkBox = new System.Windows.Forms.CheckBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.aliasTxtBox = new System.Windows.Forms.TextBox(); + this.useAliasChkBox = new System.Windows.Forms.CheckBox(); + this.keyStoreFileTxtBox = new System.Windows.Forms.TextBox(); + this.useKeyStoreChkBox = new System.Windows.Forms.CheckBox(); + this.useSigningOutputDir = new System.Windows.Forms.CheckBox(); + this.textBox_SIGN_OutputFile = new System.Windows.Forms.TextBox(); + this.textBox_SIGN_PublicKey = new System.Windows.Forms.TextBox(); + this.textBox_SIGN_PrivateKey = new System.Windows.Forms.TextBox(); + this.zipalignOutputDirChkBox = new System.Windows.Forms.CheckBox(); + this.signAfterZipalignChkBox = new System.Windows.Forms.CheckBox(); + this.checkBox_ZIPALIGN_Recompress = new System.Windows.Forms.CheckBox(); + this.checkBox_ZIPALIGN_CheckAlignment = new System.Windows.Forms.CheckBox(); + this.textBox_ZIPALIGN_OutputFile = new System.Windows.Forms.TextBox(); + this.checkBox_ZIPALIGN_VerboseOutput = new System.Windows.Forms.CheckBox(); + this.numericUpDown_ZIPALIGN_AlignmentBytes = new System.Windows.Forms.NumericUpDown(); + this.checkBox_ZIPALIGN_OverwriteOutputFile = new System.Windows.Forms.CheckBox(); + this.clearFwBeforeDecodeChkBox = new System.Windows.Forms.CheckBox(); + this.checkBox_IF_Tag = new System.Windows.Forms.CheckBox(); + this.checkBox_IF_FramePath = new System.Windows.Forms.CheckBox(); + this.textBox_IF_Tag = new System.Windows.Forms.TextBox(); + this.button_IF_BrowseFrameDir = new System.Windows.Forms.Button(); + this.textBox_IF_InputFramePath = new System.Windows.Forms.TextBox(); + this.textBox_IF_FrameDir = new System.Windows.Forms.TextBox(); + this.smaliUseOutputChkBox = new System.Windows.Forms.CheckBox(); + this.smaliBrowseInputDirTxtBox = new System.Windows.Forms.TextBox(); + this.smaliBrowseOutputTxtBox = new System.Windows.Forms.TextBox(); + this.baksmaliUseOutputChkBox = new System.Windows.Forms.CheckBox(); + this.baksmaliBrowseOutputTxtBox = new System.Windows.Forms.TextBox(); + this.baksmaliBrowseInputDexTxtBox = new System.Windows.Forms.TextBox(); + this.overrideAbiCheckBox = new System.Windows.Forms.CheckBox(); + this.setVendorChkBox = new System.Windows.Forms.CheckBox(); + this.apkPathAdbTxtBox = new System.Windows.Forms.TextBox(); this.tabControlMain.SuspendLayout(); this.tabPageMain.SuspendLayout(); this.mergePanel.SuspendLayout(); @@ -276,15 +278,12 @@ this.tabPage3.SuspendLayout(); this.tabPageDecode.SuspendLayout(); this.groupBox_DECODE_Options.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.decApiLvlUpDown)).BeginInit(); this.tabPageBuild.SuspendLayout(); this.groupBox_BUILD_Options.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.buildApiLvlUpDown)).BeginInit(); this.tabPageSign.SuspendLayout(); this.groupBox_SIGN_Options.SuspendLayout(); this.tabPageZipAlign.SuspendLayout(); this.groupBox_ZIPALIGN_Options.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ZIPALIGN_AlignmentBytes)).BeginInit(); this.tabPageInstallFramework.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox_IF_Options.SuspendLayout(); @@ -295,6 +294,9 @@ this.statusStrip1.SuspendLayout(); this.contextMenuStripLog.SuspendLayout(); this.menuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.decApiLvlUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.buildApiLvlUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ZIPALIGN_AlignmentBytes)).BeginInit(); this.SuspendLayout(); // // tabControlMain @@ -349,14 +351,6 @@ resources.ApplyResources(this.splitApkTxt, "splitApkTxt"); this.splitApkTxt.Name = "splitApkTxt"; // - // splitApkPathTxtBox - // - this.splitApkPathTxtBox.AllowDrop = true; - resources.ApplyResources(this.splitApkPathTxtBox, "splitApkPathTxtBox"); - this.splitApkPathTxtBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "SplitApk_InputFile", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.splitApkPathTxtBox.Name = "splitApkPathTxtBox"; - this.splitApkPathTxtBox.Text = global::APKToolGUI.Properties.Settings.Default.SplitApk_InputFile; - // // selSplitApkBtn // resources.ApplyResources(this.selSplitApkBtn, "selSplitApkBtn"); @@ -439,14 +433,6 @@ resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; // - // textBox_SIGN_InputFile - // - this.textBox_SIGN_InputFile.AllowDrop = true; - resources.ApplyResources(this.textBox_SIGN_InputFile, "textBox_SIGN_InputFile"); - this.textBox_SIGN_InputFile.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Sign_InputFile", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.textBox_SIGN_InputFile.Name = "textBox_SIGN_InputFile"; - this.textBox_SIGN_InputFile.Text = global::APKToolGUI.Properties.Settings.Default.Sign_InputFile; - // // button_SIGN_BrowseInputFile // resources.ApplyResources(this.button_SIGN_BrowseInputFile, "button_SIGN_BrowseInputFile"); @@ -488,14 +474,6 @@ this.button_ZIPALIGN_BrowseInputFile.Name = "button_ZIPALIGN_BrowseInputFile"; this.button_ZIPALIGN_BrowseInputFile.UseVisualStyleBackColor = true; // - // textBox_ZIPALIGN_InputFile - // - this.textBox_ZIPALIGN_InputFile.AllowDrop = true; - resources.ApplyResources(this.textBox_ZIPALIGN_InputFile, "textBox_ZIPALIGN_InputFile"); - this.textBox_ZIPALIGN_InputFile.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Zipalign_InputFile", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.textBox_ZIPALIGN_InputFile.Name = "textBox_ZIPALIGN_InputFile"; - this.textBox_ZIPALIGN_InputFile.Text = global::APKToolGUI.Properties.Settings.Default.Zipalign_InputFile; - // // comPanel // this.comPanel.AllowDrop = true; @@ -524,14 +502,6 @@ this.button_BUILD_Build.Name = "button_BUILD_Build"; this.button_BUILD_Build.UseVisualStyleBackColor = true; // - // textBox_BUILD_InputProjectDir - // - this.textBox_BUILD_InputProjectDir.AllowDrop = true; - resources.ApplyResources(this.textBox_BUILD_InputProjectDir, "textBox_BUILD_InputProjectDir"); - this.textBox_BUILD_InputProjectDir.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Build_InputDir", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.textBox_BUILD_InputProjectDir.Name = "textBox_BUILD_InputProjectDir"; - this.textBox_BUILD_InputProjectDir.Text = global::APKToolGUI.Properties.Settings.Default.Build_InputDir; - // // decPanel // this.decPanel.AllowDrop = true; @@ -548,14 +518,6 @@ resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; // - // textBox_DECODE_InputAppPath - // - this.textBox_DECODE_InputAppPath.AllowDrop = true; - resources.ApplyResources(this.textBox_DECODE_InputAppPath, "textBox_DECODE_InputAppPath"); - this.textBox_DECODE_InputAppPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Decode_InputAppPath", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.textBox_DECODE_InputAppPath.Name = "textBox_DECODE_InputAppPath"; - this.textBox_DECODE_InputAppPath.Text = global::APKToolGUI.Properties.Settings.Default.Decode_InputAppPath; - // // button_DECODE_Decode // this.button_DECODE_Decode.AllowDrop = true; @@ -894,6 +856,665 @@ this.groupBox_DECODE_Options.Name = "groupBox_DECODE_Options"; this.groupBox_DECODE_Options.TabStop = false; // + // tabPageBuild + // + resources.ApplyResources(this.tabPageBuild, "tabPageBuild"); + this.tabPageBuild.BackColor = System.Drawing.Color.White; + this.tabPageBuild.Controls.Add(this.groupBox_BUILD_Options); + this.tabPageBuild.Name = "tabPageBuild"; + // + // groupBox_BUILD_Options + // + this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_NetSecConf); + this.groupBox_BUILD_Options.Controls.Add(this.useAapt2ChkBox); + this.groupBox_BUILD_Options.Controls.Add(this.buildApiLvlUpDown); + this.groupBox_BUILD_Options.Controls.Add(this.buildSetApiLvlChkBox); + this.groupBox_BUILD_Options.Controls.Add(this.createUnsignApkChkBox); + this.groupBox_BUILD_Options.Controls.Add(this.signAfterBuildChkBox); + this.groupBox_BUILD_Options.Controls.Add(this.zipalignAfterBuildChkBox); + this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_NoCrunch); + this.groupBox_BUILD_Options.Controls.Add(this.button_BUILD_BrowseOutputAppPath); + this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_ForceAll); + this.groupBox_BUILD_Options.Controls.Add(this.button_BUILD_BrowseFrameDir); + this.groupBox_BUILD_Options.Controls.Add(this.button_BUILD_BrowseAaptPath); + this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_OutputAppPath); + this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_CopyOriginal); + this.groupBox_BUILD_Options.Controls.Add(this.textBox_BUILD_OutputAppPath); + this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_UseAapt); + this.groupBox_BUILD_Options.Controls.Add(this.textBox_BUILD_AaptPath); + this.groupBox_BUILD_Options.Controls.Add(this.textBox_BUILD_FrameDir); + this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_UseFramework); + resources.ApplyResources(this.groupBox_BUILD_Options, "groupBox_BUILD_Options"); + this.groupBox_BUILD_Options.Name = "groupBox_BUILD_Options"; + this.groupBox_BUILD_Options.TabStop = false; + // + // tabPageSign + // + resources.ApplyResources(this.tabPageSign, "tabPageSign"); + this.tabPageSign.BackColor = System.Drawing.Color.White; + this.tabPageSign.Controls.Add(this.groupBox_SIGN_Options); + this.tabPageSign.Name = "tabPageSign"; + // + // groupBox_SIGN_Options + // + this.groupBox_SIGN_Options.Controls.Add(this.checkBox2); + this.groupBox_SIGN_Options.Controls.Add(this.checkBox1); + this.groupBox_SIGN_Options.Controls.Add(this.autoDelIdsigChkBox); + this.groupBox_SIGN_Options.Controls.Add(this.schemev4ComboBox); + this.groupBox_SIGN_Options.Controls.Add(this.label27); + this.groupBox_SIGN_Options.Controls.Add(this.schemev3ComboBox); + this.groupBox_SIGN_Options.Controls.Add(this.label26); + this.groupBox_SIGN_Options.Controls.Add(this.schemev2ComboBox); + this.groupBox_SIGN_Options.Controls.Add(this.label25); + this.groupBox_SIGN_Options.Controls.Add(this.schemev1ComboBox); + this.groupBox_SIGN_Options.Controls.Add(this.label24); + this.groupBox_SIGN_Options.Controls.Add(this.textBox3); + this.groupBox_SIGN_Options.Controls.Add(this.selectKeyStoreFileBtn); + this.groupBox_SIGN_Options.Controls.Add(this.aliasTxtBox); + this.groupBox_SIGN_Options.Controls.Add(this.useAliasChkBox); + this.groupBox_SIGN_Options.Controls.Add(this.label22); + this.groupBox_SIGN_Options.Controls.Add(this.keyStoreFileTxtBox); + this.groupBox_SIGN_Options.Controls.Add(this.label21); + this.groupBox_SIGN_Options.Controls.Add(this.label20); + this.groupBox_SIGN_Options.Controls.Add(this.useKeyStoreChkBox); + this.groupBox_SIGN_Options.Controls.Add(this.useSigningOutputDir); + this.groupBox_SIGN_Options.Controls.Add(this.label_SIGN_PrivateKey); + this.groupBox_SIGN_Options.Controls.Add(this.label_SIGN_PublicKey); + this.groupBox_SIGN_Options.Controls.Add(this.button_SIGN_BrowseOutputFile); + this.groupBox_SIGN_Options.Controls.Add(this.textBox_SIGN_OutputFile); + this.groupBox_SIGN_Options.Controls.Add(this.button_SIGN_BrowsePublicKey); + this.groupBox_SIGN_Options.Controls.Add(this.button_SIGN_BrowsePrivateKey); + this.groupBox_SIGN_Options.Controls.Add(this.textBox_SIGN_PublicKey); + this.groupBox_SIGN_Options.Controls.Add(this.textBox_SIGN_PrivateKey); + resources.ApplyResources(this.groupBox_SIGN_Options, "groupBox_SIGN_Options"); + this.groupBox_SIGN_Options.Name = "groupBox_SIGN_Options"; + this.groupBox_SIGN_Options.TabStop = false; + // + // schemev4ComboBox + // + this.schemev4ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.schemev4ComboBox.FormattingEnabled = true; + this.schemev4ComboBox.Items.AddRange(new object[] { + resources.GetString("schemev4ComboBox.Items"), + resources.GetString("schemev4ComboBox.Items1"), + resources.GetString("schemev4ComboBox.Items2")}); + resources.ApplyResources(this.schemev4ComboBox, "schemev4ComboBox"); + this.schemev4ComboBox.Name = "schemev4ComboBox"; + // + // label27 + // + resources.ApplyResources(this.label27, "label27"); + this.label27.Name = "label27"; + // + // schemev3ComboBox + // + this.schemev3ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.schemev3ComboBox.FormattingEnabled = true; + this.schemev3ComboBox.Items.AddRange(new object[] { + resources.GetString("schemev3ComboBox.Items"), + resources.GetString("schemev3ComboBox.Items1"), + resources.GetString("schemev3ComboBox.Items2")}); + resources.ApplyResources(this.schemev3ComboBox, "schemev3ComboBox"); + this.schemev3ComboBox.Name = "schemev3ComboBox"; + // + // label26 + // + resources.ApplyResources(this.label26, "label26"); + this.label26.Name = "label26"; + // + // schemev2ComboBox + // + this.schemev2ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.schemev2ComboBox.FormattingEnabled = true; + this.schemev2ComboBox.Items.AddRange(new object[] { + resources.GetString("schemev2ComboBox.Items"), + resources.GetString("schemev2ComboBox.Items1"), + resources.GetString("schemev2ComboBox.Items2")}); + resources.ApplyResources(this.schemev2ComboBox, "schemev2ComboBox"); + this.schemev2ComboBox.Name = "schemev2ComboBox"; + // + // label25 + // + resources.ApplyResources(this.label25, "label25"); + this.label25.Name = "label25"; + // + // schemev1ComboBox + // + this.schemev1ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.schemev1ComboBox.FormattingEnabled = true; + this.schemev1ComboBox.Items.AddRange(new object[] { + resources.GetString("schemev1ComboBox.Items"), + resources.GetString("schemev1ComboBox.Items1"), + resources.GetString("schemev1ComboBox.Items2")}); + resources.ApplyResources(this.schemev1ComboBox, "schemev1ComboBox"); + this.schemev1ComboBox.Name = "schemev1ComboBox"; + // + // label24 + // + resources.ApplyResources(this.label24, "label24"); + this.label24.Name = "label24"; + // + // selectKeyStoreFileBtn + // + resources.ApplyResources(this.selectKeyStoreFileBtn, "selectKeyStoreFileBtn"); + this.selectKeyStoreFileBtn.Name = "selectKeyStoreFileBtn"; + this.selectKeyStoreFileBtn.UseVisualStyleBackColor = true; + // + // label22 + // + this.label22.ForeColor = System.Drawing.Color.Maroon; + resources.ApplyResources(this.label22, "label22"); + this.label22.Name = "label22"; + // + // label21 + // + resources.ApplyResources(this.label21, "label21"); + this.label21.Name = "label21"; + // + // label20 + // + resources.ApplyResources(this.label20, "label20"); + this.label20.Name = "label20"; + // + // label_SIGN_PrivateKey + // + resources.ApplyResources(this.label_SIGN_PrivateKey, "label_SIGN_PrivateKey"); + this.label_SIGN_PrivateKey.Name = "label_SIGN_PrivateKey"; + // + // label_SIGN_PublicKey + // + resources.ApplyResources(this.label_SIGN_PublicKey, "label_SIGN_PublicKey"); + this.label_SIGN_PublicKey.Name = "label_SIGN_PublicKey"; + // + // button_SIGN_BrowseOutputFile + // + resources.ApplyResources(this.button_SIGN_BrowseOutputFile, "button_SIGN_BrowseOutputFile"); + this.button_SIGN_BrowseOutputFile.Name = "button_SIGN_BrowseOutputFile"; + this.button_SIGN_BrowseOutputFile.UseVisualStyleBackColor = true; + // + // button_SIGN_BrowsePublicKey + // + resources.ApplyResources(this.button_SIGN_BrowsePublicKey, "button_SIGN_BrowsePublicKey"); + this.button_SIGN_BrowsePublicKey.Name = "button_SIGN_BrowsePublicKey"; + this.button_SIGN_BrowsePublicKey.UseVisualStyleBackColor = true; + // + // button_SIGN_BrowsePrivateKey + // + resources.ApplyResources(this.button_SIGN_BrowsePrivateKey, "button_SIGN_BrowsePrivateKey"); + this.button_SIGN_BrowsePrivateKey.Name = "button_SIGN_BrowsePrivateKey"; + this.button_SIGN_BrowsePrivateKey.UseVisualStyleBackColor = true; + // + // tabPageZipAlign + // + resources.ApplyResources(this.tabPageZipAlign, "tabPageZipAlign"); + this.tabPageZipAlign.BackColor = System.Drawing.Color.White; + this.tabPageZipAlign.Controls.Add(this.groupBox_ZIPALIGN_Options); + this.tabPageZipAlign.Name = "tabPageZipAlign"; + // + // groupBox_ZIPALIGN_Options + // + resources.ApplyResources(this.groupBox_ZIPALIGN_Options, "groupBox_ZIPALIGN_Options"); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.zipalignOutputDirChkBox); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.signAfterZipalignChkBox); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.checkBox_ZIPALIGN_Recompress); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.label_ZIPALIGN_AlignmentBytes); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.button_ZIPALIGN_BrowseOutputFile); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.checkBox_ZIPALIGN_CheckAlignment); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.textBox_ZIPALIGN_OutputFile); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.checkBox_ZIPALIGN_VerboseOutput); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.numericUpDown_ZIPALIGN_AlignmentBytes); + this.groupBox_ZIPALIGN_Options.Controls.Add(this.checkBox_ZIPALIGN_OverwriteOutputFile); + this.groupBox_ZIPALIGN_Options.Name = "groupBox_ZIPALIGN_Options"; + this.groupBox_ZIPALIGN_Options.TabStop = false; + // + // label_ZIPALIGN_AlignmentBytes + // + resources.ApplyResources(this.label_ZIPALIGN_AlignmentBytes, "label_ZIPALIGN_AlignmentBytes"); + this.label_ZIPALIGN_AlignmentBytes.Name = "label_ZIPALIGN_AlignmentBytes"; + // + // button_ZIPALIGN_BrowseOutputFile + // + resources.ApplyResources(this.button_ZIPALIGN_BrowseOutputFile, "button_ZIPALIGN_BrowseOutputFile"); + this.button_ZIPALIGN_BrowseOutputFile.Name = "button_ZIPALIGN_BrowseOutputFile"; + this.button_ZIPALIGN_BrowseOutputFile.UseVisualStyleBackColor = true; + // + // tabPageInstallFramework + // + this.tabPageInstallFramework.BackColor = System.Drawing.Color.White; + this.tabPageInstallFramework.Controls.Add(this.groupBox1); + this.tabPageInstallFramework.Controls.Add(this.groupBox_IF_Options); + resources.ApplyResources(this.tabPageInstallFramework, "tabPageInstallFramework"); + this.tabPageInstallFramework.Name = "tabPageInstallFramework"; + // + // groupBox1 + // + resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Controls.Add(this.openFwFolderBtn); + this.groupBox1.Controls.Add(this.clearFwBtn); + this.groupBox1.Controls.Add(this.clearFwBeforeDecodeChkBox); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.TabStop = false; + // + // openFwFolderBtn + // + resources.ApplyResources(this.openFwFolderBtn, "openFwFolderBtn"); + this.openFwFolderBtn.Name = "openFwFolderBtn"; + this.openFwFolderBtn.UseVisualStyleBackColor = true; + // + // clearFwBtn + // + resources.ApplyResources(this.clearFwBtn, "clearFwBtn"); + this.clearFwBtn.Name = "clearFwBtn"; + this.clearFwBtn.UseVisualStyleBackColor = true; + // + // groupBox_IF_Options + // + resources.ApplyResources(this.groupBox_IF_Options, "groupBox_IF_Options"); + this.groupBox_IF_Options.Controls.Add(this.checkBox_IF_Tag); + this.groupBox_IF_Options.Controls.Add(this.checkBox_IF_FramePath); + this.groupBox_IF_Options.Controls.Add(this.textBox_IF_Tag); + this.groupBox_IF_Options.Controls.Add(this.button_IF_InstallFramework); + this.groupBox_IF_Options.Controls.Add(this.button_IF_BrowseFrameDir); + this.groupBox_IF_Options.Controls.Add(this.button_IF_BrowseInputFramePath); + this.groupBox_IF_Options.Controls.Add(this.textBox_IF_InputFramePath); + this.groupBox_IF_Options.Controls.Add(this.textBox_IF_FrameDir); + this.groupBox_IF_Options.Name = "groupBox_IF_Options"; + this.groupBox_IF_Options.TabStop = false; + // + // button_IF_InstallFramework + // + resources.ApplyResources(this.button_IF_InstallFramework, "button_IF_InstallFramework"); + this.button_IF_InstallFramework.Name = "button_IF_InstallFramework"; + this.button_IF_InstallFramework.UseVisualStyleBackColor = true; + // + // button_IF_BrowseInputFramePath + // + resources.ApplyResources(this.button_IF_BrowseInputFramePath, "button_IF_BrowseInputFramePath"); + this.button_IF_BrowseInputFramePath.Name = "button_IF_BrowseInputFramePath"; + this.button_IF_BrowseInputFramePath.UseVisualStyleBackColor = true; + // + // tabPageBaksmali + // + this.tabPageBaksmali.AllowDrop = true; + this.tabPageBaksmali.BackColor = System.Drawing.Color.White; + this.tabPageBaksmali.Controls.Add(this.smaliGroupBox); + this.tabPageBaksmali.Controls.Add(this.bakSmaliGroupBox); + resources.ApplyResources(this.tabPageBaksmali, "tabPageBaksmali"); + this.tabPageBaksmali.Name = "tabPageBaksmali"; + // + // smaliGroupBox + // + resources.ApplyResources(this.smaliGroupBox, "smaliGroupBox"); + this.smaliGroupBox.Controls.Add(this.label29); + this.smaliGroupBox.Controls.Add(this.smaliUseOutputChkBox); + this.smaliGroupBox.Controls.Add(this.comSmaliBtn); + this.smaliGroupBox.Controls.Add(this.smaliBrowseOutputBtn); + this.smaliGroupBox.Controls.Add(this.smaliBrowseInputDirTxtBox); + this.smaliGroupBox.Controls.Add(this.smaliBrowseOutputTxtBox); + this.smaliGroupBox.Controls.Add(this.smaliBrowseInputDirBtn); + this.smaliGroupBox.Name = "smaliGroupBox"; + this.smaliGroupBox.TabStop = false; + // + // label29 + // + resources.ApplyResources(this.label29, "label29"); + this.label29.Name = "label29"; + // + // comSmaliBtn + // + resources.ApplyResources(this.comSmaliBtn, "comSmaliBtn"); + this.comSmaliBtn.Name = "comSmaliBtn"; + this.comSmaliBtn.UseVisualStyleBackColor = true; + // + // smaliBrowseOutputBtn + // + resources.ApplyResources(this.smaliBrowseOutputBtn, "smaliBrowseOutputBtn"); + this.smaliBrowseOutputBtn.Name = "smaliBrowseOutputBtn"; + this.smaliBrowseOutputBtn.UseVisualStyleBackColor = true; + // + // smaliBrowseInputDirBtn + // + resources.ApplyResources(this.smaliBrowseInputDirBtn, "smaliBrowseInputDirBtn"); + this.smaliBrowseInputDirBtn.Name = "smaliBrowseInputDirBtn"; + this.smaliBrowseInputDirBtn.UseVisualStyleBackColor = true; + // + // bakSmaliGroupBox + // + resources.ApplyResources(this.bakSmaliGroupBox, "bakSmaliGroupBox"); + this.bakSmaliGroupBox.Controls.Add(this.label28); + this.bakSmaliGroupBox.Controls.Add(this.baksmaliUseOutputChkBox); + this.bakSmaliGroupBox.Controls.Add(this.baksmaliBrowseOutputBtn); + this.bakSmaliGroupBox.Controls.Add(this.baksmaliBrowseOutputTxtBox); + this.bakSmaliGroupBox.Controls.Add(this.decSmaliBtn); + this.bakSmaliGroupBox.Controls.Add(this.baksmaliBrowseInputDexBtn); + this.bakSmaliGroupBox.Controls.Add(this.baksmaliBrowseInputDexTxtBox); + this.bakSmaliGroupBox.Name = "bakSmaliGroupBox"; + this.bakSmaliGroupBox.TabStop = false; + // + // label28 + // + resources.ApplyResources(this.label28, "label28"); + this.label28.Name = "label28"; + // + // baksmaliBrowseOutputBtn + // + resources.ApplyResources(this.baksmaliBrowseOutputBtn, "baksmaliBrowseOutputBtn"); + this.baksmaliBrowseOutputBtn.Name = "baksmaliBrowseOutputBtn"; + this.baksmaliBrowseOutputBtn.UseVisualStyleBackColor = true; + // + // decSmaliBtn + // + resources.ApplyResources(this.decSmaliBtn, "decSmaliBtn"); + this.decSmaliBtn.Name = "decSmaliBtn"; + this.decSmaliBtn.UseVisualStyleBackColor = true; + // + // baksmaliBrowseInputDexBtn + // + resources.ApplyResources(this.baksmaliBrowseInputDexBtn, "baksmaliBrowseInputDexBtn"); + this.baksmaliBrowseInputDexBtn.Name = "baksmaliBrowseInputDexBtn"; + this.baksmaliBrowseInputDexBtn.UseVisualStyleBackColor = true; + // + // tabPageAdb + // + this.tabPageAdb.AllowDrop = true; + this.tabPageAdb.Controls.Add(this.overrideAbiComboBox); + this.tabPageAdb.Controls.Add(this.overrideAbiCheckBox); + this.tabPageAdb.Controls.Add(this.selAdbDeviceLbl); + this.tabPageAdb.Controls.Add(this.label33); + this.tabPageAdb.Controls.Add(this.killAdbBtn); + this.tabPageAdb.Controls.Add(this.installApkBtn); + this.tabPageAdb.Controls.Add(this.refreshDevicesBtn); + this.tabPageAdb.Controls.Add(this.selApkAdbBtn); + this.tabPageAdb.Controls.Add(this.setVendorChkBox); + this.tabPageAdb.Controls.Add(this.apkPathAdbTxtBox); + this.tabPageAdb.Controls.Add(this.label32); + this.tabPageAdb.Controls.Add(this.devicesListBox); + resources.ApplyResources(this.tabPageAdb, "tabPageAdb"); + this.tabPageAdb.Name = "tabPageAdb"; + this.tabPageAdb.UseVisualStyleBackColor = true; + // + // overrideAbiComboBox + // + this.overrideAbiComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.overrideAbiComboBox.FormattingEnabled = true; + this.overrideAbiComboBox.Items.AddRange(new object[] { + resources.GetString("overrideAbiComboBox.Items"), + resources.GetString("overrideAbiComboBox.Items1"), + resources.GetString("overrideAbiComboBox.Items2"), + resources.GetString("overrideAbiComboBox.Items3")}); + resources.ApplyResources(this.overrideAbiComboBox, "overrideAbiComboBox"); + this.overrideAbiComboBox.Name = "overrideAbiComboBox"; + // + // selAdbDeviceLbl + // + this.selAdbDeviceLbl.ForeColor = System.Drawing.Color.ForestGreen; + resources.ApplyResources(this.selAdbDeviceLbl, "selAdbDeviceLbl"); + this.selAdbDeviceLbl.Name = "selAdbDeviceLbl"; + // + // label33 + // + resources.ApplyResources(this.label33, "label33"); + this.label33.Name = "label33"; + // + // killAdbBtn + // + resources.ApplyResources(this.killAdbBtn, "killAdbBtn"); + this.killAdbBtn.Name = "killAdbBtn"; + this.killAdbBtn.UseVisualStyleBackColor = true; + // + // installApkBtn + // + resources.ApplyResources(this.installApkBtn, "installApkBtn"); + this.installApkBtn.Name = "installApkBtn"; + this.installApkBtn.UseVisualStyleBackColor = true; + // + // refreshDevicesBtn + // + resources.ApplyResources(this.refreshDevicesBtn, "refreshDevicesBtn"); + this.refreshDevicesBtn.Name = "refreshDevicesBtn"; + this.refreshDevicesBtn.UseVisualStyleBackColor = true; + // + // selApkAdbBtn + // + resources.ApplyResources(this.selApkAdbBtn, "selApkAdbBtn"); + this.selApkAdbBtn.Name = "selApkAdbBtn"; + this.selApkAdbBtn.UseVisualStyleBackColor = true; + // + // label32 + // + resources.ApplyResources(this.label32, "label32"); + this.label32.Name = "label32"; + // + // devicesListBox + // + resources.ApplyResources(this.devicesListBox, "devicesListBox"); + this.devicesListBox.FormattingEnabled = true; + this.devicesListBox.Name = "devicesListBox"; + // + // statusStrip1 + // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelStateImage, + this.toolStripStatusLabelStateText, + this.progressBar}); + resources.ApplyResources(this.statusStrip1, "statusStrip1"); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.SizingGrip = false; + // + // toolStripStatusLabelStateImage + // + this.toolStripStatusLabelStateImage.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripStatusLabelStateImage.Name = "toolStripStatusLabelStateImage"; + resources.ApplyResources(this.toolStripStatusLabelStateImage, "toolStripStatusLabelStateImage"); + // + // toolStripStatusLabelStateText + // + this.toolStripStatusLabelStateText.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + resources.ApplyResources(this.toolStripStatusLabelStateText, "toolStripStatusLabelStateText"); + this.toolStripStatusLabelStateText.Name = "toolStripStatusLabelStateText"; + this.toolStripStatusLabelStateText.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never; + this.toolStripStatusLabelStateText.Spring = true; + this.toolStripStatusLabelStateText.Click += new System.EventHandler(this.toolStripStatusLabelStateText_Click); + // + // progressBar + // + this.progressBar.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + resources.ApplyResources(this.progressBar, "progressBar"); + this.progressBar.MarqueeAnimationSpeed = 30; + this.progressBar.Name = "progressBar"; + this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous; + this.progressBar.Click += new System.EventHandler(this.toolStripProgressBar1_Click); + // + // contextMenuStripLog + // + this.contextMenuStripLog.ImageScalingSize = new System.Drawing.Size(20, 20); + this.contextMenuStripLog.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.copyToolStripMenuItem, + this.clearLogToolStripMenuItem}); + this.contextMenuStripLog.Name = "contextMenuStripLog"; + resources.ApplyResources(this.contextMenuStripLog, "contextMenuStripLog"); + // + // copyToolStripMenuItem + // + this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; + resources.ApplyResources(this.copyToolStripMenuItem, "copyToolStripMenuItem"); + // + // clearLogToolStripMenuItem + // + this.clearLogToolStripMenuItem.Name = "clearLogToolStripMenuItem"; + resources.ApplyResources(this.clearLogToolStripMenuItem, "clearLogToolStripMenuItem"); + // + // logTxtBox + // + resources.ApplyResources(this.logTxtBox, "logTxtBox"); + this.logTxtBox.ContextMenuStrip = this.contextMenuStripLog; + this.logTxtBox.HideSelection = false; + this.logTxtBox.Name = "logTxtBox"; + this.logTxtBox.ReadOnly = true; + this.logTxtBox.TabStop = false; + // + // menuStrip1 + // + this.menuStrip1.GripMargin = new System.Windows.Forms.Padding(2); + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem, + this.settingsToolStripMenuItem1, + this.helpToolStripMenuItem}); + resources.ApplyResources(this.menuStrip1, "menuStrip1"); + this.menuStrip1.Name = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newInsToolStripMenuItem, + this.saveLogToFileToolStripMenuItem, + this.toolStripMenuItem1, + this.openTempFolderToolStripMenuItem, + this.clearTempFolderToolStripMenuItem, + this.toolStripMenuItem2, + this.exitToolStripMenuItem}); + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem"); + // + // newInsToolStripMenuItem + // + this.newInsToolStripMenuItem.Name = "newInsToolStripMenuItem"; + resources.ApplyResources(this.newInsToolStripMenuItem, "newInsToolStripMenuItem"); + // + // saveLogToFileToolStripMenuItem + // + this.saveLogToFileToolStripMenuItem.Name = "saveLogToFileToolStripMenuItem"; + resources.ApplyResources(this.saveLogToFileToolStripMenuItem, "saveLogToFileToolStripMenuItem"); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1"); + // + // openTempFolderToolStripMenuItem + // + this.openTempFolderToolStripMenuItem.Name = "openTempFolderToolStripMenuItem"; + resources.ApplyResources(this.openTempFolderToolStripMenuItem, "openTempFolderToolStripMenuItem"); + // + // clearTempFolderToolStripMenuItem + // + this.clearTempFolderToolStripMenuItem.Name = "clearTempFolderToolStripMenuItem"; + resources.ApplyResources(this.clearTempFolderToolStripMenuItem, "clearTempFolderToolStripMenuItem"); + this.clearTempFolderToolStripMenuItem.Click += new System.EventHandler(this.clearTempFolderToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + resources.ApplyResources(this.toolStripMenuItem2, "toolStripMenuItem2"); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); + // + // settingsToolStripMenuItem1 + // + this.settingsToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.useAPKEditorForDecompilingItem, + this.settingsToolStripMenuItem}); + this.settingsToolStripMenuItem1.Name = "settingsToolStripMenuItem1"; + resources.ApplyResources(this.settingsToolStripMenuItem1, "settingsToolStripMenuItem1"); + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + resources.ApplyResources(this.settingsToolStripMenuItem, "settingsToolStripMenuItem"); + // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.checkForUpdateToolStripMenuItem, + this.reportAnIsuueToolStripMenuItem, + this.apktoolIssuesToolStripMenuItem, + this.baksmaliIssuesToolStripMenuItem, + this.aboutToolStripMenuItem}); + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); + // + // checkForUpdateToolStripMenuItem + // + this.checkForUpdateToolStripMenuItem.Name = "checkForUpdateToolStripMenuItem"; + resources.ApplyResources(this.checkForUpdateToolStripMenuItem, "checkForUpdateToolStripMenuItem"); + // + // reportAnIsuueToolStripMenuItem + // + this.reportAnIsuueToolStripMenuItem.Name = "reportAnIsuueToolStripMenuItem"; + resources.ApplyResources(this.reportAnIsuueToolStripMenuItem, "reportAnIsuueToolStripMenuItem"); + // + // apktoolIssuesToolStripMenuItem + // + this.apktoolIssuesToolStripMenuItem.Name = "apktoolIssuesToolStripMenuItem"; + resources.ApplyResources(this.apktoolIssuesToolStripMenuItem, "apktoolIssuesToolStripMenuItem"); + // + // baksmaliIssuesToolStripMenuItem + // + this.baksmaliIssuesToolStripMenuItem.Name = "baksmaliIssuesToolStripMenuItem"; + resources.ApplyResources(this.baksmaliIssuesToolStripMenuItem, "baksmaliIssuesToolStripMenuItem"); + // + // aboutToolStripMenuItem + // + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + resources.ApplyResources(this.aboutToolStripMenuItem, "aboutToolStripMenuItem"); + // + // toolTip1 + // + this.toolTip1.AutoPopDelay = 10000; + this.toolTip1.InitialDelay = 500; + this.toolTip1.ReshowDelay = 100; + // + // useAPKEditorForDecompilingItem + // + this.useAPKEditorForDecompilingItem.Checked = global::APKToolGUI.Properties.Settings.Default.UseApkeditor; + this.useAPKEditorForDecompilingItem.CheckOnClick = true; + this.useAPKEditorForDecompilingItem.Name = "useAPKEditorForDecompilingItem"; + resources.ApplyResources(this.useAPKEditorForDecompilingItem, "useAPKEditorForDecompilingItem"); + // + // splitApkPathTxtBox + // + this.splitApkPathTxtBox.AllowDrop = true; + resources.ApplyResources(this.splitApkPathTxtBox, "splitApkPathTxtBox"); + this.splitApkPathTxtBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "SplitApk_InputFile", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.splitApkPathTxtBox.Name = "splitApkPathTxtBox"; + this.splitApkPathTxtBox.Text = global::APKToolGUI.Properties.Settings.Default.SplitApk_InputFile; + // + // textBox_SIGN_InputFile + // + this.textBox_SIGN_InputFile.AllowDrop = true; + resources.ApplyResources(this.textBox_SIGN_InputFile, "textBox_SIGN_InputFile"); + this.textBox_SIGN_InputFile.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Sign_InputFile", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.textBox_SIGN_InputFile.Name = "textBox_SIGN_InputFile"; + this.textBox_SIGN_InputFile.Text = global::APKToolGUI.Properties.Settings.Default.Sign_InputFile; + // + // textBox_ZIPALIGN_InputFile + // + this.textBox_ZIPALIGN_InputFile.AllowDrop = true; + resources.ApplyResources(this.textBox_ZIPALIGN_InputFile, "textBox_ZIPALIGN_InputFile"); + this.textBox_ZIPALIGN_InputFile.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Zipalign_InputFile", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.textBox_ZIPALIGN_InputFile.Name = "textBox_ZIPALIGN_InputFile"; + this.textBox_ZIPALIGN_InputFile.Text = global::APKToolGUI.Properties.Settings.Default.Zipalign_InputFile; + // + // textBox_BUILD_InputProjectDir + // + this.textBox_BUILD_InputProjectDir.AllowDrop = true; + resources.ApplyResources(this.textBox_BUILD_InputProjectDir, "textBox_BUILD_InputProjectDir"); + this.textBox_BUILD_InputProjectDir.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Build_InputDir", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.textBox_BUILD_InputProjectDir.Name = "textBox_BUILD_InputProjectDir"; + this.textBox_BUILD_InputProjectDir.Text = global::APKToolGUI.Properties.Settings.Default.Build_InputDir; + // + // textBox_DECODE_InputAppPath + // + this.textBox_DECODE_InputAppPath.AllowDrop = true; + resources.ApplyResources(this.textBox_DECODE_InputAppPath, "textBox_DECODE_InputAppPath"); + this.textBox_DECODE_InputAppPath.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Decode_InputAppPath", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.textBox_DECODE_InputAppPath.Name = "textBox_DECODE_InputAppPath"; + this.textBox_DECODE_InputAppPath.Text = global::APKToolGUI.Properties.Settings.Default.Decode_InputAppPath; + // // checkBox7 // resources.ApplyResources(this.checkBox7, "checkBox7"); @@ -1036,38 +1657,6 @@ this.checkBox_DECODE_NoDebugInfo.Name = "checkBox_DECODE_NoDebugInfo"; this.checkBox_DECODE_NoDebugInfo.UseVisualStyleBackColor = true; // - // tabPageBuild - // - resources.ApplyResources(this.tabPageBuild, "tabPageBuild"); - this.tabPageBuild.BackColor = System.Drawing.Color.White; - this.tabPageBuild.Controls.Add(this.groupBox_BUILD_Options); - this.tabPageBuild.Name = "tabPageBuild"; - // - // groupBox_BUILD_Options - // - this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_NetSecConf); - this.groupBox_BUILD_Options.Controls.Add(this.useAapt2ChkBox); - this.groupBox_BUILD_Options.Controls.Add(this.buildApiLvlUpDown); - this.groupBox_BUILD_Options.Controls.Add(this.buildSetApiLvlChkBox); - this.groupBox_BUILD_Options.Controls.Add(this.createUnsignApkChkBox); - this.groupBox_BUILD_Options.Controls.Add(this.signAfterBuildChkBox); - this.groupBox_BUILD_Options.Controls.Add(this.zipalignAfterBuildChkBox); - this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_NoCrunch); - this.groupBox_BUILD_Options.Controls.Add(this.button_BUILD_BrowseOutputAppPath); - this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_ForceAll); - this.groupBox_BUILD_Options.Controls.Add(this.button_BUILD_BrowseFrameDir); - this.groupBox_BUILD_Options.Controls.Add(this.button_BUILD_BrowseAaptPath); - this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_OutputAppPath); - this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_CopyOriginal); - this.groupBox_BUILD_Options.Controls.Add(this.textBox_BUILD_OutputAppPath); - this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_UseAapt); - this.groupBox_BUILD_Options.Controls.Add(this.textBox_BUILD_AaptPath); - this.groupBox_BUILD_Options.Controls.Add(this.textBox_BUILD_FrameDir); - this.groupBox_BUILD_Options.Controls.Add(this.checkBox_BUILD_UseFramework); - resources.ApplyResources(this.groupBox_BUILD_Options, "groupBox_BUILD_Options"); - this.groupBox_BUILD_Options.Name = "groupBox_BUILD_Options"; - this.groupBox_BUILD_Options.TabStop = false; - // // checkBox_BUILD_NetSecConf // resources.ApplyResources(this.checkBox_BUILD_NetSecConf, "checkBox_BUILD_NetSecConf"); @@ -1228,48 +1817,6 @@ this.checkBox_BUILD_UseFramework.Name = "checkBox_BUILD_UseFramework"; this.checkBox_BUILD_UseFramework.UseVisualStyleBackColor = true; // - // tabPageSign - // - resources.ApplyResources(this.tabPageSign, "tabPageSign"); - this.tabPageSign.BackColor = System.Drawing.Color.White; - this.tabPageSign.Controls.Add(this.groupBox_SIGN_Options); - this.tabPageSign.Name = "tabPageSign"; - // - // groupBox_SIGN_Options - // - this.groupBox_SIGN_Options.Controls.Add(this.checkBox2); - this.groupBox_SIGN_Options.Controls.Add(this.checkBox1); - this.groupBox_SIGN_Options.Controls.Add(this.autoDelIdsigChkBox); - this.groupBox_SIGN_Options.Controls.Add(this.schemev4ComboBox); - this.groupBox_SIGN_Options.Controls.Add(this.label27); - this.groupBox_SIGN_Options.Controls.Add(this.schemev3ComboBox); - this.groupBox_SIGN_Options.Controls.Add(this.label26); - this.groupBox_SIGN_Options.Controls.Add(this.schemev2ComboBox); - this.groupBox_SIGN_Options.Controls.Add(this.label25); - this.groupBox_SIGN_Options.Controls.Add(this.schemev1ComboBox); - this.groupBox_SIGN_Options.Controls.Add(this.label24); - this.groupBox_SIGN_Options.Controls.Add(this.textBox3); - this.groupBox_SIGN_Options.Controls.Add(this.selectKeyStoreFileBtn); - this.groupBox_SIGN_Options.Controls.Add(this.aliasTxtBox); - this.groupBox_SIGN_Options.Controls.Add(this.useAliasChkBox); - this.groupBox_SIGN_Options.Controls.Add(this.label22); - this.groupBox_SIGN_Options.Controls.Add(this.keyStoreFileTxtBox); - this.groupBox_SIGN_Options.Controls.Add(this.label21); - this.groupBox_SIGN_Options.Controls.Add(this.label20); - this.groupBox_SIGN_Options.Controls.Add(this.useKeyStoreChkBox); - this.groupBox_SIGN_Options.Controls.Add(this.useSigningOutputDir); - this.groupBox_SIGN_Options.Controls.Add(this.label_SIGN_PrivateKey); - this.groupBox_SIGN_Options.Controls.Add(this.label_SIGN_PublicKey); - this.groupBox_SIGN_Options.Controls.Add(this.button_SIGN_BrowseOutputFile); - this.groupBox_SIGN_Options.Controls.Add(this.textBox_SIGN_OutputFile); - this.groupBox_SIGN_Options.Controls.Add(this.button_SIGN_BrowsePublicKey); - this.groupBox_SIGN_Options.Controls.Add(this.button_SIGN_BrowsePrivateKey); - this.groupBox_SIGN_Options.Controls.Add(this.textBox_SIGN_PublicKey); - this.groupBox_SIGN_Options.Controls.Add(this.textBox_SIGN_PrivateKey); - resources.ApplyResources(this.groupBox_SIGN_Options, "groupBox_SIGN_Options"); - this.groupBox_SIGN_Options.Name = "groupBox_SIGN_Options"; - this.groupBox_SIGN_Options.TabStop = false; - // // checkBox2 // resources.ApplyResources(this.checkBox2, "checkBox2"); @@ -1295,70 +1842,6 @@ this.autoDelIdsigChkBox.Name = "autoDelIdsigChkBox"; this.autoDelIdsigChkBox.UseVisualStyleBackColor = true; // - // schemev4ComboBox - // - this.schemev4ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.schemev4ComboBox.FormattingEnabled = true; - this.schemev4ComboBox.Items.AddRange(new object[] { - resources.GetString("schemev4ComboBox.Items"), - resources.GetString("schemev4ComboBox.Items1"), - resources.GetString("schemev4ComboBox.Items2")}); - resources.ApplyResources(this.schemev4ComboBox, "schemev4ComboBox"); - this.schemev4ComboBox.Name = "schemev4ComboBox"; - // - // label27 - // - resources.ApplyResources(this.label27, "label27"); - this.label27.Name = "label27"; - // - // schemev3ComboBox - // - this.schemev3ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.schemev3ComboBox.FormattingEnabled = true; - this.schemev3ComboBox.Items.AddRange(new object[] { - resources.GetString("schemev3ComboBox.Items"), - resources.GetString("schemev3ComboBox.Items1"), - resources.GetString("schemev3ComboBox.Items2")}); - resources.ApplyResources(this.schemev3ComboBox, "schemev3ComboBox"); - this.schemev3ComboBox.Name = "schemev3ComboBox"; - // - // label26 - // - resources.ApplyResources(this.label26, "label26"); - this.label26.Name = "label26"; - // - // schemev2ComboBox - // - this.schemev2ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.schemev2ComboBox.FormattingEnabled = true; - this.schemev2ComboBox.Items.AddRange(new object[] { - resources.GetString("schemev2ComboBox.Items"), - resources.GetString("schemev2ComboBox.Items1"), - resources.GetString("schemev2ComboBox.Items2")}); - resources.ApplyResources(this.schemev2ComboBox, "schemev2ComboBox"); - this.schemev2ComboBox.Name = "schemev2ComboBox"; - // - // label25 - // - resources.ApplyResources(this.label25, "label25"); - this.label25.Name = "label25"; - // - // schemev1ComboBox - // - this.schemev1ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.schemev1ComboBox.FormattingEnabled = true; - this.schemev1ComboBox.Items.AddRange(new object[] { - resources.GetString("schemev1ComboBox.Items"), - resources.GetString("schemev1ComboBox.Items1"), - resources.GetString("schemev1ComboBox.Items2")}); - resources.ApplyResources(this.schemev1ComboBox, "schemev1ComboBox"); - this.schemev1ComboBox.Name = "schemev1ComboBox"; - // - // label24 - // - resources.ApplyResources(this.label24, "label24"); - this.label24.Name = "label24"; - // // textBox3 // this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Sign_KeystorePassword", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); @@ -1367,12 +1850,6 @@ this.textBox3.Text = global::APKToolGUI.Properties.Settings.Default.Sign_KeystorePassword; this.textBox3.UseSystemPasswordChar = true; // - // selectKeyStoreFileBtn - // - resources.ApplyResources(this.selectKeyStoreFileBtn, "selectKeyStoreFileBtn"); - this.selectKeyStoreFileBtn.Name = "selectKeyStoreFileBtn"; - this.selectKeyStoreFileBtn.UseVisualStyleBackColor = true; - // // aliasTxtBox // this.aliasTxtBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Sign_Alias", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); @@ -1389,12 +1866,6 @@ this.useAliasChkBox.Name = "useAliasChkBox"; this.useAliasChkBox.UseVisualStyleBackColor = true; // - // label22 - // - this.label22.ForeColor = System.Drawing.Color.Maroon; - resources.ApplyResources(this.label22, "label22"); - this.label22.Name = "label22"; - // // keyStoreFileTxtBox // this.keyStoreFileTxtBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Sign_KeystoreFilePath", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); @@ -1402,16 +1873,6 @@ this.keyStoreFileTxtBox.Name = "keyStoreFileTxtBox"; this.keyStoreFileTxtBox.Text = global::APKToolGUI.Properties.Settings.Default.Sign_KeystoreFilePath; // - // label21 - // - resources.ApplyResources(this.label21, "label21"); - this.label21.Name = "label21"; - // - // label20 - // - resources.ApplyResources(this.label20, "label20"); - this.label20.Name = "label20"; - // // useKeyStoreChkBox // resources.ApplyResources(this.useKeyStoreChkBox, "useKeyStoreChkBox"); @@ -1428,22 +1889,6 @@ this.useSigningOutputDir.Name = "useSigningOutputDir"; this.useSigningOutputDir.UseVisualStyleBackColor = true; // - // label_SIGN_PrivateKey - // - resources.ApplyResources(this.label_SIGN_PrivateKey, "label_SIGN_PrivateKey"); - this.label_SIGN_PrivateKey.Name = "label_SIGN_PrivateKey"; - // - // label_SIGN_PublicKey - // - resources.ApplyResources(this.label_SIGN_PublicKey, "label_SIGN_PublicKey"); - this.label_SIGN_PublicKey.Name = "label_SIGN_PublicKey"; - // - // button_SIGN_BrowseOutputFile - // - resources.ApplyResources(this.button_SIGN_BrowseOutputFile, "button_SIGN_BrowseOutputFile"); - this.button_SIGN_BrowseOutputFile.Name = "button_SIGN_BrowseOutputFile"; - this.button_SIGN_BrowseOutputFile.UseVisualStyleBackColor = true; - // // textBox_SIGN_OutputFile // this.textBox_SIGN_OutputFile.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Sign_OutputDir", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); @@ -1451,18 +1896,6 @@ this.textBox_SIGN_OutputFile.Name = "textBox_SIGN_OutputFile"; this.textBox_SIGN_OutputFile.Text = global::APKToolGUI.Properties.Settings.Default.Sign_OutputDir; // - // button_SIGN_BrowsePublicKey - // - resources.ApplyResources(this.button_SIGN_BrowsePublicKey, "button_SIGN_BrowsePublicKey"); - this.button_SIGN_BrowsePublicKey.Name = "button_SIGN_BrowsePublicKey"; - this.button_SIGN_BrowsePublicKey.UseVisualStyleBackColor = true; - // - // button_SIGN_BrowsePrivateKey - // - resources.ApplyResources(this.button_SIGN_BrowsePrivateKey, "button_SIGN_BrowsePrivateKey"); - this.button_SIGN_BrowsePrivateKey.Name = "button_SIGN_BrowsePrivateKey"; - this.button_SIGN_BrowsePrivateKey.UseVisualStyleBackColor = true; - // // textBox_SIGN_PublicKey // this.textBox_SIGN_PublicKey.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Sign_PublicKey", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); @@ -1477,29 +1910,6 @@ this.textBox_SIGN_PrivateKey.Name = "textBox_SIGN_PrivateKey"; this.textBox_SIGN_PrivateKey.Text = global::APKToolGUI.Properties.Settings.Default.Sign_PrivateKey; // - // tabPageZipAlign - // - resources.ApplyResources(this.tabPageZipAlign, "tabPageZipAlign"); - this.tabPageZipAlign.BackColor = System.Drawing.Color.White; - this.tabPageZipAlign.Controls.Add(this.groupBox_ZIPALIGN_Options); - this.tabPageZipAlign.Name = "tabPageZipAlign"; - // - // groupBox_ZIPALIGN_Options - // - resources.ApplyResources(this.groupBox_ZIPALIGN_Options, "groupBox_ZIPALIGN_Options"); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.zipalignOutputDirChkBox); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.signAfterZipalignChkBox); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.checkBox_ZIPALIGN_Recompress); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.label_ZIPALIGN_AlignmentBytes); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.button_ZIPALIGN_BrowseOutputFile); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.checkBox_ZIPALIGN_CheckAlignment); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.textBox_ZIPALIGN_OutputFile); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.checkBox_ZIPALIGN_VerboseOutput); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.numericUpDown_ZIPALIGN_AlignmentBytes); - this.groupBox_ZIPALIGN_Options.Controls.Add(this.checkBox_ZIPALIGN_OverwriteOutputFile); - this.groupBox_ZIPALIGN_Options.Name = "groupBox_ZIPALIGN_Options"; - this.groupBox_ZIPALIGN_Options.TabStop = false; - // // zipalignOutputDirChkBox // resources.ApplyResources(this.zipalignOutputDirChkBox, "zipalignOutputDirChkBox"); @@ -1525,17 +1935,6 @@ this.checkBox_ZIPALIGN_Recompress.Name = "checkBox_ZIPALIGN_Recompress"; this.checkBox_ZIPALIGN_Recompress.UseVisualStyleBackColor = true; // - // label_ZIPALIGN_AlignmentBytes - // - resources.ApplyResources(this.label_ZIPALIGN_AlignmentBytes, "label_ZIPALIGN_AlignmentBytes"); - this.label_ZIPALIGN_AlignmentBytes.Name = "label_ZIPALIGN_AlignmentBytes"; - // - // button_ZIPALIGN_BrowseOutputFile - // - resources.ApplyResources(this.button_ZIPALIGN_BrowseOutputFile, "button_ZIPALIGN_BrowseOutputFile"); - this.button_ZIPALIGN_BrowseOutputFile.Name = "button_ZIPALIGN_BrowseOutputFile"; - this.button_ZIPALIGN_BrowseOutputFile.UseVisualStyleBackColor = true; - // // checkBox_ZIPALIGN_CheckAlignment // resources.ApplyResources(this.checkBox_ZIPALIGN_CheckAlignment, "checkBox_ZIPALIGN_CheckAlignment"); @@ -1579,35 +1978,6 @@ this.checkBox_ZIPALIGN_OverwriteOutputFile.Name = "checkBox_ZIPALIGN_OverwriteOutputFile"; this.checkBox_ZIPALIGN_OverwriteOutputFile.UseVisualStyleBackColor = true; // - // tabPageInstallFramework - // - this.tabPageInstallFramework.BackColor = System.Drawing.Color.White; - this.tabPageInstallFramework.Controls.Add(this.groupBox1); - this.tabPageInstallFramework.Controls.Add(this.groupBox_IF_Options); - resources.ApplyResources(this.tabPageInstallFramework, "tabPageInstallFramework"); - this.tabPageInstallFramework.Name = "tabPageInstallFramework"; - // - // groupBox1 - // - resources.ApplyResources(this.groupBox1, "groupBox1"); - this.groupBox1.Controls.Add(this.openFwFolderBtn); - this.groupBox1.Controls.Add(this.clearFwBtn); - this.groupBox1.Controls.Add(this.clearFwBeforeDecodeChkBox); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.TabStop = false; - // - // openFwFolderBtn - // - resources.ApplyResources(this.openFwFolderBtn, "openFwFolderBtn"); - this.openFwFolderBtn.Name = "openFwFolderBtn"; - this.openFwFolderBtn.UseVisualStyleBackColor = true; - // - // clearFwBtn - // - resources.ApplyResources(this.clearFwBtn, "clearFwBtn"); - this.clearFwBtn.Name = "clearFwBtn"; - this.clearFwBtn.UseVisualStyleBackColor = true; - // // clearFwBeforeDecodeChkBox // resources.ApplyResources(this.clearFwBeforeDecodeChkBox, "clearFwBeforeDecodeChkBox"); @@ -1617,20 +1987,6 @@ this.clearFwBeforeDecodeChkBox.Name = "clearFwBeforeDecodeChkBox"; this.clearFwBeforeDecodeChkBox.UseVisualStyleBackColor = true; // - // groupBox_IF_Options - // - resources.ApplyResources(this.groupBox_IF_Options, "groupBox_IF_Options"); - this.groupBox_IF_Options.Controls.Add(this.checkBox_IF_Tag); - this.groupBox_IF_Options.Controls.Add(this.checkBox_IF_FramePath); - this.groupBox_IF_Options.Controls.Add(this.textBox_IF_Tag); - this.groupBox_IF_Options.Controls.Add(this.button_IF_InstallFramework); - this.groupBox_IF_Options.Controls.Add(this.button_IF_BrowseFrameDir); - this.groupBox_IF_Options.Controls.Add(this.button_IF_BrowseInputFramePath); - this.groupBox_IF_Options.Controls.Add(this.textBox_IF_InputFramePath); - this.groupBox_IF_Options.Controls.Add(this.textBox_IF_FrameDir); - this.groupBox_IF_Options.Name = "groupBox_IF_Options"; - this.groupBox_IF_Options.TabStop = false; - // // checkBox_IF_Tag // resources.ApplyResources(this.checkBox_IF_Tag, "checkBox_IF_Tag"); @@ -1656,12 +2012,6 @@ this.textBox_IF_Tag.Name = "textBox_IF_Tag"; this.textBox_IF_Tag.Text = global::APKToolGUI.Properties.Settings.Default.InstallFramework_Tag; // - // button_IF_InstallFramework - // - resources.ApplyResources(this.button_IF_InstallFramework, "button_IF_InstallFramework"); - this.button_IF_InstallFramework.Name = "button_IF_InstallFramework"; - this.button_IF_InstallFramework.UseVisualStyleBackColor = true; - // // button_IF_BrowseFrameDir // this.button_IF_BrowseFrameDir.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", global::APKToolGUI.Properties.Settings.Default, "Framework_UseFrameDir", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); @@ -1670,12 +2020,6 @@ this.button_IF_BrowseFrameDir.Name = "button_IF_BrowseFrameDir"; this.button_IF_BrowseFrameDir.UseVisualStyleBackColor = true; // - // button_IF_BrowseInputFramePath - // - resources.ApplyResources(this.button_IF_BrowseInputFramePath, "button_IF_BrowseInputFramePath"); - this.button_IF_BrowseInputFramePath.Name = "button_IF_BrowseInputFramePath"; - this.button_IF_BrowseInputFramePath.UseVisualStyleBackColor = true; - // // textBox_IF_InputFramePath // resources.ApplyResources(this.textBox_IF_InputFramePath, "textBox_IF_InputFramePath"); @@ -1692,33 +2036,6 @@ this.textBox_IF_FrameDir.Name = "textBox_IF_FrameDir"; this.textBox_IF_FrameDir.Text = global::APKToolGUI.Properties.Settings.Default.Framework_FrameDir; // - // tabPageBaksmali - // - this.tabPageBaksmali.AllowDrop = true; - this.tabPageBaksmali.BackColor = System.Drawing.Color.White; - this.tabPageBaksmali.Controls.Add(this.smaliGroupBox); - this.tabPageBaksmali.Controls.Add(this.bakSmaliGroupBox); - resources.ApplyResources(this.tabPageBaksmali, "tabPageBaksmali"); - this.tabPageBaksmali.Name = "tabPageBaksmali"; - // - // smaliGroupBox - // - resources.ApplyResources(this.smaliGroupBox, "smaliGroupBox"); - this.smaliGroupBox.Controls.Add(this.label29); - this.smaliGroupBox.Controls.Add(this.smaliUseOutputChkBox); - this.smaliGroupBox.Controls.Add(this.comSmaliBtn); - this.smaliGroupBox.Controls.Add(this.smaliBrowseOutputBtn); - this.smaliGroupBox.Controls.Add(this.smaliBrowseInputDirTxtBox); - this.smaliGroupBox.Controls.Add(this.smaliBrowseOutputTxtBox); - this.smaliGroupBox.Controls.Add(this.smaliBrowseInputDirBtn); - this.smaliGroupBox.Name = "smaliGroupBox"; - this.smaliGroupBox.TabStop = false; - // - // label29 - // - resources.ApplyResources(this.label29, "label29"); - this.label29.Name = "label29"; - // // smaliUseOutputChkBox // resources.ApplyResources(this.smaliUseOutputChkBox, "smaliUseOutputChkBox"); @@ -1727,18 +2044,6 @@ this.smaliUseOutputChkBox.Name = "smaliUseOutputChkBox"; this.smaliUseOutputChkBox.UseVisualStyleBackColor = true; // - // comSmaliBtn - // - resources.ApplyResources(this.comSmaliBtn, "comSmaliBtn"); - this.comSmaliBtn.Name = "comSmaliBtn"; - this.comSmaliBtn.UseVisualStyleBackColor = true; - // - // smaliBrowseOutputBtn - // - resources.ApplyResources(this.smaliBrowseOutputBtn, "smaliBrowseOutputBtn"); - this.smaliBrowseOutputBtn.Name = "smaliBrowseOutputBtn"; - this.smaliBrowseOutputBtn.UseVisualStyleBackColor = true; - // // smaliBrowseInputDirTxtBox // resources.ApplyResources(this.smaliBrowseInputDirTxtBox, "smaliBrowseInputDirTxtBox"); @@ -1753,30 +2058,6 @@ this.smaliBrowseOutputTxtBox.Name = "smaliBrowseOutputTxtBox"; this.smaliBrowseOutputTxtBox.Text = global::APKToolGUI.Properties.Settings.Default.Smali_OutputDir; // - // smaliBrowseInputDirBtn - // - resources.ApplyResources(this.smaliBrowseInputDirBtn, "smaliBrowseInputDirBtn"); - this.smaliBrowseInputDirBtn.Name = "smaliBrowseInputDirBtn"; - this.smaliBrowseInputDirBtn.UseVisualStyleBackColor = true; - // - // bakSmaliGroupBox - // - resources.ApplyResources(this.bakSmaliGroupBox, "bakSmaliGroupBox"); - this.bakSmaliGroupBox.Controls.Add(this.label28); - this.bakSmaliGroupBox.Controls.Add(this.baksmaliUseOutputChkBox); - this.bakSmaliGroupBox.Controls.Add(this.baksmaliBrowseOutputBtn); - this.bakSmaliGroupBox.Controls.Add(this.baksmaliBrowseOutputTxtBox); - this.bakSmaliGroupBox.Controls.Add(this.decSmaliBtn); - this.bakSmaliGroupBox.Controls.Add(this.baksmaliBrowseInputDexBtn); - this.bakSmaliGroupBox.Controls.Add(this.baksmaliBrowseInputDexTxtBox); - this.bakSmaliGroupBox.Name = "bakSmaliGroupBox"; - this.bakSmaliGroupBox.TabStop = false; - // - // label28 - // - resources.ApplyResources(this.label28, "label28"); - this.label28.Name = "label28"; - // // baksmaliUseOutputChkBox // resources.ApplyResources(this.baksmaliUseOutputChkBox, "baksmaliUseOutputChkBox"); @@ -1785,12 +2066,6 @@ this.baksmaliUseOutputChkBox.Name = "baksmaliUseOutputChkBox"; this.baksmaliUseOutputChkBox.UseVisualStyleBackColor = true; // - // baksmaliBrowseOutputBtn - // - resources.ApplyResources(this.baksmaliBrowseOutputBtn, "baksmaliBrowseOutputBtn"); - this.baksmaliBrowseOutputBtn.Name = "baksmaliBrowseOutputBtn"; - this.baksmaliBrowseOutputBtn.UseVisualStyleBackColor = true; - // // baksmaliBrowseOutputTxtBox // this.baksmaliBrowseOutputTxtBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::APKToolGUI.Properties.Settings.Default, "Baksmali_OutputDir", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); @@ -1798,18 +2073,6 @@ this.baksmaliBrowseOutputTxtBox.Name = "baksmaliBrowseOutputTxtBox"; this.baksmaliBrowseOutputTxtBox.Text = global::APKToolGUI.Properties.Settings.Default.Baksmali_OutputDir; // - // decSmaliBtn - // - resources.ApplyResources(this.decSmaliBtn, "decSmaliBtn"); - this.decSmaliBtn.Name = "decSmaliBtn"; - this.decSmaliBtn.UseVisualStyleBackColor = true; - // - // baksmaliBrowseInputDexBtn - // - resources.ApplyResources(this.baksmaliBrowseInputDexBtn, "baksmaliBrowseInputDexBtn"); - this.baksmaliBrowseInputDexBtn.Name = "baksmaliBrowseInputDexBtn"; - this.baksmaliBrowseInputDexBtn.UseVisualStyleBackColor = true; - // // baksmaliBrowseInputDexTxtBox // resources.ApplyResources(this.baksmaliBrowseInputDexTxtBox, "baksmaliBrowseInputDexTxtBox"); @@ -1817,57 +2080,13 @@ this.baksmaliBrowseInputDexTxtBox.Name = "baksmaliBrowseInputDexTxtBox"; this.baksmaliBrowseInputDexTxtBox.Text = global::APKToolGUI.Properties.Settings.Default.Baksmali_InputDexFile; // - // tabPageAdb + // overrideAbiCheckBox // - this.tabPageAdb.AllowDrop = true; - this.tabPageAdb.Controls.Add(this.selAdbDeviceLbl); - this.tabPageAdb.Controls.Add(this.label33); - this.tabPageAdb.Controls.Add(this.killAdbBtn); - this.tabPageAdb.Controls.Add(this.installApkBtn); - this.tabPageAdb.Controls.Add(this.refreshDevicesBtn); - this.tabPageAdb.Controls.Add(this.selApkAdbBtn); - this.tabPageAdb.Controls.Add(this.setVendorChkBox); - this.tabPageAdb.Controls.Add(this.apkPathAdbTxtBox); - this.tabPageAdb.Controls.Add(this.label32); - this.tabPageAdb.Controls.Add(this.devicesListBox); - resources.ApplyResources(this.tabPageAdb, "tabPageAdb"); - this.tabPageAdb.Name = "tabPageAdb"; - this.tabPageAdb.UseVisualStyleBackColor = true; - // - // selAdbDeviceLbl - // - this.selAdbDeviceLbl.ForeColor = System.Drawing.Color.ForestGreen; - resources.ApplyResources(this.selAdbDeviceLbl, "selAdbDeviceLbl"); - this.selAdbDeviceLbl.Name = "selAdbDeviceLbl"; - // - // label33 - // - resources.ApplyResources(this.label33, "label33"); - this.label33.Name = "label33"; - // - // killAdbBtn - // - resources.ApplyResources(this.killAdbBtn, "killAdbBtn"); - this.killAdbBtn.Name = "killAdbBtn"; - this.killAdbBtn.UseVisualStyleBackColor = true; - // - // installApkBtn - // - resources.ApplyResources(this.installApkBtn, "installApkBtn"); - this.installApkBtn.Name = "installApkBtn"; - this.installApkBtn.UseVisualStyleBackColor = true; - // - // refreshDevicesBtn - // - resources.ApplyResources(this.refreshDevicesBtn, "refreshDevicesBtn"); - this.refreshDevicesBtn.Name = "refreshDevicesBtn"; - this.refreshDevicesBtn.UseVisualStyleBackColor = true; - // - // selApkAdbBtn - // - resources.ApplyResources(this.selApkAdbBtn, "selApkAdbBtn"); - this.selApkAdbBtn.Name = "selApkAdbBtn"; - this.selApkAdbBtn.UseVisualStyleBackColor = true; + resources.ApplyResources(this.overrideAbiCheckBox, "overrideAbiCheckBox"); + this.overrideAbiCheckBox.Checked = global::APKToolGUI.Properties.Settings.Default.Adb_SetOverrideAbi; + this.overrideAbiCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::APKToolGUI.Properties.Settings.Default, "Adb_SetOverrideAbi", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.overrideAbiCheckBox.Name = "overrideAbiCheckBox"; + this.overrideAbiCheckBox.UseVisualStyleBackColor = true; // // setVendorChkBox // @@ -1884,201 +2103,6 @@ this.apkPathAdbTxtBox.Name = "apkPathAdbTxtBox"; this.apkPathAdbTxtBox.Text = global::APKToolGUI.Properties.Settings.Default.Adb_SelectedApkPath; // - // label32 - // - resources.ApplyResources(this.label32, "label32"); - this.label32.Name = "label32"; - // - // devicesListBox - // - resources.ApplyResources(this.devicesListBox, "devicesListBox"); - this.devicesListBox.FormattingEnabled = true; - this.devicesListBox.Name = "devicesListBox"; - // - // statusStrip1 - // - this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabelStateImage, - this.toolStripStatusLabelStateText, - this.progressBar}); - resources.ApplyResources(this.statusStrip1, "statusStrip1"); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.SizingGrip = false; - // - // toolStripStatusLabelStateImage - // - this.toolStripStatusLabelStateImage.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripStatusLabelStateImage.Name = "toolStripStatusLabelStateImage"; - resources.ApplyResources(this.toolStripStatusLabelStateImage, "toolStripStatusLabelStateImage"); - // - // toolStripStatusLabelStateText - // - this.toolStripStatusLabelStateText.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - resources.ApplyResources(this.toolStripStatusLabelStateText, "toolStripStatusLabelStateText"); - this.toolStripStatusLabelStateText.Name = "toolStripStatusLabelStateText"; - this.toolStripStatusLabelStateText.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never; - this.toolStripStatusLabelStateText.Spring = true; - this.toolStripStatusLabelStateText.Click += new System.EventHandler(this.toolStripStatusLabelStateText_Click); - // - // progressBar - // - this.progressBar.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - resources.ApplyResources(this.progressBar, "progressBar"); - this.progressBar.MarqueeAnimationSpeed = 30; - this.progressBar.Name = "progressBar"; - this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous; - this.progressBar.Click += new System.EventHandler(this.toolStripProgressBar1_Click); - // - // contextMenuStripLog - // - this.contextMenuStripLog.ImageScalingSize = new System.Drawing.Size(20, 20); - this.contextMenuStripLog.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.copyToolStripMenuItem, - this.clearLogToolStripMenuItem}); - this.contextMenuStripLog.Name = "contextMenuStripLog"; - resources.ApplyResources(this.contextMenuStripLog, "contextMenuStripLog"); - // - // copyToolStripMenuItem - // - this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - resources.ApplyResources(this.copyToolStripMenuItem, "copyToolStripMenuItem"); - // - // clearLogToolStripMenuItem - // - this.clearLogToolStripMenuItem.Name = "clearLogToolStripMenuItem"; - resources.ApplyResources(this.clearLogToolStripMenuItem, "clearLogToolStripMenuItem"); - // - // logTxtBox - // - resources.ApplyResources(this.logTxtBox, "logTxtBox"); - this.logTxtBox.ContextMenuStrip = this.contextMenuStripLog; - this.logTxtBox.HideSelection = false; - this.logTxtBox.Name = "logTxtBox"; - this.logTxtBox.ReadOnly = true; - this.logTxtBox.TabStop = false; - // - // menuStrip1 - // - this.menuStrip1.GripMargin = new System.Windows.Forms.Padding(2); - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.fileToolStripMenuItem, - this.settingsToolStripMenuItem1, - this.helpToolStripMenuItem}); - resources.ApplyResources(this.menuStrip1, "menuStrip1"); - this.menuStrip1.Name = "menuStrip1"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.newInsToolStripMenuItem, - this.saveLogToFileToolStripMenuItem, - this.toolStripMenuItem1, - this.openTempFolderToolStripMenuItem, - this.clearTempFolderToolStripMenuItem, - this.toolStripMenuItem2, - this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - resources.ApplyResources(this.fileToolStripMenuItem, "fileToolStripMenuItem"); - // - // newInsToolStripMenuItem - // - this.newInsToolStripMenuItem.Name = "newInsToolStripMenuItem"; - resources.ApplyResources(this.newInsToolStripMenuItem, "newInsToolStripMenuItem"); - // - // saveLogToFileToolStripMenuItem - // - this.saveLogToFileToolStripMenuItem.Name = "saveLogToFileToolStripMenuItem"; - resources.ApplyResources(this.saveLogToFileToolStripMenuItem, "saveLogToFileToolStripMenuItem"); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1"); - // - // openTempFolderToolStripMenuItem - // - this.openTempFolderToolStripMenuItem.Name = "openTempFolderToolStripMenuItem"; - resources.ApplyResources(this.openTempFolderToolStripMenuItem, "openTempFolderToolStripMenuItem"); - // - // clearTempFolderToolStripMenuItem - // - this.clearTempFolderToolStripMenuItem.Name = "clearTempFolderToolStripMenuItem"; - resources.ApplyResources(this.clearTempFolderToolStripMenuItem, "clearTempFolderToolStripMenuItem"); - this.clearTempFolderToolStripMenuItem.Click += new System.EventHandler(this.clearTempFolderToolStripMenuItem_Click); - // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - resources.ApplyResources(this.toolStripMenuItem2, "toolStripMenuItem2"); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); - // - // settingsToolStripMenuItem1 - // - this.settingsToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.useAPKEditorForDecompilingItem, - this.settingsToolStripMenuItem}); - this.settingsToolStripMenuItem1.Name = "settingsToolStripMenuItem1"; - resources.ApplyResources(this.settingsToolStripMenuItem1, "settingsToolStripMenuItem1"); - // - // useAPKEditorForDecompilingItem - // - this.useAPKEditorForDecompilingItem.Checked = global::APKToolGUI.Properties.Settings.Default.UseApkeditor; - this.useAPKEditorForDecompilingItem.CheckOnClick = true; - this.useAPKEditorForDecompilingItem.Name = "useAPKEditorForDecompilingItem"; - resources.ApplyResources(this.useAPKEditorForDecompilingItem, "useAPKEditorForDecompilingItem"); - // - // settingsToolStripMenuItem - // - this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - resources.ApplyResources(this.settingsToolStripMenuItem, "settingsToolStripMenuItem"); - // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.checkForUpdateToolStripMenuItem, - this.reportAnIsuueToolStripMenuItem, - this.apktoolIssuesToolStripMenuItem, - this.baksmaliIssuesToolStripMenuItem, - this.aboutToolStripMenuItem}); - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); - // - // checkForUpdateToolStripMenuItem - // - this.checkForUpdateToolStripMenuItem.Name = "checkForUpdateToolStripMenuItem"; - resources.ApplyResources(this.checkForUpdateToolStripMenuItem, "checkForUpdateToolStripMenuItem"); - // - // reportAnIsuueToolStripMenuItem - // - this.reportAnIsuueToolStripMenuItem.Name = "reportAnIsuueToolStripMenuItem"; - resources.ApplyResources(this.reportAnIsuueToolStripMenuItem, "reportAnIsuueToolStripMenuItem"); - // - // apktoolIssuesToolStripMenuItem - // - this.apktoolIssuesToolStripMenuItem.Name = "apktoolIssuesToolStripMenuItem"; - resources.ApplyResources(this.apktoolIssuesToolStripMenuItem, "apktoolIssuesToolStripMenuItem"); - // - // baksmaliIssuesToolStripMenuItem - // - this.baksmaliIssuesToolStripMenuItem.Name = "baksmaliIssuesToolStripMenuItem"; - resources.ApplyResources(this.baksmaliIssuesToolStripMenuItem, "baksmaliIssuesToolStripMenuItem"); - // - // aboutToolStripMenuItem - // - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - resources.ApplyResources(this.aboutToolStripMenuItem, "aboutToolStripMenuItem"); - // - // toolTip1 - // - this.toolTip1.AutoPopDelay = 10000; - this.toolTip1.InitialDelay = 500; - this.toolTip1.ReshowDelay = 100; - // // FormMain // this.AllowDrop = true; @@ -2115,18 +2139,15 @@ this.tabPageDecode.ResumeLayout(false); this.groupBox_DECODE_Options.ResumeLayout(false); this.groupBox_DECODE_Options.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.decApiLvlUpDown)).EndInit(); this.tabPageBuild.ResumeLayout(false); this.groupBox_BUILD_Options.ResumeLayout(false); this.groupBox_BUILD_Options.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.buildApiLvlUpDown)).EndInit(); this.tabPageSign.ResumeLayout(false); this.groupBox_SIGN_Options.ResumeLayout(false); this.groupBox_SIGN_Options.PerformLayout(); this.tabPageZipAlign.ResumeLayout(false); this.groupBox_ZIPALIGN_Options.ResumeLayout(false); this.groupBox_ZIPALIGN_Options.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ZIPALIGN_AlignmentBytes)).EndInit(); this.tabPageInstallFramework.ResumeLayout(false); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); @@ -2144,6 +2165,9 @@ this.contextMenuStripLog.ResumeLayout(false); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.decApiLvlUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.buildApiLvlUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ZIPALIGN_AlignmentBytes)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -2383,6 +2407,8 @@ private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem1; internal System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem useAPKEditorForDecompilingItem; + internal System.Windows.Forms.CheckBox overrideAbiCheckBox; + internal System.Windows.Forms.ComboBox overrideAbiComboBox; } } diff --git a/APKToolGUI/Forms/FormMain.cs b/APKToolGUI/Forms/FormMain.cs index dad57f5..105cc38 100644 --- a/APKToolGUI/Forms/FormMain.cs +++ b/APKToolGUI/Forms/FormMain.cs @@ -91,6 +91,10 @@ namespace APKToolGUI schemev4ComboBox.SelectedIndex = v4; Settings.Default.Sign_Schemev4 = v4; + int overrideAbi = (overrideAbiComboBox.Items.Count + 1 > Settings.Default.Adb_OverrideAbi) ? Settings.Default.Adb_OverrideAbi : 0; + overrideAbiComboBox.SelectedIndex = overrideAbi; + Settings.Default.Adb_OverrideAbi = overrideAbi; + useAPKEditorForDecompilingItem.Checked = Settings.Default.UseApkeditor; new DecodeControlEventHandlers(this); @@ -1566,6 +1570,8 @@ namespace APKToolGUI apkPathAdbTxtBox.Enabled = value; selApkAdbBtn.Enabled = value; setVendorChkBox.Enabled = value; + overrideAbiCheckBox.Enabled = value; + overrideAbiComboBox.Enabled = value; } } @@ -1582,6 +1588,7 @@ namespace APKToolGUI Settings.Default.Sign_Schemev2 = schemev2ComboBox.SelectedIndex; Settings.Default.Sign_Schemev3 = schemev3ComboBox.SelectedIndex; Settings.Default.Sign_Schemev4 = schemev4ComboBox.SelectedIndex; + Settings.Default.Adb_OverrideAbi = overrideAbiComboBox.SelectedIndex; Settings.Default.UseApkeditor = useAPKEditorForDecompilingItem.Checked; Settings.Default.Save(); } diff --git a/APKToolGUI/Forms/FormMain.resx b/APKToolGUI/Forms/FormMain.resx index c208a84..d3ed09a 100644 --- a/APKToolGUI/Forms/FormMain.resx +++ b/APKToolGUI/Forms/FormMain.resx @@ -5607,6 +5607,69 @@ 7 + + arm64-v8a + + + armeabi-v7a + + + x86 + + + x86_64 + + + 223, 46 + + + 121, 21 + + + 23 + + + overrideAbiComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageAdb + + + 0 + + + True + + + NoControl + + + 9, 48 + + + 190, 17 + + + 18 + + + Override platform's default ABI: + + + overrideAbiCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPageAdb + + + 1 + NoControl @@ -5632,7 +5695,7 @@ tabPageAdb - 0 + 2 True @@ -5662,13 +5725,13 @@ tabPageAdb - 1 + 3 NoControl - 8, 76 + 7, 101 121, 23 @@ -5689,7 +5752,7 @@ tabPageAdb - 2 + 4 Top, Left, Right @@ -5698,7 +5761,7 @@ NoControl - 475, 76 + 474, 101 121, 23 @@ -5719,13 +5782,13 @@ tabPageAdb - 3 + 5 NoControl - 135, 76 + 134, 101 121, 23 @@ -5746,7 +5809,7 @@ tabPageAdb - 4 + 6 Top, Right @@ -5758,7 +5821,7 @@ NoControl - 564, 25 + 565, 71 28, 24 @@ -5779,7 +5842,7 @@ tabPageAdb - 5 + 7 True @@ -5788,7 +5851,7 @@ NoControl - 11, 54 + 9, 26 267, 17 @@ -5809,13 +5872,13 @@ tabPageAdb - 6 + 8 Top, Right - 192, 26 + 193, 72 366, 22 @@ -5833,7 +5896,7 @@ tabPageAdb - 7 + 9 True @@ -5842,7 +5905,7 @@ NoControl - 8, 31 + 9, 77 78, 13 @@ -5863,13 +5926,13 @@ tabPageAdb - 8 + 10 - Top, Left, Right + Top, Bottom, Left, Right - 8, 102 + 7, 130 588, 173 @@ -5887,7 +5950,7 @@ tabPageAdb - 9 + 11 4, 27 @@ -8100,6 +8163,9 @@ //////////w4AAAcP/////// + + NoControl + 99, 97 @@ -8190,12 +8256,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - useAPKEditorForDecompilingItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - settingsToolStripMenuItem @@ -8244,6 +8304,12 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + useAPKEditorForDecompilingItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + FormMain diff --git a/APKToolGUI/Handlers/AdbControlEventHandlers.cs b/APKToolGUI/Handlers/AdbControlEventHandlers.cs index 47ff2e7..f089ccd 100644 --- a/APKToolGUI/Handlers/AdbControlEventHandlers.cs +++ b/APKToolGUI/Handlers/AdbControlEventHandlers.cs @@ -1,4 +1,5 @@ using APKToolGUI.Languages; +using APKToolGUI.Properties; using System; using System.Collections.Generic; using System.IO; @@ -20,6 +21,12 @@ namespace APKToolGUI.Handlers main.refreshDevicesBtn.Click += refreshDevicesBtn_Click; main.selApkAdbBtn.Click += selApkAdbBtn_Click; main.devicesListBox.SelectedValueChanged += devicesListBox_SelectedValueChanged; + main.overrideAbiComboBox.SelectedIndexChanged += ComboBoxChanged; + } + + private void ComboBoxChanged(object sender, EventArgs e) + { + Settings.Default.Adb_OverrideAbi = main.overrideAbiComboBox.SelectedIndex; } private async void refreshDevicesBtn_Click(object sender, EventArgs e) diff --git a/APKToolGUI/Properties/Settings.Designer.cs b/APKToolGUI/Properties/Settings.Designer.cs index 2ef81a0..ea74214 100644 --- a/APKToolGUI/Properties/Settings.Designer.cs +++ b/APKToolGUI/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace APKToolGUI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -1302,5 +1302,29 @@ namespace APKToolGUI.Properties { this["UseApkeditor"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int Adb_OverrideAbi { + get { + return ((int)(this["Adb_OverrideAbi"])); + } + set { + this["Adb_OverrideAbi"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool Adb_SetOverrideAbi { + get { + return ((bool)(this["Adb_SetOverrideAbi"])); + } + set { + this["Adb_SetOverrideAbi"] = value; + } + } } } diff --git a/APKToolGUI/Properties/Settings.settings b/APKToolGUI/Properties/Settings.settings index 6a14279..718811b 100644 --- a/APKToolGUI/Properties/Settings.settings +++ b/APKToolGUI/Properties/Settings.settings @@ -278,5 +278,11 @@ False + + 0 + + + False + \ No newline at end of file diff --git a/APKToolGUI/app.config b/APKToolGUI/app.config index 6862692..a3d2a93 100644 --- a/APKToolGUI/app.config +++ b/APKToolGUI/app.config @@ -283,6 +283,12 @@ False + + 0 + + + False +