Merge branch 'release/RSL-2.16'

This commit is contained in:
SytheZN
2022-11-05 03:41:06 +02:00
parent 22ecbee791
commit 67a9089952
16 changed files with 569 additions and 537 deletions

View File

@@ -41,7 +41,7 @@
<setting name="SpoofGames" serializeAs="String">
<value>False</value>
</setting>
<setting name="BandwithLimit" serializeAs="String">
<setting name="BandwidthLimit" serializeAs="String">
<value/>
</setting>
<setting name="BigFontStyle" serializeAs="String">

View File

@@ -1,4 +1,17 @@
RSL 2.14
RSL 2.15
- Massive UI Changes:
- Rounded buttons
- Added version Number at Bottom Left
- Changed fonts to some extend
- Added background pattern to category buttons and MainForm background
- Added an animation when opening/closing category
- Overall darker theme
- New splash
~Chax
RSL 2.14
- Added upload config for easier config management
- Improved upload logic to handle failures better

411
MainForm.Designer.cs generated
View File

@@ -33,6 +33,7 @@ namespace AndroidSideloader
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.m_combo = new SergeUtils.EasyCompletionComboBox();
this.startsideloadbutton = new System.Windows.Forms.Button();
this.devicesbutton = new System.Windows.Forms.Button();
@@ -49,7 +50,7 @@ namespace AndroidSideloader
this.ULLabel = new System.Windows.Forms.Label();
this.ULGif = new System.Windows.Forms.PictureBox();
this.BatteryLbl = new System.Windows.Forms.Label();
this.pictureBox5 = new System.Windows.Forms.PictureBox();
this.imgBattery = new System.Windows.Forms.PictureBox();
this.downloadingLabel = new System.Windows.Forms.Label();
this.aboutBtn = new System.Windows.Forms.Button();
this.settingsButton = new System.Windows.Forms.Button();
@@ -85,35 +86,58 @@ namespace AndroidSideloader
this.ProgressText = new System.Windows.Forms.Label();
this.notesRichTextBox = new System.Windows.Forms.RichTextBox();
this.DragDropLbl = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.lblNotes = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.lblSearchHelp = new System.Windows.Forms.Label();
this.lblShortcutsF2 = new System.Windows.Forms.Label();
this.lblQuickSearch = new System.Windows.Forms.Label();
this.lblUpdateAvailable = new System.Windows.Forms.Label();
this.lblUpToDate = new System.Windows.Forms.Label();
this.lblMirror = new System.Windows.Forms.Label();
this.EnterInstallBox = new System.Windows.Forms.CheckBox();
this.ADBcommandbox = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.lblShortcutCtrlR = new System.Windows.Forms.Label();
this.lblAdbCommand = new System.Windows.Forms.Label();
this.pictureBox7 = new System.Windows.Forms.PictureBox();
this.lblNeedsDonate = new System.Windows.Forms.Label();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.btnSearch = new System.Windows.Forms.PictureBox();
this.gamesPictureBox = new System.Windows.Forms.PictureBox();
this.MountButton = new AndroidSideloader.RoundButton();
this.startsideloadbutton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.devicesbutton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.obbcopybutton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.backupbutton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.restorebutton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.getApkButton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.uninstallAppButton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.pullAppToDesktopBtn_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.copyBulkObbButton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.aboutBtn_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.settingsButton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.InstallQUset_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.removeQUSetting_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.QuestOptionsButton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.ADBWirelessDisable_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.ADBWirelessEnable_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.UpdateGamesButton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.listApkButton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.speedLabel_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.etaLabel_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.EnterInstallBox_Tooltip = new System.Windows.Forms.ToolTip(this.components);
this.panel2 = new System.Windows.Forms.Panel();
this.downloadInstallGameButton = new AndroidSideloader.RoundButton();
this.MountButton = new AndroidSideloader.RoundButton();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ULGif)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imgBattery)).BeginInit();
this.otherContainer.SuspendLayout();
this.backupContainer.SuspendLayout();
this.sideloadContainer.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.btnSearch)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gamesPictureBox)).BeginInit();
this.panel2.SuspendLayout();
this.SuspendLayout();
//
// m_combo
@@ -147,6 +171,7 @@ namespace AndroidSideloader
this.startsideloadbutton.TabIndex = 5;
this.startsideloadbutton.Text = "Sideload APK";
this.startsideloadbutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.startsideloadbutton_Tooltip.SetToolTip(this.startsideloadbutton, "Sideload an APK onto your device");
this.startsideloadbutton.UseVisualStyleBackColor = false;
this.startsideloadbutton.Click += new System.EventHandler(this.startsideloadbutton_Click);
//
@@ -167,6 +192,7 @@ namespace AndroidSideloader
this.devicesbutton.TabIndex = 0;
this.devicesbutton.Text = "RECONNECT DEVICE";
this.devicesbutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.devicesbutton_Tooltip.SetToolTip(this.devicesbutton, "Rookie will attempt to reconnect to your Device");
this.devicesbutton.UseVisualStyleBackColor = false;
this.devicesbutton.Click += new System.EventHandler(this.devicesbutton_Click);
//
@@ -187,6 +213,8 @@ namespace AndroidSideloader
this.obbcopybutton.TabIndex = 0;
this.obbcopybutton.Text = "Copy OBB";
this.obbcopybutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.obbcopybutton_Tooltip.SetToolTip(this.obbcopybutton, "Copies an obb folder to the Android/obb folder from the device (Not all games use" +
" obb files)");
this.obbcopybutton.UseVisualStyleBackColor = false;
this.obbcopybutton.Click += new System.EventHandler(this.obbcopybutton_Click);
//
@@ -207,6 +235,8 @@ namespace AndroidSideloader
this.backupbutton.TabIndex = 1;
this.backupbutton.Text = "Backup Gamedata";
this.backupbutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.backupbutton_Tooltip.SetToolTip(this.backupbutton, "Saves the game and apps data to the sideloader folder (Does not save APKs or OBBs" +
")");
this.backupbutton.UseVisualStyleBackColor = false;
this.backupbutton.Click += new System.EventHandler(this.backupbutton_Click);
//
@@ -227,6 +257,8 @@ namespace AndroidSideloader
this.restorebutton.TabIndex = 0;
this.restorebutton.Text = "Restore Gamedata";
this.restorebutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.restorebutton_Tooltip.SetToolTip(this.restorebutton, "Restores the game and apps data to the device (Use the Backup Game Data button fi" +
"rst!)");
this.restorebutton.UseVisualStyleBackColor = false;
this.restorebutton.Click += new System.EventHandler(this.restorebutton_Click);
//
@@ -247,6 +279,7 @@ namespace AndroidSideloader
this.getApkButton.TabIndex = 2;
this.getApkButton.Text = "Share Selected App";
this.getApkButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.getApkButton_Tooltip.SetToolTip(this.getApkButton, "Uploads the selected app to our Servers (Pick app within the Dropdown)");
this.getApkButton.UseVisualStyleBackColor = false;
this.getApkButton.Click += new System.EventHandler(this.getApkButton_Click);
//
@@ -267,6 +300,7 @@ namespace AndroidSideloader
this.uninstallAppButton.TabIndex = 3;
this.uninstallAppButton.Text = "Uninstall Selected App";
this.uninstallAppButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.uninstallAppButton_Tooltip.SetToolTip(this.uninstallAppButton, "Uninstalls the selected app (Select within the Dropdown)");
this.uninstallAppButton.UseVisualStyleBackColor = false;
this.uninstallAppButton.Click += new System.EventHandler(this.uninstallAppButton_Click);
//
@@ -287,18 +321,20 @@ namespace AndroidSideloader
this.pullAppToDesktopBtn.TabIndex = 4;
this.pullAppToDesktopBtn.Text = "Pull App To Desktop";
this.pullAppToDesktopBtn.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.pullAppToDesktopBtn_Tooltip.SetToolTip(this.pullAppToDesktopBtn, "Extracts APK and OBB to your Desktop (Select within the Dropdown)");
this.pullAppToDesktopBtn.UseVisualStyleBackColor = false;
this.pullAppToDesktopBtn.Click += new System.EventHandler(this.pullAppToDesktopBtn_Click);
//
// progressBar
//
this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.progressBar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.progressBar.ForeColor = System.Drawing.Color.Purple;
this.progressBar.Location = new System.Drawing.Point(224, 436);
this.progressBar.Location = new System.Drawing.Point(2, 0);
this.progressBar.MinimumSize = new System.Drawing.Size(200, 13);
this.progressBar.Name = "progressBar";
this.progressBar.Size = new System.Drawing.Size(426, 13);
this.progressBar.Size = new System.Drawing.Size(418, 13);
this.progressBar.TabIndex = 7;
//
// copyBulkObbButton
@@ -318,6 +354,7 @@ namespace AndroidSideloader
this.copyBulkObbButton.TabIndex = 1;
this.copyBulkObbButton.Text = "Recursive Copy OBB";
this.copyBulkObbButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.copyBulkObbButton_Tooltip.SetToolTip(this.copyBulkObbButton, "Copies an multiple OBB folders to your device.");
this.copyBulkObbButton.UseVisualStyleBackColor = false;
this.copyBulkObbButton.Click += new System.EventHandler(this.copyBulkObbButton_Click);
//
@@ -329,7 +366,7 @@ namespace AndroidSideloader
this.panel1.Controls.Add(this.ULLabel);
this.panel1.Controls.Add(this.ULGif);
this.panel1.Controls.Add(this.BatteryLbl);
this.panel1.Controls.Add(this.pictureBox5);
this.panel1.Controls.Add(this.imgBattery);
this.panel1.Controls.Add(this.downloadingLabel);
this.panel1.Controls.Add(this.aboutBtn);
this.panel1.Controls.Add(this.settingsButton);
@@ -393,17 +430,17 @@ namespace AndroidSideloader
this.BatteryLbl.Size = new System.Drawing.Size(0, 13);
this.BatteryLbl.TabIndex = 84;
//
// pictureBox5
// imgBattery
//
this.pictureBox5.BackColor = System.Drawing.Color.Transparent;
this.pictureBox5.BackgroundImage = global::AndroidSideloader.Properties.Resources.battery11;
this.pictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.pictureBox5.Location = new System.Drawing.Point(163, 596);
this.pictureBox5.Margin = new System.Windows.Forms.Padding(2);
this.pictureBox5.Name = "pictureBox5";
this.pictureBox5.Size = new System.Drawing.Size(55, 29);
this.pictureBox5.TabIndex = 85;
this.pictureBox5.TabStop = false;
this.imgBattery.BackColor = System.Drawing.Color.Transparent;
this.imgBattery.BackgroundImage = global::AndroidSideloader.Properties.Resources.battery11;
this.imgBattery.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.imgBattery.Location = new System.Drawing.Point(163, 596);
this.imgBattery.Margin = new System.Windows.Forms.Padding(2);
this.imgBattery.Name = "imgBattery";
this.imgBattery.Size = new System.Drawing.Size(55, 29);
this.imgBattery.TabIndex = 85;
this.imgBattery.TabStop = false;
//
// downloadingLabel
//
@@ -433,6 +470,7 @@ namespace AndroidSideloader
this.aboutBtn.TabIndex = 5;
this.aboutBtn.Text = " ? ABOUT";
this.aboutBtn.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.aboutBtn_Tooltip.SetToolTip(this.aboutBtn, "About the Rookie App and it\'s amazing creators and contributors");
this.aboutBtn.UseVisualStyleBackColor = false;
this.aboutBtn.Click += new System.EventHandler(this.aboutBtn_Click);
//
@@ -454,6 +492,7 @@ namespace AndroidSideloader
this.settingsButton.TabIndex = 4;
this.settingsButton.Text = "⚙ SETTINGS";
this.settingsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.settingsButton_Tooltip.SetToolTip(this.settingsButton, "Rookie App Settings");
this.settingsButton.UseVisualStyleBackColor = false;
this.settingsButton.Click += new System.EventHandler(this.settingsButton_Click);
//
@@ -490,6 +529,8 @@ namespace AndroidSideloader
this.InstallQUset.TabIndex = 5;
this.InstallQUset.Text = "Install QU Setting";
this.InstallQUset.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.InstallQUset_Tooltip.SetToolTip(this.InstallQUset, "After you enter your username it will create an user.json file needed for some ga" +
"mes");
this.InstallQUset.UseVisualStyleBackColor = false;
this.InstallQUset.Click += new System.EventHandler(this.InstallQUset_Click);
//
@@ -510,6 +551,7 @@ namespace AndroidSideloader
this.removeQUSetting.TabIndex = 4;
this.removeQUSetting.Text = "Remove QU Setting";
this.removeQUSetting.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.removeQUSetting_Tooltip.SetToolTip(this.removeQUSetting, "Remove QU Settings");
this.removeQUSetting.UseVisualStyleBackColor = false;
this.removeQUSetting.Click += new System.EventHandler(this.removeQUSetting_Click);
//
@@ -530,6 +572,7 @@ namespace AndroidSideloader
this.QuestOptionsButton.TabIndex = 2;
this.QuestOptionsButton.Text = "Quest Options";
this.QuestOptionsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.QuestOptionsButton_Tooltip.SetToolTip(this.QuestOptionsButton, "Additional Quest Settings and Utilities");
this.QuestOptionsButton.UseVisualStyleBackColor = false;
this.QuestOptionsButton.Click += new System.EventHandler(this.QuestOptionsButton_Click);
//
@@ -550,6 +593,7 @@ namespace AndroidSideloader
this.ADBWirelessDisable.TabIndex = 1;
this.ADBWirelessDisable.Text = "Disable Wireless ADB";
this.ADBWirelessDisable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.ADBWirelessDisable_Tooltip.SetToolTip(this.ADBWirelessDisable, "Removes Wireless ADB settings and disconnects any Wireless devices");
this.ADBWirelessDisable.UseVisualStyleBackColor = false;
this.ADBWirelessDisable.Click += new System.EventHandler(this.ADBWirelessDisable_Click);
//
@@ -570,6 +614,7 @@ namespace AndroidSideloader
this.ADBWirelessEnable.TabIndex = 0;
this.ADBWirelessEnable.Text = "Enable Wireless ADB";
this.ADBWirelessEnable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.ADBWirelessEnable_Tooltip.SetToolTip(this.ADBWirelessEnable, "Enables Wireless sideloading. Requires a connected device to activate!");
this.ADBWirelessEnable.UseVisualStyleBackColor = false;
this.ADBWirelessEnable.Click += new System.EventHandler(this.ADBWirelessEnable_Click);
//
@@ -665,6 +710,7 @@ namespace AndroidSideloader
this.UpdateGamesButton.TabIndex = 7;
this.UpdateGamesButton.Text = "Refresh Update List";
this.UpdateGamesButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.UpdateGamesButton_Tooltip.SetToolTip(this.UpdateGamesButton, "Refresh Game List and available updates");
this.UpdateGamesButton.UseVisualStyleBackColor = false;
this.UpdateGamesButton.Click += new System.EventHandler(this.UpdateGamesButton_Click);
//
@@ -685,6 +731,7 @@ namespace AndroidSideloader
this.listApkButton.TabIndex = 6;
this.listApkButton.Text = "Refresh All";
this.listApkButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.listApkButton_Tooltip.SetToolTip(this.listApkButton, "Refresh connected devices, installed apps, and update game list");
this.listApkButton.UseVisualStyleBackColor = false;
this.listApkButton.Click += new System.EventHandler(this.listApkButton_Click);
//
@@ -731,27 +778,31 @@ namespace AndroidSideloader
this.speedLabel.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.speedLabel.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.speedLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.speedLabel.Location = new System.Drawing.Point(225, 452);
this.speedLabel.Location = new System.Drawing.Point(2, 14);
this.speedLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.speedLabel.Name = "speedLabel";
this.speedLabel.Size = new System.Drawing.Size(149, 18);
this.speedLabel.TabIndex = 76;
this.speedLabel.Text = "DLS: Speed in MBPS";
this.speedLabel_Tooltip.SetToolTip(this.speedLabel, "Current download speed, updates every second, in mbps");
//
// etaLabel
//
this.etaLabel.AutoSize = true;
this.etaLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.etaLabel.BackColor = System.Drawing.Color.Transparent;
this.etaLabel.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.etaLabel.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.etaLabel.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.etaLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.etaLabel.Location = new System.Drawing.Point(502, 452);
this.etaLabel.Location = new System.Drawing.Point(224, 14);
this.etaLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.etaLabel.Name = "etaLabel";
this.etaLabel.Size = new System.Drawing.Size(148, 18);
this.etaLabel.Size = new System.Drawing.Size(196, 18);
this.etaLabel.TabIndex = 75;
this.etaLabel.Text = "ETA: HH:MM:SS Left";
this.etaLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
this.etaLabel_Tooltip.SetToolTip(this.etaLabel, "Estimated time when game will finish download, updates every 5 seconds, format is" +
" HH:MM:SS");
//
// freeDisclaimer
//
@@ -971,20 +1022,20 @@ namespace AndroidSideloader
this.DragDropLbl.Text = "DragDropLBL";
this.DragDropLbl.Visible = false;
//
// label1
// lblNotes
//
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.label1.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.label1.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.label1.Location = new System.Drawing.Point(597, 674);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(48, 18);
this.label1.TabIndex = 86;
this.label1.Text = "Notes";
this.lblNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblNotes.AutoSize = true;
this.lblNotes.BackColor = System.Drawing.Color.Transparent;
this.lblNotes.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.lblNotes.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.lblNotes.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.lblNotes.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.lblNotes.Location = new System.Drawing.Point(597, 674);
this.lblNotes.Name = "lblNotes";
this.lblNotes.Size = new System.Drawing.Size(48, 18);
this.lblNotes.TabIndex = 86;
this.lblNotes.Text = "Notes";
//
// pictureBox1
//
@@ -1013,51 +1064,51 @@ namespace AndroidSideloader
this.label2.TabIndex = 89;
this.label2.Visible = false;
//
// label3
// lblSearchHelp
//
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.lblSearchHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.label3.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.label3.Location = new System.Drawing.Point(516, 209);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(170, 51);
this.label3.TabIndex = 90;
this.label3.Text = "Start typing to search.\r\nPress ESC to close.\r\n\r\n";
this.label3.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label3.Visible = false;
this.lblSearchHelp.AutoSize = true;
this.lblSearchHelp.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.lblSearchHelp.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.lblSearchHelp.Location = new System.Drawing.Point(516, 209);
this.lblSearchHelp.Name = "lblSearchHelp";
this.lblSearchHelp.Size = new System.Drawing.Size(170, 51);
this.lblSearchHelp.TabIndex = 90;
this.lblSearchHelp.Text = "Start typing to search.\r\nPress ESC to close.\r\n\r\n";
this.lblSearchHelp.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.lblSearchHelp.Visible = false;
//
// label4
// lblShortcutsF2
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.lblShortcutsF2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.label4.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.label4.Location = new System.Drawing.Point(509, 284);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(188, 17);
this.label4.TabIndex = 90;
this.label4.Text = "Shortcuts: CTRL+F or F2";
this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label4.Visible = false;
this.lblShortcutsF2.AutoSize = true;
this.lblShortcutsF2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.lblShortcutsF2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.lblShortcutsF2.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.lblShortcutsF2.Location = new System.Drawing.Point(509, 284);
this.lblShortcutsF2.Name = "lblShortcutsF2";
this.lblShortcutsF2.Size = new System.Drawing.Size(188, 17);
this.lblShortcutsF2.TabIndex = 90;
this.lblShortcutsF2.Text = "Shortcuts: CTRL+F or F2";
this.lblShortcutsF2.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.lblShortcutsF2.Visible = false;
//
// label5
// lblQuickSearch
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.label5.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.label5.Location = new System.Drawing.Point(738, 11);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(105, 17);
this.label5.TabIndex = 90;
this.label5.Text = "Quick Search";
this.label5.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.lblQuickSearch.AutoSize = true;
this.lblQuickSearch.BackColor = System.Drawing.Color.Transparent;
this.lblQuickSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.lblQuickSearch.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.lblQuickSearch.Location = new System.Drawing.Point(738, 11);
this.lblQuickSearch.Name = "lblQuickSearch";
this.lblQuickSearch.Size = new System.Drawing.Size(105, 17);
this.lblQuickSearch.TabIndex = 90;
this.lblQuickSearch.Text = "Quick Search";
this.lblQuickSearch.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// lblUpdateAvailable
//
@@ -1115,7 +1166,9 @@ namespace AndroidSideloader
this.EnterInstallBox.TabIndex = 93;
this.EnterInstallBox.Text = " Install w/ \r\n Enter Key";
this.EnterInstallBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.EnterInstallBox.UseVisualStyleBackColor = false;
this.EnterInstallBox_Tooltip.SetToolTip(this.EnterInstallBox, "Use the ENTER key on your keyboard to start installation of games from the Game L" +
"ist");
this.EnterInstallBox.UseVisualStyleBackColor = true;
this.EnterInstallBox.CheckedChanged += new System.EventHandler(this.EnterInstallBox_CheckedChanged);
//
// ADBcommandbox
@@ -1142,39 +1195,39 @@ namespace AndroidSideloader
this.ADBcommandbox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ADBcommandbox_KeyPress);
this.ADBcommandbox.Leave += new System.EventHandler(this.ADBcommandbox_Leave);
//
// label11
// lblShortcutCtrlR
//
this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.lblShortcutCtrlR.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.label11.AutoSize = true;
this.label11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.label11.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.label11.Location = new System.Drawing.Point(528, 285);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(143, 17);
this.label11.TabIndex = 90;
this.label11.Text = "Shorcut = CTRL+R";
this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label11.Visible = false;
this.lblShortcutCtrlR.AutoSize = true;
this.lblShortcutCtrlR.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
this.lblShortcutCtrlR.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.lblShortcutCtrlR.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.lblShortcutCtrlR.Location = new System.Drawing.Point(528, 285);
this.lblShortcutCtrlR.Name = "lblShortcutCtrlR";
this.lblShortcutCtrlR.Size = new System.Drawing.Size(148, 17);
this.lblShortcutCtrlR.TabIndex = 90;
this.lblShortcutCtrlR.Text = "Shortcut = CTRL+R";
this.lblShortcutCtrlR.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.lblShortcutCtrlR.Visible = false;
//
// label9
// lblAdbCommand
//
this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.lblAdbCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.label9.AutoSize = true;
this.label9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.label9.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.label9.Location = new System.Drawing.Point(514, 206);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(173, 68);
this.label9.TabIndex = 90;
this.label9.Text = "Type command without\r\n\"adb\" prefix.\r\n\r\n\r\n";
this.label9.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.label9.Visible = false;
this.lblAdbCommand.AutoSize = true;
this.lblAdbCommand.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.lblAdbCommand.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
this.lblAdbCommand.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.lblAdbCommand.Location = new System.Drawing.Point(514, 206);
this.lblAdbCommand.Name = "lblAdbCommand";
this.lblAdbCommand.Size = new System.Drawing.Size(173, 68);
this.lblAdbCommand.TabIndex = 90;
this.lblAdbCommand.Text = "Type command without\r\n\"adb\" prefix.\r\n\r\n\r\n";
this.lblAdbCommand.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.lblAdbCommand.Visible = false;
//
// pictureBox7
//
@@ -1207,18 +1260,18 @@ namespace AndroidSideloader
this.lblNeedsDonate.Text = "𝖭𝖤𝖶𝖤𝖱 𝖳𝖧𝖠𝖭 𝖫𝖨𝖲𝖳";
this.lblNeedsDonate.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
// pictureBox2
// btnSearch
//
this.pictureBox2.BackColor = System.Drawing.Color.Transparent;
this.pictureBox2.BackgroundImage = global::AndroidSideloader.Properties.Resources.SearchGlass;
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.pictureBox2.Location = new System.Drawing.Point(773, 37);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(28, 24);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pictureBox2.TabIndex = 91;
this.pictureBox2.TabStop = false;
this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click);
this.btnSearch.BackColor = System.Drawing.Color.Transparent;
this.btnSearch.BackgroundImage = global::AndroidSideloader.Properties.Resources.SearchGlass;
this.btnSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.btnSearch.Location = new System.Drawing.Point(773, 37);
this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(28, 24);
this.btnSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.btnSearch.TabIndex = 91;
this.btnSearch.TabStop = false;
this.btnSearch.Click += new System.EventHandler(this.pictureBox2_Click);
//
// gamesPictureBox
//
@@ -1234,6 +1287,50 @@ namespace AndroidSideloader
this.gamesPictureBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
this.gamesPictureBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.Form1_DragEnter);
//
// panel2
//
this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.panel2.BackColor = System.Drawing.Color.Transparent;
this.panel2.Controls.Add(this.downloadInstallGameButton);
this.panel2.Controls.Add(this.progressBar);
this.panel2.Controls.Add(this.etaLabel);
this.panel2.Controls.Add(this.speedLabel);
this.panel2.Location = new System.Drawing.Point(224, 436);
this.panel2.MinimumSize = new System.Drawing.Size(600, 34);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(798, 34);
this.panel2.TabIndex = 96;
//
// downloadInstallGameButton
//
this.downloadInstallGameButton.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.downloadInstallGameButton.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.downloadInstallGameButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.downloadInstallGameButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.downloadInstallGameButton.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.downloadInstallGameButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.downloadInstallGameButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.downloadInstallGameButton.DialogResult = System.Windows.Forms.DialogResult.OK;
this.downloadInstallGameButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
this.downloadInstallGameButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.downloadInstallGameButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.downloadInstallGameButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.downloadInstallGameButton.Location = new System.Drawing.Point(433, 0);
this.downloadInstallGameButton.Margin = new System.Windows.Forms.Padding(0);
this.downloadInstallGameButton.Name = "downloadInstallGameButton";
this.downloadInstallGameButton.Radius = 5;
this.downloadInstallGameButton.Size = new System.Drawing.Size(364, 34);
this.downloadInstallGameButton.Stroke = true;
this.downloadInstallGameButton.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
this.downloadInstallGameButton.TabIndex = 94;
this.downloadInstallGameButton.Text = "Download and Install Game/Add To Queue ⮩ ";
this.downloadInstallGameButton.Transparency = false;
this.downloadInstallGameButton.Click += new System.EventHandler(this.downloadInstallGameButton_Click);
this.downloadInstallGameButton.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
this.downloadInstallGameButton.DragEnter += new System.Windows.Forms.DragEventHandler(this.Form1_DragEnter);
//
// MountButton
//
this.MountButton.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
@@ -1261,36 +1358,6 @@ namespace AndroidSideloader
this.MountButton.Click += new System.EventHandler(this.MountButton_Click);
this.MountButton.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
//
// downloadInstallGameButton
//
this.downloadInstallGameButton.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.downloadInstallGameButton.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.downloadInstallGameButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.downloadInstallGameButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.downloadInstallGameButton.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.downloadInstallGameButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.downloadInstallGameButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.downloadInstallGameButton.DialogResult = System.Windows.Forms.DialogResult.OK;
this.downloadInstallGameButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
this.downloadInstallGameButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.downloadInstallGameButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.downloadInstallGameButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.downloadInstallGameButton.Location = new System.Drawing.Point(654, 436);
this.downloadInstallGameButton.Margin = new System.Windows.Forms.Padding(0);
this.downloadInstallGameButton.Name = "downloadInstallGameButton";
this.downloadInstallGameButton.Radius = 5;
this.downloadInstallGameButton.Size = new System.Drawing.Size(369, 34);
this.downloadInstallGameButton.Stroke = true;
this.downloadInstallGameButton.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
this.downloadInstallGameButton.TabIndex = 94;
this.downloadInstallGameButton.Text = "Download and Install Game/Add To Queue ⮩ ";
this.downloadInstallGameButton.Transparency = false;
this.downloadInstallGameButton.Click += new System.EventHandler(this.downloadInstallGameButton_Click);
this.downloadInstallGameButton.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
this.downloadInstallGameButton.DragEnter += new System.Windows.Forms.DragEventHandler(this.Form1_DragEnter);
//
// MainForm
//
this.AllowDrop = true;
@@ -1298,36 +1365,32 @@ namespace AndroidSideloader
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor;
this.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes_1_1_1_0_0_0_1__000000_212121;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.ClientSize = new System.Drawing.Size(1032, 721);
this.Controls.Add(this.panel2);
this.Controls.Add(this.MountButton);
this.Controls.Add(this.downloadInstallGameButton);
this.Controls.Add(this.label4);
this.Controls.Add(this.lblShortcutsF2);
this.Controls.Add(this.EnterInstallBox);
this.Controls.Add(this.ProgressText);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.btnSearch);
this.Controls.Add(this.lblNeedsDonate);
this.Controls.Add(this.lblUpToDate);
this.Controls.Add(this.lblUpdateAvailable);
this.Controls.Add(this.lblMirror);
this.Controls.Add(this.label5);
this.Controls.Add(this.label11);
this.Controls.Add(this.lblQuickSearch);
this.Controls.Add(this.lblShortcutCtrlR);
this.Controls.Add(this.ADBcommandbox);
this.Controls.Add(this.searchTextBox);
this.Controls.Add(this.label9);
this.Controls.Add(this.label3);
this.Controls.Add(this.lblAdbCommand);
this.Controls.Add(this.lblSearchHelp);
this.Controls.Add(this.freeDisclaimer);
this.Controls.Add(this.speedLabel);
this.Controls.Add(this.DragDropLbl);
this.Controls.Add(this.etaLabel);
this.Controls.Add(this.label1);
this.Controls.Add(this.lblNotes);
this.Controls.Add(this.gamesQueueLabel);
this.Controls.Add(this.gamesPictureBox);
this.Controls.Add(this.remotesList);
this.Controls.Add(this.devicesComboBox);
this.Controls.Add(this.gamesQueListBox);
this.Controls.Add(this.panel1);
this.Controls.Add(this.progressBar);
this.Controls.Add(this.m_combo);
this.Controls.Add(this.notesRichTextBox);
this.Controls.Add(this.label2);
@@ -1337,6 +1400,7 @@ namespace AndroidSideloader
this.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.DoubleBuffered = true;
this.MaximizeBox = false;
this.MinimumSize = new System.Drawing.Size(1048, 760);
this.Name = "MainForm";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
@@ -1350,14 +1414,16 @@ namespace AndroidSideloader
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.ULGif)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.imgBattery)).EndInit();
this.otherContainer.ResumeLayout(false);
this.backupContainer.ResumeLayout(false);
this.sideloadContainer.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.btnSearch)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gamesPictureBox)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1403,24 +1469,24 @@ namespace AndroidSideloader
private System.Windows.Forms.Label downloadingLabel;
private System.Windows.Forms.RichTextBox notesRichTextBox;
private System.Windows.Forms.Label DragDropLbl;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label lblNotes;
private System.Windows.Forms.Button removeQUSetting;
private System.Windows.Forms.Button InstallQUset;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label lblSearchHelp;
private System.Windows.Forms.Label lblShortcutsF2;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.Label lblQuickSearch;
private System.Windows.Forms.PictureBox btnSearch;
private System.Windows.Forms.Label lblUpdateAvailable;
private System.Windows.Forms.Label lblUpToDate;
private System.Windows.Forms.Label lblMirror;
private System.Windows.Forms.CheckBox EnterInstallBox;
private System.Windows.Forms.TextBox ADBcommandbox;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Label lblShortcutCtrlR;
private System.Windows.Forms.Label lblAdbCommand;
private System.Windows.Forms.Label BatteryLbl;
private System.Windows.Forms.PictureBox pictureBox5;
private System.Windows.Forms.PictureBox imgBattery;
public System.Windows.Forms.ComboBox remotesList;
private System.Windows.Forms.PictureBox ULGif;
private System.Windows.Forms.Label ULLabel;
@@ -1432,6 +1498,9 @@ namespace AndroidSideloader
private System.Windows.Forms.ColumnHeader VersionCodeIndex;
private System.Windows.Forms.ColumnHeader ReleaseAPKPathIndex;
public System.Windows.Forms.ColumnHeader VersionNameIndex;
private Label verLabel;
private RoundButton downloadInstallGameButton;
private RoundButton MountButton;
private ToolTip startsideloadbutton_Tooltip;
private ToolTip devicesbutton_Tooltip;
private ToolTip obbcopybutton_Tooltip;
@@ -1441,7 +1510,6 @@ namespace AndroidSideloader
private ToolTip uninstallAppButton_Tooltip;
private ToolTip pullAppToDesktopBtn_Tooltip;
private ToolTip copyBulkObbButton_Tooltip;
private ToolTip downloadInstallGameButton_Tooltip;
private ToolTip aboutBtn_Tooltip;
private ToolTip settingsButton_Tooltip;
private ToolTip InstallQUset_Tooltip;
@@ -1453,10 +1521,7 @@ namespace AndroidSideloader
private ToolTip listApkButton_Tooltip;
private ToolTip speedLabel_Tooltip;
private ToolTip etaLabel_Tooltip;
private ToolTip MountButton_Tooltip;
private ToolTip EnterInstallBox_Tooltip;
private Label verLabel;
private RoundButton downloadInstallGameButton;
private RoundButton MountButton;
private Panel panel2;
}
}

