From 247cc1010a4967a24d2d0eaeb092acc24c08ba96 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 05 四月 2025 14:25:12 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 08e90a8..5f655d9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -7,14 +7,13 @@
 using System.Net;
 using System.Text;
 using System.Windows.Forms;
-using DevExpress.LookAndFeel;
-using DevExpress.Skins;
-using DevExpress.UserSkins;
 using DevExpress.XtraBars;
 using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.TextEditController;
 using DevExpress.XtraGrid;
 using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraLayout;
+using DevExpress.XtraRichEdit.Export.Rtf;
 using Gs.DevApp.DevFrm.Rpt;
 using Gs.DevApp.DevFrm.Sys;
 using Gs.DevApp.Entity;
@@ -59,6 +58,7 @@
             btnWg.ItemClick += BtnWg_ItemClick;
             btnHelp.ItemClick += BtnHelp_ItemClick;
             btnLayout.ItemClick += BtnLayout_ItemClick;
+            btnFont.ItemClick += BtnFont_ItemClick;
             var lst = new List<string>();
             foreach (BarItem item in barManager1.Items)
                 if (item is BarLargeButtonItem largeButtonItem)
@@ -66,6 +66,8 @@
                         lst.Add(item.Caption);
             actions = lst;
         }
+
+     
 
 
         /// <summary>
@@ -493,6 +495,7 @@
                 lst.Add(btnPiZhun.Name);
                 lst.Add(btnHelp.Name);
                 lst.Add(btnLayout.Name);
+                lst.Add(btnFont.Name);
                 lst.Add(btnBoHui.Name);
                 lst.Add(btnTzbl.Name);
                 lst.Add(btnKg.Name);
@@ -505,7 +508,6 @@
         }
 
 
-
         private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnSaveClick != null)
@@ -516,7 +518,7 @@
                     var lst = new List<string>();
                     lst.Add(btnAdd.Name);
                     lst.Add(btnEdit.Name);
-                    lst.Add(btnEsc.Name);
+                    //lst.Add(btnEsc.Name);
                     lst.Add(btnChk.Name);
                     lst.Add(btnFchk.Name);
                     lst.Add(btnDel.Name);
@@ -535,10 +537,13 @@
                     lst.Add(btnZhongTai.Name);
                     lst.Add(btnHelp.Name);
                     lst.Add(btnLayout.Name);
+                    lst.Add(btnFont.Name);
                     lst.Add(btnLoad.Name);
                     lst.Add(btnTzbl.Name);
                     _enabledBtn(lst);
                 }
+
+
             }
         }
 
@@ -560,6 +565,7 @@
             lst.Add(btnEsc.Name);
             lst.Add(btnHelp.Name);
             lst.Add(btnLayout.Name);
+            lst.Add(btnFont.Name);
             _enabledBtn(lst);
             this.currentAction = "edit";
             if (btnEdtClick != null) btnEdtClick(this, e);
@@ -586,6 +592,7 @@
             lst.Add(btnEsc.Name);
             lst.Add(btnHelp.Name);
             lst.Add(btnLayout.Name);
+            lst.Add(btnFont.Name);
             _enabledBtn(lst);
             this.currentAction = "add";
             if (btnAddClick != null) btnAddClick(this, e);
@@ -614,8 +621,6 @@
         {
             if (btnWgClick != null) btnWgClick(this, e);
         }
-
-
 
         private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
         {
@@ -663,6 +668,8 @@
         private void BtnLayout_ItemClick(object sender, ItemClickEventArgs ee)
         {
             Form parentForm = this.Parent as Form;
+            if (parentForm == null)
+                parentForm = this.Parent.Parent as Form;
             string _formNamespace = parentForm.GetType().FullName;
             if (parentForm != null)
             {
@@ -672,7 +679,11 @@
                 Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList, layList, spcList);
                 DevFrm.ShowDialog();
             }
-            //if (btnLayoutClick != null) btnLayoutClick(this, ee);
+        }
+        private void BtnFont_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            Gs.DevApp.UserControl.SelectFont DevFrm = new SelectFont();
+            DevFrm.ShowDialog();
         }
         private void _enabledBtn(List<string> lstBtn)
         {
@@ -814,6 +825,7 @@
                 _enabledList.Add(btnLoad.Name);
                 _enabledList.Add(btnHelp.Name);
                 _enabledList.Add(btnLayout.Name);
+                _enabledList.Add(btnFont.Name);
                 _enabledBtn(_enabledList);
             }
             catch (Exception ex)
@@ -1218,7 +1230,7 @@
                             {
                                 spt.RestoreLayoutFromStream(stream);
                             }
-                            spt.Horizontal = false;
+                           // spt.Horizontal = false;
                             spt.Panel1.AutoScroll = false;
                             spt.Panel2.AutoScroll = false;
                             //spt.Panel1.MaximumSize = new System.Drawing.Size(spt.Panel1.Width, 100);

--
Gitblit v1.9.3