diff --git a/.vs/WinformGeneralDeveloperFrame/v16/.suo b/.vs/WinformGeneralDeveloperFrame/v16/.suo
index 020e517..3f7d054 100644
Binary files a/.vs/WinformGeneralDeveloperFrame/v16/.suo and b/.vs/WinformGeneralDeveloperFrame/v16/.suo differ
diff --git a/WinformGeneralDeveloperFrame/MainForm.Designer.cs b/WinformGeneralDeveloperFrame/MainForm.Designer.cs
index df2a212..45c4828 100644
--- a/WinformGeneralDeveloperFrame/MainForm.Designer.cs
+++ b/WinformGeneralDeveloperFrame/MainForm.Designer.cs
@@ -43,6 +43,8 @@ namespace WinformGeneralDeveloperFrame
this.btnabout = new DevExpress.XtraBars.BarButtonItem();
this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
+ this.barStaticItem2 = new DevExpress.XtraBars.BarStaticItem();
+ this.barButtonItem3 = new DevExpress.XtraBars.BarButtonItem();
this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
this.ribbonStatusBar1 = new DevExpress.XtraBars.Ribbon.RibbonStatusBar();
@@ -51,7 +53,6 @@ namespace WinformGeneralDeveloperFrame
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.bsi_UserName = new DevExpress.XtraBars.BarStaticItem();
this.barStaticItem1 = new DevExpress.XtraBars.BarStaticItem();
- this.barStaticItem2 = new DevExpress.XtraBars.BarStaticItem();
((System.ComponentModel.ISupportInitialize)(this.ribbonControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemTimeEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabbedMdiManager1)).BeginInit();
@@ -74,9 +75,10 @@ namespace WinformGeneralDeveloperFrame
this.btnabout,
this.barButtonItem1,
this.barButtonItem2,
- this.barStaticItem2});
+ this.barStaticItem2,
+ this.barButtonItem3});
this.ribbonControl1.Location = new System.Drawing.Point(0, 0);
- this.ribbonControl1.MaxItemId = 12;
+ this.ribbonControl1.MaxItemId = 13;
this.ribbonControl1.Name = "ribbonControl1";
this.ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
this.ribbonPage1});
@@ -170,6 +172,21 @@ namespace WinformGeneralDeveloperFrame
this.barButtonItem2.Id = 10;
this.barButtonItem2.Name = "barButtonItem2";
//
+ // barStaticItem2
+ //
+ this.barStaticItem2.Caption = "barStaticItem2";
+ this.barStaticItem2.Id = 11;
+ this.barStaticItem2.Name = "barStaticItem2";
+ //
+ // barButtonItem3
+ //
+ this.barButtonItem3.Caption = "注销";
+ this.barButtonItem3.Id = 12;
+ this.barButtonItem3.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.removepivotfield_16x16;
+ this.barButtonItem3.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.removepivotfield_32x32;
+ this.barButtonItem3.Name = "barButtonItem3";
+ this.barButtonItem3.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem3_ItemClick);
+ //
// ribbonPage1
//
this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
@@ -181,6 +198,7 @@ namespace WinformGeneralDeveloperFrame
//
this.ribbonPageGroup1.ItemLinks.Add(this.barButtonItem1);
this.ribbonPageGroup1.ItemLinks.Add(this.btnabout);
+ this.ribbonPageGroup1.ItemLinks.Add(this.barButtonItem3);
this.ribbonPageGroup1.Name = "ribbonPageGroup1";
//
// ribbonStatusBar1
@@ -232,12 +250,6 @@ namespace WinformGeneralDeveloperFrame
this.barStaticItem1.Name = "barStaticItem1";
this.barStaticItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
//
- // barStaticItem2
- //
- this.barStaticItem2.Caption = "barStaticItem2";
- this.barStaticItem2.Id = 11;
- this.barStaticItem2.Name = "barStaticItem2";
- //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -285,6 +297,7 @@ namespace WinformGeneralDeveloperFrame
private DevExpress.XtraBars.BarButtonItem barButtonItem1;
private DevExpress.XtraBars.BarButtonItem barButtonItem2;
private DevExpress.XtraBars.BarStaticItem barStaticItem2;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem3;
}
}
diff --git a/WinformGeneralDeveloperFrame/MainForm.cs b/WinformGeneralDeveloperFrame/MainForm.cs
index 17991ee..2e36606 100644
--- a/WinformGeneralDeveloperFrame/MainForm.cs
+++ b/WinformGeneralDeveloperFrame/MainForm.cs
@@ -8,8 +8,10 @@ using System.Data;
using System.Diagnostics;
using System.Linq;
using System.Threading;
+using System.Windows.Forms;
using DevExpress.XtraSplashScreen;
using WinformGeneralDeveloperFrame.Commons;
+using Login;
namespace WinformGeneralDeveloperFrame
{
@@ -116,5 +118,14 @@ namespace WinformGeneralDeveloperFrame
{
}
+
+ private void barButtonItem3_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ if ("您确定要注销登录吗？".ShowYesNoAndTips() == DialogResult.Yes)
+ {
+ Application.Exit();
+ System.Diagnostics.Process.Start(Application.StartupPath+ "\\WinformGeneralDeveloperFrame.Start.exe");
+ }
+ }
}
}
diff --git a/WinformGeneralDeveloperFrame/Properties/Resources.Designer.cs b/WinformGeneralDeveloperFrame/Properties/Resources.Designer.cs
index 8c0a185..28ee91e 100644
--- a/WinformGeneralDeveloperFrame/Properties/Resources.Designer.cs
+++ b/WinformGeneralDeveloperFrame/Properties/Resources.Designer.cs
@@ -310,6 +310,26 @@ namespace WinformGeneralDeveloperFrame.Properties {
}
}
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap removepivotfield_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("removepivotfield_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap removepivotfield_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("removepivotfield_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
///
diff --git a/WinformGeneralDeveloperFrame/Properties/Resources.resx b/WinformGeneralDeveloperFrame/Properties/Resources.resx
index bc8472a..ba9e751 100644
--- a/WinformGeneralDeveloperFrame/Properties/Resources.resx
+++ b/WinformGeneralDeveloperFrame/Properties/Resources.resx
@@ -118,94 +118,100 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ..\Resources\time_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Logo_96px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\bocustomer_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\lock_open_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\operatingsystem_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\LoginView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\database_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\bosaleitem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\bofileattachment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\team_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\removepivotfield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\selectdata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\mail_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\time_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\boscheduler_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\boreport_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\HomeTaitou.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\boscheduler_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\borole_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\bosaleitem_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\operatingsystem_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\bosaleitem_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\pagesetup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\database_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\selectdata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\database_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\boscheduler_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\mail_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\bocustomer_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\team_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\folderpanel_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\build_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\mail_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\boreport_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\bosaleitem_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\addfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\build_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\bofileattachment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\bosaleitem_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\time_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\pagesetup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\bocustomer_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\bocustomer_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\mail_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\HomeTaitou.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\lock_open_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\LoginView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\Logo_96px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\database_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\user_24px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\folderpanel_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\removepivotfield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Resources/removepivotfield_16x16.png b/WinformGeneralDeveloperFrame/Resources/removepivotfield_16x16.png
new file mode 100644
index 0000000..545c598
Binary files /dev/null and b/WinformGeneralDeveloperFrame/Resources/removepivotfield_16x16.png differ
diff --git a/WinformGeneralDeveloperFrame/Resources/removepivotfield_32x32.png b/WinformGeneralDeveloperFrame/Resources/removepivotfield_32x32.png
new file mode 100644
index 0000000..edc68a8
Binary files /dev/null and b/WinformGeneralDeveloperFrame/Resources/removepivotfield_32x32.png differ
diff --git a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj
index de91a16..579c66b 100644
--- a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj
+++ b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj
@@ -7675,6 +7675,8 @@
Always
+
+