View File

@@ -17,9 +17,6 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using AndroidSideloader.Models;
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.Drawing.Drawing2D;
namespace AndroidSideloader
{
@@ -57,7 +54,7 @@ namespace AndroidSideloader
public static bool isOffline = false;
public static bool hasPublicConfig = false;
public static PublicConfig PublicConfigFile;
public static string PublicMirrorExtraArgs = " --tpslimit 1.0 --tpslimit-burst 1";
public static string PublicMirrorExtraArgs = " --tpslimit 1.0 --tpslimit-burst 3";
public MainForm()
{
// check for offline mode
@@ -228,26 +225,16 @@ namespace AndroidSideloader
{
if (File.Exists($"{Environment.CurrentDirectory}\\crashlog.txt") && File.Exists($"{Environment.CurrentDirectory}\\nouns\\nouns.txt"))
{
Random r = new Random();
int x = r.Next(6806);
int y = r.Next(6806);
string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\nouns\\nouns.txt");
string randomnoun = lines[new Random(x).Next(lines.Length)];
string randomnoun2 = lines[new Random(y).Next(lines.Length)];
string combined = randomnoun + "-" + randomnoun2;
System.IO.File.Move("crashlog.txt", $"{Environment.CurrentDirectory}\\{combined}.txt");
Properties.Settings.Default.CurrentCrashPath = $"{Environment.CurrentDirectory}\\{combined}.txt";
Properties.Settings.Default.CurrentCrashName = combined;
string UUID = SideloaderUtilities.UUID();
System.IO.File.Move("crashlog.txt", $"{Environment.CurrentDirectory}\\{UUID}.log");
Properties.Settings.Default.CurrentCrashPath = $"{Environment.CurrentDirectory}\\{UUID}.log";
Properties.Settings.Default.CurrentCrashName = UUID;
Properties.Settings.Default.Save();
Clipboard.SetText(combined);
RCLONE.runRcloneCommand_DownloadConfig($"copy \"{Properties.Settings.Default.CurrentCrashPath}\" VRP-debuglogs:CrashLogs");
FlexibleMessageBox.Show($"Your CrashLog has been copied to the server. Please mention your CrashLogID ({Properties.Settings.Default.CurrentCrashName}) to the Mods (it has been automatically copied to your clipboard).");
Clipboard.SetText(UUID);
RCLONE.runRcloneCommand_UploadConfig($"copy \"{Properties.Settings.Default.CurrentCrashPath}\" RSL-gameuploads:CrashLogs");
FlexibleMessageBox.Show($"Your CrashLog has been copied to the server.\nPlease mention your CrashLogID ({Properties.Settings.Default.CurrentCrashName}) to the Mods.\nIt has been automatically copied to your clipboard.");
Clipboard.SetText(Properties.Settings.Default.CurrentCrashName);
}
}
else
@@ -1691,7 +1678,7 @@ namespace AndroidSideloader
ADB.RunCommandToString(cmd, path);
Directory.Delete($"{Properties.Settings.Default.MainDir}\\{game.Pckgcommand}", true);
Program.form.ChangeTitle("Uploading to drive, you may continue to use Rookie while it uploads.");
RCLONE.runRcloneCommand_UploadConfig(game.Uploadcommand);
RCLONE.runRcloneCommand_UploadConfig($"copy \"{Properties.Settings.Default.MainDir}\\{gameZipName}\" RSL-gameuploads:");
if (game.isUpdate)
{
Properties.Settings.Default.SubmittedUpdates += game.Pckgcommand + ("\n");
@@ -1777,7 +1764,6 @@ namespace AndroidSideloader
game.Pckgcommand = packagename;
game.Uploadgamename = GameName;
game.Uploadversion = installedVersionInt;
game.Uploadcommand = $"copy \"{Properties.Settings.Default.MainDir}\\{game.Uploadgamename} v{game.Uploadversion} {game.Pckgcommand}.zip\" RSL-gameuploads:";
gamesToUpload.Add(game);
}
private void initMirrors(bool random)
@@ -2158,7 +2144,7 @@ Things you can try:
{
var rclonecommand =
$"copy \":http:/{gameNameHash}/\" \"{Environment.CurrentDirectory}\\{gameNameHash}\" --progress --rc";
gameDownloadOutput = RCLONE.runRcloneCommand_PublicConfig(rclonecommand, Properties.Settings.Default.BandwithLimit);
gameDownloadOutput = RCLONE.runRcloneCommand_PublicConfig(rclonecommand, Properties.Settings.Default.BandwidthLimit);
});
}
else
@@ -2172,7 +2158,7 @@ Things you can try:
Logger.Log($"rclone copy \"{currentRemote}:{SideloaderRCLONE.RcloneGamesFolder}/{gameName}\"");
t1 = new Thread(() =>
{
gameDownloadOutput = RCLONE.runRcloneCommand_DownloadConfig($"copy \"{currentRemote}:{SideloaderRCLONE.RcloneGamesFolder}/{gameName}\" \"{Environment.CurrentDirectory}\\{gameName}\" --progress --rc", Properties.Settings.Default.BandwithLimit);
gameDownloadOutput = RCLONE.runRcloneCommand_DownloadConfig($"copy \"{currentRemote}:{SideloaderRCLONE.RcloneGamesFolder}/{gameName}\" \"{Environment.CurrentDirectory}\\{gameName}\" --progress --rc", Properties.Settings.Default.BandwidthLimit);
});
}
@@ -2669,8 +2655,8 @@ Things you can try:
}
searchTextBox.Visible = false;
label2.Visible = false;
label3.Visible = false;
label4.Visible = false;
lblSearchHelp.Visible = false;
lblShortcutsF2.Visible = false;
if (ADBcommandbox.Visible)
{
@@ -2679,8 +2665,8 @@ Things you can try:
ChangeTitle(" \n\n");
}
ADBcommandbox.Visible = false;
label9.Visible = false;
label11.Visible = false;
lblAdbCommand.Visible = false;
lblShortcutCtrlR.Visible = false;
label2.Visible = false;
}
@@ -2688,11 +2674,11 @@ Things you can try:
{
searchTextBox.Visible = false;
label2.Visible = false;
label3.Visible = false;
label4.Visible = false;
lblSearchHelp.Visible = false;
lblShortcutsF2.Visible = false;
ADBcommandbox.Visible = false;
label9.Visible = false;
label11.Visible = false;
lblAdbCommand.Visible = false;
lblShortcutCtrlR.Visible = false;
label2.Visible = false;
}
}
@@ -2704,8 +2690,8 @@ Things you can try:
searchTextBox.Clear();
searchTextBox.Visible = true;
label2.Visible = true;
label3.Visible = true;
label4.Visible = true;
lblSearchHelp.Visible = true;
lblShortcutsF2.Visible = true;
searchTextBox.Focus();
}
if (keyData == (Keys.Control | Keys.L))
@@ -2736,8 +2722,8 @@ Things you can try:
{
ADBcommandbox.Visible = true;
ADBcommandbox.Clear();
label9.Visible = true;
label11.Visible = true;
lblAdbCommand.Visible = true;
lblShortcutCtrlR.Visible = true;
label2.Visible = true;
ADBcommandbox.Focus();
}
@@ -2746,8 +2732,8 @@ Things you can try:
searchTextBox.Clear();
searchTextBox.Visible = true;
label2.Visible = true;
label3.Visible = true;
label4.Visible = true;
lblSearchHelp.Visible = true;
lblShortcutsF2.Visible = true;
searchTextBox.Focus();
}
if (keyData == (Keys.Control | Keys.F4))
@@ -3008,8 +2994,8 @@ Things you can try:
searchTextBox.Clear();
searchTextBox.Visible = true;
label2.Visible = true;
label3.Visible = true;
label4.Visible = true;
lblSearchHelp.Visible = true;
lblShortcutsF2.Visible = true;
searchTextBox.Focus();
}
private void EnterInstallBox1_CheckedChanged(object sender, EventArgs e)
@@ -3022,8 +3008,8 @@ Things you can try:
{
searchTextBox.Visible = false;
label2.Visible = false;
label3.Visible = false;
label4.Visible = false;
lblSearchHelp.Visible = false;
lblShortcutsF2.Visible = false;
}
else
gamesListView.Focus();
@@ -3064,8 +3050,8 @@ Things you can try:
string output = ADB.RunAdbCommandToString(ADBcommandbox.Text).Output;
FlexibleMessageBox.Show($"Ran adb command: ADB {ADBcommandbox.Text}, Output: {output}");
ADBcommandbox.Visible = false;
label9.Visible = false;
label11.Visible = false;
lblAdbCommand.Visible = false;
lblShortcutCtrlR.Visible = false;
label2.Visible = false;
gamesListView.Focus();
Program.form.ChangeTitle("");
@@ -3073,8 +3059,8 @@ Things you can try:
if (e.KeyChar == (char)Keys.Escape)
{
ADBcommandbox.Visible = false;
label11.Visible = false;
label9.Visible = false;
lblShortcutCtrlR.Visible = false;
lblAdbCommand.Visible = false;
label2.Visible = false;
gamesListView.Focus();
}
@@ -3085,8 +3071,8 @@ Things you can try:
label2.Visible = false;
ADBcommandbox.Visible = false;
label9.Visible = false;
label11.Visible = false;
lblAdbCommand.Visible = false;
lblShortcutCtrlR.Visible = false;
}
private void gamesQueListBox_MouseDown(object sender, MouseEventArgs e)

