Revert "Merge branch 'master' of git://github.com/AenBleidd/boinc"

This reverts commit cacecc8, reversing changes made to 716ebdd.
MrBrain295 · Jul 1, 2018 · ab3a4fa · ab3a4fa
1 parent 23e737e
commit ab3a4fa
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 300 deletions.
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
@@ -111,11 +111,6 @@ bool CBOINCGUIApp::OnInit() {
     m_bSafeMessageBoxDisplayed = 0;
     m_bRunDaemon = true;
     m_bNeedRunDaemon = true;
-    m_bUseDifferentTaskColours = false;
-    m_colourTaskCPU = *wxWHITE;
-    m_colourTaskGPUIntel = wxColor(0, 123, 195);
-    m_colourTaskGPUAMD = wxColor(220, 27, 35);
-    m_colourTaskGPUNVIDIA = wxColor(119, 183, 0);
 
     // Initialize local variables
     int      iErrorCode = 0;
@@ -195,20 +190,6 @@ bool CBOINCGUIApp::OnInit() {
     m_pConfig->Read(wxT("GUISelection"), &m_iGUISelected, BOINC_SIMPLEGUI);
     m_pConfig->Read(wxT("EventLogOpen"), &bOpenEventLog);
     m_pConfig->Read(wxT("RunDaemon"), &m_bRunDaemon, 1L);
-    m_pConfig->Read(wxT("UseDifferentTaskColours"), &m_bUseDifferentTaskColours, false);
-    wxString colour;
-    m_pConfig->Read(wxT("CPUTaskColour"), &colour);
-    if (!colour.IsEmpty())
-      m_colourTaskCPU.Set(colour);
-    m_pConfig->Read(wxT("IntelGPUTaskColour"), &colour);
-    if (!colour.IsEmpty())
-      m_colourTaskGPUIntel.Set(colour);
-    m_pConfig->Read(wxT("AMDGPUTaskColour"), &colour);
-    if (!colour.IsEmpty())
-      m_colourTaskGPUAMD.Set(colour);
-    m_pConfig->Read(wxT("NVIDIAGPUTaskColour"), &colour);
-    if (!colour.IsEmpty())
-      m_colourTaskGPUNVIDIA.Set(colour);
 
     // Detect if the daemon should be launched
     m_bNeedRunDaemon = m_bNeedRunDaemon && m_bRunDaemon;
@@ -606,11 +587,6 @@ void CBOINCGUIApp::SaveState() {
     m_pConfig->Write(wxT("DisplayShutdownConnectedClientDialog"), m_iDisplayShutdownConnectedClientDialog);
     m_pConfig->Write(wxT("DisableAutoStart"), m_iBOINCMGRDisableAutoStart);
     m_pConfig->Write(wxT("RunDaemon"), m_bRunDaemon);
-    m_pConfig->Write(wxT("UseDifferentTaskColours"), m_bUseDifferentTaskColours);
-    m_pConfig->Write(wxT("CPUTaskColour"), m_colourTaskCPU);
-    m_pConfig->Write(wxT("IntelGPUTaskColour"), m_colourTaskGPUIntel);
-    m_pConfig->Write(wxT("AMDGPUTaskColour"), m_colourTaskGPUAMD);
-    m_pConfig->Write(wxT("NVIDIAGPUTaskColour"), m_colourTaskGPUNVIDIA);    
 }
 
 

diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
@@ -116,13 +116,6 @@ class CBOINCGUIApp : public wxApp {
 
     int                 m_bSafeMessageBoxDisplayed;
 
-    bool                m_bUseDifferentTaskColours;
-    // Task colours
-    wxColour            m_colourTaskCPU;
-    wxColour            m_colourTaskGPUIntel;
-    wxColour            m_colourTaskGPUAMD;
-    wxColour            m_colourTaskGPUNVIDIA;
-
 public:
 
     bool                OnInit();
@@ -225,21 +218,6 @@ class CBOINCGUIApp : public wxApp {
     void                SetAboutDialogIsOpen(bool set) { m_bAboutDialogIsOpen = set; }
     bool                GetAboutDialogIsOpen() { return m_bAboutDialogIsOpen; }
 
-    void                SetUseDifferentTaskColours(bool set) { m_bUseDifferentTaskColours = set; }
-    bool                GetUseDifferentTaskColours() { return m_bUseDifferentTaskColours; }
-
-    void                SetColourTaskCPU(wxColour set) { m_colourTaskCPU = set; }
-    wxColour            GetColourTaskCPU() { return m_colourTaskCPU; }
-
-    void                SetColourTaskGPUIntel(wxColour set) { m_colourTaskGPUIntel = set; }
-    wxColour            GetColourTaskGPUIntel() { return m_colourTaskGPUIntel; }
-
-    void                SetColourTaskGPUAMD(wxColour set) { m_colourTaskGPUAMD = set; }
-    wxColour            GetColourTaskGPUAMD() { return m_colourTaskGPUAMD; }
-
-    void                SetColourTaskGPUNVIDIA(wxColour set) { m_colourTaskGPUNVIDIA = set; }
-    wxColour            GetColourTaskGPUNVIDIA() { return m_colourTaskGPUNVIDIA; }
-
 #ifdef __WXMAC__
     // The following Cocoa routines are in CBOINCGUIApp.mm
     //