[iclect-commits] iclect/src/iclect.Forms AddressBar.cs,1.6,1.7 iclect.Forms.csproj,1.6,1.7
Status: Beta
Brought to you by:
mhjp
Menu
▾
▴
[iclect-commits] iclect/src/iclect.Forms AddressBar.cs,1.6,1.7 iclect.Forms.csproj,1.6,1.7
|
From: Michael P. <mh...@us...> - 2003-07-26 11:46:16
|
Update of /cvsroot/iclect/iclect/src/iclect.Forms
In directory sc8-pr-cvs1:/tmp/cvs-serv30005/iclect.Forms
Modified Files:
AddressBar.cs iclect.Forms.csproj
Log Message:
Changed MenuItems from (iclect) MenuItemWithHelp to (System) MenuItem with (iclect) MenuItemHelp extension class.
Index: AddressBar.cs
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect.Forms/AddressBar.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AddressBar.cs 3 Jul 2003 17:32:50 -0000 1.6
--- AddressBar.cs 25 Jul 2003 17:07:48 -0000 1.7
***************
*** 26,41 ****
private System.Windows.Forms.ToolBarButton toolBarButtonOpen;
private System.Windows.Forms.ContextMenu contextMenuFolderText;
! private MenuItemWithHelp menuItemFolderEditCut;
! private MenuItemWithHelp menuItemFolderEditCopy;
! private MenuItemWithHelp menuItemFolderEditPaste;
! private MenuItemWithHelp menuItemFolderEditDelete;
! private MenuItemWithHelp menuItemFolderEditSelectAll;
! private MenuItemWithHelp menuItemFolderSep2;
! private MenuItemWithHelp menuItemFolderSep3;
! private MenuItemWithHelp menuItemFolderGo;
! private MenuItemWithHelp menuItemFolderUp;
! private MenuItemWithHelp menuItemFolderOpen;
private System.Windows.Forms.ContextMenu contextMenuFolderList;
private System.ComponentModel.IContainer components;
public AddressBar()
--- 26,42 ----
private System.Windows.Forms.ToolBarButton toolBarButtonOpen;
private System.Windows.Forms.ContextMenu contextMenuFolderText;
! private System.Windows.Forms.MenuItem menuItemFolderEditCut;
! private System.Windows.Forms.MenuItem menuItemFolderEditCopy;
! private System.Windows.Forms.MenuItem menuItemFolderEditPaste;
! private System.Windows.Forms.MenuItem menuItemFolderEditDelete;
! private System.Windows.Forms.MenuItem menuItemFolderEditSelectAll;
! private System.Windows.Forms.MenuItem menuItemFolderSep2;
! private System.Windows.Forms.MenuItem menuItemFolderSep3;
! private System.Windows.Forms.MenuItem menuItemFolderGo;
! private System.Windows.Forms.MenuItem menuItemFolderUp;
! private System.Windows.Forms.MenuItem menuItemFolderOpen;
private System.Windows.Forms.ContextMenu contextMenuFolderList;
private System.ComponentModel.IContainer components;
+ private iclect.Forms.Utility.MenuItemHelp menuItemHelp;
public AddressBar()
***************
*** 71,84 ****
this.comboBoxFolder = new System.Windows.Forms.ComboBox();
this.contextMenuFolderText = new System.Windows.Forms.ContextMenu();
! this.menuItemFolderEditCut = new iclect.Forms.Utility.MenuItemWithHelp();
! this.menuItemFolderEditCopy = new iclect.Forms.Utility.MenuItemWithHelp();
! this.menuItemFolderEditPaste = new iclect.Forms.Utility.MenuItemWithHelp();
! this.menuItemFolderEditDelete = new iclect.Forms.Utility.MenuItemWithHelp();
! this.menuItemFolderSep2 = new iclect.Forms.Utility.MenuItemWithHelp();
! this.menuItemFolderEditSelectAll = new iclect.Forms.Utility.MenuItemWithHelp();
! this.menuItemFolderSep3 = new iclect.Forms.Utility.MenuItemWithHelp();
! this.menuItemFolderUp = new iclect.Forms.Utility.MenuItemWithHelp();
! this.menuItemFolderGo = new iclect.Forms.Utility.MenuItemWithHelp();
! this.menuItemFolderOpen = new iclect.Forms.Utility.MenuItemWithHelp();
this.imageListNavigation = new System.Windows.Forms.ImageList(this.components);
this.toolBarNavigation = new System.Windows.Forms.ToolBar();
--- 72,85 ----
this.comboBoxFolder = new System.Windows.Forms.ComboBox();
this.contextMenuFolderText = new System.Windows.Forms.ContextMenu();
! this.menuItemFolderEditCut = new System.Windows.Forms.MenuItem();
! this.menuItemFolderEditCopy = new System.Windows.Forms.MenuItem();
! this.menuItemFolderEditPaste = new System.Windows.Forms.MenuItem();
! this.menuItemFolderEditDelete = new System.Windows.Forms.MenuItem();
! this.menuItemFolderSep2 = new System.Windows.Forms.MenuItem();
! this.menuItemFolderEditSelectAll = new System.Windows.Forms.MenuItem();
! this.menuItemFolderSep3 = new System.Windows.Forms.MenuItem();
! this.menuItemFolderUp = new System.Windows.Forms.MenuItem();
! this.menuItemFolderGo = new System.Windows.Forms.MenuItem();
! this.menuItemFolderOpen = new System.Windows.Forms.MenuItem();
this.imageListNavigation = new System.Windows.Forms.ImageList(this.components);
this.toolBarNavigation = new System.Windows.Forms.ToolBar();
***************
*** 87,90 ****
--- 88,92 ----
this.toolBarButtonOpen = new System.Windows.Forms.ToolBarButton();
this.contextMenuFolderList = new System.Windows.Forms.ContextMenu();
+ this.menuItemHelp = new iclect.Forms.Utility.MenuItemHelp(this.components);
this.SuspendLayout();
//
***************
*** 119,126 ****
// menuItemFolderEditCut
//
! this.menuItemFolderEditCut.HelpText = "Cut the selected text.";
this.menuItemFolderEditCut.Index = 0;
this.menuItemFolderEditCut.Shortcut = System.Windows.Forms.Shortcut.CtrlX;
- this.menuItemFolderEditCut.StatusBar = null;
this.menuItemFolderEditCut.Text = "Cu&t";
this.menuItemFolderEditCut.Click += new System.EventHandler(this.OnFolderEditCut);
--- 121,127 ----
// menuItemFolderEditCut
//
! this.menuItemHelp.SetHelpText(this.menuItemFolderEditCut, "Cut the selected text.");
this.menuItemFolderEditCut.Index = 0;
this.menuItemFolderEditCut.Shortcut = System.Windows.Forms.Shortcut.CtrlX;
this.menuItemFolderEditCut.Text = "Cu&t";
this.menuItemFolderEditCut.Click += new System.EventHandler(this.OnFolderEditCut);
***************
*** 128,135 ****
// menuItemFolderEditCopy
//
! this.menuItemFolderEditCopy.HelpText = "Copy the selected text to the clipboard.";
this.menuItemFolderEditCopy.Index = 1;
this.menuItemFolderEditCopy.Shortcut = System.Windows.Forms.Shortcut.CtrlC;
- this.menuItemFolderEditCopy.StatusBar = null;
this.menuItemFolderEditCopy.Text = "&Copy";
this.menuItemFolderEditCopy.Click += new System.EventHandler(this.OnFolderEditCopy);
--- 129,135 ----
// menuItemFolderEditCopy
//
! this.menuItemHelp.SetHelpText(this.menuItemFolderEditCopy, "Copy the selected text to the clipboard.");
this.menuItemFolderEditCopy.Index = 1;
this.menuItemFolderEditCopy.Shortcut = System.Windows.Forms.Shortcut.CtrlC;
this.menuItemFolderEditCopy.Text = "&Copy";
this.menuItemFolderEditCopy.Click += new System.EventHandler(this.OnFolderEditCopy);
***************
*** 137,144 ****
// menuItemFolderEditPaste
//
! this.menuItemFolderEditPaste.HelpText = "Paste text from the clipboard, replacing the current selection.";
this.menuItemFolderEditPaste.Index = 2;
this.menuItemFolderEditPaste.Shortcut = System.Windows.Forms.Shortcut.CtrlV;
- this.menuItemFolderEditPaste.StatusBar = null;
this.menuItemFolderEditPaste.Text = "&Paste";
this.menuItemFolderEditPaste.Click += new System.EventHandler(this.OnFolderEditPaste);
--- 137,143 ----
// menuItemFolderEditPaste
//
! this.menuItemHelp.SetHelpText(this.menuItemFolderEditPaste, "Paste text from the clipboard, replacing the current selection.");
this.menuItemFolderEditPaste.Index = 2;
this.menuItemFolderEditPaste.Shortcut = System.Windows.Forms.Shortcut.CtrlV;
this.menuItemFolderEditPaste.Text = "&Paste";
this.menuItemFolderEditPaste.Click += new System.EventHandler(this.OnFolderEditPaste);
***************
*** 146,153 ****
// menuItemFolderEditDelete
//
! this.menuItemFolderEditDelete.HelpText = "Delete the selected text.";
this.menuItemFolderEditDelete.Index = 3;
this.menuItemFolderEditDelete.Shortcut = System.Windows.Forms.Shortcut.Del;
- this.menuItemFolderEditDelete.StatusBar = null;
this.menuItemFolderEditDelete.Text = "&Delete";
this.menuItemFolderEditDelete.Click += new System.EventHandler(this.OnFolderEditDelete);
--- 145,151 ----
// menuItemFolderEditDelete
//
! this.menuItemHelp.SetHelpText(this.menuItemFolderEditDelete, "Delete the selected text.");
this.menuItemFolderEditDelete.Index = 3;
this.menuItemFolderEditDelete.Shortcut = System.Windows.Forms.Shortcut.Del;
this.menuItemFolderEditDelete.Text = "&Delete";
this.menuItemFolderEditDelete.Click += new System.EventHandler(this.OnFolderEditDelete);
***************
*** 155,169 ****
// menuItemFolderSep2
//
- this.menuItemFolderSep2.HelpText = null;
this.menuItemFolderSep2.Index = 4;
- this.menuItemFolderSep2.StatusBar = null;
this.menuItemFolderSep2.Text = "-";
//
// menuItemFolderEditSelectAll
//
! this.menuItemFolderEditSelectAll.HelpText = "Select all text.";
this.menuItemFolderEditSelectAll.Index = 5;
this.menuItemFolderEditSelectAll.Shortcut = System.Windows.Forms.Shortcut.CtrlA;
- this.menuItemFolderEditSelectAll.StatusBar = null;
this.menuItemFolderEditSelectAll.Text = "Select &All";
this.menuItemFolderEditSelectAll.Click += new System.EventHandler(this.OnFolderEditSelectAll);
--- 153,164 ----
// menuItemFolderSep2
//
this.menuItemFolderSep2.Index = 4;
this.menuItemFolderSep2.Text = "-";
//
// menuItemFolderEditSelectAll
//
! this.menuItemHelp.SetHelpText(this.menuItemFolderEditSelectAll, "Select all text.");
this.menuItemFolderEditSelectAll.Index = 5;
this.menuItemFolderEditSelectAll.Shortcut = System.Windows.Forms.Shortcut.CtrlA;
this.menuItemFolderEditSelectAll.Text = "Select &All";
this.menuItemFolderEditSelectAll.Click += new System.EventHandler(this.OnFolderEditSelectAll);
***************
*** 171,185 ****
// menuItemFolderSep3
//
- this.menuItemFolderSep3.HelpText = null;
this.menuItemFolderSep3.Index = 6;
- this.menuItemFolderSep3.StatusBar = null;
this.menuItemFolderSep3.Text = "-";
//
// menuItemFolderUp
//
! this.menuItemFolderUp.HelpText = "Navigate up one level.";
this.menuItemFolderUp.Index = 7;
this.menuItemFolderUp.Shortcut = System.Windows.Forms.Shortcut.AltBksp;
- this.menuItemFolderUp.StatusBar = null;
this.menuItemFolderUp.Text = "&Up one level";
this.menuItemFolderUp.Click += new System.EventHandler(this.OnFolderUp);
--- 166,177 ----
// menuItemFolderSep3
//
this.menuItemFolderSep3.Index = 6;
this.menuItemFolderSep3.Text = "-";
//
// menuItemFolderUp
//
! this.menuItemHelp.SetHelpText(this.menuItemFolderUp, "Navigate up one level.");
this.menuItemFolderUp.Index = 7;
this.menuItemFolderUp.Shortcut = System.Windows.Forms.Shortcut.AltBksp;
this.menuItemFolderUp.Text = "&Up one level";
this.menuItemFolderUp.Click += new System.EventHandler(this.OnFolderUp);
***************
*** 187,193 ****
// menuItemFolderGo
//
! this.menuItemFolderGo.HelpText = "Go to folder.";
this.menuItemFolderGo.Index = 8;
- this.menuItemFolderGo.StatusBar = null;
this.menuItemFolderGo.Text = "&Go";
this.menuItemFolderGo.Visible = false;
--- 179,184 ----
// menuItemFolderGo
//
! this.menuItemHelp.SetHelpText(this.menuItemFolderGo, "Go to folder.");
this.menuItemFolderGo.Index = 8;
this.menuItemFolderGo.Text = "&Go";
this.menuItemFolderGo.Visible = false;
***************
*** 196,203 ****
// menuItemFolderOpen
//
! this.menuItemFolderOpen.HelpText = "Open a folder.";
this.menuItemFolderOpen.Index = 9;
this.menuItemFolderOpen.Shortcut = System.Windows.Forms.Shortcut.CtrlO;
- this.menuItemFolderOpen.StatusBar = null;
this.menuItemFolderOpen.Text = "&Open...";
this.menuItemFolderOpen.Visible = false;
--- 187,193 ----
// menuItemFolderOpen
//
! this.menuItemHelp.SetHelpText(this.menuItemFolderOpen, "Open a folder.");
this.menuItemFolderOpen.Index = 9;
this.menuItemFolderOpen.Shortcut = System.Windows.Forms.Shortcut.CtrlO;
this.menuItemFolderOpen.Text = "&Open...";
this.menuItemFolderOpen.Visible = false;
***************
*** 300,304 ****
private void OnNavigation(object sender, System.Windows.Forms.ToolBarButtonClickEventArgs e)
{
! MenuItemWithHelp menuItem = e.Button.Tag as MenuItemWithHelp;
if (menuItem != null)
menuItem.PerformClick();
--- 290,294 ----
private void OnNavigation(object sender, System.Windows.Forms.ToolBarButtonClickEventArgs e)
{
! System.Windows.Forms.MenuItem menuItem = e.Button.Tag as System.Windows.Forms.MenuItem;
if (menuItem != null)
menuItem.PerformClick();
***************
*** 342,348 ****
private void OnSelectedFolder(object sender, System.EventArgs e)
{
! MenuItemWithHelp mi = sender as MenuItemWithHelp;
if (mi != null)
! GoToFolder(mi.HelpText);
}
--- 332,338 ----
private void OnSelectedFolder(object sender, System.EventArgs e)
{
! System.Windows.Forms.MenuItem mi = sender as System.Windows.Forms.MenuItem;
if (mi != null)
! GoToFolder(menuItemHelp.GetHelpText(mi));
}
***************
*** 359,365 ****
private void AddFolderToMenu(Menu m, EventHandler eh, string folder)
{
! MenuItemWithHelp mi = new MenuItemWithHelp();
mi.Text = Path.GetFileName(folder);
- mi.HelpText = folder;
mi.Click += eh;
m.MenuItems.Add(mi);
--- 349,355 ----
private void AddFolderToMenu(Menu m, EventHandler eh, string folder)
{
! System.Windows.Forms.MenuItem mi = new System.Windows.Forms.MenuItem();
! menuItemHelp.SetHelpText(mi, folder);
mi.Text = Path.GetFileName(folder);
mi.Click += eh;
m.MenuItems.Add(mi);
***************
*** 382,388 ****
foreach (string drive in drives)
{
! MenuItemWithHelp mi = new MenuItemWithHelp();
mi.Text = drive;
- mi.HelpText = drive;
mi.Click += eh;
m.MenuItems.Add(mi);
--- 372,378 ----
foreach (string drive in drives)
{
! System.Windows.Forms.MenuItem mi = new System.Windows.Forms.MenuItem();
! menuItemHelp.SetHelpText(mi, drive);
mi.Text = drive;
mi.Click += eh;
m.MenuItems.Add(mi);
***************
*** 537,548 ****
public override string Text
{
! get
! {
! return this.comboBoxFolder.Text;
! }
! set
! {
! this.comboBoxFolder.Text = value;
! }
}
}
--- 527,538 ----
public override string Text
{
! get { return this.comboBoxFolder.Text; }
! set { this.comboBoxFolder.Text = value; }
! }
!
! public StatusBar StatusBar
! {
! get { return this.menuItemHelp.StatusBar; }
! set { this.menuItemHelp.StatusBar = value; }
}
}
Index: iclect.Forms.csproj
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect.Forms/iclect.Forms.csproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** iclect.Forms.csproj 4 Jul 2003 23:49:53 -0000 1.6
--- iclect.Forms.csproj 25 Jul 2003 17:07:48 -0000 1.7
***************
*** 175,185 ****
/>
<File
! RelPath = "Utility\MenuItemWithHelp.cs"
SubType = "Component"
BuildAction = "Compile"
/>
<File
! RelPath = "Utility\MenuItemWithHelp.resx"
! DependentUpon = "MenuItemWithHelp.cs"
BuildAction = "EmbeddedResource"
/>
--- 175,185 ----
/>
<File
! RelPath = "Utility\MenuItemHelp.cs"
SubType = "Component"
BuildAction = "Compile"
/>
<File
! RelPath = "Utility\MenuItemHelp.resx"
! DependentUpon = "MenuItemHelp.cs"
BuildAction = "EmbeddedResource"
/>
|