View File

@@ -117,4 +117,67 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="startsideloadbutton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="devicesbutton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>197, 95</value>
</metadata>
<metadata name="obbcopybutton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value>
</metadata>
<metadata name="backupbutton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1454, 56</value>
</metadata>
<metadata name="restorebutton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1284, 56</value>
</metadata>
<metadata name="getApkButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1113, 56</value>
</metadata>
<metadata name="uninstallAppButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>913, 56</value>
</metadata>
<metadata name="pullAppToDesktopBtn_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>698, 56</value>
</metadata>
<metadata name="copyBulkObbButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>493, 56</value>
</metadata>
<metadata name="aboutBtn_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>369, 95</value>
</metadata>
<metadata name="settingsButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>319, 56</value>
</metadata>
<metadata name="InstallQUset_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>
<metadata name="removeQUSetting_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1365, 17</value>
</metadata>
<metadata name="QuestOptionsButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1158, 17</value>
</metadata>
<metadata name="ADBWirelessDisable_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>954, 17</value>
</metadata>
<metadata name="ADBWirelessEnable_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>754, 17</value>
</metadata>
<metadata name="UpdateGamesButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>545, 17</value>
</metadata>
<metadata name="listApkButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>376, 17</value>
</metadata>
<metadata name="speedLabel_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>219, 17</value>
</metadata>
<metadata name="etaLabel_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>178, 56</value>
</metadata>
<metadata name="EnterInstallBox_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>514, 95</value>
</metadata>
</root>

