Refs #2233 - try moving from 640x480 to 1024x768 as default to see if X will load in 1604

src/AVWizard/WizardGUI/StartUpWizard/Wizard.cpp

@@ -85,8 +85,8 @@ Wizard::Wizard()
 	AVWizardConfParser ConfigurationParser;
 	this->AVWizardOptions = ConfigurationParser.ParseFile();
 	this->FrontEnd = NULL;
-	this->Width = 640;
-	this->Height = 480;
+	this->Width = 1024;
+	this->Height = 768;
 
 	this->FullScreen = false;
 	MainPage = NULL;
@@ -551,10 +551,10 @@ void Wizard::SetExitWithCode(int Code)
 
 void Wizard::Resize(bool FullScreen)
 {
-	Width = 640;
+	Width = 1024;
 	if(AVWizardOptions->GetDictionary()->Exists( "WindowWidth"))
 		Width = Utils::StringToInt32(AVWizardOptions->GetDictionary()->GetValue("WindowWidth"));
-	Height = 480;
+	Height = 768;
 	if(AVWizardOptions->GetDictionary()->Exists( "WindowHeight"))
 		Height = Utils::StringToInt32(AVWizardOptions->GetDictionary()->GetValue("WindowHeight"));
 

src/AVWizard/WizardGUI/StartUpWizard/WizardPageFinalSelections.cpp

@@ -129,7 +129,7 @@ std::string WizardPageFinalSelections::GetVideoResolution(SettingsDictionary* AV
 #ifdef DEBUG
 	std::cout<<"WizardPageFinalSelections::GetVideoRatio()"<<std::endl;
 #endif
-	std::string ResolutionStr = "640x480";
+	std::string ResolutionStr = "1024x768";
 	if(AVWizardSettings->Exists("VideoResolution"))
 		ResolutionStr =  AVWizardSettings->GetValue("VideoResolution");
 

src/AVWizard/WizardGUI/StartUpWizard/WizardPageWelcome.cpp

@@ -87,27 +87,27 @@ WizardPageWelcome::WizardPageWelcome(GenericBackEnd* FrontEnd, std::string Name)
 	switch (KeyCode)
 	{
 		case SDLK_1:
-			Command = CommandXConfigure + "640x480 --output DVI";
+			Command = CommandXConfigure + "1024x768 --output DVI";
 			DoBeep();
 			break;
 		case SDLK_q:
-			Command = CommandXConfigure + "640x480 --output DVI-2";
+			Command = CommandXConfigure + "1024x768 --output DVI-2";
 			DoBeep();
 			break;
 		case SDLK_a:
-			Command = CommandXConfigure + "640x480 --output HDMI-0";
+			Command = CommandXConfigure + "720p --output HDMI-0";
 			DoBeep();
 			break;
 		case SDLK_2:
-			Command = CommandXConfigure + "640x480 --output VGA";
+			Command = CommandXConfigure + "1024x768 --output VGA";
 			DoBeep();
 			break;
 		case SDLK_w:
-			Command = CommandXConfigure + "640x480 --output VGA-2";
+			Command = CommandXConfigure + "1024x768 --output VGA-2";
 			DoBeep();
 			break;
 		case SDLK_l:
-			Command = CommandXConfigure + "640x480 --output LVDS";
+			Command = CommandXConfigure + "1024x768 --output LVDS";
 			DoBeep();
 			break;
 		case SDLK_3:

src/AVWizard/scripts/AVWizard_BlindVideoSettings.sh

@@ -3,7 +3,7 @@
 . /usr/pluto/bin/AVWizard-Common.sh
 
 Output=VGA
-Resolution=640x480
+Resolution=1024x768
 
 if [[ -f /tmp/avwizard-resolution-defaults.txt ]]; then
 	DefaultSettings=$(</tmp/avwizard-resolution-defaults.txt)

src/AVWizard/scripts/AVWizard_Run.sh

@@ -62,11 +62,11 @@ SetupX () {
 	# default test assumes HDMI connection
 	bash -x ${BaseDir}/Xconfigure.sh --conffile "$XF86Config" --resolution '1280x720@60' --output HDMI-0 --tv-standard '720p (16:9)' --no-test
 	if ! TestXConfig "$Display" "$XF86Config"; then
-		# Try a VGA connection with 640x480
-		bash -x ${BaseDir}/Xconfigure.sh --conffile "$XF86Config" --resolution '640x480@60' --output VGA --no-test
+		# Try a VGA connection with 1024x768
+		bash -x ${BaseDir}/Xconfigure.sh --conffile "$XF86Config" --resolution '1024x768@60' --output VGA --no-test
 		if ! TestXConfig "$Display" "$XF86Config"; then
 			# vesa test
-			bash -x ${BaseDir}/Xconfigure.sh --conffile "$XF86Config" --resolution '640x480@60' --output VGA --force-vesa --no-test
+			bash -x ${BaseDir}/Xconfigure.sh --conffile "$XF86Config" --resolution '1024x768@60' --output VGA --force-vesa --no-test
 			if ! TestXConfig "$Display" "$XF86Config"; then
 				# all tests failed
 				beep -l 350 -f 300 &
@@ -117,10 +117,10 @@ DualBus () {
 
 SetDefaults () {
 	WizSet Video_Ratio '4_3'
-	WizSet Resolution '640x480'
-	WizSet VideoResolution '640x480'
-	WizSet WindowWidth 640
-	WizSet WindowHeight 480
+	WizSet Resolution '1024x768'
+	WizSet VideoResolution '1024x768'
+	WizSet WindowWidth 1024
+	WizSet WindowHeight 768
 	WizSet Refresh '60'
 	WizSet VideoRefresh '60'
 	WizSet VideoOutput 'VGA'
@@ -143,7 +143,7 @@ SetDefaults () {
 	WizSet RemoteCmd "$RemoteCmd"
 	WizSet GamepadCmd "$GamepadCmd"
 	WizSet ExitCode 1 # by default, we fail (i.e. on Ctrl+Alt+Bkspc)
-	echo "640x480 60 640 480 VGA" >/tmp/avwizard-resolution.txt
+	echo "1024x768 60 1024 768 VGA" >/tmp/avwizard-resolution.txt
 }
 
 SetDefaults_720p () {

src/AVWizard/scripts/AVWizard_UpdateResolution.sh

@@ -11,7 +11,7 @@ case "$Param" in
 		VideoOutput=$(SpcField 5 "$WizResolution")
 		TVStandard=$(SpcField 6 "$WizResolution")
 
-		ResolutionDefaults="640x480 60 640 480 VGA"
+		ResolutionDefaults="1024x768 60 1024 768 VGA"
 		if [[ -f "/tmp/avwizard-resolution-defaults.txt" ]]; then
 			ResolutionDefaults="$(</tmp/avwizard-resolution-defaults.txt)"
 		fi