Compare commits
No commits in common. "4dcfa05157dd5d9615cbdf2e6d416373340d9a35" and "42648f31a51e2a38084d5f1ce0a7176c1261d630" have entirely different histories.
4dcfa05157
...
42648f31a5
@ -1081,39 +1081,12 @@ namespace Volian.Controls.Library
|
|||||||
// require clearing of all enhanced config data or mapping it to existing data (quite complicated)
|
// require clearing of all enhanced config data or mapping it to existing data (quite complicated)
|
||||||
if ((ui.IsAdministrator() || ui.IsSetAdministrator(i.MyProcedure.MyDocVersion) || ui.IsWriter(i.MyProcedure.MyDocVersion)) && (!i.IsEnhancedStep && !i.IsEnhancedProcedure && !i.IsEnhancedSection && !i.IsRtfRaw && !i.IsFigure))
|
if ((ui.IsAdministrator() || ui.IsSetAdministrator(i.MyProcedure.MyDocVersion) || ui.IsWriter(i.MyProcedure.MyDocVersion)) && (!i.IsEnhancedStep && !i.IsEnhancedProcedure && !i.IsEnhancedSection && !i.IsRtfRaw && !i.IsFigure))
|
||||||
cm.MenuItems.Add("Copy", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Copy", new EventHandler(mi_Click));
|
||||||
//if (i.HasWordContent)
|
|
||||||
//{
|
|
||||||
// cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
|
||||||
// cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
|
|
||||||
//}
|
|
||||||
if (i.HasWordContent)
|
if (i.HasWordContent)
|
||||||
{
|
|
||||||
if (i.MyDocVersion.MultiUnitCount > 1)
|
|
||||||
{
|
|
||||||
if (!i.IsSubsection)
|
|
||||||
{
|
|
||||||
MenuItem mps = new MenuItem("Print Section");
|
|
||||||
MenuItem mqps = new MenuItem("Quick Print Section");
|
|
||||||
int k = 0;
|
|
||||||
foreach (string s in i.MyDocVersion.UnitNames)
|
|
||||||
{
|
|
||||||
k++;
|
|
||||||
MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
|
||||||
mp.Tag = k;
|
|
||||||
MenuItem mqp = mqps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
|
||||||
mqp.Tag = k;
|
|
||||||
}
|
|
||||||
cm.MenuItems.Add(mps);
|
|
||||||
cm.MenuItems.Add(mqps);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
||||||
cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
#endregion
|
#endregion
|
||||||
//_MyLog.WarnFormat("Context Menu 4 - {0}", GC.GetTotalMemory(true));
|
//_MyLog.WarnFormat("Context Menu 4 - {0}", GC.GetTotalMemory(true));
|
||||||
|
|
||||||
@ -2883,8 +2856,7 @@ namespace Volian.Controls.Library
|
|||||||
//since before/after folder is at same level as current folder
|
//since before/after folder is at same level as current folder
|
||||||
//so need to use the parents order to determine where to place it
|
//so need to use the parents order to determine where to place it
|
||||||
using (FolderInfo parfolderinfo = FolderInfo.Get(parentfolder.MyParent.FolderID))
|
using (FolderInfo parfolderinfo = FolderInfo.Get(parentfolder.MyParent.FolderID))
|
||||||
{
|
{ double? myorder = parfolderinfo.NewManualOrder(myindex);
|
||||||
double? myorder = parfolderinfo.NewManualOrder(myindex);
|
|
||||||
using (Folder folder = Folder.MakeFolder(parentfolder.MyParent, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, myorder, string.Empty, DateTime.Now, VlnSettings.UserID))
|
using (Folder folder = Folder.MakeFolder(parentfolder.MyParent, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, myorder, string.Empty, DateTime.Now, VlnSettings.UserID))
|
||||||
{
|
{
|
||||||
ShowBrokenRules(folder.BrokenRulesCollection);
|
ShowBrokenRules(folder.BrokenRulesCollection);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user