View File

@@ -146,12 +146,12 @@ namespace AndroidSideloader.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string BandwithLimit {
public string BandwidthLimit {
get {
return ((string)(this["BandwithLimit"]));
return ((string)(this["BandwidthLimit"]));
}
set {
this["BandwithLimit"] = value;
this["BandwidthLimit"] = value;
}
}

View File

@@ -32,7 +32,7 @@
<Setting Name="SpoofGames" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="BandwithLimit" Type="System.String" Scope="User">
<Setting Name="BandwidthLimit" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="BigFontStyle" Type="System.Drawing.Font" Scope="User">

View File

@@ -35,7 +35,7 @@ namespace AndroidSideloader
private static Process rclone = new Process();
//Run rclone command
public static ProcessOutput runRcloneCommand_DownloadConfig(string command, string bandwithLimit = "")
public static ProcessOutput runRcloneCommand_DownloadConfig(string command, string BandwidthLimit = "")
{
if (!MainForm.HasInternet || MainForm.isOffline)
{
@@ -48,9 +48,9 @@ namespace AndroidSideloader
string originalCommand = command;
//set bandwidth limit
if (bandwithLimit.Length > 0)
if (BandwidthLimit.Length > 0)
{
command += $" --bwlimit={bandwithLimit}";
command += $" --bwlimit={BandwidthLimit}";
}
//set configpath if there is any
@@ -89,6 +89,15 @@ namespace AndroidSideloader
string error = rclone.StandardError.ReadToEnd();
rclone.WaitForExit();
if (error.Contains("There is not enough space"))
{
FlexibleMessageBox.Show($"There isn't enough disk space to download this game.\r\nPlease ensure you have at least 200MB more the game size available in {Environment.CurrentDirectory} and try again.",
"NOT ENOUGH SPACE",
MessageBoxButtons.OK,
MessageBoxIcon.Error);
return new ProcessOutput("Download failed.", "");
}
//if there is one of these errors, we switch the mirrors
if (error.Contains("400 Bad Request") || error.Contains("cannot fetch token") || error.Contains("authError") || error.Contains("quota") || error.Contains("exceeded") || error.Contains("directory not found") || error.Contains("Failed to"))
{
@@ -102,7 +111,7 @@ namespace AndroidSideloader
{
return new ProcessOutput("All mirrors are on quota or down...", "All mirrors are on quota or down...");
}
prcoutput = runRcloneCommand_DownloadConfig(originalCommand.Replace(oldRemote, MainForm.currentRemote), bandwithLimit);
prcoutput = runRcloneCommand_DownloadConfig(originalCommand.Replace(oldRemote, MainForm.currentRemote), BandwidthLimit);
}
else
{
@@ -122,15 +131,10 @@ namespace AndroidSideloader
Logger.Log($"Rclone Output: {output}");
}
}
if (output.Contains("There is not enough space"))
{
FlexibleMessageBox.Show("There isn't enough space on your PC to properly install this game. Please have at least 2x the size of the game you are trying to download/install available on the drive where Rookie is installed.", "NOT ENOUGH SPACE");
}
return prcoutput;
return prcoutput;
}
public static ProcessOutput runRcloneCommand_UploadConfig(string command, string bandwithLimit = "")
public static ProcessOutput runRcloneCommand_UploadConfig(string command, string BandwidthLimit = "")
{
if (!MainForm.HasInternet || MainForm.isOffline)
{
@@ -143,9 +147,9 @@ namespace AndroidSideloader
string originalCommand = command;
//set bandwidth limit
if (bandwithLimit.Length > 0)
if (BandwidthLimit.Length > 0)
{
command += $" --bwlimit={bandwithLimit}";
command += $" --bwlimit={BandwidthLimit}";
}
//set configpath if there is any
@@ -207,15 +211,10 @@ namespace AndroidSideloader
Logger.Log($"Rclone Output: {output}");
}
}
if (output.Contains("There is not enough space"))
{
FlexibleMessageBox.Show("There isn't enough space on your PC to properly install this game. Please have at least 2x the size of the game you are trying to download/install available on the drive where Rookie is installed.", "NOT ENOUGH SPACE");
}
return prcoutput;
}
public static ProcessOutput runRcloneCommand_PublicConfig(string command, string bandwithLimit = "")
public static ProcessOutput runRcloneCommand_PublicConfig(string command, string BandwidthLimit = "")
{
if (!MainForm.HasInternet || MainForm.isOffline)
{
@@ -228,9 +227,9 @@ namespace AndroidSideloader
string originalCommand = command;
//set bandwidth limit
if (bandwithLimit.Length > 0)
if (BandwidthLimit.Length > 0)
{
command += $" --bwlimit={bandwithLimit}";
command += $" --bwlimit={BandwidthLimit}";
}
string logcmd = Utilities.StringUtilities.RemoveEverythingBeforeFirst(command, "rclone.exe");
@@ -265,8 +264,22 @@ namespace AndroidSideloader
string error = rclone.StandardError.ReadToEnd();
rclone.WaitForExit();
//if there is one of these errors, we switch the mirrors
if (error.Contains("400 Bad Request") || error.Contains("cannot fetch token") || error.Contains("authError") || error.Contains("quota") || error.Contains("exceeded") || error.Contains("directory not found") || error.Contains("Failed to"))
if (error.Contains("There is not enough space"))
{
FlexibleMessageBox.Show($"There isn't enough disk space to download this game.\r\nPlease ensure you have at least 2x the game size available in {Environment.CurrentDirectory} and try again.",
"NOT ENOUGH SPACE",
MessageBoxButtons.OK,
MessageBoxIcon.Error);
return new ProcessOutput("Download failed.", "");
}
if (error.Contains("400 Bad Request")
|| error.Contains("cannot fetch token")
|| error.Contains("authError")
|| error.Contains("quota")
|| error.Contains("exceeded")
|| error.Contains("directory not found")
|| error.Contains("Failed to"))
{
Logger.Log(error);
return new ProcessOutput("Failed to fetch from public mirror.", "Failed to fetch from public mirror.");
@@ -290,10 +303,6 @@ namespace AndroidSideloader
}
}
if (output.Contains("There is not enough space"))
{
FlexibleMessageBox.Show("There isn't enough space on your PC to properly install this game. Please have at least 2x the size of the game you are trying to download/install available on the drive where Rookie is installed.", "NOT ENOUGH SPACE");
}
return prcoutput;
}
}

