diff options
| author | SND\ckain_cp <SND\ckain_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-04-09 06:57:12 +0000 |
|---|---|---|
| committer | SND\ckain_cp <SND\ckain_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-04-09 06:57:12 +0000 |
| commit | 8945a7293bd7e260d7e19cae06249244caa1b7ca (patch) | |
| tree | 471622f4d5558d1afdf62a292c626f6fdbbd4947 /gui | |
| parent | 17913e070197edf24b28757dd116a6932007cb6c (diff) | |
| download | pcsxr-8945a7293bd7e260d7e19cae06249244caa1b7ca.tar.gz | |
gtk gui conf: disable rewind conf when dynarec & display memory usage
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89836 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'gui')
| -rwxr-xr-x | gui/ConfDlg.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index 2967081b..9b414f79 100755 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c @@ -858,22 +858,25 @@ static void OnCpu_PsxAutoClicked (GtkWidget *widget, gpointer user_data) { !(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))); } -// When the interpreter core is deselected, disable the debugger checkbox +// When the interpreter core is deselected, disable the debugger checkbox & rewind static void OnCpu_CpuClicked(GtkWidget *widget, gpointer user_data) { - GtkWidget *check; + GtkWidget *check, *rew; check = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCheckButton_Dbg")); + rew = GTK_WIDGET(gtk_builder_get_object(builder, "frame_rew")); // Debugger is only working with interpreter not recompiler, so let's set it - if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) + if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); - + } gtk_widget_set_sensitive (check, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); + gtk_widget_set_sensitive (rew, + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); } void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) { GtkWidget *widget; - s64 tmp; + long unsigned int tmp; long t; widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCombo_PsxType")); @@ -959,14 +962,22 @@ void OnConf_Cpu() { gtk_combo_box_set_active(GTK_COMBO_BOX (widget), Config.PsxType); gtk_widget_set_sensitive(GTK_WIDGET (widget), !Config.PsxAuto); - snprintf(buf, sizeof(buf), "%lu", Config.RewindCount); + snprintf(buf, sizeof(buf), "%u", Config.RewindCount); widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkEntry_RewindCount")); gtk_entry_set_text(GTK_ENTRY(widget), buf); - snprintf(buf, sizeof(buf), "%lu", Config.RewindInterval); + snprintf(buf, sizeof(buf), "%u", Config.RewindInterval); widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkEntry_RewindInterval")); gtk_entry_set_text(GTK_ENTRY(widget), buf); + // Calculate estimated memory usage + snprintf(buf, sizeof(buf), "%u", ((unsigned int)(((float)Config.RewindCount)*4.2f))); + gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "GtkEntry_RewindMem")), + buf); + + // Enabled only if interpreter + gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "frame_rew")), Config.Cpu); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Xa")), Config.Xa); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SioIrq")), Config.SioIrq); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Mdec")), Config.Mdec); |