[iclect-commits] iclect/src/iclect MainForm.cs,1.12,1.13 MainForm.resx,1.7,1.8
Status: Beta
Brought to you by:
mhjp
|
From: Michael P. <mh...@us...> - 2003-07-04 23:50:09
|
Update of /cvsroot/iclect/iclect/src/iclect
In directory sc8-pr-cvs1:/tmp/cvs-serv29448/src/iclect
Modified Files:
MainForm.cs MainForm.resx
Log Message:
Enhanced title and status bar.
Index: MainForm.cs
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/MainForm.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MainForm.cs 4 Jul 2003 14:49:53 -0000 1.12
--- MainForm.cs 4 Jul 2003 23:49:53 -0000 1.13
***************
*** 48,52 ****
--- 48,55 ----
/// </summary>
private System.ComponentModel.Container components = null;
+ private System.Windows.Forms.StatusBarPanel statusBarText;
+ private System.Windows.Forms.StatusBarPanel statusBarCount;
+ string _title;
public MainForm()
{
***************
*** 55,58 ****
--- 58,63 ----
//
InitializeComponent();
+
+ _title = this.Text;
}
***************
*** 90,93 ****
--- 95,100 ----
System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(MainForm));
this.statusBar = new System.Windows.Forms.StatusBar();
+ this.statusBarText = new System.Windows.Forms.StatusBarPanel();
+ this.statusBarCount = new System.Windows.Forms.StatusBarPanel();
this.mainMenu = new System.Windows.Forms.MainMenu();
this.menuFile = new iclect.Forms.Utility.MenuItemWithHelp();
***************
*** 114,117 ****
--- 121,126 ----
this.panelTop = new System.Windows.Forms.Panel();
this.panelCenter = new System.Windows.Forms.Panel();
+ ((System.ComponentModel.ISupportInitialize)(this.statusBarText)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.statusBarCount)).BeginInit();
this.panelTop.SuspendLayout();
this.panelCenter.SuspendLayout();
***************
*** 122,129 ****
--- 131,157 ----
this.statusBar.Location = new System.Drawing.Point(0, 499);
this.statusBar.Name = "statusBar";
+ this.statusBar.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] {
+ this.statusBarText,
+ this.statusBarCount});
+ this.statusBar.ShowPanels = true;
this.statusBar.Size = new System.Drawing.Size(712, 22);
this.statusBar.TabIndex = 0;
this.statusBar.Text = "Ready.";
//
+ // statusBarText
+ //
+ this.statusBarText.AutoSize = System.Windows.Forms.StatusBarPanelAutoSize.Spring;
+ this.statusBarText.BorderStyle = System.Windows.Forms.StatusBarPanelBorderStyle.None;
+ this.statusBarText.Text = "Ready.";
+ this.statusBarText.Width = 666;
+ //
+ // statusBarCount
+ //
+ this.statusBarCount.Alignment = System.Windows.Forms.HorizontalAlignment.Center;
+ this.statusBarCount.AutoSize = System.Windows.Forms.StatusBarPanelAutoSize.Contents;
+ this.statusBarCount.Text = "n/a";
+ this.statusBarCount.ToolTipText = "Number of files in the folder.";
+ this.statusBarCount.Width = 30;
+ //
// mainMenu
//
***************
*** 378,381 ****
--- 406,411 ----
this.MenuStart += new System.EventHandler(this.OnMenuStart);
this.MenuComplete += new System.EventHandler(this.OnMenuComplete);
+ ((System.ComponentModel.ISupportInitialize)(this.statusBarText)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.statusBarCount)).EndInit();
this.panelTop.ResumeLayout(false);
this.panelCenter.ResumeLayout(false);
***************
*** 405,412 ****
private void OnMenuComplete(object sender, System.EventArgs e)
{
! this.statusBar.Text = _savedStatusBarText;
}
#endregion
private void OnFolderChanged(object sender, AddressBar.FolderChangedEventArgs e)
{
--- 435,444 ----
private void OnMenuComplete(object sender, System.EventArgs e)
{
! this.statusBar.Text = _savedStatusBarText;
! this.statusBarText.Text = _savedStatusBarText;
}
#endregion
+
private void OnFolderChanged(object sender, AddressBar.FolderChangedEventArgs e)
{
***************
*** 414,417 ****
--- 446,453 ----
try
{
+ this.Text = _title;
+ this.statusBar.SuspendLayout();
+ this.statusBar.ShowPanels = false;
+
if (imagePreview.ImageReference != null)
{
***************
*** 434,440 ****
--- 470,481 ----
{
Debug.WriteLine(path);
+ this.Text = string.Format("{0} - {1}",
+ Path.GetFileName(path),
+ _title);
ImageFolder imageFolder = new ImageFolder(path);
+ this.statusBarCount.Text = imageFolder.ImageFiles.Length.ToString();
film.ImageFolder = imageFolder;
film.Focus();
+ this.statusBar.ShowPanels = true;
}
}
***************
*** 442,445 ****
--- 483,487 ----
{
film.ResumeLayout();
+ this.statusBar.ResumeLayout();
}
}
Index: MainForm.resx
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/MainForm.resx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MainForm.resx 4 Jul 2003 14:49:53 -0000 1.7
--- MainForm.resx 4 Jul 2003 23:49:53 -0000 1.8
***************
*** 107,110 ****
--- 107,122 ----
<value>Private</value>
</data>
+ <data name="statusBarText.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="statusBarText.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="statusBarCount.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="statusBarCount.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
<data name="mainMenu.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
***************
*** 218,221 ****
--- 230,236 ----
<value>Private</value>
</data>
+ <data name="addressBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
<data name="addressBar.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
***************
*** 224,230 ****
<value>Private</value>
</data>
- <data name="addressBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
<data name="labelAddressBar.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
--- 239,242 ----
***************
*** 272,275 ****
--- 284,290 ----
<value>Private</value>
</data>
+ <data name="panelCenter.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>8, 8</value>
+ </data>
<data name="panelCenter.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
***************
*** 281,287 ****
<value>Private</value>
</data>
- <data name="panelCenter.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>8, 8</value>
- </data>
<data name="panelCenter.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
--- 296,299 ----
***************
*** 305,311 ****
<value>8, 8</value>
</data>
- <data name="$this.Name">
- <value>MainForm</value>
- </data>
<data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
--- 317,320 ----
***************
*** 316,319 ****
--- 325,331 ----
<data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
+ </data>
+ <data name="$this.Name">
+ <value>MainForm</value>
</data>
<data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|