diff --git a/checkin_notes b/checkin_notes index c88dad1394..c903ed7a93 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8719,7 +8719,8 @@ David 28 Nov 2011 Charlie 29 Nov 2011 - MGR: Continue work on Simple View to display the description if - task has no slide show. + task has no slide show. + Change all occurrences of "n" to "^n" clientgui/ sg_TaskPanel.cpp,.h diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp index 7d64974085..0b0daa53b0 100755 --- a/clientgui/sg_TaskPanel.cpp +++ b/clientgui/sg_TaskPanel.cpp @@ -72,6 +72,7 @@ CScrolledTextBox::~CScrolledTextBox() { void CScrolledTextBox::SetValue(const wxString& s) { int lineHeight, visibleHeight, totalLines, visibleLines; + wxString t = s; Fit(); if (!m_iAvailableWidth) { @@ -81,7 +82,11 @@ void CScrolledTextBox::SetValue(const wxString& s) { m_TextSizer->Clear(true); - lineHeight = Wrap(s, m_iAvailableWidth, &totalLines); + // Change all occurrences of "n" to "^n" + t.Replace(wxT(""), wxT("^"), true); + t.Replace(wxT(""), wxT(""), true); + + lineHeight = Wrap(t, m_iAvailableWidth, &totalLines); visibleLines = visibleHeight / lineHeight; Enable(); @@ -278,7 +283,7 @@ numSlides = 0; m_institution->SetLabel(wxT("University of Washington")); m_scienceArea->SetLabel(wxT("Biology")); -m_description->SetValue(wxT("Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta@home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimers Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta@home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimers")); +m_description->SetValue(wxT("Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. Two to the nth power is 2n. By running Rosetta@home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimers Determine the 3-dimensional shapes of proteins in research that may ultimately lead to finding cures for some major human diseases. By running Rosetta@home you will help us speed up and extend our research in ways we couldn't possibly attempt without your help. You will also be helping our efforts at designing new proteins to fight diseases such as HIV, Malaria, Cancer, and Alzheimers")); m_institution->Show(true); m_scienceArea->Show(true); m_description->Show(true);