piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make the "IR Sensitivity" slider work on linux. Also clean up the appearance of the Audio config dialogs on linux and OSX a bit. It doesn't change the appearance on windows.

Browse Source 
Mark a couple of strings for translation that were missed before.
Update some of the languages from the translators.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6856 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-01-15 15:48:04 +00:00
parent 8c0f17eece
commit 2add956cba
21 changed files with 2517 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Classic.cpp
View File

@ -49,35 +49,35 @@ static const u16 classic_dpad_bitmasks[] =
Classic::PAD_UP, Classic::PAD_DOWN, Classic::PAD_LEFT, Classic::PAD_RIGHT
};
Classic::Classic() : Attachment( _trans("Classic") )
Classic::Classic() : Attachment(_trans("Classic"))
{
// buttons
groups.push_back( m_buttons = new Buttons( "Buttons" ) );
for ( unsigned int i = 0; i < sizeof(classic_button_names)/sizeof(*classic_button_names); ++i )
m_buttons->controls.push_back( new ControlGroup::Input( classic_button_names[i] ) );
groups.push_back(m_buttons = new Buttons("Buttons"));
for (unsigned int i = 0; i < sizeof(classic_button_names)/sizeof(*classic_button_names); ++i)
m_buttons->controls.push_back(new ControlGroup::Input(classic_button_names[i]));
// sticks
groups.push_back( m_left_stick = new AnalogStick( "Left Stick" ) );
groups.push_back( m_right_stick = new AnalogStick( "Right Stick" ) );
groups.push_back(m_left_stick = new AnalogStick(_trans("Left Stick")));
groups.push_back(m_right_stick = new AnalogStick(_trans("Right Stick")));
// triggers
groups.push_back( m_triggers = new MixedTriggers( "Triggers" ) );
for ( unsigned int i=0; i < sizeof(classic_trigger_names)/sizeof(*classic_trigger_names); ++i )
m_triggers->controls.push_back( new ControlGroup::Input( classic_trigger_names[i] ) );
groups.push_back(m_triggers = new MixedTriggers("Triggers"));
for (unsigned int i=0; i < sizeof(classic_trigger_names)/sizeof(*classic_trigger_names); ++i)
m_triggers->controls.push_back(new ControlGroup::Input(classic_trigger_names[i]));
// dpad
groups.push_back( m_dpad = new Buttons( "D-Pad" ) );
for ( unsigned int i=0; i < 4; ++i )
m_dpad->controls.push_back( new ControlGroup::Input( named_directions[i] ) );
groups.push_back(m_dpad = new Buttons("D-Pad"));
for (unsigned int i=0; i < 4; ++i)
m_dpad->controls.push_back(new ControlGroup::Input(named_directions[i]));
// set up register
// calibration
memcpy( &reg[0x20], classic_calibration, sizeof(classic_calibration) );
memcpy(&reg[0x20], classic_calibration, sizeof(classic_calibration));
// id
memcpy( &reg[0xfa], classic_id, sizeof(classic_id) );
memcpy(&reg[0xfa], classic_id, sizeof(classic_id));
}
void Classic::GetState( u8* const data, const bool focus )
void Classic::GetState(u8* const data, const bool focus)
{
wm_classic_extension* const ccdata = (wm_classic_extension*)data;
ccdata->bt = 0;
@ -87,7 +87,7 @@ void Classic::GetState( u8* const data, const bool focus )
// left stick
{
u8 x, y;
m_left_stick->GetState( &x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0 );
m_left_stick->GetState(&x, &y, 0x20, focus ? 0x1F /*0x15*/ : 0);
ccdata->lx = x;
ccdata->ly = y;
@ -96,7 +96,7 @@ void Classic::GetState( u8* const data, const bool focus )
// right stick
{
u8 x, y;
m_right_stick->GetState( &x, &y, 0x10, focus ? 0x0F /*0x0C*/ : 0 );
m_right_stick->GetState(&x, &y, 0x10, focus ? 0x0F /*0x0C*/ : 0);
ccdata->rx1 = x;
ccdata->rx2 = x >> 1;
@ -107,7 +107,7 @@ void Classic::GetState( u8* const data, const bool focus )
//triggers
{
u8 trigs[2];
m_triggers->GetState( &ccdata->bt, classic_trigger_bitmasks, trigs, focus ? 0x1F : 0 );
m_triggers->GetState(&ccdata->bt, classic_trigger_bitmasks, trigs, focus ? 0x1F : 0);
ccdata->lt1 = trigs[0];
ccdata->lt2 = trigs[0] >> 3;
@ -117,9 +117,9 @@ void Classic::GetState( u8* const data, const bool focus )
if (focus)
{
// buttons
m_buttons->GetState( &ccdata->bt, classic_button_bitmasks );
m_buttons->GetState(&ccdata->bt, classic_button_bitmasks);
// dpad
m_dpad->GetState( &ccdata->bt, classic_dpad_bitmasks );
m_dpad->GetState(&ccdata->bt, classic_dpad_bitmasks);
}
// flip button bits

2
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -697,7 +697,7 @@ void CConfigMain::CreateGUIControls()
sWiimoteSettings->Add(WiiSensBarPosText, wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
sWiimoteSettings->Add(WiiSensBarPos, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5);
sWiimoteSettings->Add(WiiSensBarSensText, wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
sWiimoteSettings->Add(WiiSensBarSens, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5);
sWiimoteSettings->Add(WiiSensBarSens, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND|wxALL, 5);
sWiimoteSettings->Add(WiimoteMotor, wxGBPosition(2, 0), wxGBSpan(1, 2), wxALL, 5);
sbWiimoteSettings->Add(sWiimoteSettings);

8
Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
View File

@ -48,12 +48,12 @@ DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id,
wxStaticText *FrequencyText = new wxStaticText(this, wxID_ANY, _("Sample Rate"),
wxDefaultPosition, wxDefaultSize, 0);
m_FrequencySelection = new wxChoice(this, ID_FREQUENCY, wxDefaultPosition, wxSize(110, 20),
m_FrequencySelection = new wxChoice(this, ID_FREQUENCY, wxDefaultPosition, wxDefaultSize,
wxArrayRates, 0, wxDefaultValidator, wxEmptyString);
wxStaticText *BackendText = new wxStaticText(this, wxID_ANY, _("Audio Backend"),
wxDefaultPosition, wxDefaultSize, 0);
m_BackendSelection = new wxChoice(this, ID_BACKEND, wxDefaultPosition, wxSize(110, 20),
m_BackendSelection = new wxChoice(this, ID_BACKEND, wxDefaultPosition, wxDefaultSize,
wxArrayBackends, 0, wxDefaultValidator, wxEmptyString);
m_volumeSlider = new wxSlider(this, ID_VOLUME, ac_Config.m_Volume, 1, 100,
@ -90,8 +90,8 @@ DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id,
sFrequency->Add(FrequencyText, 0, wxALIGN_LEFT|wxALL, 1);
sFrequency->Add(m_FrequencySelection, 0, wxALL, 1);
m_FrequencySelection->Append(wxString::FromAscii("48,000 Hz"));
m_FrequencySelection->Append(wxString::FromAscii("32,000 Hz"));
m_FrequencySelection->Append(_("48,000 Hz"));
m_FrequencySelection->Append(_("32,000 Hz"));
#ifdef __APPLE__
int num = m_FrequencySelection->FindString(wxString::FromAscii(ac_Config.sFrequency));
#else

2
Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp
View File

@ -44,7 +44,7 @@ DSPConfigDialogLLE::DSPConfigDialogLLE(wxWindow *parent, wxWindowID id, const wx
m_buttonEnableThrottle = new wxCheckBox(this, ID_ENABLE_THROTTLE, _("Enable Audio Throttle"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_buttonEnableJIT = new wxCheckBox(this, ID_ENABLE_JIT, _("Enable JIT Dynarec"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
wxStaticText *BackendText = new wxStaticText(this, wxID_ANY, _("Audio Backend"), wxDefaultPosition, wxDefaultSize, 0);
m_BackendSelection = new wxChoice(this, ID_BACKEND, wxDefaultPosition, wxSize(110, 20), wxArrayBackends, 0, wxDefaultValidator, wxEmptyString);
m_BackendSelection = new wxChoice(this, ID_BACKEND, wxDefaultPosition, wxDefaultSize, wxArrayBackends, 0, wxDefaultValidator, wxEmptyString);
m_volumeSlider = new wxSlider(this, ID_VOLUME, ac_Config.m_Volume, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_INVERSE);
m_volumeSlider->Enable(SupportsVolumeChanges(ac_Config.sBackend));