diff --git a/AndroidSideloader.csproj b/AndroidSideloader.csproj index 9ebb67a..0eddf9f 100644 --- a/AndroidSideloader.csproj +++ b/AndroidSideloader.csproj @@ -181,6 +181,11 @@ + + True + True + Resources.resx + Component @@ -266,14 +271,9 @@ PublicResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - True - Resources.resx - True - QuestForm.cs Designer @@ -317,8 +317,6 @@ - - diff --git a/App.config b/App.config index ade4b57..519115b 100644 --- a/App.config +++ b/App.config @@ -33,7 +33,7 @@ True - Microsoft Sans Serif, 11.25pt + Microsoft Sans Serif, 9pt @@ -135,7 +135,7 @@ False - White + DarkGray 25, 25, 25 @@ -147,10 +147,10 @@ 25, 25, 25 - Black + 32, 35, 45 - 1, 1, 1 + 31, 34, 42 diff --git a/DonorsListView.Designer.cs b/DonorsListView.Designer.cs index 3501c0e..29a038e 100644 --- a/DonorsListView.Designer.cs +++ b/DonorsListView.Designer.cs @@ -112,7 +112,6 @@ namespace AndroidSideloader // panel1 // this.panel1.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor; - this.panel1.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes; this.panel1.Controls.Add(this.skip_forever); this.panel1.Controls.Add(this.SkipButton); this.panel1.Controls.Add(this.DonateButton); diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index bbb7e89..61683bb 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -1,4 +1,3 @@ - using AndroidSideloader.Properties; using System.Drawing; using System.Windows.Forms; @@ -105,9 +104,8 @@ namespace AndroidSideloader this.speedLabel_Tooltip = new System.Windows.Forms.ToolTip(this.components); this.etaLabel_Tooltip = new System.Windows.Forms.ToolTip(this.components); this.progressDLbtnContainer = new System.Windows.Forms.Panel(); - this.downloadInstallGameButton = new AndroidSideloader.RoundButton(); - this.diskLabel = new System.Windows.Forms.Label(); this.bottomContainer = new System.Windows.Forms.Panel(); + this.diskLabel = new System.Windows.Forms.Label(); this.deviceDrop = new System.Windows.Forms.Button(); this.deviceDropContainer = new System.Windows.Forms.Panel(); this.sideloadDrop = new System.Windows.Forms.Button(); @@ -118,8 +116,11 @@ namespace AndroidSideloader this.backupContainer = new System.Windows.Forms.Panel(); this.otherDrop = new System.Windows.Forms.Button(); this.otherContainer = new System.Windows.Forms.Panel(); - this.batteryLevImg = new System.Windows.Forms.PictureBox(); + this.questInfoPanel = new System.Windows.Forms.Panel(); + this.questStorageProgressBar = new System.Windows.Forms.Panel(); this.batteryLabel = new System.Windows.Forms.Label(); + this.batteryLevImg = new System.Windows.Forms.PictureBox(); + this.questInfoLabel = new System.Windows.Forms.Label(); this.ULLabel = new System.Windows.Forms.Label(); this.verLabel = new System.Windows.Forms.Label(); this.leftNavContainer = new System.Windows.Forms.Panel(); @@ -130,16 +131,17 @@ namespace AndroidSideloader this.favoriteSwitcher = new AndroidSideloader.RoundButton(); this.adbCmd_btnSend = new AndroidSideloader.RoundButton(); this.adbCmd_btnToggleUpdates = new AndroidSideloader.RoundButton(); + this.downloadInstallGameButton = new AndroidSideloader.RoundButton(); this.MountButton = new AndroidSideloader.RoundButton(); this.btnNoDevice = new AndroidSideloader.RoundButton(); ((System.ComponentModel.ISupportInitialize)(this.gamesPictureBox)).BeginInit(); this.progressDLbtnContainer.SuspendLayout(); - this.bottomContainer.SuspendLayout(); this.deviceDropContainer.SuspendLayout(); this.sideloadContainer.SuspendLayout(); this.installedAppsMenuContainer.SuspendLayout(); this.backupContainer.SuspendLayout(); this.otherContainer.SuspendLayout(); + this.questInfoPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.batteryLevImg)).BeginInit(); this.leftNavContainer.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -157,7 +159,7 @@ namespace AndroidSideloader this.m_combo.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; this.m_combo.Location = new System.Drawing.Point(224, 9); this.m_combo.Name = "m_combo"; - this.m_combo.Size = new System.Drawing.Size(374, 26); + this.m_combo.Size = new System.Drawing.Size(374, 23); this.m_combo.TabIndex = 0; this.m_combo.Text = "Select an Installed App to Uninstall or Share..."; // @@ -184,7 +186,7 @@ namespace AndroidSideloader 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.Size = new System.Drawing.Size(124, 15); 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"); @@ -234,11 +236,11 @@ namespace AndroidSideloader this.gamesQueListBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; this.gamesQueListBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; this.gamesQueListBox.FormattingEnabled = true; - this.gamesQueListBox.ItemHeight = 18; + this.gamesQueListBox.ItemHeight = 15; this.gamesQueListBox.Location = new System.Drawing.Point(983, 493); this.gamesQueListBox.Margin = new System.Windows.Forms.Padding(2); this.gamesQueListBox.Name = "gamesQueListBox"; - this.gamesQueListBox.Size = new System.Drawing.Size(386, 128); + this.gamesQueListBox.Size = new System.Drawing.Size(386, 122); this.gamesQueListBox.TabIndex = 9; this.gamesQueListBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.gamesQueListBox_MouseClick); this.gamesQueListBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop); @@ -256,7 +258,7 @@ namespace AndroidSideloader this.devicesComboBox.Location = new System.Drawing.Point(224, 39); this.devicesComboBox.Margin = new System.Windows.Forms.Padding(2); this.devicesComboBox.Name = "devicesComboBox"; - this.devicesComboBox.Size = new System.Drawing.Size(164, 26); + this.devicesComboBox.Size = new System.Drawing.Size(164, 23); this.devicesComboBox.TabIndex = 1; this.devicesComboBox.Text = "Select your device"; this.devicesComboBox.SelectedIndexChanged += new System.EventHandler(this.devicesComboBox_SelectedIndexChanged); @@ -273,7 +275,7 @@ namespace AndroidSideloader this.remotesList.Location = new System.Drawing.Point(531, 40); this.remotesList.Margin = new System.Windows.Forms.Padding(2); this.remotesList.Name = "remotesList"; - this.remotesList.Size = new System.Drawing.Size(67, 26); + this.remotesList.Size = new System.Drawing.Size(67, 23); this.remotesList.TabIndex = 3; this.remotesList.SelectedIndexChanged += new System.EventHandler(this.remotesList_SelectedIndexChanged); // @@ -353,15 +355,14 @@ namespace AndroidSideloader | System.Windows.Forms.AnchorStyles.Right))); this.searchTextBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.searchTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.searchTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.searchTextBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.searchTextBox.ForeColor = System.Drawing.Color.Gray; + this.searchTextBox.ForeColor = System.Drawing.Color.LightGray; this.searchTextBox.Location = new System.Drawing.Point(224, 70); this.searchTextBox.MinimumSize = new System.Drawing.Size(231, 26); this.searchTextBox.Name = "searchTextBox"; - this.searchTextBox.Size = new System.Drawing.Size(1145, 24); + this.searchTextBox.Size = new System.Drawing.Size(1145, 21); this.searchTextBox.TabIndex = 5; - this.searchTextBox.Text = "Search"; + this.searchTextBox.Text = "Search..."; this.searchTextBox.Click += new System.EventHandler(this.searchTextBox_Click); this.searchTextBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged); this.searchTextBox.Enter += new System.EventHandler(this.searchTextBox_Enter); @@ -378,7 +379,7 @@ namespace AndroidSideloader this.gamesQueueLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; this.gamesQueueLabel.Location = new System.Drawing.Point(984, 603); this.gamesQueueLabel.Name = "gamesQueueLabel"; - this.gamesQueueLabel.Size = new System.Drawing.Size(123, 18); + this.gamesQueueLabel.Size = new System.Drawing.Size(103, 15); this.gamesQueueLabel.TabIndex = 86; this.gamesQueueLabel.Text = "Download Queue"; // @@ -438,7 +439,7 @@ namespace AndroidSideloader this.lblNotes.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; this.lblNotes.Location = new System.Drawing.Point(984, 689); this.lblNotes.Name = "lblNotes"; - this.lblNotes.Size = new System.Drawing.Size(106, 18); + this.lblNotes.Size = new System.Drawing.Size(88, 15); this.lblNotes.TabIndex = 86; this.lblNotes.Text = "Release Notes"; // @@ -514,7 +515,7 @@ namespace AndroidSideloader this.adbCmd_CommandBox.MaximumSize = new System.Drawing.Size(290, 24); this.adbCmd_CommandBox.MinimumSize = new System.Drawing.Size(290, 24); this.adbCmd_CommandBox.Name = "adbCmd_CommandBox"; - this.adbCmd_CommandBox.Size = new System.Drawing.Size(290, 24); + this.adbCmd_CommandBox.Size = new System.Drawing.Size(290, 21); this.adbCmd_CommandBox.TabIndex = 5; this.adbCmd_CommandBox.Visible = false; this.adbCmd_CommandBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged); @@ -571,20 +572,18 @@ namespace AndroidSideloader // // startsideloadbutton // - this.startsideloadbutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.startsideloadbutton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.startsideloadbutton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.startsideloadbutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.startsideloadbutton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.startsideloadbutton.Dock = System.Windows.Forms.DockStyle.Top; this.startsideloadbutton.FlatAppearance.BorderSize = 0; this.startsideloadbutton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.startsideloadbutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.startsideloadbutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.startsideloadbutton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.startsideloadbutton.Location = new System.Drawing.Point(0, 56); this.startsideloadbutton.Name = "startsideloadbutton"; - this.startsideloadbutton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.startsideloadbutton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.startsideloadbutton.Size = new System.Drawing.Size(221, 28); this.startsideloadbutton.TabIndex = 5; - this.startsideloadbutton.Text = "Sideload APK"; + 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; @@ -592,17 +591,15 @@ namespace AndroidSideloader // // devicesbutton // - this.devicesbutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.devicesbutton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.devicesbutton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.devicesbutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.devicesbutton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.devicesbutton.Dock = System.Windows.Forms.DockStyle.Top; this.devicesbutton.FlatAppearance.BorderSize = 0; this.devicesbutton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.devicesbutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.devicesbutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.devicesbutton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.devicesbutton.Location = new System.Drawing.Point(0, 0); this.devicesbutton.Name = "devicesbutton"; - this.devicesbutton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.devicesbutton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.devicesbutton.Size = new System.Drawing.Size(221, 28); this.devicesbutton.TabIndex = 0; this.devicesbutton.Text = "RECONNECT DEVICE"; @@ -613,20 +610,18 @@ namespace AndroidSideloader // // obbcopybutton // - this.obbcopybutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.obbcopybutton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.obbcopybutton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.obbcopybutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.obbcopybutton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.obbcopybutton.Dock = System.Windows.Forms.DockStyle.Top; this.obbcopybutton.FlatAppearance.BorderSize = 0; this.obbcopybutton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.obbcopybutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.obbcopybutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.obbcopybutton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.obbcopybutton.Location = new System.Drawing.Point(0, 0); this.obbcopybutton.Name = "obbcopybutton"; - this.obbcopybutton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.obbcopybutton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.obbcopybutton.Size = new System.Drawing.Size(221, 28); this.obbcopybutton.TabIndex = 0; - this.obbcopybutton.Text = "Copy OBB"; + 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)"); @@ -635,20 +630,18 @@ namespace AndroidSideloader // // backupadbbutton // - this.backupadbbutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.backupadbbutton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.backupadbbutton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.backupadbbutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.backupadbbutton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.backupadbbutton.Dock = System.Windows.Forms.DockStyle.Top; this.backupadbbutton.FlatAppearance.BorderSize = 0; this.backupadbbutton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.backupadbbutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.backupadbbutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.backupadbbutton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.backupadbbutton.Location = new System.Drawing.Point(0, 28); this.backupadbbutton.Name = "backupadbbutton"; - this.backupadbbutton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.backupadbbutton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.backupadbbutton.Size = new System.Drawing.Size(221, 28); this.backupadbbutton.TabIndex = 1; - this.backupadbbutton.Text = "Backup with ADB"; + this.backupadbbutton.Text = "BACKUP WITH ADB"; this.backupadbbutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.backupadbbutton_Tooltip.SetToolTip(this.backupadbbutton, "Uses ADB-Backup to Save Game Data (Pick app within the Dropdown)"); this.backupadbbutton.UseVisualStyleBackColor = false; @@ -656,20 +649,18 @@ namespace AndroidSideloader // // backupbutton // - this.backupbutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.backupbutton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.backupbutton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.backupbutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.backupbutton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.backupbutton.Dock = System.Windows.Forms.DockStyle.Top; this.backupbutton.FlatAppearance.BorderSize = 0; this.backupbutton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.backupbutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.backupbutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.backupbutton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.backupbutton.Location = new System.Drawing.Point(0, 0); this.backupbutton.Name = "backupbutton"; - this.backupbutton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.backupbutton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.backupbutton.Size = new System.Drawing.Size(221, 28); this.backupbutton.TabIndex = 1; - this.backupbutton.Text = "Backup Gamedata"; + 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" + ")"); @@ -678,20 +669,18 @@ namespace AndroidSideloader // // restorebutton // - this.restorebutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.restorebutton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.restorebutton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.restorebutton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.restorebutton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.restorebutton.Dock = System.Windows.Forms.DockStyle.Top; this.restorebutton.FlatAppearance.BorderSize = 0; this.restorebutton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.restorebutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.restorebutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.restorebutton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.restorebutton.Location = new System.Drawing.Point(0, 56); this.restorebutton.Name = "restorebutton"; - this.restorebutton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.restorebutton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.restorebutton.Size = new System.Drawing.Size(221, 28); this.restorebutton.TabIndex = 0; - this.restorebutton.Text = "Restore Gamedata"; + 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!)"); @@ -700,20 +689,17 @@ namespace AndroidSideloader // // getApkButton // - this.getApkButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.getApkButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.getApkButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.getApkButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.getApkButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.getApkButton.Dock = System.Windows.Forms.DockStyle.Top; this.getApkButton.FlatAppearance.BorderSize = 0; this.getApkButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.getApkButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.getApkButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; this.getApkButton.Location = new System.Drawing.Point(0, 0); this.getApkButton.Name = "getApkButton"; - this.getApkButton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.getApkButton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.getApkButton.Size = new System.Drawing.Size(221, 28); this.getApkButton.TabIndex = 2; - this.getApkButton.Text = "Share Selected App"; + 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; @@ -721,20 +707,18 @@ namespace AndroidSideloader // // uninstallAppButton // - this.uninstallAppButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.uninstallAppButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.uninstallAppButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.uninstallAppButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.uninstallAppButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.uninstallAppButton.Dock = System.Windows.Forms.DockStyle.Top; this.uninstallAppButton.FlatAppearance.BorderSize = 0; this.uninstallAppButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.uninstallAppButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.uninstallAppButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.uninstallAppButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.uninstallAppButton.Location = new System.Drawing.Point(0, 28); this.uninstallAppButton.Name = "uninstallAppButton"; - this.uninstallAppButton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.uninstallAppButton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.uninstallAppButton.Size = new System.Drawing.Size(221, 28); this.uninstallAppButton.TabIndex = 3; - this.uninstallAppButton.Text = "Uninstall Selected App"; + 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; @@ -742,20 +726,18 @@ namespace AndroidSideloader // // pullAppToDesktopBtn // - this.pullAppToDesktopBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.pullAppToDesktopBtn.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.pullAppToDesktopBtn.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.pullAppToDesktopBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.pullAppToDesktopBtn.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.pullAppToDesktopBtn.Dock = System.Windows.Forms.DockStyle.Top; this.pullAppToDesktopBtn.FlatAppearance.BorderSize = 0; this.pullAppToDesktopBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.pullAppToDesktopBtn.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.pullAppToDesktopBtn.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.pullAppToDesktopBtn.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.pullAppToDesktopBtn.Location = new System.Drawing.Point(0, 56); this.pullAppToDesktopBtn.Name = "pullAppToDesktopBtn"; - this.pullAppToDesktopBtn.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.pullAppToDesktopBtn.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.pullAppToDesktopBtn.Size = new System.Drawing.Size(221, 28); this.pullAppToDesktopBtn.TabIndex = 4; - this.pullAppToDesktopBtn.Text = "Pull App To Desktop"; + 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; @@ -763,20 +745,18 @@ namespace AndroidSideloader // // copyBulkObbButton // - this.copyBulkObbButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.copyBulkObbButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.copyBulkObbButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.copyBulkObbButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.copyBulkObbButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.copyBulkObbButton.Dock = System.Windows.Forms.DockStyle.Top; this.copyBulkObbButton.FlatAppearance.BorderSize = 0; this.copyBulkObbButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.copyBulkObbButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.copyBulkObbButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.copyBulkObbButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.copyBulkObbButton.Location = new System.Drawing.Point(0, 28); this.copyBulkObbButton.Name = "copyBulkObbButton"; - this.copyBulkObbButton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.copyBulkObbButton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.copyBulkObbButton.Size = new System.Drawing.Size(221, 28); this.copyBulkObbButton.TabIndex = 1; - this.copyBulkObbButton.Text = "Recursive Copy OBB"; + 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; @@ -784,20 +764,19 @@ namespace AndroidSideloader // // aboutBtn // - this.aboutBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); + this.aboutBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(35)))), ((int)(((byte)(45))))); this.aboutBtn.Cursor = System.Windows.Forms.Cursors.Hand; - this.aboutBtn.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.aboutBtn.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.aboutBtn.Dock = System.Windows.Forms.DockStyle.Top; this.aboutBtn.FlatAppearance.BorderSize = 0; this.aboutBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.aboutBtn.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.aboutBtn.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; - this.aboutBtn.Location = new System.Drawing.Point(0, 645); + this.aboutBtn.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.aboutBtn.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(203)))), ((int)(((byte)(173))))); + this.aboutBtn.Location = new System.Drawing.Point(0, 697); this.aboutBtn.Name = "aboutBtn"; + this.aboutBtn.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.aboutBtn.Size = new System.Drawing.Size(221, 28); this.aboutBtn.TabIndex = 5; - this.aboutBtn.Text = " ?   ABOUT"; + 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; @@ -805,21 +784,20 @@ namespace AndroidSideloader // // settingsButton // - this.settingsButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); + this.settingsButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(35)))), ((int)(((byte)(45))))); this.settingsButton.Cursor = System.Windows.Forms.Cursors.Hand; - this.settingsButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.settingsButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.settingsButton.Dock = System.Windows.Forms.DockStyle.Top; this.settingsButton.FlatAppearance.BorderSize = 0; this.settingsButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.settingsButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.settingsButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.settingsButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.settingsButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(203)))), ((int)(((byte)(173))))); this.settingsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.settingsButton.Location = new System.Drawing.Point(0, 617); + this.settingsButton.Location = new System.Drawing.Point(0, 669); this.settingsButton.Name = "settingsButton"; + this.settingsButton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.settingsButton.Size = new System.Drawing.Size(221, 28); this.settingsButton.TabIndex = 4; - this.settingsButton.Text = "⚙ SETTINGS"; + this.settingsButton.Text = "SETTINGS"; this.settingsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.settingsButton_Tooltip.SetToolTip(this.settingsButton, "Rookie App Settings"); this.settingsButton.UseVisualStyleBackColor = false; @@ -827,20 +805,18 @@ namespace AndroidSideloader // // QuestOptionsButton // - this.QuestOptionsButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.QuestOptionsButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.QuestOptionsButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.QuestOptionsButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.QuestOptionsButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.QuestOptionsButton.Dock = System.Windows.Forms.DockStyle.Top; this.QuestOptionsButton.FlatAppearance.BorderSize = 0; this.QuestOptionsButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.QuestOptionsButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.QuestOptionsButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.QuestOptionsButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.QuestOptionsButton.Location = new System.Drawing.Point(0, 56); this.QuestOptionsButton.Name = "QuestOptionsButton"; - this.QuestOptionsButton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.QuestOptionsButton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.QuestOptionsButton.Size = new System.Drawing.Size(221, 28); this.QuestOptionsButton.TabIndex = 2; - this.QuestOptionsButton.Text = "Quest Options"; + 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; @@ -848,20 +824,18 @@ namespace AndroidSideloader // // btnOpenDownloads // - this.btnOpenDownloads.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.btnOpenDownloads.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.btnOpenDownloads.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.btnOpenDownloads.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.btnOpenDownloads.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.btnOpenDownloads.Dock = System.Windows.Forms.DockStyle.Top; this.btnOpenDownloads.FlatAppearance.BorderSize = 0; this.btnOpenDownloads.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnOpenDownloads.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.btnOpenDownloads.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.btnOpenDownloads.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.btnOpenDownloads.Location = new System.Drawing.Point(0, 84); this.btnOpenDownloads.Name = "btnOpenDownloads"; - this.btnOpenDownloads.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.btnOpenDownloads.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.btnOpenDownloads.Size = new System.Drawing.Size(221, 28); this.btnOpenDownloads.TabIndex = 7; - this.btnOpenDownloads.Text = "Open Downloads Folder"; + this.btnOpenDownloads.Text = "OPEN DOWNLOADS FOLDER"; this.btnOpenDownloads.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOpenDownloads_Tooltip.SetToolTip(this.btnOpenDownloads, "Opens your set Rookie Download Folder"); this.btnOpenDownloads.UseVisualStyleBackColor = false; @@ -869,20 +843,18 @@ namespace AndroidSideloader // // btnRunAdbCmd // - this.btnRunAdbCmd.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.btnRunAdbCmd.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.btnRunAdbCmd.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.btnRunAdbCmd.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.btnRunAdbCmd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.btnRunAdbCmd.Dock = System.Windows.Forms.DockStyle.Top; this.btnRunAdbCmd.FlatAppearance.BorderSize = 0; this.btnRunAdbCmd.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnRunAdbCmd.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.btnRunAdbCmd.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.btnRunAdbCmd.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.btnRunAdbCmd.Location = new System.Drawing.Point(0, 112); this.btnRunAdbCmd.Name = "btnRunAdbCmd"; - this.btnRunAdbCmd.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.btnRunAdbCmd.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.btnRunAdbCmd.Size = new System.Drawing.Size(221, 28); this.btnRunAdbCmd.TabIndex = 6; - this.btnRunAdbCmd.Text = "Run ADB Command"; + this.btnRunAdbCmd.Text = "RUN ADB COMMAND"; this.btnRunAdbCmd.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnRunAdbCmd_Tooltip.SetToolTip(this.btnRunAdbCmd, "Opens the Run ADB Command Prompt"); this.btnRunAdbCmd.UseVisualStyleBackColor = false; @@ -890,20 +862,18 @@ namespace AndroidSideloader // // ADBWirelessDisable // - this.ADBWirelessDisable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.ADBWirelessDisable.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.ADBWirelessDisable.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.ADBWirelessDisable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.ADBWirelessDisable.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.ADBWirelessDisable.Dock = System.Windows.Forms.DockStyle.Top; this.ADBWirelessDisable.FlatAppearance.BorderSize = 0; this.ADBWirelessDisable.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ADBWirelessDisable.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.ADBWirelessDisable.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.ADBWirelessDisable.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.ADBWirelessDisable.Location = new System.Drawing.Point(0, 28); this.ADBWirelessDisable.Name = "ADBWirelessDisable"; - this.ADBWirelessDisable.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.ADBWirelessDisable.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.ADBWirelessDisable.Size = new System.Drawing.Size(221, 28); this.ADBWirelessDisable.TabIndex = 1; - this.ADBWirelessDisable.Text = "Disable Wireless ADB"; + 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; @@ -911,20 +881,18 @@ namespace AndroidSideloader // // ADBWirelessEnable // - this.ADBWirelessEnable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.ADBWirelessEnable.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.ADBWirelessEnable.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.ADBWirelessEnable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.ADBWirelessEnable.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.ADBWirelessEnable.Dock = System.Windows.Forms.DockStyle.Top; this.ADBWirelessEnable.FlatAppearance.BorderSize = 0; this.ADBWirelessEnable.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ADBWirelessEnable.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.ADBWirelessEnable.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.ADBWirelessEnable.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.ADBWirelessEnable.Location = new System.Drawing.Point(0, 0); this.ADBWirelessEnable.Name = "ADBWirelessEnable"; - this.ADBWirelessEnable.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.ADBWirelessEnable.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.ADBWirelessEnable.Size = new System.Drawing.Size(221, 28); this.ADBWirelessEnable.TabIndex = 0; - this.ADBWirelessEnable.Text = "Enable Wireless ADB"; + 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; @@ -932,20 +900,18 @@ namespace AndroidSideloader // // UpdateGamesButton // - this.UpdateGamesButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.UpdateGamesButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.UpdateGamesButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.UpdateGamesButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.UpdateGamesButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.UpdateGamesButton.Dock = System.Windows.Forms.DockStyle.Top; this.UpdateGamesButton.FlatAppearance.BorderSize = 0; this.UpdateGamesButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.UpdateGamesButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.UpdateGamesButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.UpdateGamesButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.UpdateGamesButton.Location = new System.Drawing.Point(0, 28); this.UpdateGamesButton.Name = "UpdateGamesButton"; - this.UpdateGamesButton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.UpdateGamesButton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.UpdateGamesButton.Size = new System.Drawing.Size(221, 29); this.UpdateGamesButton.TabIndex = 7; - this.UpdateGamesButton.Text = "Refresh Update List"; + this.UpdateGamesButton.Text = "REFRESH APP LIST"; this.UpdateGamesButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.UpdateGamesButton_Tooltip.SetToolTip(this.UpdateGamesButton, "Refresh Game List and available updates"); this.UpdateGamesButton.UseVisualStyleBackColor = false; @@ -953,20 +919,18 @@ namespace AndroidSideloader // // listApkButton // - this.listApkButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.listApkButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.listApkButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.listApkButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(45)))), ((int)(((byte)(58))))); + this.listApkButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(128)))), ((int)(((byte)(159))))); this.listApkButton.Dock = System.Windows.Forms.DockStyle.Top; this.listApkButton.FlatAppearance.BorderSize = 0; this.listApkButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.listApkButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.listApkButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; + this.listApkButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F); this.listApkButton.Location = new System.Drawing.Point(0, 57); this.listApkButton.Name = "listApkButton"; - this.listApkButton.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.listApkButton.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.listApkButton.Size = new System.Drawing.Size(221, 28); this.listApkButton.TabIndex = 6; - this.listApkButton.Text = "Refresh All"; + 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; @@ -988,82 +952,37 @@ namespace AndroidSideloader this.progressDLbtnContainer.Size = new System.Drawing.Size(1145, 34); this.progressDLbtnContainer.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(781, 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 / 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); - // - // diskLabel - // - this.diskLabel.AutoSize = true; - this.diskLabel.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.diskLabel.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.diskLabel.Dock = System.Windows.Forms.DockStyle.Top; - this.diskLabel.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.diskLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; - this.diskLabel.Location = new System.Drawing.Point(0, 0); - this.diskLabel.Name = "diskLabel"; - this.diskLabel.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.diskLabel.Size = new System.Drawing.Size(82, 18); - this.diskLabel.TabIndex = 7; - this.diskLabel.Text = "Disk Label"; - this.diskLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // bottomContainer // this.bottomContainer.AutoSize = true; this.bottomContainer.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.bottomContainer.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor; - this.bottomContainer.Controls.Add(this.diskLabel); this.bottomContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.bottomContainer.Dock = System.Windows.Forms.DockStyle.Top; - this.bottomContainer.Location = new System.Drawing.Point(0, 673); + this.bottomContainer.Location = new System.Drawing.Point(0, 725); this.bottomContainer.Margin = new System.Windows.Forms.Padding(2); this.bottomContainer.Name = "bottomContainer"; - this.bottomContainer.Size = new System.Drawing.Size(221, 18); + this.bottomContainer.Size = new System.Drawing.Size(221, 0); this.bottomContainer.TabIndex = 73; + this.bottomContainer.Visible = false; // // deviceDrop // - this.deviceDrop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); - this.deviceDrop.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_herringbone; + this.deviceDrop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(35)))), ((int)(((byte)(45))))); this.deviceDrop.Cursor = System.Windows.Forms.Cursors.Default; - this.deviceDrop.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.deviceDrop.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.deviceDrop.Dock = System.Windows.Forms.DockStyle.Top; this.deviceDrop.FlatAppearance.BorderSize = 0; this.deviceDrop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.deviceDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.deviceDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; - this.deviceDrop.Location = new System.Drawing.Point(0, 0); + this.deviceDrop.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.deviceDrop.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(203)))), ((int)(((byte)(173))))); + this.deviceDrop.Location = new System.Drawing.Point(0, 52); this.deviceDrop.Margin = new System.Windows.Forms.Padding(2); this.deviceDrop.Name = "deviceDrop"; + this.deviceDrop.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.deviceDrop.Size = new System.Drawing.Size(221, 28); this.deviceDrop.TabIndex = 1; - this.deviceDrop.Text = "▶ DEVICE ◀"; + this.deviceDrop.Text = "DEVICE"; + this.deviceDrop.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.deviceDrop.UseVisualStyleBackColor = false; this.deviceDrop.Click += new System.EventHandler(this.deviceDropContainer_Click); // @@ -1077,30 +996,30 @@ namespace AndroidSideloader this.deviceDropContainer.Controls.Add(this.devicesbutton); this.deviceDropContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.deviceDropContainer.Dock = System.Windows.Forms.DockStyle.Top; - this.deviceDropContainer.Location = new System.Drawing.Point(0, 28); + this.deviceDropContainer.Location = new System.Drawing.Point(0, 80); this.deviceDropContainer.Margin = new System.Windows.Forms.Padding(2); this.deviceDropContainer.Name = "deviceDropContainer"; this.deviceDropContainer.Size = new System.Drawing.Size(221, 85); this.deviceDropContainer.TabIndex = 73; + this.deviceDropContainer.Visible = false; // // sideloadDrop // - this.sideloadDrop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); - this.sideloadDrop.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_herringbone; + this.sideloadDrop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(35)))), ((int)(((byte)(45))))); this.sideloadDrop.Cursor = System.Windows.Forms.Cursors.Default; - this.sideloadDrop.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.sideloadDrop.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.sideloadDrop.Dock = System.Windows.Forms.DockStyle.Top; this.sideloadDrop.FlatAppearance.BorderSize = 0; this.sideloadDrop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.sideloadDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.sideloadDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; - this.sideloadDrop.Location = new System.Drawing.Point(0, 113); + this.sideloadDrop.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.sideloadDrop.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(203)))), ((int)(((byte)(173))))); + this.sideloadDrop.Location = new System.Drawing.Point(0, 165); this.sideloadDrop.Margin = new System.Windows.Forms.Padding(2); this.sideloadDrop.Name = "sideloadDrop"; + this.sideloadDrop.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.sideloadDrop.Size = new System.Drawing.Size(221, 28); this.sideloadDrop.TabIndex = 1; - this.sideloadDrop.Text = "▶ SIDELOAD ◀"; + this.sideloadDrop.Text = "SIDELOAD"; + this.sideloadDrop.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.sideloadDrop.UseVisualStyleBackColor = false; this.sideloadDrop.Click += new System.EventHandler(this.sideloadContainer_Click); // @@ -1114,30 +1033,30 @@ namespace AndroidSideloader this.sideloadContainer.Controls.Add(this.obbcopybutton); this.sideloadContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.sideloadContainer.Dock = System.Windows.Forms.DockStyle.Top; - this.sideloadContainer.Location = new System.Drawing.Point(0, 141); + this.sideloadContainer.Location = new System.Drawing.Point(0, 193); this.sideloadContainer.Margin = new System.Windows.Forms.Padding(2); this.sideloadContainer.Name = "sideloadContainer"; this.sideloadContainer.Size = new System.Drawing.Size(221, 84); this.sideloadContainer.TabIndex = 74; + this.sideloadContainer.Visible = false; // // installedAppsMenu // - this.installedAppsMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); - this.installedAppsMenu.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_herringbone; + this.installedAppsMenu.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(35)))), ((int)(((byte)(45))))); this.installedAppsMenu.Cursor = System.Windows.Forms.Cursors.Default; - this.installedAppsMenu.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.installedAppsMenu.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.installedAppsMenu.Dock = System.Windows.Forms.DockStyle.Top; this.installedAppsMenu.FlatAppearance.BorderSize = 0; this.installedAppsMenu.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.installedAppsMenu.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.installedAppsMenu.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; - this.installedAppsMenu.Location = new System.Drawing.Point(0, 225); + this.installedAppsMenu.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.installedAppsMenu.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(203)))), ((int)(((byte)(173))))); + this.installedAppsMenu.Location = new System.Drawing.Point(0, 277); this.installedAppsMenu.Margin = new System.Windows.Forms.Padding(2); this.installedAppsMenu.Name = "installedAppsMenu"; + this.installedAppsMenu.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.installedAppsMenu.Size = new System.Drawing.Size(221, 28); this.installedAppsMenu.TabIndex = 1; - this.installedAppsMenu.Text = "▶ INSTALLED APPS ◀"; + this.installedAppsMenu.Text = "INSTALLED APPS"; + this.installedAppsMenu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.installedAppsMenu.UseVisualStyleBackColor = false; this.installedAppsMenu.Click += new System.EventHandler(this.installedAppsMenuContainer_Click); // @@ -1151,31 +1070,30 @@ namespace AndroidSideloader this.installedAppsMenuContainer.Controls.Add(this.getApkButton); this.installedAppsMenuContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.installedAppsMenuContainer.Dock = System.Windows.Forms.DockStyle.Top; - this.installedAppsMenuContainer.Location = new System.Drawing.Point(0, 253); + this.installedAppsMenuContainer.Location = new System.Drawing.Point(0, 305); this.installedAppsMenuContainer.Margin = new System.Windows.Forms.Padding(2); this.installedAppsMenuContainer.Name = "installedAppsMenuContainer"; this.installedAppsMenuContainer.Size = new System.Drawing.Size(221, 84); this.installedAppsMenuContainer.TabIndex = 73; + this.installedAppsMenuContainer.Visible = false; // // backupDrop // - this.backupDrop.BackColor = global::AndroidSideloader.Properties.Settings.Default.ButtonColor; - this.backupDrop.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_herringbone; + this.backupDrop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(35)))), ((int)(((byte)(45))))); this.backupDrop.Cursor = System.Windows.Forms.Cursors.Default; - this.backupDrop.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.backupDrop.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.backupDrop.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "ButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.backupDrop.Dock = System.Windows.Forms.DockStyle.Top; this.backupDrop.FlatAppearance.BorderSize = 0; this.backupDrop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.backupDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.backupDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; - this.backupDrop.Location = new System.Drawing.Point(0, 337); + this.backupDrop.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.backupDrop.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(203)))), ((int)(((byte)(173))))); + this.backupDrop.Location = new System.Drawing.Point(0, 389); this.backupDrop.Margin = new System.Windows.Forms.Padding(2); this.backupDrop.Name = "backupDrop"; + this.backupDrop.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.backupDrop.Size = new System.Drawing.Size(221, 28); this.backupDrop.TabIndex = 2; - this.backupDrop.Text = "▶ BACKUP / RESTORE ◀"; + this.backupDrop.Text = "BACKUP / RESTORE"; + this.backupDrop.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.backupDrop.UseVisualStyleBackColor = false; this.backupDrop.Click += new System.EventHandler(this.backupDrop_Click); // @@ -1189,30 +1107,30 @@ namespace AndroidSideloader this.backupContainer.Controls.Add(this.backupbutton); this.backupContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.backupContainer.Dock = System.Windows.Forms.DockStyle.Top; - this.backupContainer.Location = new System.Drawing.Point(0, 365); + this.backupContainer.Location = new System.Drawing.Point(0, 417); this.backupContainer.Margin = new System.Windows.Forms.Padding(2); this.backupContainer.Name = "backupContainer"; this.backupContainer.Size = new System.Drawing.Size(221, 84); this.backupContainer.TabIndex = 76; + this.backupContainer.Visible = false; // // otherDrop // - this.otherDrop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); - this.otherDrop.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_herringbone; + this.otherDrop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(35)))), ((int)(((byte)(45))))); this.otherDrop.Cursor = System.Windows.Forms.Cursors.Default; - this.otherDrop.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.otherDrop.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.otherDrop.Dock = System.Windows.Forms.DockStyle.Top; this.otherDrop.FlatAppearance.BorderSize = 0; this.otherDrop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.otherDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle; - this.otherDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor; - this.otherDrop.Location = new System.Drawing.Point(0, 449); + this.otherDrop.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.otherDrop.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(203)))), ((int)(((byte)(173))))); + this.otherDrop.Location = new System.Drawing.Point(0, 501); this.otherDrop.Margin = new System.Windows.Forms.Padding(2); this.otherDrop.Name = "otherDrop"; + this.otherDrop.Padding = new System.Windows.Forms.Padding(30, 0, 0, 0); this.otherDrop.Size = new System.Drawing.Size(221, 28); this.otherDrop.TabIndex = 3; - this.otherDrop.Text = "▶ OTHER ◀"; + this.otherDrop.Text = "OTHER"; + this.otherDrop.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.otherDrop.UseVisualStyleBackColor = false; this.otherDrop.Click += new System.EventHandler(this.otherDrop_Click); // @@ -1228,35 +1146,91 @@ namespace AndroidSideloader this.otherContainer.Controls.Add(this.ADBWirelessEnable); this.otherContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.otherContainer.Dock = System.Windows.Forms.DockStyle.Top; - this.otherContainer.Location = new System.Drawing.Point(0, 477); + this.otherContainer.Location = new System.Drawing.Point(0, 529); this.otherContainer.Margin = new System.Windows.Forms.Padding(2); this.otherContainer.Name = "otherContainer"; this.otherContainer.Size = new System.Drawing.Size(221, 140); this.otherContainer.TabIndex = 80; + this.otherContainer.Visible = false; + // + // questStorageProgressBar + // + this.questStorageProgressBar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(24)))), ((int)(((byte)(29))))); + this.questStorageProgressBar.Location = new System.Drawing.Point(2, 2); + this.questStorageProgressBar.Margin = new System.Windows.Forms.Padding(0); + this.questStorageProgressBar.Name = "questStorageProgressBar"; + this.questStorageProgressBar.Size = new System.Drawing.Size(217, 44); + this.questStorageProgressBar.TabIndex = 100; + this.questStorageProgressBar.Paint += new System.Windows.Forms.PaintEventHandler(this.questStorageProgressBar_Paint); + // + // questInfoPanel + // + this.questInfoPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(24)))), ((int)(((byte)(29))))); + this.questInfoPanel.Controls.Add(this.batteryLabel); + this.questInfoPanel.Controls.Add(this.batteryLevImg); + this.questInfoPanel.Controls.Add(this.diskLabel); + this.questInfoPanel.Controls.Add(this.questInfoLabel); + this.questInfoPanel.Controls.Add(this.questStorageProgressBar); + this.questInfoPanel.Dock = System.Windows.Forms.DockStyle.Top; + this.questInfoPanel.Location = new System.Drawing.Point(2, 2); + this.questInfoPanel.Margin = new System.Windows.Forms.Padding(0); + this.questInfoPanel.Name = "questInfoPanel"; + this.questInfoPanel.Size = new System.Drawing.Size(217, 48); + this.questInfoPanel.TabIndex = 0; + // + // diskLabel + // + this.diskLabel.BackColor = System.Drawing.Color.Transparent; + this.diskLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.diskLabel.ForeColor = System.Drawing.Color.LightGray; + this.diskLabel.Location = new System.Drawing.Point(8, 24); + this.diskLabel.Name = "diskLabel"; + this.diskLabel.Size = new System.Drawing.Size(150, 12); + this.diskLabel.TabIndex = 7; + this.diskLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.diskLabel.Parent = this.questStorageProgressBar; // // batteryLevImg // + this.batteryLevImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.batteryLevImg.BackColor = System.Drawing.Color.Transparent; this.batteryLevImg.BackgroundImage = global::AndroidSideloader.Properties.Resources.battery; this.batteryLevImg.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.batteryLevImg.Location = new System.Drawing.Point(166, 715); + this.batteryLevImg.Location = new System.Drawing.Point(158, 8); this.batteryLevImg.Margin = new System.Windows.Forms.Padding(2); this.batteryLevImg.Name = "batteryLevImg"; this.batteryLevImg.Size = new System.Drawing.Size(55, 29); this.batteryLevImg.TabIndex = 85; this.batteryLevImg.TabStop = false; + this.batteryLevImg.Parent = this.questStorageProgressBar; // // batteryLabel // + this.batteryLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.batteryLabel.AutoSize = true; this.batteryLabel.BackColor = System.Drawing.Color.Transparent; - this.batteryLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.batteryLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.batteryLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.batteryLabel.Location = new System.Drawing.Point(174, 721); - this.batteryLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.batteryLabel.Location = new System.Drawing.Point(3, 6); + this.batteryLabel.Margin = new System.Windows.Forms.Padding(2); this.batteryLabel.Name = "batteryLabel"; this.batteryLabel.Size = new System.Drawing.Size(0, 13); this.batteryLabel.TabIndex = 84; + this.batteryLabel.Parent = this.batteryLevImg; + this.batteryLabel.BringToFront(); + // + // questInfoLabel + // + this.questInfoLabel.BackColor = System.Drawing.Color.Transparent; + this.questInfoLabel.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.questInfoLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold); + this.questInfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.questInfoLabel.Location = new System.Drawing.Point(8, 4); + this.questInfoLabel.Name = "questInfoLabel"; + this.questInfoLabel.Size = new System.Drawing.Size(150, 20); + this.questInfoLabel.TabIndex = 1; + this.questInfoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.questInfoLabel.Parent = this.questStorageProgressBar; // // ULLabel // @@ -1286,9 +1260,7 @@ namespace AndroidSideloader // leftNavContainer // this.leftNavContainer.AutoScroll = true; - this.leftNavContainer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); - this.leftNavContainer.Controls.Add(this.batteryLabel); - this.leftNavContainer.Controls.Add(this.batteryLevImg); + this.leftNavContainer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(24)))), ((int)(((byte)(29))))); this.leftNavContainer.Controls.Add(this.bottomContainer); this.leftNavContainer.Controls.Add(this.aboutBtn); this.leftNavContainer.Controls.Add(this.settingsButton); @@ -1302,6 +1274,7 @@ namespace AndroidSideloader this.leftNavContainer.Controls.Add(this.sideloadDrop); this.leftNavContainer.Controls.Add(this.deviceDropContainer); this.leftNavContainer.Controls.Add(this.deviceDrop); + this.leftNavContainer.Controls.Add(this.questInfoPanel); this.leftNavContainer.Dock = System.Windows.Forms.DockStyle.Left; this.leftNavContainer.Location = new System.Drawing.Point(0, 0); this.leftNavContainer.Margin = new System.Windows.Forms.Padding(2); @@ -1438,6 +1411,34 @@ namespace AndroidSideloader this.adbCmd_btnToggleUpdates.Visible = false; this.adbCmd_btnToggleUpdates.Click += new System.EventHandler(this.adbCmd_btnToggleUpdates_Click); // + // 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(781, 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 / 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))))); @@ -1496,8 +1497,8 @@ namespace AndroidSideloader this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor; - this.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(34)))), ((int)(((byte)(42))))); + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ClientSize = new System.Drawing.Size(1387, 747); this.Controls.Add(this.favoriteSwitcher); this.Controls.Add(this.adbCmd_btnSend); @@ -1527,8 +1528,9 @@ namespace AndroidSideloader this.Controls.Add(this.adbCmd_background); this.Controls.Add(this.gamesListView); this.Controls.Add(this.btnNoDevice); - 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.ForeColor = System.Drawing.Color.White; + this.HelpButton = true; this.MinimumSize = new System.Drawing.Size(1048, 760); this.Name = "MainForm"; this.ShowIcon = false; @@ -1542,13 +1544,13 @@ namespace AndroidSideloader ((System.ComponentModel.ISupportInitialize)(this.gamesPictureBox)).EndInit(); this.progressDLbtnContainer.ResumeLayout(false); this.progressDLbtnContainer.PerformLayout(); - this.bottomContainer.ResumeLayout(false); - this.bottomContainer.PerformLayout(); this.deviceDropContainer.ResumeLayout(false); this.sideloadContainer.ResumeLayout(false); this.installedAppsMenuContainer.ResumeLayout(false); this.backupContainer.ResumeLayout(false); this.otherContainer.ResumeLayout(false); + this.questInfoPanel.ResumeLayout(false); + this.questInfoPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.batteryLevImg)).EndInit(); this.leftNavContainer.ResumeLayout(false); this.leftNavContainer.PerformLayout(); @@ -1558,7 +1560,11 @@ namespace AndroidSideloader this.favoriteGame.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); - + this.questStorageProgressBar.Visible = false; + this.batteryLevImg.Visible = false; + this.batteryLabel.Visible = false; + this.questInfoLabel.Visible = false; + this.diskLabel.Visible = false; } #endregion @@ -1617,7 +1623,6 @@ namespace AndroidSideloader private ToolTip etaLabel_Tooltip; private Panel progressDLbtnContainer; private Microsoft.Web.WebView2.WinForms.WebView2 webView21; - private Label diskLabel; private Panel bottomContainer; private Button devicesbutton; private Button deviceDrop; @@ -1660,5 +1665,10 @@ namespace AndroidSideloader private ContextMenuStrip favoriteGame; private ToolStripMenuItem favoriteButton; private RoundButton favoriteSwitcher; + private Panel questInfoPanel; + private Panel questStorageProgressBar; + private Label questInfoLabel; + private Label diskLabel; + private System.Windows.Forms.PictureBox searchIconPictureBox; } } diff --git a/MainForm.cs b/MainForm.cs index 60f4d18..86662d3 100755 --- a/MainForm.cs +++ b/MainForm.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; using System.Drawing; +using System.Drawing.Drawing2D; using System.IO; using System.Linq; using System.Net; @@ -19,6 +20,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using System.Runtime.InteropServices; namespace AndroidSideloader { @@ -49,6 +51,14 @@ namespace AndroidSideloader public static string currremotesimple = ""; #endif + private const int EM_SETMARGINS = 0xD3; + private const int EC_LEFTMARGIN = 0x0001; + private const int EC_RIGHTMARGIN = 0x0002; + [DllImport("user32.dll", CharSet = CharSet.Auto)] + private static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam); + private string freeSpaceText = ""; + private string freeSpaceTextDetailed = ""; + private int _questStorageProgress = 0; private bool _trailerPlayerInitialized; // player.html created and loaded private bool _trailerHtmlLoaded; // initial navigation completed private static readonly Dictionary _videoIdCache = new Dictionary(StringComparer.OrdinalIgnoreCase); // per game cache @@ -78,24 +88,70 @@ namespace AndroidSideloader InitializeTimeReferences(); CheckCommandLineArguments(); - // Initialize debounce timer for search - _debounceTimer = new System.Windows.Forms.Timer - { - Interval = 100, // 100ms delay for fast response - Enabled = false - }; - _debounceTimer.Tick += async (sender, e) => await RunSearch(); + CreateSearchIcon(); + searchTextBox.HandleCreated += (s, e) => ApplySearchTextMargins(); + _debounceTimer = new System.Windows.Forms.Timer { Interval = 100, Enabled = false }; + _debounceTimer.Tick += async (sender, e) => await RunSearch(); gamesQueListBox.DataSource = gamesQueueList; SetCurrentLogPath(); StartTimers(); - lvwColumnSorter = new ListViewColumnSorter(); gamesListView.ListViewItemSorter = lvwColumnSorter; - if (searchTextBox.Visible) + if (searchTextBox.Visible) { _ = searchTextBox.Focus(); } + + this.questInfoPanel.MouseEnter += this.QuestInfoHoverEnter; + this.questInfoPanel.MouseLeave += this.QuestInfoHoverLeave; + } + + private void CreateSearchIcon() + { + if (this.searchIconPictureBox == null) { - _ = searchTextBox.Focus(); + this.searchIconPictureBox = new PictureBox + { + Name = "searchIconPictureBox", + SizeMode = PictureBoxSizeMode.Zoom, + Size = new Size(16, 16), + BackColor = searchTextBox.BackColor, // blend with textbox + TabStop = false, + Enabled = false // let clicks go to the textbox + }; + + this.searchIconPictureBox.Image = Properties.Resources.SearchGlass; + } + + // Parent the icon to the same container as the textbox + var host = searchTextBox.Parent ?? this; + if (this.searchIconPictureBox.Parent != host) + { + host.Controls.Add(this.searchIconPictureBox); + this.searchIconPictureBox.BringToFront(); + } + + // 6px left padding inside the textbox area + int leftInset = 6; + var pt = new Point( + searchTextBox.Left + leftInset, + searchTextBox.Top + (searchTextBox.Height - searchIconPictureBox.Height) / 2 + ); + searchIconPictureBox.Location = pt; + } + + private void ApplySearchTextMargins() + { + if (searchTextBox == null) return; + + // icon width + left inset + small gap + int leftInset = 6; + int leftMarginPixels = (searchIconPictureBox?.Width ?? 16) + leftInset + 2; + int rightMarginPixels = 2; + + if (searchTextBox.IsHandleCreated) + { + int lParam = (rightMarginPixels << 16) | (leftMarginPixels & 0xFFFF); + SendMessage(searchTextBox.Handle, EM_SETMARGINS, (IntPtr)(EC_LEFTMARGIN | EC_RIGHTMARGIN), (IntPtr)lParam); } } @@ -215,10 +271,39 @@ namespace AndroidSideloader public static bool updatesNotified = false; public static string backupFolder; + private static void KillAdbProcesses() + { + try + { + foreach (var p in Process.GetProcessesByName("adb")) + { + try + { + if (!p.HasExited) + { + p.Kill(); + p.WaitForExit(3000); + } + } + catch (Exception ex) + { + Logger.Log($"Failed to kill adb process (PID {p.Id}): {ex.Message}", LogLevel.WARNING); + } + } + } + catch (Exception ex) + { + Logger.Log($"Error enumerating adb processes: {ex.Message}", LogLevel.WARNING); + } + } + private async void Form1_Load(object sender, EventArgs e) { _ = Logger.Log("Starting AndroidSideloader Application"); + // Hard kill any lingering adb.exe instances to avoid port/handle conflicts + KillAdbProcesses(); + // Show the form immediately this.Show(); Application.DoEvents(); @@ -601,8 +686,10 @@ namespace AndroidSideloader remotesList.Size = System.Drawing.Size.Empty; _ = Logger.Log($"Using Offline Mode"); } - } + changeTitlebarToDevice(); + UpdateQuestInfoPanel(); + } private void timer_Tick(object sender, EventArgs e) { @@ -720,7 +807,6 @@ namespace AndroidSideloader public async Task CheckForDevice() { - Devices.Clear(); string output = string.Empty; string error = string.Empty; @@ -731,7 +817,6 @@ namespace AndroidSideloader output = ADB.RunAdbCommandToString("devices").Output; }); - t1.Start(); while (t1.IsAlive) @@ -758,8 +843,6 @@ namespace AndroidSideloader i++; } - - if (devicesComboBox.Items.Count > 0) { devicesComboBox.SelectedIndex = 0; @@ -770,6 +853,9 @@ namespace AndroidSideloader battery = Utilities.StringUtilities.RemoveEverythingAfterFirst(battery, "\n"); battery = Utilities.StringUtilities.KeepOnlyNumbers(battery); batteryLabel.Text = battery + "%"; + + UpdateQuestInfoPanel(); + return devicesComboBox.SelectedIndex; } @@ -778,7 +864,6 @@ namespace AndroidSideloader _ = await CheckForDevice(); changeTitlebarToDevice(); - showAvailableSpace(); } @@ -894,6 +979,8 @@ namespace AndroidSideloader } diskLabel.Invoke(() => { diskLabel.Text = AvailableSpace; }); + + UpdateQuestInfoPanel(); } catch (Exception ex) { @@ -2543,26 +2630,66 @@ namespace AndroidSideloader private void deviceDropContainer_Click(object sender, EventArgs e) { - ShowSubMenu(deviceDropContainer); - deviceDrop.Text = (deviceDrop.Text == "▼ DEVICE ▼") ? "▶ DEVICE ◀" : "▼ DEVICE ▼"; + ToggleContainer(deviceDropContainer, deviceDrop); } private void sideloadContainer_Click(object sender, EventArgs e) { - ShowSubMenu(sideloadContainer); - sideloadDrop.Text = (sideloadDrop.Text == "▼ SIDELOAD ▼") ? "▶ SIDELOAD ◀" : "▼ SIDELOAD ▼"; + ToggleContainer(sideloadContainer, sideloadDrop); } private void installedAppsMenuContainer_Click(object sender, EventArgs e) { - ShowSubMenu(installedAppsMenuContainer); - installedAppsMenu.Text = (installedAppsMenu.Text == "▼ INSTALLED APPS ▼") ? "▶ INSTALLED APPS ◀" : "▼ INSTALLED APPS ▼"; + ToggleContainer(installedAppsMenuContainer, installedAppsMenu); } private void backupDrop_Click(object sender, EventArgs e) { - ShowSubMenu(backupContainer); - backupDrop.Text = (backupDrop.Text == "▼ BACKUP / RESTORE ▼") ? "▶ BACKUP / RESTORE ◀" : "▼ BACKUP / RESTORE ▼"; + ToggleContainer(backupContainer, backupDrop); + } + + private void otherDrop_Click(object sender, EventArgs e) + { + ToggleContainer(otherContainer, otherDrop); + } + + private void ToggleContainer(Panel containerToToggle, Button dropButton) + { + // Collapse all other containers + CollapseAllContainers(containerToToggle); + + // Toggle the clicked container + bool isExpanding = !containerToToggle.Visible; + containerToToggle.Visible = isExpanding; + } + + private void CollapseAllContainers(Panel exceptThis = null) + { + var containers = new[] + { + deviceDropContainer, + sideloadContainer, + installedAppsMenuContainer, + backupContainer, + otherContainer + }; + + var buttons = new[] + { + deviceDrop, + sideloadDrop, + installedAppsMenu, + backupDrop, + otherDrop + }; + + for (int i = 0; i < containers.Length; i++) + { + if (containers[i] != exceptThis && containers[i].Visible) + { + containers[i].Visible = false; + } + } } private void settingsButton_Click(object sender, EventArgs e) @@ -3594,12 +3721,6 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g } } - private void otherDrop_Click(object sender, EventArgs e) - { - ShowSubMenu(otherContainer); - otherDrop.Text = (otherDrop.Text == "▼ OTHER ▼") ? "▶ OTHER ◀" : "▼ OTHER ▼"; - } - private void gamesQueListBox_MouseClick(object sender, MouseEventArgs e) { if (gamesQueListBox.SelectedIndex == 0 && gamesQueueList.Count == 1) @@ -3839,7 +3960,7 @@ Please visit our Telegram (https://t.me/VRPirates) or Discord (https://discord.g string searchTerm = searchTextBox.Text; // Ignore placeholder text - if (searchTerm == "Search" || string.IsNullOrWhiteSpace(searchTerm)) + if (searchTerm == "Search..." || string.IsNullOrWhiteSpace(searchTerm)) { RestoreFullList(); return; @@ -4232,7 +4353,7 @@ function onYouTubeIframeAPIReady() { private void searchTextBox_Enter(object sender, EventArgs e) { - if (searchTextBox.Text == "Search" && searchTextBox.ForeColor == Color.Gray) + if (searchTextBox.Text == "Search..." && searchTextBox.ForeColor == Color.LightGray) { searchTextBox.Text = ""; searchTextBox.ForeColor = Color.White; @@ -4243,8 +4364,8 @@ function onYouTubeIframeAPIReady() { { if (string.IsNullOrWhiteSpace(searchTextBox.Text)) { - searchTextBox.Text = "Search"; - searchTextBox.ForeColor = Color.Gray; + searchTextBox.Text = "Search..."; + searchTextBox.ForeColor = Color.LightGray; } if (searchTextBox.Visible) @@ -4759,6 +4880,238 @@ function onYouTubeIframeAPIReady() { initListView(false); } } + + public async void UpdateQuestInfoPanel() + { + // Check if device is actually connected by checking Devices list + bool hasDevice = Devices != null && Devices.Count > 0 && !Devices.Contains("unauthorized"); + + if ((!settings.NodeviceMode && hasDevice) || DeviceConnected) + { + try + { + ADB.DeviceID = GetDeviceID(); + + // Get device model + string deviceModel = ADB.RunAdbCommandToString("shell getprop ro.product.model").Output.Trim(); + if (string.IsNullOrEmpty(deviceModel)) + { + deviceModel = "Device"; + } + + // Get storage info + string storageOutput = ADB.RunAdbCommandToString("shell df /sdcard").Output; + string[] lines = storageOutput.Split('\n'); + + long totalSpace = 0; + long usedSpace = 0; + long freeSpace = 0; + + + if (lines.Length > 1) + { + string[] parts = lines[1].Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); + if (parts.Length >= 4) + { + if (long.TryParse(parts[1], out totalSpace) && + long.TryParse(parts[2], out usedSpace) && + long.TryParse(parts[3], out freeSpace)) + { + totalSpace = totalSpace / 1024; // Convert to MB + usedSpace = usedSpace / 1024; + freeSpace = freeSpace / 1024; + + // Format free space display + if (freeSpace > 1024) + { + freeSpaceText = $"{(freeSpace / 1024.0):F2} GB AVAILABLE"; + } + else + { + freeSpaceText = $"{freeSpace} MB AVAILABLE"; + } + + freeSpaceTextDetailed = $"{(usedSpace / 1024.0):F0} GB OF {(totalSpace / 1024.0):F0} GB USED"; + } + } + } + + // Calculate storage percentage used + int storagePercentUsed = totalSpace > 0 ? (int)((usedSpace * 100) / totalSpace) : 0; + + // Update UI on main thread + questInfoPanel.Invoke(() => + { + questInfoLabel.Text = deviceModel; + diskLabel.Text = freeSpaceText; + + // Update custom progress bar + SetQuestStorageProgress(storagePercentUsed); + }); + } + catch (Exception ex) + { + Logger.Log($"Unable to update quest info panel: {ex.Message}", LogLevel.ERROR); + questInfoPanel.Invoke(() => + { + questInfoLabel.Text = "Device Info Unavailable"; + SetQuestStorageProgress(0); + }); + } + } + else + { + questInfoPanel.Invoke(() => + { + questInfoLabel.Text = "No Device Connected"; + SetQuestStorageProgress(0); + }); + } + + // Determine visibility based on device existence + bool showQuestInfo = ((!settings.NodeviceMode && hasDevice) || DeviceConnected); + + // Toggle visibility atomically on UI thread + questInfoPanel.Invoke(() => + { + questStorageProgressBar.Visible = showQuestInfo; + batteryLevImg.Visible = showQuestInfo; + batteryLabel.Visible = showQuestInfo; + questInfoLabel.Visible = showQuestInfo; + diskLabel.Visible = showQuestInfo; + }); + } + + private void QuestInfoHoverEnter(object sender, EventArgs e) + { + // Only react when device info is shown + if (!questStorageProgressBar.Visible) return; + + diskLabel.Text = freeSpaceTextDetailed; + } + + // Restore the original baseline text ("XX GB FREE") + private void QuestInfoHoverLeave(object sender, EventArgs e) + { + // Only react when device info is shown + if (!questStorageProgressBar.Visible) return; + + // Ignore leave fired when moving between child controls inside the container + var panel = questInfoPanel; + var mouse = panel.PointToClient(MousePosition); + if (panel.ClientRectangle.Contains(mouse)) return; + + diskLabel.Text = freeSpaceText; + } + + private void questStorageProgressBar_Paint(object sender, PaintEventArgs e) + { + var g = e.Graphics; + g.SmoothingMode = SmoothingMode.AntiAlias; + g.PixelOffsetMode = PixelOffsetMode.HighQuality; + g.Clear(questStorageProgressBar.BackColor); + + int w = questStorageProgressBar.ClientSize.Width; + int h = questStorageProgressBar.ClientSize.Height; + if (w <= 0 || h <= 0) return; + + // Rounded rectangle parameters (outer + fill share the same geometry). + int radius = 10; + Color bgColor = Color.FromArgb(28, 32, 38); + Color borderColor = Color.FromArgb(60, 65, 75); + + // Modern fill gradient (adjust as desired) + Color progressStart = Color.FromArgb(43, 160, 140); + Color progressEnd = Color.FromArgb(30, 110, 95); + + // Build the rounded outer path (used for background and clipping). + var outer = new RoundedRectangleF(w, h, radius); + + // Paint background + using (var bgBrush = new SolidBrush(bgColor)) + using (var borderPen = new Pen(borderColor, 1f)) + { + g.FillPath(bgBrush, outer.Path); + g.DrawPath(borderPen, outer.Path); + } + + // Progress fraction and width + float p = Math.Max(0f, Math.Min(1f, _questStorageProgress / 100f)); + int progressWidth = Math.Max(0, (int)(w * p)); + if (progressWidth <= 0) return; + + // Near-full rounding behavior: + // As progress approaches 100%, progressively include the outer right-rounded corners. + // Threshold start at 97%. At 97% -> straight cut; at 100% -> fully rounded outer corners. + float t = 0f; + if (p > 0.97f) + { + t = Math.Min(1f, (p - 0.97f) / 0.03f); // 0..1 over last 3% + } + + // Build a clipping region for the fill: intersection of outer rounded rect with + // the left rectangular portion [0..progressWidth] + // plus a progressive right-cap region that extends into the rounded corners + // with width up to 2*radius, scaled by t. + Region fillClip = new Region(new Rectangle(0, 0, progressWidth, h)); + if (t > 0f) + { + int capWidth = (int)(t * (2 * radius)); + if (capWidth > 0) + { + // This rectangle sits inside the area of the right rounded corners, + // so union-ing it with the rectangular clip allows the fill to + // progressively "wrap" into the curvature. + var rightCapRect = new Rectangle(w - (2 * radius), 0, capWidth, h); + fillClip.Union(rightCapRect); + } + } + + Region prevClip = g.Clip; + try + { + // Final fill region = outer rounded path ∩ fillClip + using (var outerRegion = new Region(outer.Path)) + { + outerRegion.Intersect(fillClip); + g.SetClip(outerRegion, CombineMode.Replace); + + using (var progressBrush = new LinearGradientBrush( + new Rectangle(0, 0, Math.Max(1, progressWidth), h), + progressStart, + progressEnd, + LinearGradientMode.Horizontal)) + { + // Fill the outer path; clipping ensures the fill grows left to right, + // stays fully flush to the outer geometry, and never exceeds it. + g.FillPath(progressBrush, outer.Path); + } + } + } + finally + { + // Restore clip and re-stroke border to keep outline crisp + g.Clip = prevClip; + using (var borderPen = new Pen(borderColor, 1f)) + { + g.DrawPath(borderPen, outer.Path); + } + } + } + + private void SetQuestStorageProgress(int percentage) + { + _questStorageProgress = Math.Max(0, Math.Min(100, percentage)); + + if (questStorageProgressBar.InvokeRequired) + { + questStorageProgressBar.Invoke(new Action(() => questStorageProgressBar.Invalidate())); + } + else + { + questStorageProgressBar.Invalidate(); + } + } } public static class ControlExtensions diff --git a/MainForm.resx b/MainForm.resx index 98d1e97..d8f7f90 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -180,16 +180,10 @@ 955, 17 - - 798, 17 - - - 428, 56 - 855, 95 - 134 + 159 \ No newline at end of file diff --git a/NewApps.Designer.cs b/NewApps.Designer.cs index 814fe14..a31c736 100644 --- a/NewApps.Designer.cs +++ b/NewApps.Designer.cs @@ -126,7 +126,6 @@ namespace AndroidSideloader this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor; - this.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes; this.ClientSize = new System.Drawing.Size(313, 248); this.ControlBox = false; this.Controls.Add(this.NewAppsButton); diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 5e3ddff..ee8b378 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace AndroidSideloader.Properties { /// - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ namespace AndroidSideloader.Properties { } /// - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ namespace AndroidSideloader.Properties { } /// - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ namespace AndroidSideloader.Properties { } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap ajax_loader { get { @@ -71,7 +71,7 @@ namespace AndroidSideloader.Properties { } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap battery { get { @@ -81,37 +81,7 @@ namespace AndroidSideloader.Properties { } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Pattern { - get { - object obj = ResourceManager.GetObject("Pattern", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap pattern_cubes { - get { - object obj = ResourceManager.GetObject("pattern_cubes", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap pattern_herringbone { - get { - object obj = ResourceManager.GetObject("pattern_herringbone", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap SearchGlass { get { diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 12edd7b..dac8c83 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -127,13 +127,4 @@ ..\Resources\SearchGlass.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Pattern.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\pattern_cubes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\pattern_herringbone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index cabd49f..cbba1d8 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace AndroidSideloader.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -109,7 +109,7 @@ namespace AndroidSideloader.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("Microsoft Sans Serif, 11.25pt")] + [global::System.Configuration.DefaultSettingValueAttribute("Microsoft Sans Serif, 9pt")] public global::System.Drawing.Font FontStyle { get { return ((global::System.Drawing.Font)(this["FontStyle"])); @@ -516,7 +516,7 @@ namespace AndroidSideloader.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("White")] + [global::System.Configuration.DefaultSettingValueAttribute("DarkGray")] public global::System.Drawing.Color FontColor { get { return ((global::System.Drawing.Color)(this["FontColor"])); @@ -564,7 +564,7 @@ namespace AndroidSideloader.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("Black")] + [global::System.Configuration.DefaultSettingValueAttribute("32, 35, 45")] public global::System.Drawing.Color ButtonColor { get { return ((global::System.Drawing.Color)(this["ButtonColor"])); @@ -576,7 +576,7 @@ namespace AndroidSideloader.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("1, 1, 1")] + [global::System.Configuration.DefaultSettingValueAttribute("31, 34, 42")] public global::System.Drawing.Color BackColor { get { return ((global::System.Drawing.Color)(this["BackColor"])); diff --git a/Properties/Settings.settings b/Properties/Settings.settings index 6ac8e85..f839a12 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -24,7 +24,7 @@ True - Microsoft Sans Serif, 11.25pt + Microsoft Sans Serif, 9pt @@ -126,7 +126,7 @@ False - White + DarkGray 25, 25, 25 @@ -138,10 +138,10 @@ 25, 25, 25 - Black + 32, 35, 45 - 1, 1, 1 + 31, 34, 42 diff --git a/QuestForm.Designer.cs b/QuestForm.Designer.cs index cbc5235..94148b0 100644 --- a/QuestForm.Designer.cs +++ b/QuestForm.Designer.cs @@ -375,7 +375,6 @@ namespace AndroidSideloader this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45))))); - this.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes; this.ClientSize = new System.Drawing.Size(309, 486); this.Controls.Add(this.label3); this.Controls.Add(this.btnApplyUsername); diff --git a/Resources/Pattern.png b/Resources/Pattern.png deleted file mode 100644 index 9bc9b8f..0000000 Binary files a/Resources/Pattern.png and /dev/null differ diff --git a/Resources/battery.png b/Resources/battery.png index d161b59..116d4d1 100644 Binary files a/Resources/battery.png and b/Resources/battery.png differ diff --git a/Resources/pattern_cubes.png b/Resources/pattern_cubes.png deleted file mode 100644 index ba2ede4..0000000 Binary files a/Resources/pattern_cubes.png and /dev/null differ diff --git a/Resources/pattern_herringbone.png b/Resources/pattern_herringbone.png deleted file mode 100644 index a1f5ce5..0000000 Binary files a/Resources/pattern_herringbone.png and /dev/null differ diff --git a/UpdateForm.Designer.cs b/UpdateForm.Designer.cs index 7239705..5430551 100644 --- a/UpdateForm.Designer.cs +++ b/UpdateForm.Designer.cs @@ -44,7 +44,6 @@ namespace AndroidSideloader // panel1 // this.panel1.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor; - this.panel1.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes; this.panel1.Controls.Add(this.YesUpdate); this.panel1.Controls.Add(this.panel3); this.panel1.Controls.Add(this.UpdateVerLabel); diff --git a/UsernameForm.Designer.cs b/UsernameForm.Designer.cs index 7572361..0e164ef 100644 --- a/UsernameForm.Designer.cs +++ b/UsernameForm.Designer.cs @@ -72,7 +72,6 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor; - this.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes; this.ClientSize = new System.Drawing.Size(443, 100); this.Controls.Add(this.button1); this.Controls.Add(this.textBox1);