Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=10530
This commit is contained in:
Rom Walton 2006-06-28 01:02:39 +00:00
parent 19fda4bc2b
commit 549480104d
5 changed files with 158 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -6946,3 +6946,11 @@ Charlie 27 June 2006
mac_build/
boinc.xcodeproj/
project.pbxproj
Rom 27 June 2006
- Enable the Simple GUI only if the define SIMPLEGUI exists.
clientgui/
AdvancedFrame.cpp
BOINCGUIApp.cpp, .h

2
clientgui/AdvancedFrame.cpp
View File

@ -990,7 +990,9 @@ void CAdvancedFrame::OnSelectComputer(wxCommandEvent& WXUNUSED(event)) {
void CAdvancedFrame::OnSwitchGUI(wxCommandEvent& WXUNUSED(event)) {
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnSwitchGUI - Function Begin"));
#ifdef SIMPLEGUI
wxGetApp().SetActiveGUI(BOINC_SIMPLEGUI, true);
#endif
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnSwitchGUI - Function End"));
}

24
clientgui/BOINCGUIApp.cpp
View File

@ -37,11 +37,13 @@
#include "BOINCGUIApp.h"
#include "AdvancedFrame.h"
#ifdef SIMPLEGUI
#include "common/wxAnimate.h"
#include "common/wxFlatNotebook.h"
#include "sg_ImageLoader.h"
#include "sg_StatImageLoader.h"
#include "sg_BoincSimpleGUI.h"
#endif
////@begin XPM images
@ -260,7 +262,11 @@ bool CBOINCGUIApp::OnInit() {
m_bBOINCStartedByManager = false;
m_pFrame = NULL;
m_bGUIVisible = true;
#ifdef SIMPLEGUI
m_iGUISelected = BOINC_SIMPLEGUI;
#else
m_iGUISelected = BOINC_ADVANCEDGUI;
#endif
m_lBOINCCoreProcessId = 0;
#ifdef __WXMSW__
m_hBOINCCoreProcess = NULL;
@ -427,8 +433,10 @@ bool CBOINCGUIApp::OnInit() {
m_pDocument->OnInit();
#ifdef SIMPLEGUI
// Which GUI should be displayed?
m_iGUISelected = m_pConfig->Read(wxT("GUISelection"), BOINC_SIMPLEGUI);
#endif
// Initialize the task bar icon
m_pTaskBarIcon = new CTaskBarIcon(
@ -1016,6 +1024,7 @@ int CBOINCGUIApp::StartBOINCScreensaverTest() {
bool CBOINCGUIApp::SetActiveGUI(int iGUISelection, bool bShowWindow) {
#ifdef SIMPLEGUI
CBOINCBaseFrame* pNewFrame = NULL;
// Create the new window
@ -1027,7 +1036,6 @@ bool CBOINCGUIApp::SetActiveGUI(int iGUISelection, bool bShowWindow) {
m_pBranding->GetApplicationName(),
m_pBranding->GetApplicationIcon()
);
wxASSERT(pNewFrame);
break;
case BOINC_ADVANCEDGUI:
default:
@ -1036,9 +1044,9 @@ bool CBOINCGUIApp::SetActiveGUI(int iGUISelection, bool bShowWindow) {
m_pBranding->GetApplicationName(),
m_pBranding->GetApplicationIcon()
);
wxASSERT(pNewFrame);
break;
}
wxASSERT(pNewFrame);
if (pNewFrame) {
SetTopWindow(pNewFrame);
@ -1049,6 +1057,18 @@ bool CBOINCGUIApp::SetActiveGUI(int iGUISelection, bool bShowWindow) {
m_pFrame = pNewFrame;
}
}
#else
if (!m_pFrame) {
// Initialize the advanced gui window
iGUISelection = BOINC_ADVANCEDGUI;
m_pFrame = new CAdvancedFrame(
m_pBranding->GetApplicationName(),
m_pBranding->GetApplicationIcon()
);
wxASSERT(m_pFrame);
SetTopWindow(m_pFrame);
}
#endif
// Show the new frame if needed
if (m_pFrame && bShowWindow) m_pFrame->Show();

2
clientgui/BOINCGUIApp.h
View File

@ -34,7 +34,9 @@
#include "MainDocument.h"
#define BOINC_ADVANCEDGUI 1
#ifdef SIMPLEGUI
#define BOINC_SIMPLEGUI 2
#endif
class CBrandingScheme : public wxObject {

232
win_build/boincmgr_curl.vcproj
View File

@ -264,36 +264,40 @@
<Filter
Name="Simple"
Filter="">
<File
RelativePath="..\clientgui\sg_BoincSimpleGUI.cpp">
</File>
<File
RelativePath="..\clientgui\sg_BoincSimpleGUI.h">
</File>
<File
RelativePath="..\clientgui\sg_DlgPreferences.cpp">
</File>
<File
RelativePath="..\clientgui\sg_DlgPreferences.h">
</File>
<File
RelativePath="..\clientgui\sg_ImageLoader.cpp">
</File>
<File
RelativePath="..\clientgui\sg_ImageLoader.h">
</File>
<File
RelativePath="..\clientgui\sg_SkinClass.cpp">
</File>
<File
RelativePath="..\clientgui\sg_SkinClass.h">
</File>
<File
RelativePath="..\clientgui\sg_StatImageLoader.cpp">
</File>
<File
RelativePath="..\clientgui\sg_StatImageLoader.h">
</File>
<Filter
Name="Prototype"
Filter="">
<File
RelativePath="..\clientgui\sg_BoincSimpleGUI.cpp">
</File>
<File
RelativePath="..\clientgui\sg_BoincSimpleGUI.h">
</File>
<File
RelativePath="..\clientgui\sg_DlgPreferences.cpp">
</File>
<File
RelativePath="..\clientgui\sg_DlgPreferences.h">
</File>
<File
RelativePath="..\clientgui\sg_ImageLoader.cpp">
</File>
<File
RelativePath="..\clientgui\sg_ImageLoader.h">
</File>
<File
RelativePath="..\clientgui\sg_SkinClass.cpp">
</File>
<File
RelativePath="..\clientgui\sg_SkinClass.h">
</File>
<File
RelativePath="..\clientgui\sg_StatImageLoader.cpp">
</File>
<File
RelativePath="..\clientgui\sg_StatImageLoader.h">
</File>
</Filter>
</Filter>
<Filter
Name="libboinc"
@ -623,41 +627,6 @@
<File
RelativePath="..\clientgui\BOINCDialupManager.h">
</File>
<File
RelativePath="..\lib\gui_rpc_client.C">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\lib\gui_rpc_client.h">
</File>
<File
RelativePath="..\lib\gui_rpc_client_ops.C">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\clientgui\hyperlink.cpp">
</File>
@ -676,33 +645,6 @@
<File
RelativePath="..\clientgui\LogBOINC.h">
</File>
<File
RelativePath="..\clientgui\MainDocument.cpp">
</File>
<File
RelativePath="..\clientgui\MainDocument.h">
</File>
<File
RelativePath="..\clientgui\resource.h">
</File>
<File
RelativePath="..\clientgui\stdwx.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
<File
RelativePath="..\clientgui\stdwx.h">
</File>
<Filter
Name="FlatNotebook"
Filter="">
@ -726,22 +668,6 @@
RelativePath="..\clientgui\common\wxAnimate.h">
</File>
</Filter>
<Filter
Name="Taskbar"
Filter="">
<File
RelativePath="..\clientgui\BOINCTaskBar.cpp">
</File>
<File
RelativePath="..\clientgui\BOINCTaskBar.h">
</File>
<File
RelativePath="..\clientgui\msw\taskbarex.cpp">
</File>
<File
RelativePath="..\clientgui\msw\taskbarex.h">
</File>
</Filter>
<Filter
Name="Validators"
Filter="">
@ -865,6 +791,75 @@
</File>
</Filter>
</Filter>
<Filter
Name="Taskbar"
Filter="">
<File
RelativePath="..\clientgui\BOINCTaskBar.cpp">
</File>
<File
RelativePath="..\clientgui\BOINCTaskBar.h">
</File>
<Filter
Name="Infrastructure"
Filter="">
<File
RelativePath="..\clientgui\msw\taskbarex.cpp">
</File>
<File
RelativePath="..\clientgui\msw\taskbarex.h">
</File>
</Filter>
</Filter>
<Filter
Name="Document"
Filter="">
<File
RelativePath="..\clientgui\MainDocument.cpp">
</File>
<File
RelativePath="..\clientgui\MainDocument.h">
</File>
<Filter
Name="Support"
Filter="">
<File
RelativePath="..\lib\gui_rpc_client.C">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\lib\gui_rpc_client.h">
</File>
<File
RelativePath="..\lib\gui_rpc_client_ops.C">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
</File>
</Filter>
</Filter>
<File
RelativePath="..\clientgui\_wx_intellisense.h">
</File>
@ -877,6 +872,27 @@
<File
RelativePath="..\clientgui\Events.h">
</File>
<File
RelativePath="..\clientgui\resource.h">
</File>
<File
RelativePath="..\clientgui\stdwx.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
<File
RelativePath="..\clientgui\stdwx.h">
</File>
</Files>
<Globals>
<Global