ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

At this point, everyone should be pretty comfortable with it

This commit is contained in:
TwistedUmbrella 2014-02-27 20:47:22 -05:00
parent 4d3ccfe5bf
commit d45603c2e0
8 changed files with 27 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shell/android/res/values-da/strings.xml
View File

@ -62,11 +62,6 @@
<string name="map_keycode_title">Tilpas controller</string>
<string name="map_keycode_message">Tryk på den nye controller taste for %1$s</string>
<string name="bios_menu">Tryk på %1$s knappen for en menu</string>
<string name="back_button">tilbage</string>
<string name="menu_button">menu</string>
<string name="right_button">R3</string>
<string name="moga_pro_connect">MOGA Pro tilsluttet!</string>
<string name="moga_connect">MOGA tilsluttet!</string>

5
shell/android/res/values-ru/strings.xml
View File

@ -55,11 +55,6 @@
<string name="map_keycode_title">Изменить контроллер</string>
<string name="map_keycode_message">Нажмите кнопку на контроллере для %1$s</string>
<string name="bios_menu">Нажмите на кнопку %1$s для выхода в меню</string>
<string name="back_button">назад</string>
<string name="search_button">поиск</string>
<string name="moga_pro_connect">MOGA Pro присоиденен!</string>
<string name="moga_connect">MOGA присоиденен!</string>

3
shell/android/res/values-zh-rCN/strings.xml
View File

@ -47,9 +47,6 @@
<string name="customize_physical_controls">自定义物理控制</string>
<string name="map_keycode_title">修改控制器</string>
<string name="map_keycode_message">按下控制器按钮来映射 %1$s</string>
<string name="bios_menu">按 %1$s 来调出菜单</string>
<string name="back_button">返回</string>
<string name="search_button">搜寻</string>
<string name="moga_pro_connect">MOGA Pro已连接!</string>
<string name="moga_connect">MOGA已连接</string>
<string name="about_text">reicast是一款dreamcast模拟器</string>

3
shell/android/res/values-zh/strings.xml
View File

@ -47,9 +47,6 @@
<string name="customize_physical_controls">自定義物理控制</string>
<string name="map_keycode_title">修改控制器</string>
<string name="map_keycode_message">按下控制器按鈕來映射 %1$s</string>
<string name="bios_menu">按 %1$s 來調出菜單</string>
<string name="back_button">返回</string>
<string name="search_button">搜尋</string>
<string name="moga_pro_connect">MOGA Pro已連接!</string>
<string name="moga_connect">MOGA已連接</string>
<string name="about_text">reicast是一款dreamcast模擬器</string>

5
shell/android/res/values/strings.xml
View File

@ -62,11 +62,6 @@
<string name="map_keycode_title">Modify Controller</string>
<string name="map_keycode_message">Press the new controller button for %1$s</string>
<string name="bios_menu">Press the %1$s button for a menu</string>
<string name="back_button">back / select</string>
<string name="menu_button">menu</string>
<string name="right_button">R3</string>
<string name="moga_pro_connect">MOGA Pro Connected!</string>
<string name="moga_connect">MOGA Connected!</string>

12
shell/android/src/com/reicast/emulator/GL2JNIActivity.java
View File

@ -186,18 +186,6 @@ public class GL2JNIActivity extends Activity {
mView = new GL2JNIView(getApplication(), config, fileName, false,
prefs.getInt("depth_render", 24), 0, false);
setContentView(mView);
String menu_spec;
if (pad.isXperiaPlay || pad.isOuyaOrTV) {
menu_spec = getApplicationContext().getString(R.string.menu_button);
} else {
menu_spec = getApplicationContext().getString(R.string.back_button);
}
Toast.makeText(
getApplicationContext(),
getApplicationContext()
.getString(R.string.bios_menu, menu_spec),
Toast.LENGTH_SHORT).show();
//setup mic
boolean micPluggedIn = prefs.getBoolean("mic_plugged_in", false);

12
shell/android/src/com/reicast/emulator/GL2JNINative.java
View File

@ -204,18 +204,6 @@ public class GL2JNINative extends NativeActivity {
mView = new GL2JNIView(getApplication(), config, fileName, false,
prefs.getInt("depth_render", 24), 0, false);
setContentView(mView);
String menu_spec;
if (pad.isXperiaPlay || pad.isOuyaOrTV) {
menu_spec = getApplicationContext().getString(R.string.menu_button);
} else {
menu_spec = getApplicationContext().getString(R.string.back_button);
}
Toast.makeText(
getApplicationContext(),
getApplicationContext()
.getString(R.string.bios_menu, menu_spec),
Toast.LENGTH_SHORT).show();
//setup mic
boolean micPluggedIn = prefs.getBoolean("mic_plugged_in", false);

31
shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
View File

@ -1,6 +1,7 @@
package com.reicast.emulator.emu;
import java.io.File;
import java.util.ArrayList;
import java.util.Vector;
import android.app.Activity;
@ -192,6 +193,7 @@ public class OnScreenMenu {
private View fastforward;
private View fdown;
private View fup;
ArrayList<View> menuItems = new ArrayList<View>();
public ConfigPopup(Context c) {
super(c);
@ -203,11 +205,13 @@ public class OnScreenMenu {
hlay.setOrientation(LinearLayout.HORIZONTAL);
hlay.addView(addbut(R.drawable.up, new OnClickListener() {
View up = addbut(R.drawable.up, new OnClickListener() {
public void onClick(View v) {
removePopUp(ConfigPopup.this);
}
}), configParams);
});
hlay.addView(up, configParams);
menuItems.add(up);
fullscreen = addbut(R.drawable.widescreen, new OnClickListener() {
public void onClick(View v) {
@ -230,6 +234,7 @@ public class OnScreenMenu {
}
hlay.addView(fullscreen, params);
menuItems.add(fullscreen);
fdown = addbut(R.drawable.frames_down, new OnClickListener() {
public void onClick(View v) {
@ -251,7 +256,9 @@ public class OnScreenMenu {
});
hlay.addView(fdown, params);
menuItems.add(fdown);
hlay.addView(fup, params);
menuItems.add(fup);
enableState(fdown, fup);
framelimit = addbut(R.drawable.frames_limit_on,
@ -275,6 +282,7 @@ public class OnScreenMenu {
.setImageResource(R.drawable.frames_limit_off);
}
hlay.addView(framelimit, params);
menuItems.add(framelimit);
audiosetting = addbut(R.drawable.enable_sound,
new OnClickListener() {
@ -314,6 +322,7 @@ public class OnScreenMenu {
audiosetting.setEnabled(false);
}
hlay.addView(audiosetting, params);
menuItems.add(audiosetting);
fastforward = addbut(R.drawable.star, new OnClickListener() {
public void onClick(View v) {
@ -372,17 +381,31 @@ public class OnScreenMenu {
.setImageResource(R.drawable.reset);
}
hlay.addView(fastforward, params);
menuItems.add(fastforward);
hlay.addView(addbut(R.drawable.close, new OnClickListener() {
View close = addbut(R.drawable.close, new OnClickListener() {
public void onClick(View v) {
popups.remove(ConfigPopup.this);
dismiss();
}
}), configParams);
});
hlay.addView(close, configParams);
menuItems.add(close);
setContentView(hlay);
getFocusedItem();
popups.add(this);
}
public void getFocusedItem() {
for (View menuItem : menuItems) {
if (menuItem.hasFocus()) {
// do something to the focused item
} else {
// do something to the rest of them
}
}
}
}
/**