View File

@@ -17,8 +17,6 @@ namespace AndroidSideloader
Color inactive1, inactive2, active1, active2;
private Color strokeColor;
private bool stroke;
internal bool UseVisualStyleBackColor;
internal FlatStyle FlatStyle;
public bool Stroke
{

317
SettingsForm.Designer.cs generated
View File

@@ -1,4 +1,5 @@
namespace AndroidSideloader

namespace AndroidSideloader
{
partial class SettingsForm
{
@@ -33,21 +34,18 @@
this.deleteAfterInstallCheckBox = new System.Windows.Forms.CheckBox();
this.updateConfigCheckBox = new System.Windows.Forms.CheckBox();
this.userJsonOnGameInstall = new System.Windows.Forms.CheckBox();
this.BandwithTextbox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.BandwithComboBox = new System.Windows.Forms.ComboBox();
this.txtBandwidth = new System.Windows.Forms.TextBox();
this.lblDownloadSpeedLimiter = new System.Windows.Forms.Label();
this.crashlogID = new System.Windows.Forms.Label();
this.debuglogID = new System.Windows.Forms.Label();
this.DebugID = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.nodevicemodeBox = new System.Windows.Forms.CheckBox();
this.bmbfBox = new System.Windows.Forms.CheckBox();
this.AutoReinstBox = new System.Windows.Forms.CheckBox();
this.applyButton = new AndroidSideloader.RoundButton();
this.resetSettingsButton = new AndroidSideloader.RoundButton();
this.DebugLogCopy = new AndroidSideloader.RoundButton();
this.Button1 = new AndroidSideloader.RoundButton();
this.btnResetDebug = new AndroidSideloader.RoundButton();
this.btnUploadDebug = new AndroidSideloader.RoundButton();
this.btnOpenDebug = new AndroidSideloader.RoundButton();
this.lblMibs = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// checkForUpdatesCheckBox
@@ -64,23 +62,6 @@
this.checkForUpdatesCheckBox.UseVisualStyleBackColor = false;
this.checkForUpdatesCheckBox.CheckedChanged += new System.EventHandler(this.checkForUpdatesCheckBox_CheckedChanged);
//
// applyButton
//
this.applyButton.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
this.applyButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.applyButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.applyButton.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.applyButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.applyButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.applyButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.applyButton.Location = new System.Drawing.Point(67, 328);
this.applyButton.Name = "applyButton";
this.applyButton.Size = new System.Drawing.Size(101, 31);
this.applyButton.TabIndex = 5;
this.applyButton.Text = "Apply";
this.applyButton.UseVisualStyleBackColor = false;
this.applyButton.Click += new System.EventHandler(this.applyButton_Click);
//
// enableMessageBoxesCheckBox
//
this.enableMessageBoxesCheckBox.AutoSize = true;
@@ -137,50 +118,30 @@
this.userJsonOnGameInstall.UseVisualStyleBackColor = false;
this.userJsonOnGameInstall.CheckedChanged += new System.EventHandler(this.userJsonOnGameInstall_CheckedChanged);
//
// BandwithTextbox
// txtBandwidth
//
this.BandwithTextbox.BackColor = global::AndroidSideloader.Properties.Settings.Default.TextBoxColor;
this.BandwithTextbox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.BandwithTextbox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.BandwithTextbox.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "TextBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.BandwithTextbox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.BandwithTextbox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.BandwithTextbox.Location = new System.Drawing.Point(29, 248);
this.BandwithTextbox.Name = "BandwithTextbox";
this.BandwithTextbox.Size = new System.Drawing.Size(177, 24);
this.BandwithTextbox.TabIndex = 11;
this.txtBandwidth.BackColor = global::AndroidSideloader.Properties.Settings.Default.TextBoxColor;
this.txtBandwidth.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.txtBandwidth.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.txtBandwidth.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "TextBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.txtBandwidth.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.txtBandwidth.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.txtBandwidth.Location = new System.Drawing.Point(49, 254);
this.txtBandwidth.Name = "txtBandwidth";
this.txtBandwidth.Size = new System.Drawing.Size(103, 24);
this.txtBandwidth.TabIndex = 11;
//
// label1
// lblDownloadSpeedLimiter
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.label1.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.label1.Location = new System.Drawing.Point(48, 225);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(245, 18);
this.label1.TabIndex = 12;
this.label1.Text = "Download speed limiter, 0 to disable";
//
// BandwithComboBox
//
this.BandwithComboBox.BackColor = global::AndroidSideloader.Properties.Settings.Default.ComboBoxColor;
this.BandwithComboBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.BandwithComboBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.BandwithComboBox.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "ComboBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.BandwithComboBox.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BandwithComboBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.BandwithComboBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.BandwithComboBox.FormattingEnabled = true;
this.BandwithComboBox.Items.AddRange(new object[] {
"B",
"K",
"M",
"G"});
this.BandwithComboBox.Location = new System.Drawing.Point(258, 246);
this.BandwithComboBox.Name = "BandwithComboBox";
this.BandwithComboBox.Size = new System.Drawing.Size(55, 26);
this.BandwithComboBox.TabIndex = 13;
this.lblDownloadSpeedLimiter.AutoSize = true;
this.lblDownloadSpeedLimiter.BackColor = System.Drawing.Color.Transparent;
this.lblDownloadSpeedLimiter.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.lblDownloadSpeedLimiter.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.lblDownloadSpeedLimiter.Location = new System.Drawing.Point(87, 230);
this.lblDownloadSpeedLimiter.Name = "lblDownloadSpeedLimiter";
this.lblDownloadSpeedLimiter.Size = new System.Drawing.Size(169, 18);
this.lblDownloadSpeedLimiter.TabIndex = 12;
this.lblDownloadSpeedLimiter.Text = "Download Speed Limiter";
//
// crashlogID
//
@@ -191,66 +152,6 @@
this.crashlogID.Size = new System.Drawing.Size(0, 13);
this.crashlogID.TabIndex = 15;
//
// debuglogID
//
this.debuglogID.BackColor = System.Drawing.Color.Transparent;
this.debuglogID.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
this.debuglogID.Location = new System.Drawing.Point(29, 434);
this.debuglogID.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.debuglogID.Name = "debuglogID";
this.debuglogID.Size = new System.Drawing.Size(285, 48);
this.debuglogID.TabIndex = 14;
this.debuglogID.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// DebugID
//
this.DebugID.AccessibleRole = System.Windows.Forms.AccessibleRole.Row;
this.DebugID.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.DebugID.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.DebugID.Cursor = System.Windows.Forms.Cursors.Default;
this.DebugID.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold);
this.DebugID.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.DebugID.Location = new System.Drawing.Point(29, 405);
this.DebugID.Margin = new System.Windows.Forms.Padding(2);
this.DebugID.Name = "DebugID";
this.DebugID.ReadOnly = true;
this.DebugID.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
this.DebugID.Size = new System.Drawing.Size(285, 21);
this.DebugID.TabIndex = 16;
this.DebugID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.DebugID.Click += new System.EventHandler(this.DebugID_Click);
//
// label2
//
this.label2.BackColor = System.Drawing.Color.Transparent;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
this.label2.Location = new System.Drawing.Point(29, 505);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(284, 86);
this.label2.TabIndex = 14;
this.label2.Text = "This is your most recent CrashLogID. Click on the CrashLogID to copy it to your c" +
"lipboard.";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// textBox1
//
this.textBox1.AccessibleRole = System.Windows.Forms.AccessibleRole.Row;
this.textBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.textBox1.Cursor = System.Windows.Forms.Cursors.Default;
this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold);
this.textBox1.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.textBox1.Location = new System.Drawing.Point(29, 488);
this.textBox1.Margin = new System.Windows.Forms.Padding(2);
this.textBox1.Name = "textBox1";
this.textBox1.ReadOnly = true;
this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
this.textBox1.Size = new System.Drawing.Size(285, 21);
this.textBox1.TabIndex = 16;
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.textBox1.Click += new System.EventHandler(this.textBox1_Click);
//
// nodevicemodeBox
//
this.nodevicemodeBox.AutoSize = true;
@@ -298,20 +199,23 @@
//
this.applyButton.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.applyButton.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.applyButton.BackColor = System.Drawing.Color.Transparent;
this.applyButton.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
this.applyButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.applyButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.applyButton.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.applyButton.DialogResult = System.Windows.Forms.DialogResult.OK;
this.applyButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
this.applyButton.ForeColor = System.Drawing.Color.White;
this.applyButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.applyButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.applyButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.applyButton.Location = new System.Drawing.Point(29, 286);
this.applyButton.Location = new System.Drawing.Point(29, 301);
this.applyButton.Name = "applyButton";
this.applyButton.Radius = 5;
this.applyButton.Size = new System.Drawing.Size(101, 31);
this.applyButton.Size = new System.Drawing.Size(133, 31);
this.applyButton.Stroke = true;
this.applyButton.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
this.applyButton.TabIndex = 17;
this.applyButton.Text = "Apply";
this.applyButton.Text = "Apply Settings";
this.applyButton.Transparency = false;
this.applyButton.Click += new System.EventHandler(this.applyButton_Click);
//
@@ -325,58 +229,91 @@
this.resetSettingsButton.ForeColor = System.Drawing.Color.White;
this.resetSettingsButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.resetSettingsButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.resetSettingsButton.Location = new System.Drawing.Point(212, 286);
this.resetSettingsButton.Location = new System.Drawing.Point(181, 301);
this.resetSettingsButton.Name = "resetSettingsButton";
this.resetSettingsButton.Radius = 5;
this.resetSettingsButton.Size = new System.Drawing.Size(101, 31);
this.resetSettingsButton.Size = new System.Drawing.Size(133, 31);
this.resetSettingsButton.Stroke = true;
this.resetSettingsButton.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
this.resetSettingsButton.TabIndex = 18;
this.resetSettingsButton.Text = "Reset";
this.resetSettingsButton.Text = "Reset Settings";
this.resetSettingsButton.Transparency = false;
this.resetSettingsButton.Click += new System.EventHandler(this.resetSettingsButton_Click);
//
// DebugLogCopy
// btnResetDebug
//
this.DebugLogCopy.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.DebugLogCopy.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.DebugLogCopy.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.DebugLogCopy.DialogResult = System.Windows.Forms.DialogResult.OK;
this.DebugLogCopy.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
this.DebugLogCopy.ForeColor = System.Drawing.Color.White;
this.DebugLogCopy.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.DebugLogCopy.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.DebugLogCopy.Location = new System.Drawing.Point(29, 323);
this.DebugLogCopy.Name = "DebugLogCopy";
this.DebugLogCopy.Radius = 5;
this.DebugLogCopy.Size = new System.Drawing.Size(285, 31);
this.DebugLogCopy.Stroke = true;
this.DebugLogCopy.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
this.DebugLogCopy.TabIndex = 19;
this.DebugLogCopy.Text = "Send DebugLog to server.";
this.DebugLogCopy.Transparency = false;
this.DebugLogCopy.Click += new System.EventHandler(this.DebugLogCopy_click);
this.btnResetDebug.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.btnResetDebug.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.btnResetDebug.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.btnResetDebug.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnResetDebug.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
this.btnResetDebug.ForeColor = System.Drawing.Color.White;
this.btnResetDebug.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.btnResetDebug.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.btnResetDebug.Location = new System.Drawing.Point(29, 385);
this.btnResetDebug.Name = "btnResetDebug";
this.btnResetDebug.Radius = 5;
this.btnResetDebug.Size = new System.Drawing.Size(285, 31);
this.btnResetDebug.Stroke = true;
this.btnResetDebug.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
this.btnResetDebug.TabIndex = 20;
this.btnResetDebug.Text = "Reset Debug Log";
this.btnResetDebug.Transparency = false;
this.btnResetDebug.Click += new System.EventHandler(this.btnResetDebug_click);
//
// Button1
// btnUploadDebug
//
this.Button1.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.Button1.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.Button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.Button1.DialogResult = System.Windows.Forms.DialogResult.OK;
this.Button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
this.Button1.ForeColor = System.Drawing.Color.White;
this.Button1.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.Button1.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.Button1.Location = new System.Drawing.Point(29, 358);
this.Button1.Name = "Button1";
this.Button1.Radius = 5;
this.Button1.Size = new System.Drawing.Size(285, 31);
this.Button1.Stroke = true;
this.Button1.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
this.Button1.TabIndex = 20;
this.Button1.Text = "Reset Debug Log";
this.Button1.Transparency = false;
this.Button1.Click += new System.EventHandler(this.button1_click);
this.btnUploadDebug.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.btnUploadDebug.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.btnUploadDebug.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.btnUploadDebug.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnUploadDebug.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
this.btnUploadDebug.ForeColor = System.Drawing.Color.White;
this.btnUploadDebug.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.btnUploadDebug.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.btnUploadDebug.Location = new System.Drawing.Point(29, 422);
this.btnUploadDebug.Name = "btnUploadDebug";
this.btnUploadDebug.Radius = 5;
this.btnUploadDebug.Size = new System.Drawing.Size(285, 31);
this.btnUploadDebug.Stroke = true;
this.btnUploadDebug.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
this.btnUploadDebug.TabIndex = 19;
this.btnUploadDebug.Text = "Upload Debug Log";
this.btnUploadDebug.Transparency = false;
this.btnUploadDebug.Click += new System.EventHandler(this.btnUploadDebug_click);
//
// btnOpenDebug
//
this.btnOpenDebug.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.btnOpenDebug.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
this.btnOpenDebug.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.btnOpenDebug.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnOpenDebug.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
this.btnOpenDebug.ForeColor = System.Drawing.Color.White;
this.btnOpenDebug.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.btnOpenDebug.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
this.btnOpenDebug.Location = new System.Drawing.Point(29, 348);
this.btnOpenDebug.Name = "btnOpenDebug";
this.btnOpenDebug.Radius = 5;
this.btnOpenDebug.Size = new System.Drawing.Size(285, 31);
this.btnOpenDebug.Stroke = true;
this.btnOpenDebug.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
this.btnOpenDebug.TabIndex = 21;
this.btnOpenDebug.Text = "Open Debug Log";
this.btnOpenDebug.Transparency = false;
this.btnOpenDebug.Click += new System.EventHandler(this.btnOpenDebug_Click);
//
// lblMibs
//
this.lblMibs.AutoSize = true;
this.lblMibs.BackColor = System.Drawing.Color.Transparent;
this.lblMibs.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.lblMibs.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
this.lblMibs.Location = new System.Drawing.Point(159, 257);
this.lblMibs.Name = "lblMibs";
this.lblMibs.Size = new System.Drawing.Size(135, 18);
this.lblMibs.TabIndex = 22;
this.lblMibs.Text = "MiB/s (0 to disable)";
//
// SettingsForm
//
@@ -384,19 +321,16 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor;
this.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes_1_1_1_0_0_0_1__000000_212121;
this.ClientSize = new System.Drawing.Size(342, 601);
this.Controls.Add(this.Button1);
this.Controls.Add(this.DebugLogCopy);
this.ClientSize = new System.Drawing.Size(342, 469);
this.Controls.Add(this.lblMibs);
this.Controls.Add(this.btnOpenDebug);
this.Controls.Add(this.btnResetDebug);
this.Controls.Add(this.btnUploadDebug);
this.Controls.Add(this.resetSettingsButton);
this.Controls.Add(this.applyButton);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.DebugID);
this.Controls.Add(this.crashlogID);
this.Controls.Add(this.label2);
this.Controls.Add(this.debuglogID);
this.Controls.Add(this.BandwithComboBox);
this.Controls.Add(this.label1);
this.Controls.Add(this.BandwithTextbox);
this.Controls.Add(this.lblDownloadSpeedLimiter);
this.Controls.Add(this.txtBandwidth);
this.Controls.Add(this.bmbfBox);
this.Controls.Add(this.AutoReinstBox);
this.Controls.Add(this.nodevicemodeBox);
@@ -428,20 +362,17 @@
private System.Windows.Forms.CheckBox deleteAfterInstallCheckBox;
private System.Windows.Forms.CheckBox updateConfigCheckBox;
private System.Windows.Forms.CheckBox userJsonOnGameInstall;
private System.Windows.Forms.TextBox BandwithTextbox;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox BandwithComboBox;
private System.Windows.Forms.TextBox txtBandwidth;
private System.Windows.Forms.Label lblDownloadSpeedLimiter;
private System.Windows.Forms.Label crashlogID;
public System.Windows.Forms.Label debuglogID;
private System.Windows.Forms.TextBox DebugID;
public System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.CheckBox nodevicemodeBox;
private System.Windows.Forms.CheckBox bmbfBox;
private System.Windows.Forms.CheckBox AutoReinstBox;
private RoundButton applyButton;
private RoundButton resetSettingsButton;
private RoundButton DebugLogCopy;
private RoundButton Button1;
private RoundButton btnResetDebug;
private RoundButton btnUploadDebug;
private RoundButton btnOpenDebug;
private System.Windows.Forms.Label lblMibs;
}
}

