From e2f1aa32bd003cd24cdf25393808c5a81f3b89d5 Mon Sep 17 00:00:00 2001
From: "SND\\floAr_cp" <SND\floAr_cp@7a4bfd9b-e295-4cbd-a51f-ab472bcf69b7>
Date: Sat, 8 Sep 2012 10:32:05 +0000
Subject: [PATCH] 2 minor enhancements on SampleBrowser
---
.../SampleBrowser.Designer.cs | 48 +++++++++++++++----
Tools/AnxSampleBrowser/SampleBrowser.cs | 4 +-
2 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/Tools/AnxSampleBrowser/SampleBrowser.Designer.cs b/Tools/AnxSampleBrowser/SampleBrowser.Designer.cs
index 53ef7cf0..ab212468 100644
--- a/Tools/AnxSampleBrowser/SampleBrowser.Designer.cs
+++ b/Tools/AnxSampleBrowser/SampleBrowser.Designer.cs
@@ -46,6 +46,8 @@
this._bSearch = new System.Windows.Forms.Button();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
+ this._lCurrentPage = new System.Windows.Forms.Label();
+ this._lMaxPage = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
@@ -92,9 +94,9 @@
this._lCategorie.ForeColor = System.Drawing.Color.White;
this._lCategorie.Location = new System.Drawing.Point(739, 274);
this._lCategorie.Name = "_lCategorie";
- this._lCategorie.Size = new System.Drawing.Size(82, 21);
+ this._lCategorie.Size = new System.Drawing.Size(77, 21);
this._lCategorie.TabIndex = 2;
- this._lCategorie.Text = "Categorie";
+ this._lCategorie.Text = "Category";
//
// _dCategories
//
@@ -141,11 +143,11 @@
this._lPageIndex.BackColor = System.Drawing.Color.Transparent;
this._lPageIndex.Font = new System.Drawing.Font("Segoe UI", 15F);
this._lPageIndex.ForeColor = System.Drawing.Color.White;
- this._lPageIndex.Location = new System.Drawing.Point(807, 464);
+ this._lPageIndex.Location = new System.Drawing.Point(823, 469);
this._lPageIndex.Name = "_lPageIndex";
- this._lPageIndex.Size = new System.Drawing.Size(64, 28);
+ this._lPageIndex.Size = new System.Drawing.Size(20, 28);
this._lPageIndex.TabIndex = 11;
- this._lPageIndex.Text = "99/99";
+ this._lPageIndex.Text = "/";
//
// _bApply
//
@@ -238,7 +240,7 @@
// pictureBox1
//
this.pictureBox1.Image = global::AnxSampleBrowser.Properties.Resources.appbar_arrow_left;
- this.pictureBox1.Location = new System.Drawing.Point(751, 457);
+ this.pictureBox1.Location = new System.Drawing.Point(746, 461);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(42, 50);
this.pictureBox1.TabIndex = 12;
@@ -248,13 +250,37 @@
// pictureBox2
//
this.pictureBox2.Image = global::AnxSampleBrowser.Properties.Resources.appbar_arrow_right;
- this.pictureBox2.Location = new System.Drawing.Point(880, 457);
+ this.pictureBox2.Location = new System.Drawing.Point(878, 461);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(42, 50);
this.pictureBox2.TabIndex = 13;
this.pictureBox2.TabStop = false;
this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click);
//
+ // _lCurrentPage
+ //
+ this._lCurrentPage.AutoSize = true;
+ this._lCurrentPage.BackColor = System.Drawing.Color.Transparent;
+ this._lCurrentPage.Font = new System.Drawing.Font("Segoe UI", 15F);
+ this._lCurrentPage.ForeColor = System.Drawing.Color.White;
+ this._lCurrentPage.Location = new System.Drawing.Point(794, 469);
+ this._lCurrentPage.Name = "_lCurrentPage";
+ this._lCurrentPage.Size = new System.Drawing.Size(23, 28);
+ this._lCurrentPage.TabIndex = 14;
+ this._lCurrentPage.Text = "9";
+ //
+ // _lMaxPage
+ //
+ this._lMaxPage.AutoSize = true;
+ this._lMaxPage.BackColor = System.Drawing.Color.Transparent;
+ this._lMaxPage.Font = new System.Drawing.Font("Segoe UI", 15F);
+ this._lMaxPage.ForeColor = System.Drawing.Color.White;
+ this._lMaxPage.Location = new System.Drawing.Point(849, 469);
+ this._lMaxPage.Name = "_lMaxPage";
+ this._lMaxPage.Size = new System.Drawing.Size(23, 28);
+ this._lMaxPage.TabIndex = 15;
+ this._lMaxPage.Text = "9";
+ //
// AnxSampleBrowser
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -262,11 +288,13 @@
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44)))));
this.ClientSize = new System.Drawing.Size(934, 522);
this.Controls.Add(this.pictureBox2);
- this.Controls.Add(this.pictureBox1);
+ this.Controls.Add(this._lMaxPage);
this.Controls.Add(this._bApply);
- this.Controls.Add(this._lPageIndex);
+ this.Controls.Add(this.pictureBox1);
this.Controls.Add(this._dSort);
+ this.Controls.Add(this._lPageIndex);
this.Controls.Add(this._pSamples);
+ this.Controls.Add(this._lCurrentPage);
this.Controls.Add(this._lFilter);
this.Controls.Add(this.panel1);
this.Controls.Add(this._lSortBy);
@@ -305,6 +333,8 @@
private System.Windows.Forms.Button _bApply;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.PictureBox pictureBox2;
+ private System.Windows.Forms.Label _lCurrentPage;
+ private System.Windows.Forms.Label _lMaxPage;
}
}
diff --git a/Tools/AnxSampleBrowser/SampleBrowser.cs b/Tools/AnxSampleBrowser/SampleBrowser.cs
index 4da01400..33d875ca 100644
--- a/Tools/AnxSampleBrowser/SampleBrowser.cs
+++ b/Tools/AnxSampleBrowser/SampleBrowser.cs
@@ -91,7 +91,8 @@ namespace AnxSampleBrowser
while (_currentPage > _pageCount)
_currentPage--;
- _lPageIndex.Text = _currentPage + " / " + _pageCount;
+ _lCurrentPage.Text = _currentPage.ToString();
+ _lMaxPage.Text = _pageCount.ToString();
for (int i = 6 * (_currentPage - 1); i < _currentPage * 6 && i < _filteredSamples.Count; ++i)
{
@@ -301,6 +302,7 @@ namespace AnxSampleBrowser
_currentPage = _currentPage - 1 <= 0 ? _currentPage : _currentPage - 1;
calculatePages();
}
+
}
static class StringExtender