* Italian translation update

+ some little GUI adjustements

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7066 8ced0084-cf51-0410-be5f-012b33b47a6e

4 files changed, 44 insertions, 47 deletions

diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp
index d21bc9e0cd..0f264fdde8 100644
--- a/Source/Core/Common/Src/CPUDetect.cpp
+++ b/Source/Core/Common/Src/CPUDetect.cpp
@@ -168,13 +168,18 @@ void CPUInfo::Detect()
 		if (cpu_id[2] & 2) cmp_legacy = true; //wtf is this?
 		if ((cpu_id[3] >> 29) & 1) bLongMode = true;
 	}
+
+	num_cores = logical_cpu_count;
+	
 	if (max_ex_fn >= 0x80000008) {
 		// Get number of cores. This is a bit complicated. Following AMD manual here.
 		__cpuid(cpu_id, 0x80000008);
 		int apic_id_core_id_size = (cpu_id[2] >> 12) & 0xF;
 		if (apic_id_core_id_size == 0) {
-			num_cores = logical_cpu_count;
 			if (ht) {
+				if (vendor == VENDOR_OTHER) {
+					num_cores = 1;
+				}
 				// New mechanism for modern Intel CPUs.
 				if (HTT) {
 					__cpuid(cpu_id, 0x00000004);
@@ -183,20 +188,14 @@ void CPUInfo::Detect()
 					num_cores = (cores_x_package > 1) ? cores_x_package : num_cores;
 					logical_cpu_count /= cores_x_package;
 				}
-			}
-			else 
-			{
+			} else {
 				num_cores = 1;
 			}
 		} else {
 			// Use AMD's new method.
 			num_cores = (cpu_id[2] & 0xFF) + 1;
 		}
-	} else {
-		// Wild guess
-		if (logical_cpu_count)
-			num_cores = logical_cpu_count;
-	}
+	} 
 }
 
 // Turn the cpu info into a string we can show
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 404942456f..464e66c362 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -529,7 +529,7 @@ void CConfigMain::InitializeGUITooltips()
 	Framelimit->SetToolTip(_("If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective."));
 
 	// General - Advanced
-	DSPThread->SetToolTip(_("Run DSPLLE on a dedicated thread (not recommended)."));
+	DSPThread->SetToolTip(_("Run DSP LLE on a dedicated thread (not recommended)."));
 
 	// Display - Display
 	FullscreenResolution->SetToolTip(_("Select resolution for fullscreen mode"));
