Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-23 04:33:24 +00:00
Code Issues Projects Releases Wiki Activity

GTK: Fix message boxes

Browse Source 
- Increase default size for new volumes
This commit is contained in:
robxnano 2024-08-17 18:29:09 +01:00
parent e517d73f0c
commit 2658de9556
No known key found for this signature in database
GPG Key ID: 9FB6B03B782D1E42
4 changed files with 68 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
BasiliskII/src/Unix/main_unix.cpp
View File

@ -1604,37 +1604,23 @@ ill: printf("SIGILL num %d, code %d\n", sig, code);
*/
#ifdef ENABLE_GTK
static void dl_destroyed(void)
{
gtk_main_quit();
}
static void dl_quit(GtkWidget *dialog)
static GCallback dl_destroyed(GtkWidget *dialog)
{
gtk_widget_destroy(dialog);
gtk_main_quit();
return NULL;
}
void display_alert(int title_id, int prefix_id, int button_id, const char *text)
{
char str[256];
sprintf(str, GetString(prefix_id), text);
GtkWidget *dialog = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dialog), GetString(title_id));
gtk_container_border_width(GTK_CONTAINER(dialog), 5);
gtk_widget_set_uposition(GTK_WIDGET(dialog), 100, 150);
gtk_signal_connect(GTK_OBJECT(dialog), "destroy", GTK_SIGNAL_FUNC(dl_destroyed), NULL);
GtkWidget *label = gtk_label_new(str);
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE, TRUE, 0);
GtkWidget *button = gtk_button_new_with_label(GetString(button_id));
gtk_widget_show(button);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(dl_quit), GTK_OBJECT(dialog));
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_widget_grab_default(button);
GtkWidget *dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
GetString(title_id), NULL);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text);
gtk_dialog_add_button(GTK_DIALOG(dialog), GetString(button_id), GTK_RESPONSE_CLOSE);
g_signal_connect(dialog, "response", G_CALLBACK(dl_destroyed), NULL);
gtk_widget_show(dialog);
gtk_main();
@ -1653,11 +1639,13 @@ void ErrorAlert(const char *text)
rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
return;
}
#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
if (PrefsFindBool("nogui") || x_display == NULL) {
#ifdef ENABLE_GTK
#ifndef USE_SDL_VIDEO
if (x_display == NULL) {
printf(GetString(STR_SHELL_ERROR_PREFIX), text);
return;
}
#endif
VideoQuitFullScreen();
display_alert(STR_ERROR_ALERT_TITLE, STR_GUI_ERROR_PREFIX, STR_QUIT_BUTTON, text);
#else
@ -1677,11 +1665,13 @@ void WarningAlert(const char *text)
rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
return;
}
#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
if (PrefsFindBool("nogui") || x_display == NULL) {
#ifdef ENABLE_GTK
#ifndef USE_SDL_VIDEO
if (x_display == NULL) {
printf(GetString(STR_SHELL_WARNING_PREFIX), text);
return;
}
#endif
display_alert(STR_WARNING_ALERT_TITLE, STR_GUI_WARNING_PREFIX, STR_OK_BUTTON, text);
#else
printf(GetString(STR_SHELL_WARNING_PREFIX), text);

38
BasiliskII/src/Unix/prefs_editor_gtk.cpp
View File

@ -420,7 +420,7 @@ static void cb_quit(...)
}
// "OK" button of "About" dialog clicked
static void dl_quit(GtkWidget *dialog)
extern "C" void dl_quit(GtkWidget *dialog)
{
gtk_widget_destroy(dialog);
}
@ -621,7 +621,8 @@ static void cb_create_volume (...)
gtk_widget_show(label);
GtkWidget *size_entry = gtk_entry_new();
gtk_widget_show(size_entry);
gtk_entry_set_text(GTK_ENTRY(size_entry), "40");
gtk_entry_set_activates_default(GTK_ENTRY(size_entry), TRUE);
gtk_entry_set_text(GTK_ENTRY(size_entry), "64");
gtk_box_pack_end(GTK_BOX(box), size_entry, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(box), label, FALSE, FALSE, 0);
@ -1606,32 +1607,23 @@ bool DarwinCDReadTOC(char *, uint8 *) { }
* Display alert
*/
static void dl_destroyed(void)
static GCallback dl_destroyed(GtkWidget *dialog)
{
gtk_widget_destroy(dialog);
gtk_main_quit();
return NULL;
}
static void display_alert(int title_id, int prefix_id, int button_id, const char *text)
void display_alert(int title_id, int prefix_id, int button_id, const char *text)
{
char str[256];
sprintf(str, GetString(prefix_id), text);
GtkWidget *dialog = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dialog), GetString(title_id));
gtk_container_border_width(GTK_CONTAINER(dialog), 5);
gtk_widget_set_uposition(GTK_WIDGET(dialog), 100, 150);
g_signal_connect(dialog, "destroy", G_CALLBACK(dl_destroyed), NULL);
GtkWidget *label = gtk_label_new(str);
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE, TRUE, 0);
GtkWidget *button = gtk_button_new_with_label(GetString(button_id));
gtk_widget_show(button);
g_signal_connect_object(button, "clicked", G_CALLBACK(dl_quit), dialog, (GConnectFlags) 0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_widget_grab_default(button);
GtkWidget *dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
GetString(title_id), NULL);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text);
gtk_dialog_add_button(GTK_DIALOG(dialog), GetString(button_id), GTK_RESPONSE_CLOSE);
g_signal_connect(dialog, "response", G_CALLBACK(dl_destroyed), NULL);
gtk_widget_show(dialog);
gtk_main();

