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

Convert rotation menu to a GtkRadioActionEntry 

And one atoi less in the wild :)

Code change extracted from patch #2998869 by noodlebox.
This commit is contained in:
riccardom 2010-05-09 16:24:35 +00:00
parent 65151a3094
commit 9912b1b04d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
desmume/src/gtk/main.cpp
View File

@ -123,7 +123,7 @@ static void ToggleAudio (GtkToggleAction *action);
static void ToggleMicNoise (GtkToggleAction *action); static void ToggleMicNoise (GtkToggleAction *action);
#endif #endif
static void ToggleGap (GtkToggleAction *action); static void ToggleGap (GtkToggleAction *action);
static void SetRotation (GtkAction *action); static void SetRotation(GtkAction *action, GtkRadioAction *current);
static void ToggleLayerVisibility(GtkToggleAction* action, gpointer data); static void ToggleLayerVisibility(GtkToggleAction* action, gpointer data);
#ifdef DESMUME_GTK_FIRMWARE_BROKEN #ifdef DESMUME_GTK_FIRMWARE_BROKEN
static void SelectFirmwareFile(); static void SelectFirmwareFile();
@ -285,10 +285,6 @@ static const GtkActionEntry action_entries[] = {
{ "editctrls", NULL, "_Edit controls",NULL, NULL, Edit_Controls }, { "editctrls", NULL, "_Edit controls",NULL, NULL, Edit_Controls },
{ "editjoyctrls", NULL, "Edit _Joystick controls",NULL, NULL, Edit_Joystick_Controls }, { "editjoyctrls", NULL, "Edit _Joystick controls",NULL, NULL, Edit_Joystick_Controls },
{ "RotationMenu", NULL, "_Rotation" }, { "RotationMenu", NULL, "_Rotation" },
{ "rotate_0", "gtk-orientation-portrait", "_0", NULL, NULL, G_CALLBACK(SetRotation) },
{ "rotate_90", "gtk-orientation-landscape", "_90", NULL, NULL, G_CALLBACK(SetRotation) },
{ "rotate_180", "gtk-orientation-reverse-portrait", "_180",NULL, NULL, G_CALLBACK(SetRotation) },
{ "rotate_270", "gtk-orientation-reverse-landscape", "_270",NULL, NULL, G_CALLBACK(SetRotation) },
{ "InterpolationMenu", NULL, "_Interpolation" }, { "InterpolationMenu", NULL, "_Interpolation" },
{ "ViewMenu", NULL, "_View" }, { "ViewMenu", NULL, "_View" },
@ -314,6 +310,13 @@ static const GtkRadioActionEntry interpolation_entries[] = {
{ "interp_bilinear", NULL, "_Bilinear", NULL, NULL, 1}, { "interp_bilinear", NULL, "_Bilinear", NULL, NULL, 1},
}; };
static const GtkRadioActionEntry rotation_entries[] = {
{ "rotate_0", "gtk-orientation-portrait", "_0", NULL, NULL, 0 },
{ "rotate_90", "gtk-orientation-landscape", "_90", NULL, NULL, 90 },
{ "rotate_180", "gtk-orientation-reverse-portrait", "_180",NULL, NULL, 180 },
{ "rotate_270", "gtk-orientation-reverse-landscape", "_270",NULL, NULL, 270 },
};
enum frameskip_enum { enum frameskip_enum {
FRAMESKIP_0 = 0, FRAMESKIP_0 = 0,
FRAMESKIP_1 = 1, FRAMESKIP_1 = 1,
@ -996,12 +999,9 @@ static void ToggleGap(GtkToggleAction* action)
UpdateDrawingAreaAspect(); UpdateDrawingAreaAspect();
} }
static void SetRotation(GtkAction* action) static void SetRotation(GtkAction *action, GtkRadioAction *current)
{ {
const gchar *angle; nds_screen_rotation_angle = gtk_radio_action_get_current_value(current);
angle = gtk_action_get_name(GTK_ACTION(action)) + strlen("rotate_");
nds_screen_rotation_angle = atoi(angle);
UpdateDrawingAreaAspect(); UpdateDrawingAreaAspect();
} }
@ -2041,6 +2041,8 @@ common_gtk_main( struct configured_features *my_config)
1, G_CALLBACK(Modify_Interpolation), NULL); 1, G_CALLBACK(Modify_Interpolation), NULL);
gtk_action_group_add_radio_actions(action_group, frameskip_entries, G_N_ELEMENTS(frameskip_entries), gtk_action_group_add_radio_actions(action_group, frameskip_entries, G_N_ELEMENTS(frameskip_entries),
0, G_CALLBACK(Modify_Frameskip), NULL); 0, G_CALLBACK(Modify_Frameskip), NULL);
gtk_action_group_add_radio_actions(action_group, rotation_entries, G_N_ELEMENTS(rotation_entries),
0, G_CALLBACK(SetRotation), NULL);
{ {
GList * list = gtk_action_group_list_actions(action_group); GList * list = gtk_action_group_list_actions(action_group);
g_list_foreach(list, dui_set_accel_group, accel_group); g_list_foreach(list, dui_set_accel_group, accel_group);