View File

@@ -1,5 +1,6 @@
using JR.Utils.GUI.Forms;
using System;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
@@ -15,11 +16,6 @@ namespace AndroidSideloader
private void SettingsForm_Load(object sender, EventArgs e)
{
this.CenterToParent();
if (!string.IsNullOrEmpty(Properties.Settings.Default.CurrentLogName))
textBox1.Text = Properties.Settings.Default.CurrentCrashName;
if (!string.IsNullOrEmpty(Properties.Settings.Default.CurrentLogPath))
DebugID.Text = Properties.Settings.Default.CurrentLogName;
debuglogID.Text = "This is your DebugLogID. Click on your DebugLogID to copy it to your clipboard.";
intSettings();
intToolTips();
}
@@ -36,10 +32,9 @@ namespace AndroidSideloader
bmbfBox.Checked = Properties.Settings.Default.BMBFchecked;
AutoReinstBox.Checked = Properties.Settings.Default.AutoReinstall;
if (Properties.Settings.Default.BandwithLimit.Length > 1)
if (Properties.Settings.Default.BandwidthLimit.Length > 1)
{
BandwithTextbox.Text = Properties.Settings.Default.BandwithLimit.Remove(Properties.Settings.Default.BandwithLimit.Length - 1);
BandwithComboBox.Text = Properties.Settings.Default.BandwithLimit[Properties.Settings.Default.BandwithLimit.Length - 1].ToString();
txtBandwidth.Text = Properties.Settings.Default.BandwidthLimit.Remove(Properties.Settings.Default.BandwidthLimit.Length - 1);
}
}
@@ -54,67 +49,38 @@ namespace AndroidSideloader
deleteAfterInstallToolTip.SetToolTip(this.deleteAfterInstallCheckBox, "If this is checked, the software will delete all game files after downloading and installing a game from a remote server");
}
public void DebugLogCopy_click(object sender, EventArgs e)
public void btnUploadDebug_click(object sender, EventArgs e)
{
if (File.Exists($"{Properties.Settings.Default.CurrentLogPath}"))
{
RCLONE.runRcloneCommand_DownloadConfig($"copy \"{Properties.Settings.Default.CurrentLogPath}\" VRP-debuglogs:DebugLogs");
Clipboard.SetText(DebugID.Text);
MessageBox.Show($"Your debug log has been copied to the server. Please mention your DebugLog ID ({Properties.Settings.Default.CurrentLogName}) to the Mods (it has been automatically copied to your clipboard).");
string UUID = SideloaderUtilities.UUID();
string debugLogPath = $"{Environment.CurrentDirectory}\\{UUID}.log";
System.IO.File.Copy("debuglog.txt", debugLogPath);
Clipboard.SetText(UUID);
RCLONE.runRcloneCommand_UploadConfig($"copy \"{debugLogPath}\" RSL-gameuploads:DebugLogs");
MessageBox.Show($"Your debug log has been copied to the server. ID: {UUID}");
}
}
public void button1_click(object sender, EventArgs e)
public void btnResetDebug_click(object sender, EventArgs e)
{
if (File.Exists($"{Properties.Settings.Default.CurrentLogPath}"))
File.Delete($"{Properties.Settings.Default.CurrentLogPath}");
if (File.Exists($"{Environment.CurrentDirectory}\\debuglog.txt"))
File.Delete($"{Environment.CurrentDirectory}\\debuglog.txt");
if (File.Exists($"{Environment.CurrentDirectory}\\nouns\\nouns.txt"))
{
string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\nouns\\nouns.txt");
Random r = new Random();
int x = r.Next(6806);
int y = r.Next(6806);
string randomnoun = lines[new Random(x).Next(lines.Length)];
string randomnoun2 = lines[new Random(y).Next(lines.Length)];
string combined = randomnoun + "-" + randomnoun2;
Properties.Settings.Default.CurrentLogPath = Environment.CurrentDirectory + "\\" + combined + ".txt";
Properties.Settings.Default.CurrentLogName = combined;
Properties.Settings.Default.Save();
DebugID.Text = combined;
this.Close();
SettingsForm Form = new SettingsForm();
Form.Show();
}
}
//Apply settings
private void applyButton_Click(object sender, EventArgs e)
{
if (BandwithTextbox.Text.Length > 0 && BandwithTextbox.Text != "0")
if (BandwithComboBox.SelectedIndex == -1)
{
FlexibleMessageBox.Show("You need to select something from the combobox");
return;
}
else
{
Properties.Settings.Default.BandwithLimit = $"{BandwithTextbox.Text.Replace(" ", "")}{BandwithComboBox.Text}";
}
else
Properties.Settings.Default.BandwithLimit = "";
if (txtBandwidth.Text.Length > 0 && txtBandwidth.Text != "0") {
Properties.Settings.Default.BandwidthLimit = $"{txtBandwidth.Text.Replace(" ", "")}M";
} else {
Properties.Settings.Default.BandwidthLimit = "";
}
Properties.Settings.Default.Save();
FlexibleMessageBox.Show("Settings applied!");
@@ -164,7 +130,6 @@ namespace AndroidSideloader
this.Close();
}
private void Form_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape)
@@ -182,22 +147,6 @@ namespace AndroidSideloader
return base.ProcessDialogKey(keyData);
}
private void DebugID_Click(object sender, EventArgs e)
{
if (File.Exists(Environment.CurrentDirectory + "\\" + Properties.Settings.Default.CurrentLogName + ".txt"))
Clipboard.SetText(DebugID.Text);
MessageBox.Show("DebugLogID copied to clipboard! Paste it to a moderator/helper for assistance!");
}
private void textBox1_Click(object sender, EventArgs e)
{
if (!String.IsNullOrEmpty(Properties.Settings.Default.CurrentCrashName))
{
Clipboard.SetText(textBox1.Text);
MessageBox.Show("CrashLogID copied to clipboard! Paste it to a moderator/helper for assistance!");
}
}
private void nodevicemodeBox_CheckedChanged(object sender, EventArgs e)
{
Properties.Settings.Default.nodevicemode = nodevicemodeBox.Checked;
@@ -230,6 +179,14 @@ namespace AndroidSideloader
}
}
private void btnOpenDebug_Click(object sender, EventArgs e)
{
if (File.Exists($"{Environment.CurrentDirectory}\\debuglog.txt"))
{
Process.Start($"{Environment.CurrentDirectory}\\debuglog.txt");
}
}
}
}

