Skip to content

Commit a927547

Browse files
authored
LT-21550: Remove DocumentName OnPropertyChanged
Cherry-pick from the PubSub branch to the main branch using the following command: git cherry-pick --no-commit 438d59b
1 parent 43da152 commit a927547

2 files changed

Lines changed: 2 additions & 13 deletions

File tree

Src/XCore/xWindow.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,10 +1890,6 @@ public virtual void OnPropertyChanged(string name)
18901890
}
18911891
}
18921892
break;
1893-
1894-
case "DocumentName":
1895-
UpdateCaptionBar();
1896-
break;
18971893
case "ShowRecordList": // Replaces obsolete "ShowTreeBar".
18981894
UpdateSidebarAndRecordBarDisplay(true);
18991895
break;
@@ -2152,7 +2148,7 @@ protected void UpdateCaptionBar()
21522148
{
21532149
Text = String.Format("{0} - {1}",
21542150
m_propertyTable.GetStringProperty("DocumentName", ""),
2155-
m_propertyTable.GetStringProperty("applicationName", "application name???")); ;
2151+
m_propertyTable.GetStringProperty("applicationName", "application name???"));
21562152
}
21572153

21582154
#region Helper methods

Src/xWorks/FwXWindow.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ protected void InitMediatorValues(LcmCache cache)
534534
m_propertyTable.LocalSettingsId = "local";
535535
m_propertyTable.SetProperty("cache", cache, true);
536536
m_propertyTable.SetPropertyPersistence("cache", false);
537-
m_propertyTable.SetProperty("DocumentName", GetProjectName(cache), true);
537+
m_propertyTable.SetProperty("DocumentName", GetProjectName(cache), false);
538538
m_propertyTable.SetPropertyPersistence("DocumentName", false);
539539
var path = LcmFileHelper.GetConfigSettingsDir(cache.ProjectId.ProjectFolder);
540540
Directory.CreateDirectory(path);
@@ -1289,13 +1289,6 @@ private void LaunchProjPropertiesDlg()
12891289
{
12901290
fFilesMoved = m_app.UpdateExternalLinks(sLinkedFilesRootDir);
12911291
}
1292-
// no need for any of these refreshes if entire window has been/will be
1293-
// destroyed and recreated.
1294-
if (!fDbRenamed && !fFilesMoved)
1295-
{
1296-
m_propertyTable.SetProperty("DocumentName", cache.ProjectId.UiName, true);
1297-
m_propertyTable.SetPropertyPersistence("DocumentName", false);
1298-
}
12991292
}
13001293
}
13011294
if (fDbRenamed)

0 commit comments

Comments
 (0)