48
SheepShaver/src/Unix/main_unix.cpp
View File

@ -2296,37 +2296,23 @@ void SheepMem::Exit(void)
*/
#ifdef ENABLE_GTK
static void dl_destroyed(void)
{
gtk_main_quit();
}
static void dl_quit(GtkWidget *dialog)
static GCallback dl_destroyed(GtkWidget *dialog)
{
gtk_widget_destroy(dialog);
gtk_main_quit();
return NULL;
}
void display_alert(int title_id, int prefix_id, int button_id, const char *text)
{
char str[256];
sprintf(str, GetString(prefix_id), text);
GtkWidget *dialog = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dialog), GetString(title_id));
gtk_container_border_width(GTK_CONTAINER(dialog), 5);
gtk_widget_set_uposition(GTK_WIDGET(dialog), 100, 150);
gtk_signal_connect(GTK_OBJECT(dialog), "destroy", GTK_SIGNAL_FUNC(dl_destroyed), NULL);
GtkWidget *label = gtk_label_new(str);
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE, TRUE, 0);
GtkWidget *button = gtk_button_new_with_label(GetString(button_id));
gtk_widget_show(button);
gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(dl_quit), GTK_OBJECT(dialog));
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_widget_grab_default(button);
GtkWidget *dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
GetString(title_id), NULL);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text);
gtk_dialog_add_button(GTK_DIALOG(dialog), GetString(button_id), GTK_RESPONSE_CLOSE);
g_signal_connect(dialog, "response", G_CALLBACK(dl_destroyed), NULL);
gtk_widget_show(dialog);
gtk_main();
@ -2345,11 +2331,13 @@ void ErrorAlert(const char *text)
rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
return;
}
#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
if (PrefsFindBool("nogui") || x_display == NULL) {
#ifdef ENABLE_GTK
#ifndef USE_SDL_VIDEO
if (x_display == NULL) {
printf(GetString(STR_SHELL_ERROR_PREFIX), text);
return;
}
#endif
VideoQuitFullScreen();
display_alert(STR_ERROR_ALERT_TITLE, STR_GUI_ERROR_PREFIX, STR_QUIT_BUTTON, text);
#else
@ -2369,11 +2357,13 @@ void WarningAlert(const char *text)
rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
return;
}
#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
if (PrefsFindBool("nogui") || x_display == NULL) {
#ifdef ENABLE_GTK
#ifndef USE_SDL_VIDEO
if (x_display == NULL) {
printf(GetString(STR_SHELL_WARNING_PREFIX), text);
return;
}
#endif
display_alert(STR_WARNING_ALERT_TITLE, STR_GUI_WARNING_PREFIX, STR_OK_BUTTON, text);
#else
printf(GetString(STR_SHELL_WARNING_PREFIX), text);

38
SheepShaver/src/Unix/prefs_editor_gtk.cpp
View File

@ -383,7 +383,7 @@ static void cb_quit(...)
}
// "OK" button of "About" dialog clicked
static void dl_quit(GtkWidget *dialog)
extern "C" void dl_quit(GtkWidget *dialog)
{
gtk_widget_destroy(dialog);
}
@ -577,7 +577,8 @@ static void cb_create_volume (...)
gtk_widget_show(label);
GtkWidget *size_entry = gtk_entry_new();
gtk_widget_show(size_entry);
gtk_entry_set_text(GTK_ENTRY(size_entry), "40");
gtk_entry_set_activates_default(GTK_ENTRY(size_entry), TRUE);
gtk_entry_set_text(GTK_ENTRY(size_entry), "256");
gtk_box_pack_end(GTK_BOX(box), size_entry, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(box), label, FALSE, FALSE, 0);
@ -1379,32 +1380,23 @@ bool DarwinCDReadTOC(char *, uint8 *) { }
* Display alert
*/
static void dl_destroyed(void)
static GCallback dl_destroyed(GtkWidget *dialog)
{
gtk_widget_destroy(dialog);
gtk_main_quit();
return NULL;
}
static void display_alert(int title_id, int prefix_id, int button_id, const char *text)
void display_alert(int title_id, int prefix_id, int button_id, const char *text)
{
char str[256];
sprintf(str, GetString(prefix_id), text);
GtkWidget *dialog = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dialog), GetString(title_id));
gtk_container_border_width(GTK_CONTAINER(dialog), 5);
gtk_widget_set_uposition(GTK_WIDGET(dialog), 100, 150);
g_signal_connect(dialog, "destroy", G_CALLBACK(dl_destroyed), NULL);
GtkWidget *label = gtk_label_new(str);
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE, TRUE, 0);
GtkWidget *button = gtk_button_new_with_label(GetString(button_id));
gtk_widget_show(button);
g_signal_connect_object(button, "clicked", G_CALLBACK(dl_quit), dialog, (GConnectFlags) 0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_widget_grab_default(button);
GtkWidget *dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
GetString(title_id), NULL);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text);
gtk_dialog_add_button(GTK_DIALOG(dialog), GetString(button_id), GTK_RESPONSE_CLOSE);
g_signal_connect(dialog, "response", G_CALLBACK(dl_destroyed), NULL);
gtk_widget_show(dialog);
gtk_main();