View File

@@ -17,7 +17,7 @@ namespace AndroidSideloader
private static string RawGitHubUrl;
private static string GitHubUrl;
static readonly public string LocalVersion = "2.15";
static readonly public string LocalVersion = "2.16";
public static string currentVersion = string.Empty;
public static string changelog = string.Empty;

View File

@@ -10,7 +10,6 @@ namespace AndroidSideloader.Utilities
{
public UploadGame(string Uploadcommand, string Pckgcommand, string Uploadgamename, ulong Uploadversion, bool isUpdate)
{
this.Uploadcommand = Uploadcommand;
this.Pckgcommand = Pckgcommand;
this.Uploadgamename = Uploadgamename;
this.Uploadversion = Uploadversion;
@@ -22,8 +21,6 @@ namespace AndroidSideloader.Utilities
}
public bool isUpdate { get; set; }
public string Uploadcommand { get; set; }
public string Pckgcommand { get; set; }
public string Uploadgamename { get; set; }

View File

@@ -2,6 +2,9 @@
using System.Diagnostics;
using System.Net;
using System.IO;
using System.Linq;
using JR.Utils.GUI.Forms;
using System.Windows.Forms;
namespace AndroidSideloader.Utilities
{
@@ -35,15 +38,27 @@ namespace AndroidSideloader.Utilities
pro.Arguments = args;
pro.CreateNoWindow = true;
pro.UseShellExecute = false;
Logger.Log($"Extract: 7z {args}");
pro.RedirectStandardInput = true;
pro.RedirectStandardError = true;
pro.RedirectStandardOutput = true;
Logger.Log($"Extract: 7z {string.Join(" ", args.Split(' ').Where(a => !a.StartsWith("-p")))}");
Process x = Process.Start(pro);
x.WaitForExit();
if (x.ExitCode != 0)
{
Logger.Log($"Extract failed");
string error = x.StandardError.ReadToEnd();
if (error.Contains("There is not enough space on the disk"))
{
FlexibleMessageBox.Show($"Not enough space to extract archive.\r\nCheck free space in {Environment.CurrentDirectory} and try again.",
"NOT ENOUGH SPACE",
MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
Logger.Log(x.StandardOutput.ReadToEnd());
Logger.Log(error);
throw new ApplicationException($"Extracting failed, status code {x.ExitCode}");
}
}

View File

@@ -1,12 +1,10 @@
RSL 2.15
RSL 2.16
- Massive UI Changes:
- Rounded buttons
- Added version Number at Bottom Left
- Changed fonts to some extend
- Added background pattern to category buttons and MainForm background
- Added an animation when opening/closing category
- Overall darker theme
- New splash
- Fix misleading error message when not enough disk space
- Fix downloads silently failing in some cases
- Fix failure to detect failed extraction when archive corrupt
- Fix UI issues when resizing main form
- Various code cleanups
~Chax
~SytheZN
~fenopy

View File

@@ -1 +1 @@
2.15
2.16