[Nmailserver-commits] SF.net SVN: nmailserver: [199] NMail/trunk
Brought to you by:
dframpton-oss,
tmyroadctfig
|
From: <tmy...@us...> - 2007-05-21 10:55:56
|
Revision: 199
http://svn.sourceforge.net/nmailserver/?rev=199&view=rev
Author: tmyroadctfig
Date: 2007-05-21 03:55:56 -0700 (Mon, 21 May 2007)
Log Message:
-----------
Further work on administration tool.
Modified Paths:
--------------
NMail/trunk/NMail.Administration.WinForms/MainForm.Designer.cs
NMail/trunk/NMail.Administration.WinForms/MainForm.cs
NMail/trunk/NMail.Administration.WinForms/ManagementTree/ManagementTree.Designer.cs
NMail/trunk/NMail.Administration.WinForms/ManagementTree/ManagementTree.cs
NMail/trunk/NMail.Administration.WinForms/NMail.Administration.WinForms.csproj
NMail/trunk/NMail.Administration.WinForms/Services/ServicesViewer.cs
NMail/trunk/NMail.Icons/NMail.Icons.csproj
Added Paths:
-----------
NMail/trunk/NMail.Administration.WinForms/Resources/
NMail/trunk/NMail.Administration.WinForms/Resources/ConnectFailed.html
NMail/trunk/NMail.Administration.WinForms/Resources/NotConnected.html
NMail/trunk/NMail.Administration.WinForms/Resources/Welcome.html
NMail/trunk/NMail.Icons/Resources/22x22/actions/edit_group.png
NMail/trunk/NMail.Icons/Resources/22x22/actions/exec.png
NMail/trunk/NMail.Icons/Resources/22x22/actions/folder.png
NMail/trunk/NMail.Icons/Resources/22x22/actions/queue.png
NMail/trunk/NMail.Icons/Resources/22x22/actions/server.png
NMail/trunk/References/MRG.Controls.UI.dll
Modified: NMail/trunk/NMail.Administration.WinForms/MainForm.Designer.cs
===================================================================
--- NMail/trunk/NMail.Administration.WinForms/MainForm.Designer.cs 2007-05-20 23:58:57 UTC (rev 198)
+++ NMail/trunk/NMail.Administration.WinForms/MainForm.Designer.cs 2007-05-21 10:55:56 UTC (rev 199)
@@ -26,14 +26,15 @@
this.menuStrip = new System.Windows.Forms.MenuStrip();
this.fileMenu = new System.Windows.Forms.ToolStripMenuItem();
this.connectMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.disconnectMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.exitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip = new System.Windows.Forms.StatusStrip();
this.serverNameLbl = new System.Windows.Forms.ToolStripStatusLabel();
this.connectionStatusLbl = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripContainer = new System.Windows.Forms.ToolStripContainer();
this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel();
- this.disconnectMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.loadingCircle1 = new MRG.Controls.UI.LoadingCircleToolStripMenuItem();
this.menuStrip.SuspendLayout();
this.statusStrip.SuspendLayout();
this.toolStripContainer.ContentPanel.SuspendLayout();
@@ -43,7 +44,8 @@
// menuStrip
//
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.fileMenu});
+ this.fileMenu,
+ this.loadingCircle1});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
this.menuStrip.Size = new System.Drawing.Size(715, 24);
@@ -64,14 +66,26 @@
// connectMenuItem
//
this.connectMenuItem.Name = "connectMenuItem";
- this.connectMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.connectMenuItem.Size = new System.Drawing.Size(137, 22);
this.connectMenuItem.Text = "Connect";
this.connectMenuItem.Click += new System.EventHandler(this.connectMenuItem_Click);
//
+ // disconnectMenuItem
+ //
+ this.disconnectMenuItem.Name = "disconnectMenuItem";
+ this.disconnectMenuItem.Size = new System.Drawing.Size(137, 22);
+ this.disconnectMenuItem.Text = "Disconnect";
+ this.disconnectMenuItem.Click += new System.EventHandler(this.disconnectMenuItem_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(134, 6);
+ //
// exitMenuItem
//
this.exitMenuItem.Name = "exitMenuItem";
- this.exitMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.exitMenuItem.Size = new System.Drawing.Size(137, 22);
this.exitMenuItem.Text = "Exit";
this.exitMenuItem.Click += new System.EventHandler(this.exitMenuItem_Click);
//
@@ -122,17 +136,32 @@
this.dockPanel.Size = new System.Drawing.Size(715, 446);
this.dockPanel.TabIndex = 0;
//
- // disconnectMenuItem
+ // loadingCircle1
//
- this.disconnectMenuItem.Name = "disconnectMenuItem";
- this.disconnectMenuItem.Size = new System.Drawing.Size(152, 22);
- this.disconnectMenuItem.Text = "Disconnect";
- this.disconnectMenuItem.Click += new System.EventHandler(this.disconnectMenuItem_Click);
+ this.loadingCircle1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.loadingCircle1.BackColor = System.Drawing.Color.Transparent;
+ this.loadingCircle1.Enabled = false;
//
- // toolStripSeparator1
+ // loadingCircle1
//
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
+ this.loadingCircle1.LoadingCircleControl.AccessibleName = "loadingCircle1";
+ this.loadingCircle1.LoadingCircleControl.Active = false;
+ this.loadingCircle1.LoadingCircleControl.BackColor = System.Drawing.Color.Transparent;
+ this.loadingCircle1.LoadingCircleControl.Color = System.Drawing.Color.Black;
+ this.loadingCircle1.LoadingCircleControl.Enabled = false;
+ this.loadingCircle1.LoadingCircleControl.InnerCircleRadius = 4;
+ this.loadingCircle1.LoadingCircleControl.Location = new System.Drawing.Point(697, 3);
+ this.loadingCircle1.LoadingCircleControl.Name = "loadingCircle1";
+ this.loadingCircle1.LoadingCircleControl.NumberSpoke = 10;
+ this.loadingCircle1.LoadingCircleControl.OuterCircleRadius = 7;
+ this.loadingCircle1.LoadingCircleControl.RotationSpeed = 100;
+ this.loadingCircle1.LoadingCircleControl.Size = new System.Drawing.Size(18, 17);
+ this.loadingCircle1.LoadingCircleControl.SpokeThickness = 2;
+ this.loadingCircle1.LoadingCircleControl.TabIndex = 1;
+ this.loadingCircle1.LoadingCircleControl.TabStop = false;
+ this.loadingCircle1.Name = "loadingCircle1";
+ this.loadingCircle1.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
+ this.loadingCircle1.Size = new System.Drawing.Size(18, 17);
//
// MainForm
//
@@ -172,6 +201,7 @@
private System.Windows.Forms.ToolStripMenuItem connectMenuItem;
private System.Windows.Forms.ToolStripMenuItem disconnectMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private MRG.Controls.UI.LoadingCircleToolStripMenuItem loadingCircle1;
}
}
Modified: NMail/trunk/NMail.Administration.WinForms/MainForm.cs
===================================================================
--- NMail/trunk/NMail.Administration.WinForms/MainForm.cs 2007-05-20 23:58:57 UTC (rev 198)
+++ NMail/trunk/NMail.Administration.WinForms/MainForm.cs 2007-05-21 10:55:56 UTC (rev 199)
@@ -21,6 +21,8 @@
using System.ComponentModel;
using System.Data;
using System.Drawing;
+using System.IO;
+using System.Net.Sockets;
using System.Runtime.Remoting;
using System.Runtime.Remoting.Channels;
using System.Runtime.Remoting.Channels.Tcp;
@@ -47,17 +49,10 @@
InitialiseRemoting();
- ManagementTree.ManagementTree managementTree = new ManagementTree.ManagementTree();
- managementTree.Dock = DockStyle.Fill;
+ InitialiseStatusBrowser();
+ InitialiseManagementTree();
+ InitialiseServicesViewer();
- DockContent managementTreeDock = new DockContent();
- managementTreeDock.Controls.Add(managementTree);
- managementTreeDock.CloseButton = false;
- managementTreeDock.Text = "Management Tree";
- managementTreeDock.DockPanel = this.dockPanel;
- managementTreeDock.DockState = DockState.DockLeft;
- managementTreeDock.Icon = IconHelper.GetIcon("tree", "apps", IconSize.s16x16);
-
this.connectionStatusLbl.Image = IconHelper.GetImage("connect_no", "actions", IconSize.s16x16);
this.connectMenuItem.Image = IconHelper.GetImage("connect_no", "actions", IconSize.s16x16);
}
@@ -83,11 +78,20 @@
}
#region Connect
+ /// <summary>
+ /// Returns true if remote server is connected.
+ /// </summary>
+ public bool Connected {
+ get {
+ return this.remoteAdministration != null;
+ }
+ }
protected void BeginConnect(string host) {
this.serverNameLbl.Text = host;
this.connectionStatusLbl.Image = IconHelper.GetImage("connect_creating", "actions", IconSize.s16x16);
this.connectionStatusLbl.Text = "Connecting...";
+ this.loadingCircle1.LoadingCircleControl.Active = true;
ThreadPool.QueueUserWorkItem(new WaitCallback(Connect), host);
}
@@ -95,12 +99,22 @@
protected void Connect(object o) {
string host = o as string;
- string url = string.Format("tcp://{0}:7877/RemoteAdministration.rem", host);
- this.remoteAdministration = (RemoteAdministration) RemotingServices.Connect(typeof(RemoteAdministration), url);
+ try {
+ string url = string.Format("tcp://{0}:7877/RemoteAdministration.rem", host);
+ this.remoteAdministration = (RemoteAdministration) RemotingServices.Connect(typeof(RemoteAdministration), url);
- // Force the connection to come up
- log.Debug("Remote server assembly version: " + this.remoteAdministration.Version);
+ // Force the connection to come up
+ log.Debug("Remote server assembly version: " + this.remoteAdministration.Version);
+ } catch (SocketException) {
+ this.ConnectFailed();
+ return;
+
+ } catch (IOException) {
+ this.ConnectFailed();
+ return;
+ }
+
this.Invoke(new MethodInvoker(UpdateConnectionStatus));
}
@@ -132,24 +146,35 @@
protected void UpdateConnectionStatus() {
if (this.remoteAdministration == null) {
+ // Update status label
this.connectionStatusLbl.Image = IconHelper.GetImage("connect_no", "actions", IconSize.s16x16);
this.connectionStatusLbl.Text = "Disconnected";
+
+ // Update status browser
+ string path = Directory.GetCurrentDirectory() + "\\Resources\\NotConnected.html";
+ statusBrowswer.Navigate(path);
+ statusBrowserDock.Text = "Not connected";
} else {
+ // Update status label
this.connectionStatusLbl.Image = IconHelper.GetImage("connect_established", "actions", IconSize.s16x16);
this.connectionStatusLbl.Text = "Connected";
}
+
+ this.loadingCircle1.LoadingCircleControl.Active = false;
}
#region Disconnect
public void Disconnect() {
- this.remoteAdministration = null;
+ // Reinvoke if required
+ if (InvokeRequired) {
+ Invoke(new MethodInvoker(Disconnect));
- if (InvokeRequired) {
- Invoke(new MethodInvoker(UpdateConnectionStatus));
} else {
+ this.remoteAdministration = null;
UpdateConnectionStatus();
+ ShowStatusBrowser();
}
}
@@ -158,6 +183,127 @@
}
#endregion
+ public void ConnectFailed() {
+ // Reinvoke if required
+ if (InvokeRequired) {
+ Invoke(new MethodInvoker(ConnectFailed));
+
+ } else {
+ this.remoteAdministration = null;
+ UpdateConnectionStatus();
+
+ // Update status browser
+ string path = Directory.GetCurrentDirectory() + "\\Resources\\ConnectFailed.html";
+ statusBrowswer.Navigate(path);
+ statusBrowserDock.Text = "Connection failed";
+
+ ShowStatusBrowser();
+ }
+ }
+
+ #region Status Browser
+ /// <summary>
+ /// The services viewer.
+ /// </summary>
+ WebBrowser statusBrowswer;
+
+ DockContent statusBrowserDock;
+
+ protected void InitialiseStatusBrowser() {
+ statusBrowswer = new WebBrowser();
+ statusBrowswer.AllowWebBrowserDrop = false;
+ statusBrowswer.IsWebBrowserContextMenuEnabled = false;
+ statusBrowswer.WebBrowserShortcutsEnabled = false;
+ statusBrowswer.Dock = DockStyle.Fill;
+ statusBrowswer.Navigating += new WebBrowserNavigatingEventHandler(notConnectedBrowser_Navigating);
+
+ string path = Directory.GetCurrentDirectory() + "\\Resources\\Welcome.html";
+ statusBrowswer.Navigate(path);
+
+ statusBrowserDock = new DockContent();
+ statusBrowserDock.Controls.Add(statusBrowswer);
+ statusBrowserDock.CloseButton = false;
+ statusBrowserDock.Text = "Welcome";
+ statusBrowserDock.DockPanel = this.dockPanel;
+ statusBrowserDock.DockState = DockState.Document;
+ statusBrowserDock.Icon = IconHelper.GetIcon("connect_no", "actions", IconSize.s16x16);
+ }
+
+ void notConnectedBrowser_Navigating(object sender, WebBrowserNavigatingEventArgs e) {
+ if (e.Url.ToString() == "connect:") {
+ this.connectMenuItem_Click(this, new EventArgs());
+
+ e.Cancel = true;
+ }
+ }
+
+ protected void ShowStatusBrowser() {
+ }
+ #endregion
+
+ #region Management Tree
+
+ protected void InitialiseManagementTree() {
+ ManagementTree.ManagementTree managementTree = new ManagementTree.ManagementTree(this);
+ managementTree.Dock = DockStyle.Fill;
+
+ DockContent managementTreeDock = new DockContent();
+ managementTreeDock.Controls.Add(managementTree);
+ managementTreeDock.CloseButton = false;
+ managementTreeDock.Text = "Management Tree";
+ managementTreeDock.DockPanel = this.dockPanel;
+ managementTreeDock.DockState = DockState.DockLeft;
+ managementTreeDock.Icon = IconHelper.GetIcon("tree", "apps", IconSize.s16x16);
+ }
+ #endregion
+
+ public void ShowNMailDetails() {
+ }
+
+ #region Services Viewer
+ /// <summary>
+ /// The services viewer.
+ /// </summary>
+ Services.ServicesViewer services;
+
+ DockContent servicesDock;
+
+ protected void InitialiseServicesViewer() {
+ this.services = new Services.ServicesViewer(this);
+ this.services.Dock = DockStyle.Fill;
+
+ servicesDock = new DockContent();
+ servicesDock.Controls.Add(services);
+ servicesDock.CloseButton = false;
+ servicesDock.Text = "Services";
+ servicesDock.DockPanel = this.dockPanel;
+ servicesDock.DockState = DockState.Document;
+ servicesDock.Icon = IconHelper.GetIcon("exec", "actions", IconSize.s16x16);
+ servicesDock.Visible = false;
+ }
+
+ public void ShowServicesControl() {
+ if (!Connected) {
+ ShowStatusBrowser();
+
+ } else {
+
+ }
+ }
+ #endregion
+
+ public void ShowSpoolControl() {
+ }
+
+ public void ShowMailDomainControl() {
+ }
+
+ public void ShowUsersControl() {
+ }
+
+ public void ShowFoldersControl() {
+ }
+
private void exitMenuItem_Click(object sender, EventArgs e) {
this.Close();
}
Modified: NMail/trunk/NMail.Administration.WinForms/ManagementTree/ManagementTree.Designer.cs
===================================================================
--- NMail/trunk/NMail.Administration.WinForms/ManagementTree/ManagementTree.Designer.cs 2007-05-20 23:58:57 UTC (rev 198)
+++ NMail/trunk/NMail.Administration.WinForms/ManagementTree/ManagementTree.Designer.cs 2007-05-21 10:55:56 UTC (rev 199)
@@ -39,11 +39,12 @@
this.treeView.SelectedImageIndex = 0;
this.treeView.Size = new System.Drawing.Size(150, 150);
this.treeView.TabIndex = 0;
+ this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
//
// imageList
//
this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
- this.imageList.ImageSize = new System.Drawing.Size(16, 16);
+ this.imageList.ImageSize = new System.Drawing.Size(22, 22);
this.imageList.TransparentColor = System.Drawing.Color.Transparent;
//
// ManagementTree
Modified: NMail/trunk/NMail.Administration.WinForms/ManagementTree/ManagementTree.cs
===================================================================
--- NMail/trunk/NMail.Administration.WinForms/ManagementTree/ManagementTree.cs 2007-05-20 23:58:57 UTC (rev 198)
+++ NMail/trunk/NMail.Administration.WinForms/ManagementTree/ManagementTree.cs 2007-05-21 10:55:56 UTC (rev 199)
@@ -30,36 +30,74 @@
/// Provides a tree view of possible management options.
/// </summary>
public partial class ManagementTree : UserControl {
- public ManagementTree() {
+ public ManagementTree(MainForm mainForm) {
InitializeComponent();
+ this.mainForm = mainForm;
+
// Setup the image list
this.imageList.Images.Add(IconHelper.GetImage("nmail", "apps", IconSize.s16x16));
- this.imageList.Images.Add(IconHelper.GetImage("exec", "actions", IconSize.s16x16));
- this.imageList.Images.Add(IconHelper.GetImage("server", "actions", IconSize.s16x16));
- this.imageList.Images.Add(IconHelper.GetImage("edit_group", "actions", IconSize.s16x16));
- this.imageList.Images.Add(IconHelper.GetImage("folder", "actions", IconSize.s16x16));
- this.imageList.Images.Add(IconHelper.GetImage("queue", "actions", IconSize.s16x16));
+ this.imageList.Images.Add(IconHelper.GetImage("exec", "actions", IconSize.s22x22));
+ this.imageList.Images.Add(IconHelper.GetImage("server", "actions", IconSize.s22x22));
+ this.imageList.Images.Add(IconHelper.GetImage("edit_group", "actions", IconSize.s22x22));
+ this.imageList.Images.Add(IconHelper.GetImage("folder", "actions", IconSize.s22x22));
+ this.imageList.Images.Add(IconHelper.GetImage("queue", "actions", IconSize.s22x22));
- TreeNode nmailNode = new TreeNode("NMail", 0, 0);
- this.treeView.Nodes.Add(nmailNode);
+ this.nmailNode = new TreeNode("NMail", 0, 0);
+ this.treeView.Nodes.Add(this.nmailNode);
- TreeNode servicesNode = new TreeNode("Services", 1, 1);
- nmailNode.Nodes.Add(servicesNode);
+ this.servicesNode = new TreeNode("Services", 1, 1);
+ this.nmailNode.Nodes.Add(this.servicesNode);
- TreeNode spoolNode = new TreeNode("Smtp Spool", 5, 5);
- nmailNode.Nodes.Add(spoolNode);
+ this.spoolNode = new TreeNode("Smtp Spool", 5, 5);
+ this.nmailNode.Nodes.Add(this.spoolNode);
- TreeNode mailDomainNode = new TreeNode("Mail Domains", 2, 2);
- nmailNode.Nodes.Add(mailDomainNode);
+ this.mailDomainNode = new TreeNode("Mail Domains", 2, 2);
+ this.nmailNode.Nodes.Add(this.mailDomainNode);
- TreeNode usersNode = new TreeNode("Users", 3, 3);
- nmailNode.Nodes.Add(usersNode);
+ this.usersNode = new TreeNode("Users", 3, 3);
+ this.nmailNode.Nodes.Add(this.usersNode);
- TreeNode foldersNode = new TreeNode("Folders", 4, 4);
- nmailNode.Nodes.Add(foldersNode);
+ this.foldersNode = new TreeNode("Folders", 4, 4);
+ this.nmailNode.Nodes.Add(this.foldersNode);
this.treeView.ExpandAll();
}
+
+ MainForm mainForm;
+
+ TreeNode nmailNode;
+
+ TreeNode servicesNode;
+
+ TreeNode spoolNode;
+
+ TreeNode mailDomainNode;
+
+ TreeNode usersNode;
+
+ TreeNode foldersNode;
+
+ private void treeView_AfterSelect(object sender, TreeViewEventArgs e) {
+ if (e.Node == nmailNode) {
+ this.mainForm.ShowNMailDetails();
+
+ } else if (e.Node == servicesNode) {
+ this.mainForm.ShowServicesControl();
+
+ } else if (e.Node == servicesNode) {
+ this.mainForm.ShowServicesControl();
+
+ } else if (e.Node == mailDomainNode) {
+ this.mainForm.ShowMailDomainControl();
+
+ } else if (e.Node == usersNode) {
+ this.mainForm.ShowUsersControl();
+
+ } else if (e.Node == foldersNode) {
+ this.mainForm.ShowFoldersControl();
+
+ }
+ }
}
}
Modified: NMail/trunk/NMail.Administration.WinForms/NMail.Administration.WinForms.csproj
===================================================================
--- NMail/trunk/NMail.Administration.WinForms/NMail.Administration.WinForms.csproj 2007-05-20 23:58:57 UTC (rev 198)
+++ NMail/trunk/NMail.Administration.WinForms/NMail.Administration.WinForms.csproj 2007-05-21 10:55:56 UTC (rev 199)
@@ -32,6 +32,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\References\log4net.dll</HintPath>
</Reference>
+ <Reference Include="MRG.Controls.UI, Version=1.0.2601.14400, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\References\MRG.Controls.UI.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
@@ -104,7 +108,6 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
- <None Include="Resources\ErrorConnecting.mht" />
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
@@ -118,8 +121,15 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <Content Include="Resources\Connecting.html" />
- <Content Include="Resources\ErrorConnecting.html" />
+ <Content Include="Resources\ConnectFailed.html">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Resources\Welcome.html">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Resources\NotConnected.html">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NMail.Icons\NMail.Icons.csproj">
Added: NMail/trunk/NMail.Administration.WinForms/Resources/ConnectFailed.html
===================================================================
--- NMail/trunk/NMail.Administration.WinForms/Resources/ConnectFailed.html (rev 0)
+++ NMail/trunk/NMail.Administration.WinForms/Resources/ConnectFailed.html 2007-05-21 10:55:56 UTC (rev 199)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+ <head>
+ <title></title>
+ <style>body{FONT-FAMILY: Arial, Sans-Serif}
+ h1{FONT-WEIGHT: normal}
+ </style>
+ </head>
+ <body>
+ <h1>Connection Failed</h1>
+ <p>The administration tool failed to connect to the server.
+ <p><a href="connect:">Click here to reconnect.</a></p>
+ </body>
+</HTML>
Added: NMail/trunk/NMail.Administration.WinForms/Resources/NotConnected.html
===================================================================
--- NMail/trunk/NMail.Administration.WinForms/Resources/NotConnected.html (rev 0)
+++ NMail/trunk/NMail.Administration.WinForms/Resources/NotConnected.html 2007-05-21 10:55:56 UTC (rev 199)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+ <head>
+ <title></title>
+ <style>body{FONT-FAMILY: Arial, Sans-Serif}
+ h1{FONT-WEIGHT: normal}
+ </style>
+ </head>
+ <body>
+ <h1>Not Connected</h1>
+ <p>The administration tool is currently not connected to any NMail server.</p>
+ <p><a href="connect:">Click here to connect.</a></p>
+ </body>
+</HTML>
Added: NMail/trunk/NMail.Administration.WinForms/Resources/Welcome.html
===================================================================
--- NMail/trunk/NMail.Administration.WinForms/Resources/Welcome.html (rev 0)
+++ NMail/trunk/NMail.Administration.WinForms/Resources/Welcome.html 2007-05-21 10:55:56 UTC (rev 199)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+ <head>
+ <title></title>
+ <style>body{FONT-FAMILY: Arial, Sans-Serif}
+ h1{FONT-WEIGHT: normal}
+ </style>
+ </head>
+ <body>
+ <h1>Welcome</h1>
+ <p>The administration tool is currently not connected to any NMail server.</p>
+ <p><a href="connect:">Click here to connect.</a></p>
+ </body>
+</HTML>
Modified: NMail/trunk/NMail.Administration.WinForms/Services/ServicesViewer.cs
===================================================================
--- NMail/trunk/NMail.Administration.WinForms/Services/ServicesViewer.cs 2007-05-20 23:58:57 UTC (rev 198)
+++ NMail/trunk/NMail.Administration.WinForms/Services/ServicesViewer.cs 2007-05-21 10:55:56 UTC (rev 199)
@@ -25,7 +25,7 @@
namespace NMail.Administration.WinForms.Services {
public partial class ServicesViewer : UserControl {
- public ServicesViewer() {
+ public ServicesViewer(MainForm mainForm) {
InitializeComponent();
}
}
Modified: NMail/trunk/NMail.Icons/NMail.Icons.csproj
===================================================================
--- NMail/trunk/NMail.Icons/NMail.Icons.csproj 2007-05-20 23:58:57 UTC (rev 198)
+++ NMail/trunk/NMail.Icons/NMail.Icons.csproj 2007-05-21 10:55:56 UTC (rev 199)
@@ -51,13 +51,17 @@
<EmbeddedResource Include="Resources\16x16\actions\exec.png" />
<EmbeddedResource Include="Resources\16x16\actions\folder.png" />
<EmbeddedResource Include="Resources\16x16\actions\queue.png" />
+ <EmbeddedResource Include="Resources\22x22\actions\exec.png" />
+ <EmbeddedResource Include="Resources\22x22\actions\server.png" />
+ <EmbeddedResource Include="Resources\22x22\actions\edit_group.png" />
+ <EmbeddedResource Include="Resources\22x22\actions\folder.png" />
+ <EmbeddedResource Include="Resources\22x22\actions\queue.png" />
<Content Include="Resources\LGPL.txt" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\16x16\devices\" />
<Folder Include="Resources\16x16\filesystems\" />
<Folder Include="Resources\16x16\mimetypes\" />
- <Folder Include="Resources\22x22\actions\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Added: NMail/trunk/NMail.Icons/Resources/22x22/actions/edit_group.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Icons/Resources/22x22/actions/edit_group.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Icons/Resources/22x22/actions/exec.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Icons/Resources/22x22/actions/exec.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Icons/Resources/22x22/actions/folder.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Icons/Resources/22x22/actions/folder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Icons/Resources/22x22/actions/queue.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Icons/Resources/22x22/actions/queue.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/NMail.Icons/Resources/22x22/actions/server.png
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/NMail.Icons/Resources/22x22/actions/server.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: NMail/trunk/References/MRG.Controls.UI.dll
===================================================================
(Binary files differ)
Property changes on: NMail/trunk/References/MRG.Controls.UI.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|