@@ -599,11 +599,11 @@ void CConfigMain::CreateGUIControls()
 	AlwaysHLE_BS2 = new wxCheckBox(GeneralPage, ID_ALWAYS_HLE_BS2, _("Skip GC BIOS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS);
 	LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, _("Lock threads to cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	DSPThread = new wxCheckBox(GeneralPage, ID_DSPTHREAD, _("DSPLLE on thread"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	DSPThread = new wxCheckBox(GeneralPage, ID_DSPTHREAD, _("DSP LLE on thread"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Populate the General settings
 	wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL);
-	sFramelimit->Add(TEXT_BOX(GeneralPage, _("Framelimit :")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+	sFramelimit->Add(TEXT_BOX(GeneralPage, _("Framelimit:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
 	sFramelimit->Add(Framelimit, 0, wxALL | wxEXPAND, 5);
 	sFramelimit->Add(UseFPSForLimiting, 0, wxALL | wxEXPAND, 5);
 	wxStaticBoxSizer* const sbBasic = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Basic Settings"));
@@ -664,7 +664,7 @@ void CConfigMain::CreateGUIControls()
 	svidbackend->Add(TEXT_BOX(DisplayPage, _("Video Backend:")), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
 	GraphicSelection = new wxChoice(DisplayPage, ID_GRAPHIC_CB,
 			wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
-	svidbackend->Add(GraphicSelection, 0, wxALIGN_CENTER_VERTICAL, 5);
+	svidbackend->Add(GraphicSelection, 0, wxLEFT|wxBOTTOM|wxTOP, 5);
 	GraphicConfig = new wxButton(DisplayPage, ID_GRAPHIC_CONFIG, _("GFX Config"),
 			wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator);
 	svidbackend->Add(GraphicConfig, 0, wxALIGN_CENTER_VERTICAL, 5);
@@ -688,7 +688,7 @@ void CConfigMain::CreateGUIControls()
 
 	wxBoxSizer* sInterface = new wxBoxSizer(wxHORIZONTAL);
 	sInterface->Add(TEXT_BOX(DisplayPage, _("Language:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
-	sInterface->Add(InterfaceLang, 0, wxEXPAND | wxALL, 5);
+	sInterface->Add(InterfaceLang, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
 	sInterface->AddStretchSpacer();
 	sInterface->Add(HotkeyConfig, 0, wxALIGN_RIGHT | wxALL, 5);
 	sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings"));
@@ -727,18 +727,16 @@ void CConfigMain::CreateGUIControls()
 	sbAudioSettings->Add(EnableThrottle, 0, wxALL, 5);
 
 	wxStaticBoxSizer *sbVolume = new wxStaticBoxSizer(wxVERTICAL, AudioPage, _("Volume"));
-	sbVolume->Add(VolumeSlider, 1, wxLEFT|wxRIGHT|wxALIGN_CENTER, 6);
-	sbVolume->Add(VolumeText, 0, wxALL|wxALIGN_LEFT, 4);
+	sbVolume->Add(VolumeSlider, 1, wxLEFT|wxRIGHT, 13);
+	sbVolume->Add(VolumeText, 0, wxALIGN_CENTER|wxALL, 5);
 
-	wxBoxSizer *sBackendText = new wxBoxSizer(wxVERTICAL);
 	wxGridBagSizer *sBackend = new wxGridBagSizer();
-	sBackendText->Add(TEXT_BOX(AudioPage, _("Audio Backend :")), 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sBackend->Add(BackendSelection, wxGBPosition(0, 0), wxDefaultSpan, wxEXPAND|wxALL, 1);
-	sBackendText->Add(TEXT_BOX(AudioPage, _("Sample Rate :")), 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-	sBackend->Add(FrequencySelection, wxGBPosition(1, 0), wxDefaultSpan, wxEXPAND|wxALL, 1);
+	sBackend->Add(TEXT_BOX(AudioPage, _("Audio Backend:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sBackend->Add(BackendSelection, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5);
+	sBackend->Add(TEXT_BOX(AudioPage, _("Sample Rate:")), wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+	sBackend->Add(FrequencySelection, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5);
 	wxStaticBoxSizer *sbBackend = new wxStaticBoxSizer(wxHORIZONTAL, AudioPage, _("Backend Settings"));
-	sbBackend->Add(sBackendText, 1, wxALL | wxEXPAND);
-	sbBackend->Add(sBackend, 0, wxALL | wxEXPAND);
+	sbBackend->Add(sBackend, 0, wxEXPAND);
 
 	wxBoxSizer *sAudio = new wxBoxSizer(wxHORIZONTAL);
 	sAudio->Add(sbAudioSettings, 1, wxEXPAND|wxALL, 5);
@@ -792,7 +790,7 @@ void CConfigMain::CreateGUIControls()
 	{
 		sEXIDevices[i] = new wxBoxSizer(wxHORIZONTAL);
 		sEXIDevices[i]->Add(GCEXIDeviceText[i], 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-		sEXIDevices[i]->Add(GCEXIDevice[i], 0, wxALL, 5);
+		sEXIDevices[i]->Add(GCEXIDevice[i], 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 		if (i < 2)
 			sEXIDevices[i]->Add(GCMemcardPath[i], 0, wxALL, 5);
 		sbGamecubeDeviceSettings->Add(sEXIDevices[i]);
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index ac19e3ef3b..df9637ea8e 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -360,15 +360,15 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	wxBoxSizer* sConfigPage;
 	sConfigPage = new wxBoxSizer(wxVERTICAL);
 	sbCoreOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Core"));
-	sbCoreOverrides->Add(CPUThread, 0, wxEXPAND|wxLEFT, 5);
-	sbCoreOverrides->Add(SkipIdle, 0, wxEXPAND|wxLEFT, 5);
-	sbCoreOverrides->Add(MMU, 0, wxEXPAND|wxLEFT, 5);
-	sbCoreOverrides->Add(MMUBAT, 0, wxEXPAND|wxLEFT, 5);
-	sbCoreOverrides->Add(TLBHack, 0, wxEXPAND|wxLEFT, 5);
-	sbCoreOverrides->Add(VBeam, 0, wxEXPAND|wxLEFT, 5);
-	sbCoreOverrides->Add(FastDiscSpeed, 0, wxEXPAND|wxLEFT, 5);	
-	sbCoreOverrides->Add(BlockMerging, 0, wxEXPAND|wxLEFT, 5);
-	sbCoreOverrides->Add(DSPHLE, 0, wxEXPAND|wxLEFT, 5);
+	sbCoreOverrides->Add(CPUThread, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(SkipIdle, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(MMU, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(MMUBAT, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(TLBHack, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(VBeam, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(FastDiscSpeed, 0, wxLEFT, 5);	
+	sbCoreOverrides->Add(BlockMerging, 0, wxLEFT, 5);
+	sbCoreOverrides->Add(DSPHLE, 0, wxLEFT, 5);
 
 	sbWiiOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Wii Console"));
 	if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO))
@@ -384,23 +384,23 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 		// rather useless.
 		EnableProgressiveScan->Disable();
 	}
-	sbWiiOverrides->Add(EnableProgressiveScan, 0, wxEXPAND|wxLEFT, 5);
-	sbWiiOverrides->Add(EnableWideScreen, 0, wxEXPAND|wxLEFT, 5);
+	sbWiiOverrides->Add(EnableProgressiveScan, 0, wxLEFT, 5);
+	sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5);
 
 	sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video"));
-	sbVideoOverrides->Add(ForceFiltering, 0, wxEXPAND|wxLEFT, 5);
-	sbVideoOverrides->Add(EFBCopyEnable, 0, wxEXPAND|wxLEFT, 5);
-	sbVideoOverrides->Add(EFBAccessEnable, 0, wxEXPAND|wxLEFT, 5);
-	sbVideoOverrides->Add(EFBToTextureEnable, 0, wxEXPAND|wxLEFT, 5);
-	sbVideoOverrides->Add(SafeTextureCache, 0, wxEXPAND|wxLEFT, 5);
-	sbVideoOverrides->Add(DstAlphaPass, 0, wxEXPAND|wxLEFT, 5);
-	sbVideoOverrides->Add(UseXFB, 0, wxEXPAND|wxLEFT, 5);
-	sbVideoOverrides->Add(UseZTPSpeedupHack, 0, wxEXPAND|wxLEFT, 5);
-	sbVideoOverrides->Add(DListCache, 0, wxEXPAND|wxLEFT, 5);
-	szrPHackSettings->Add(PHackEnable, 0, wxEXPAND|wxLEFT, 5);
+	sbVideoOverrides->Add(ForceFiltering, 0, wxLEFT, 5);
+	sbVideoOverrides->Add(EFBCopyEnable, 0, wxLEFT, 5);
+	sbVideoOverrides->Add(EFBAccessEnable, 0, wxLEFT, 5);
+	sbVideoOverrides->Add(EFBToTextureEnable, 0, wxLEFT, 5);
+	sbVideoOverrides->Add(SafeTextureCache, 0, wxLEFT, 5);
+	sbVideoOverrides->Add(DstAlphaPass, 0, wxLEFT, 5);
+	sbVideoOverrides->Add(UseXFB, 0, wxLEFT, 5);
+	sbVideoOverrides->Add(UseZTPSpeedupHack, 0, wxLEFT, 5);
+	sbVideoOverrides->Add(DListCache, 0, wxLEFT, 5);
+	szrPHackSettings->Add(PHackEnable, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5);
 	szrPHackSettings->Add(PHSettings, 0, wxLEFT, 5);
-	sbVideoOverrides->Add(szrPHackSettings, 0, wxEXPAND);
 
+	sbVideoOverrides->Add(szrPHackSettings, 0, wxEXPAND);
 	sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
 	sbGameConfig->Add(OverrideText, 0, wxEXPAND|wxALL, 5);
 	sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND);
diff --git a/Source/Core/DolphinWX/Src/PHackSettings.cpp b/Source/Core/DolphinWX/Src/PHackSettings.cpp
index ffa3d3d779..d1a6fb2200 100644
--- a/Source/Core/DolphinWX/Src/PHackSettings.cpp
+++ b/Source/Core/DolphinWX/Src/PHackSettings.cpp
@@ -104,7 +104,7 @@ void CPHackSettings::LoadPHackData()
 		if (sTemp.empty())
 			sTemp = wxString(_("(UNKNOWN)")).char_str();
 		if (i == 0)
-			PHackChoice->Append(wxString("-----------", *wxConvCurrent));
+			PHackChoice->Append(wxString("-------------", *wxConvCurrent));
 		PHackChoice->Append(wxString(sTemp.c_str(), *wxConvCurrent));
 	}
 	PHackChoice->Select(0);