diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index d79a9c87df..2cc7fa2769 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -47,8 +47,6 @@
#define BITMAP_TASKHEADER wxT(SECTION_TASK ".xpm")
#define BITMAP_TIPSHEADER wxT(SECTION_TIPS ".xpm")
-#define LINK_DEFAULT wxT("default")
-
#define COLUMN_PROJECT 0
#define COLUMN_TIME 1
#define COLUMN_MESSAGE 2
@@ -57,15 +55,19 @@
#define PRIORITY_ERROR 2
+const wxString LINK_DEFAULT = wxT("default");
+const wxString LINKDESC_DEFAULT =
+ _("Please click a message to see additional options.");
+
const wxString LINK_TASKCOPYALL = wxT(SECTION_TASK "copyall");
const wxString LINKDESC_TASKCOPYALL =
_("Copy All
"
- "Selecting copy all, copies all the messages to the system clipboard.");
+ "Clicking copy all, copies all the messages to the system clipboard.");
const wxString LINK_TASKCOPYMESSAGE = wxT(SECTION_TASK "copymessage");
const wxString LINKDESC_TASKCOPYMESSAGE =
_("Copy Message
"
- "Selecting copy message, copies the single message to the system clipboard.");
+ "Clicking copy message, copies the single message to the system clipboard.");
IMPLEMENT_DYNAMIC_CLASS(CViewMessages, CBOINCBaseView)
@@ -98,9 +100,9 @@ CViewMessages::CViewMessages(wxNotebook* pNotebook) :
m_pTaskPane->CreateTaskHeader(BITMAP_TASKHEADER, bmpTask, _("Tasks"));
m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick Tips"));
- m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_TIME, _("Time"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_MESSAGE, _("Message"), wxLIST_FORMAT_LEFT, -1);
+ m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 115);
+ m_pListPane->InsertColumn(COLUMN_TIME, _("Time"), wxLIST_FORMAT_LEFT, 145);
+ m_pListPane->InsertColumn(COLUMN_MESSAGE, _("Message"), wxLIST_FORMAT_LEFT, 550);
m_pMessageInfoAttr = new wxListItemAttr( *wxBLACK, *wxWHITE, wxNullFont );
m_pMessageErrorAttr = new wxListItemAttr( *wxRED, *wxWHITE, wxNullFont );
@@ -108,8 +110,8 @@ CViewMessages::CViewMessages(wxNotebook* pNotebook) :
m_bTipsHeaderHidden = false;
SetCurrentQuickTip(
- wxT(LINK_DEFAULT),
- _("Please select a message to see additional options.")
+ LINK_DEFAULT,
+ LINKDESC_DEFAULT
);
UpdateSelection();
@@ -324,7 +326,7 @@ void CViewMessages::OnTaskCellMouseHover( wxHtmlCell* cell, wxCoord x, wxCoord y
{
SetCurrentQuickTip(
LINK_DEFAULT,
- _("Please select a message to see additional options.")
+ LINKDESC_DEFAULT
);
bUpdateSelection = true;
@@ -435,6 +437,8 @@ wxInt32 CViewMessages::FormatMessage( wxInt32 item, wxString& strBuffer ) const
pDoc->GetMessageMessage(item, strBuffer);
+ strBuffer.Replace( wxT("\n"), wxT(""), true );
+
return 0;
}
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index bad99b82e2..697cb95b43 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -53,8 +53,6 @@
#define BITMAP_TIPSHEADER wxT(SECTION_TIPS ".xpm")
#define BITMAP_BOINC wxT("boinc.xpm")
-#define LINK_DEFAULT wxT("default")
-
#define COLUMN_PROJECT 0
#define COLUMN_ACCOUNTNAME 1
#define COLUMN_TEAMNAME 2
@@ -64,43 +62,46 @@
#define COLUMN_STATUS 6
+const wxString LINK_DEFAULT = wxT("default");
+const wxString LINKDESC_DEFAULT =
+ _("Please click a project to see additional options.");
+
const wxString LINK_TASKATTACH = wxT(SECTION_TASK "attach");
const wxString LINKDESC_TASKATTACH =
_("Attach to Project
"
- "Selecting attach to project allows you to join other BOINC "
+ "Clicking attach to project allows you to join other BOINC "
"projects. You will need a valid project URL and Authenticator.");
-
const wxString LINK_TASKDETACH = wxT(SECTION_TASK "detach");
const wxString LINKDESC_TASKDETACH =
_("Detach from Project
"
- "Selecting detach from project removes the computer from the currently "
+ "Clicking detach from project removes the computer from the currently "
"selected project. You may wish to update the project first to submit "
"any completed work.");
const wxString LINK_TASKRESET = wxT(SECTION_TASK "reset");
const wxString LINKDESC_TASKRESET =
_("Reset Project
"
- "Selecting reset project removes all workunits and applications from "
+ "Clicking reset project removes all workunits and applications from "
"the currently selected project. You may wish to update the project "
"first to submit any completed work.");
const wxString LINK_TASKSUSPEND = wxT(SECTION_TASK "suspend");
const wxString LINKDESC_TASKSUSPEND =
_("Suspend Project
"
- "Selecting suspend project will pause the project from any additional "
+ "Clicking suspend project will pause the project from any additional "
"computation for that project until the resume project option is selected.");
const wxString LINK_TASKRESUME = wxT(SECTION_TASK "resume");
const wxString LINKDESC_TASKRESUME =
_("Resume Project
"
- "Selecting resume project resumes computation for a project that has been"
+ "Clicking resume project resumes computation for a project that has been"
"previously suspended.");
const wxString LINK_TASKUPDATE = wxT(SECTION_TASK "update");
const wxString LINKDESC_TASKUPDATE =
_("Update Project
"
- "Selecting update project submits any outstanding work and refreshes "
+ "Clicking update project submits any outstanding work and refreshes "
"your credit and preferences for the currently selected project.");
const wxString LINK_WEBBOINC = wxT(SECTION_WEB "boinc");
@@ -153,19 +154,19 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
m_pTaskPane->CreateTaskHeader(BITMAP_WEBHEADER, bmpWeb, _("Websites"));
m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick Tips"));
- m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_ACCOUNTNAME, _("Account"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_TEAMNAME, _("Team"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_TOTALCREDIT, _("Total Credit"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_AVGCREDIT, _("Avg. Credit"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_RESOURCESHARE, _("Resource Share"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_STATUS, _("Status"), wxLIST_FORMAT_LEFT, -1);
+ m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 150);
+ m_pListPane->InsertColumn(COLUMN_ACCOUNTNAME, _("Account"), wxLIST_FORMAT_LEFT, 80);
+ m_pListPane->InsertColumn(COLUMN_TEAMNAME, _("Team"), wxLIST_FORMAT_LEFT, 80);
+ m_pListPane->InsertColumn(COLUMN_TOTALCREDIT, _("Total Credit"), wxLIST_FORMAT_RIGHT, 80);
+ m_pListPane->InsertColumn(COLUMN_AVGCREDIT, _("Avg. Credit"), wxLIST_FORMAT_RIGHT, 80);
+ m_pListPane->InsertColumn(COLUMN_RESOURCESHARE, _("Resource Share"), wxLIST_FORMAT_CENTRE, 85);
+ m_pListPane->InsertColumn(COLUMN_STATUS, _("Status"), wxLIST_FORMAT_LEFT, 150);
m_bTipsHeaderHidden = false;
SetCurrentQuickTip(
LINK_DEFAULT,
- _("Please select a project to see additional options.")
+ LINKDESC_DEFAULT
);
UpdateSelection();
@@ -550,7 +551,7 @@ void CViewProjects::OnTaskCellMouseHover( wxHtmlCell* cell, wxCoord x, wxCoord y
{
SetCurrentQuickTip(
LINK_DEFAULT,
- _("Please select a project to see additional options.")
+ LINKDESC_DEFAULT
);
bUpdateSelection = true;
diff --git a/clientgui/ViewResources.cpp b/clientgui/ViewResources.cpp
index f130d113f8..6da84d3354 100644
--- a/clientgui/ViewResources.cpp
+++ b/clientgui/ViewResources.cpp
@@ -47,12 +47,15 @@
#define BITMAP_TASKHEADER wxT(SECTION_TASK ".xpm")
#define BITMAP_TIPSHEADER wxT(SECTION_TIPS ".xpm")
-#define LINK_DEFAULT wxT("default")
-
#define COLUMN_PROJECT 0
#define COLUMN_DISKSPACE 1
+const wxString LINK_DEFAULT = wxT("default");
+const wxString LINKDESC_DEFAULT =
+ _("No available options currently defined.");
+
+
IMPLEMENT_DYNAMIC_CLASS(CViewResources, CBOINCBaseView)
@@ -90,7 +93,7 @@ CViewResources::CViewResources(wxNotebook* pNotebook) :
SetCurrentQuickTip(
LINK_DEFAULT,
- _("No available options currently defined.")
+ LINKDESC_DEFAULT
);
UpdateSelection();
@@ -232,7 +235,7 @@ void CViewResources::OnTaskCellMouseHover( wxHtmlCell* cell, wxCoord x, wxCoord
{
SetCurrentQuickTip(
LINK_DEFAULT,
- _("No avaiable options currently defined.")
+ LINKDESC_DEFAULT
);
bUpdateSelection = true;
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index dedc2dc2eb..c9262e9a3d 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -46,8 +46,6 @@
#define BITMAP_TASKHEADER wxT(SECTION_TASK ".xpm")
#define BITMAP_TIPSHEADER wxT(SECTION_TIPS ".xpm")
-#define LINK_DEFAULT wxT("default")
-
#define COLUMN_PROJECT 0
#define COLUMN_FILE 1
#define COLUMN_PROGRESS 2
@@ -57,16 +55,20 @@
#define COLUMN_STATUS 6
+const wxString LINK_DEFAULT = wxT("default");
+const wxString LINKDESC_DEFAULT =
+ _("Please click a transfer item to see additional options.");
+
const wxString LINK_TASKRETRY = wxT(SECTION_TASK "retry");
const wxString LINKDESC_TASKRETRY =
_("Retry Now
"
- "Selecting retry now will attempt to upload the result data file "
+ "Clicking retry now will attempt to upload the result data file "
"to the project server now.");
const wxString LINK_TASKABORT = wxT(SECTION_TASK "abort");
const wxString LINKDESC_TASKABORT =
_("Abort Upload
"
- "Selecting abort upload will delete the result from the upload queue. "
+ "Clicking abort upload will delete the result from the upload queue. "
"Doing this will keep you from being granted any credit for this result.");
@@ -112,7 +114,7 @@ CViewTransfers::CViewTransfers(wxNotebook* pNotebook) :
SetCurrentQuickTip(
LINK_DEFAULT,
- _("Please select a transfer item to see additional options.")
+ LINKDESC_DEFAULT
);
UpdateSelection();
@@ -281,7 +283,7 @@ void CViewTransfers::OnTaskCellMouseHover( wxHtmlCell* cell, wxCoord x, wxCoord
{
SetCurrentQuickTip(
LINK_DEFAULT,
- _("Please select an result upload to see additional options.")
+ LINKDESC_DEFAULT
);
bUpdateSelection = true;
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index d1062d7c8c..f03e6f9632 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -47,8 +47,6 @@
#define BITMAP_TASKHEADER wxT(SECTION_TASK ".xpm")
#define BITMAP_TIPSHEADER wxT(SECTION_TIPS ".xpm")
-#define LINK_DEFAULT wxT("default")
-
#define COLUMN_PROJECT 0
#define COLUMN_APPLICATION 1
#define COLUMN_NAME 2
@@ -59,26 +57,30 @@
#define COLUMN_STATUS 7
+const wxString LINK_DEFAULT = wxT("default");
+const wxString LINKDESC_DEFAULT =
+ _("Please click a result to see additional options.");
+
const wxString LINK_TASKSUSPEND = wxT(SECTION_TASK "suspend");
const wxString LINKDESC_TASKSUSPEND =
_("Suspend
"
- "Selecting suspend allows you to suspend the currently selected result.");
+ "Clicking suspend allows you to suspend the currently selected result.");
const wxString LINK_TASKRESUME = wxT(SECTION_TASK "resume");
const wxString LINKDESC_TASKRESUME =
_("Resume
"
- "Selecting resume allows you to resume a previously suspended result.");
+ "Clicking resume allows you to resume a previously suspended result.");
const wxString LINK_TASKSHOWGRAPHICS = wxT(SECTION_TASK "showgraphics");
const wxString LINKDESC_TASKSHOWGRAPHICS=
_("Show Graphics
"
- "Selecting show graphics will display a window giving you a chance "
+ "Clicking show graphics will display a window giving you a chance "
"to see how the active result will look while in screensaver mode.");
const wxString LINK_TASKABORT = wxT(SECTION_TASK "abort");
const wxString LINKDESC_TASKABORT =
_("Abort Result
"
- "Selecting abort result will delete the result from the work queue. "
+ "Clicking abort result will delete the result from the work queue. "
"Doing this will keep you from being granted any credit for this result.");
@@ -112,20 +114,20 @@ CViewWork::CViewWork(wxNotebook* pNotebook) :
m_pTaskPane->CreateTaskHeader(BITMAP_TASKHEADER, bmpTask, _("Tasks"));
m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick Tips"));
- m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_APPLICATION, _("Application"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_NAME, _("Name"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_CPUTIME, _("CPU time"), wxLIST_FORMAT_RIGHT, -1);
- m_pListPane->InsertColumn(COLUMN_PROGRESS, _("Progress"), wxLIST_FORMAT_CENTER, -1);
- m_pListPane->InsertColumn(COLUMN_TOCOMPLETETION, _("To Completetion"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_REPORTDEADLINE, _("Report Deadline"), wxLIST_FORMAT_LEFT, -1);
- m_pListPane->InsertColumn(COLUMN_STATUS, _("Status"), wxLIST_FORMAT_LEFT, -1);
+ m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 125);
+ m_pListPane->InsertColumn(COLUMN_APPLICATION, _("Application"), wxLIST_FORMAT_LEFT, 95);
+ m_pListPane->InsertColumn(COLUMN_NAME, _("Name"), wxLIST_FORMAT_LEFT, 285);
+ m_pListPane->InsertColumn(COLUMN_CPUTIME, _("CPU time"), wxLIST_FORMAT_RIGHT, 80);
+ m_pListPane->InsertColumn(COLUMN_PROGRESS, _("Progress"), wxLIST_FORMAT_CENTRE, 60);
+ m_pListPane->InsertColumn(COLUMN_TOCOMPLETETION, _("To Completetion"), wxLIST_FORMAT_RIGHT, 100);
+ m_pListPane->InsertColumn(COLUMN_REPORTDEADLINE, _("Report Deadline"), wxLIST_FORMAT_LEFT, 150);
+ m_pListPane->InsertColumn(COLUMN_STATUS, _("Status"), wxLIST_FORMAT_LEFT, 135);
m_bTipsHeaderHidden = false;
SetCurrentQuickTip(
LINK_DEFAULT,
- _("Please select a result to see additional options.")
+ LINKDESC_DEFAULT
);
UpdateSelection();
@@ -430,7 +432,7 @@ void CViewWork::OnTaskCellMouseHover( wxHtmlCell* cell, wxCoord x, wxCoord y )
{
SetCurrentQuickTip(
LINK_DEFAULT,
- _("Please select a result to see additional options.")
+ LINKDESC_DEFAULT
);
bUpdateSelection = true;