Removed dated drag-and-drop label, updated notes display

Removed DragDropLbl label and its related logic, consolidating drag-and-drop tips into the notesRichTextBox with improved styling. Added UpdateReleaseNotes method to handle dynamic notes display and placeholer styling
This commit is contained in:
jp64k
2026-01-02 15:43:33 +01:00
parent 38a1968c42
commit f80d5f841c
2 changed files with 32 additions and 36 deletions

27
MainForm.Designer.cs generated
View File

@@ -49,7 +49,6 @@ namespace AndroidSideloader
this.DownloadsIndex = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.gamesQueueLabel = new System.Windows.Forms.Label();
this.notesRichTextBox = new System.Windows.Forms.RichTextBox();
this.DragDropLbl = new System.Windows.Forms.Label();
this.lblNotes = new System.Windows.Forms.Label();
this.gamesPictureBox = new System.Windows.Forms.PictureBox();
this.startsideloadbutton_Tooltip = new System.Windows.Forms.ToolTip(this.components);
@@ -337,38 +336,24 @@ namespace AndroidSideloader
//
// notesRichTextBox
//
this.notesRichTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
this.notesRichTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.notesRichTextBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(24)))), ((int)(((byte)(26)))), ((int)(((byte)(30)))));
this.notesRichTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.notesRichTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
this.notesRichTextBox.ForeColor = System.Drawing.Color.White;
this.notesRichTextBox.Font = new System.Drawing.Font("Segoe UI", 8.5F, System.Drawing.FontStyle.Italic);
this.notesRichTextBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140)))));
this.notesRichTextBox.HideSelection = false;
this.notesRichTextBox.Location = new System.Drawing.Point(954, 496);
this.notesRichTextBox.Name = "notesRichTextBox";
this.notesRichTextBox.ReadOnly = true;
this.notesRichTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None;
this.notesRichTextBox.SelectionAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.notesRichTextBox.ShowSelectionMargin = true;
this.notesRichTextBox.Size = new System.Drawing.Size(265, 192);
this.notesRichTextBox.TabIndex = 10;
this.notesRichTextBox.Text = "Tip: Press F1 to see all shortcuts";
this.notesRichTextBox.Text = "\n\n\n\n\nTip: Press F1 to see all shortcuts\n\nDrag and drop APKs or folders to install";
this.notesRichTextBox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.notesRichTextBox_LinkClicked);
//
// DragDropLbl
//
this.DragDropLbl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.DragDropLbl.AutoSize = true;
this.DragDropLbl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.DragDropLbl.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
this.DragDropLbl.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.DragDropLbl.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
this.DragDropLbl.Location = new System.Drawing.Point(620, 561);
this.DragDropLbl.Name = "DragDropLbl";
this.DragDropLbl.Size = new System.Drawing.Size(320, 55);
this.DragDropLbl.TabIndex = 25;
this.DragDropLbl.Text = "DragDropLBL";
this.DragDropLbl.Visible = false;
//
// lblNotes
//
this.lblNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -1577,7 +1562,6 @@ namespace AndroidSideloader
this.Controls.Add(this.ULLabel);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.progressDLbtnContainer);
this.Controls.Add(this.DragDropLbl);
this.Controls.Add(this.lblNotes);
this.Controls.Add(this.gamesQueueLabel);
this.Controls.Add(this.gamesQueListBox);
@@ -1639,7 +1623,6 @@ namespace AndroidSideloader
private System.Windows.Forms.PictureBox gamesPictureBox;
private System.Windows.Forms.Label gamesQueueLabel;
private System.Windows.Forms.RichTextBox notesRichTextBox;
private System.Windows.Forms.Label DragDropLbl;
private System.Windows.Forms.Label lblNotes;
public System.Windows.Forms.ComboBox remotesList;
public System.Windows.Forms.ColumnHeader GameNameIndex;

View File

@@ -1604,8 +1604,6 @@ namespace AndroidSideloader
}
changeTitle($"Processing dropped file. If Rookie freezes, please wait. Do not close Rookie!");
DragDropLbl.Visible = false;
ProcessOutput output = new ProcessOutput(String.Empty, String.Empty);
ADB.DeviceID = GetDeviceID();
progressBar.IsIndeterminate = true;
@@ -1964,9 +1962,6 @@ namespace AndroidSideloader
progressBar.IsIndeterminate = false;
showAvailableSpace();
DragDropLbl.Visible = false;
ShowPrcOutput(output);
listAppsBtn();
}
@@ -1977,17 +1972,10 @@ namespace AndroidSideloader
{
e.Effect = DragDropEffects.Copy;
}
DragDropLbl.Visible = true;
DragDropLbl.Text = "Drag APK or OBB";
changeTitle(DragDropLbl.Text);
}
private void Form1_DragLeave(object sender, EventArgs e)
{
DragDropLbl.Visible = false;
DragDropLbl.Text = String.Empty;
changeTitle("");
}
@@ -5364,7 +5352,7 @@ function onYouTubeIframeAPIReady() {
if (!isGalleryView)
{
notesRichTextBox.Text = File.Exists(NotePath) ? File.ReadAllText(NotePath) : "";
UpdateReleaseNotes(NotePath);
UpdateNotesScrollBar();
}
}
@@ -6460,7 +6448,32 @@ function onYouTubeIframeAPIReady() {
// Load release notes
string notePath = Path.Combine(SideloaderRCLONE.NotesFolder, $"{releaseName}.txt");
notesRichTextBox.Text = File.Exists(notePath) ? File.ReadAllText(notePath) : "";
UpdateReleaseNotes(notePath);
UpdateNotesScrollBar();
}
private void UpdateReleaseNotes(string notes)
{
if (File.Exists(notes))
{
// Reset to normal styling for actual content
notesRichTextBox.Font = new Font("Segoe UI", 9F, FontStyle.Regular);
notesRichTextBox.ForeColor = Color.White;
notesRichTextBox.Text = File.ReadAllText(notes);
notesRichTextBox.SelectAll();
notesRichTextBox.SelectionAlignment = HorizontalAlignment.Left;
notesRichTextBox.DeselectAll();
}
else
{
// Show placeholder with queue-matching style (grey, italic, centered)
notesRichTextBox.Font = new Font("Segoe UI", 8.5F, FontStyle.Italic);
notesRichTextBox.ForeColor = Color.FromArgb(140, 140, 140);
notesRichTextBox.Text = "\n\n\n\n\nTip: Press F1 to see all shortcuts\n\nDrag and drop APKs or folders to install";
notesRichTextBox.SelectAll();
notesRichTextBox.SelectionAlignment = HorizontalAlignment.Center;
notesRichTextBox.DeselectAll();
}
UpdateNotesScrollBar();
}