diff --git a/src/closure.c b/src/closure.c index 1743c8e..9fb3202 100644 --- a/src/closure.c +++ b/src/closure.c @@ -291,7 +291,6 @@ void GuiReadDotfile() if(!strcmp(symbol, "read-raw")) { Closure->readRaw = atoi(value); continue; } if(!strcmp(symbol, "redundancy")) { if(Closure->redundancy) g_free(Closure->redundancy); Closure->redundancy = g_strdup(value); continue; } - if(!strcmp(symbol, "reverse-cancel-ok")) { Closure->reverseCancelOK = atoi(value); continue; } if(!strcmp(symbol, "spinup-delay")) { Closure->spinupDelay = atoi(value); continue; } if(!strcmp(symbol, "unlink")) { Closure->unlinkImage = atoi(value); continue; } if(!strcmp(symbol, "verbose")) { Closure->verbose = atoi(value); continue; } @@ -394,7 +393,6 @@ static void update_dotfile() g_fprintf(dotfile, "read-raw: %d\n", Closure->readRaw); if(Closure->redundancy) g_fprintf(dotfile, "redundancy: %s\n", Closure->redundancy); - g_fprintf(dotfile, "reverse-cancel-ok: %d\n", Closure->reverseCancelOK); g_fprintf(dotfile, "spinup-delay: %d\n", Closure->spinupDelay); g_fprintf(dotfile, "unlink: %d\n", Closure->unlinkImage); g_fprintf(dotfile, "verbose: %d\n", Closure->verbose); diff --git a/src/dvdisaster.h b/src/dvdisaster.h index 9446d44..bce9c44 100644 --- a/src/dvdisaster.h +++ b/src/dvdisaster.h @@ -296,7 +296,6 @@ typedef struct _GlobalClosure int defectiveDump; /* dump non-recoverable sectors into given path */ char *dDumpDir; /* directory for above */ char *dDumpPrefix; /* file name prefix for above */ - int reverseCancelOK; /* if TRUE the button order is reversed */ int eject; /* eject medium on success */ int readingPasses; /* try to read medium n times */ int pauseAfter; /* pause after given amount of minutes */ @@ -1209,7 +1208,6 @@ void GuiExitWorkerThread(); int GuiGetLabelWidth(GtkLabel*, char*, ...) PRINTF_FORMAT(2); void GuiLockLabelSize(GtkWidget*, char*, ...) PRINTF_FORMAT(2); int GuiModalDialog(GtkMessageType, GtkButtonsType, void (*)(GtkDialog*), char*, ...) PRINTF_FORMAT(4); -void GuiReverseCancelOK(GtkDialog*); void GuiSetLabelText(GtkWidget*, char*, ...) PRINTF_FORMAT(2); void GuiShowMessage(GtkWindow*, char*, GtkMessageType); void GuiSetProgress(GtkWidget*, int, int); @@ -1225,7 +1223,6 @@ void GuiSwitchAndSetFootline(GtkWidget*, int, GtkWidget*, char*, ...) PRINTF_FOR #define GuiGetLabelWidth(l, c, args...) (0) #define GuiLockLabelSize(w, c, args...) #define GuiModalDialog(a, b, c, d, args...) (0) -#define GuiReverseCancelOK(d) #define GuiSetLabelText(w, c, args...) #define GuiShowMessage(w, a, b) #define GuiSetProgress(w, a, b) diff --git a/src/menubar.c b/src/menubar.c index 167c734..321b5f3 100644 --- a/src/menubar.c +++ b/src/menubar.c @@ -336,7 +336,6 @@ static void file_select_cb(GtkWidget *widget, gpointer data) case MENU_FILE_IMAGE: if(!Closure->imageFileSel) { Closure->imageFileSel = gtk_file_selection_new(_utf("windowtitle|Image file selection")); - GuiReverseCancelOK(GTK_DIALOG(Closure->imageFileSel)); g_signal_connect(G_OBJECT(Closure->imageFileSel), "destroy", G_CALLBACK(file_select_cb), GINT_TO_POINTER(MENU_FILE_IMAGE_DESTROY)); g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(Closure->imageFileSel)->ok_button),"clicked", @@ -373,7 +372,6 @@ static void file_select_cb(GtkWidget *widget, gpointer data) case MENU_FILE_ECC: if(!Closure->eccFileSel) { Closure->eccFileSel = gtk_file_selection_new(_utf("windowtitle|Error correction file selection")); - GuiReverseCancelOK(GTK_DIALOG(Closure->eccFileSel)); g_signal_connect(G_OBJECT(Closure->eccFileSel), "destroy", G_CALLBACK(file_select_cb), GINT_TO_POINTER(MENU_FILE_ECC_DESTROY)); g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(Closure->eccFileSel)->ok_button),"clicked", diff --git a/src/misc-gui.c b/src/misc-gui.c index bc4403e..ecf4d68 100644 --- a/src/misc-gui.c +++ b/src/misc-gui.c @@ -436,7 +436,6 @@ static gboolean modal_idle_func(gpointer data) if(mi->button_fn) mi->button_fn(GTK_DIALOG(dialog)); - else GuiReverseCancelOK(GTK_DIALOG(dialog)); response = gtk_dialog_run(GTK_DIALOG(dialog)); @@ -537,34 +536,6 @@ void GuiSetText(PangoLayout *layout, char *text, int *w, int *h) *h = rect.height; } -/* - * Rearrange buttons to OK Cancel order - * in file dialogs - * - * gtk_dialog_set_alternative_button_order() - * has been introduced since gtk+2.6, - * but does not seem to work correctly. - */ - -void GuiReverseCancelOK(GtkDialog *dialog) -{ GtkWidget *box, *button ; - - if(!Closure->guiMode || !Closure->reverseCancelOK) - return; - - box = dialog->action_area; - button = ((GtkBoxChild*)(g_list_first(GTK_BOX(box)->children)->data))->widget; - - gtk_box_reorder_child(GTK_BOX(box), button, 1); - -#if 0 - gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog), - GTK_RESPONSE_OK, - GTK_RESPONSE_CANCEL, - -1); -#endif -} - /* * Get the width of a label text */ @@ -644,7 +615,6 @@ static void insert_button(GtkDialog *dialog) gtk_widget_show(align); gtk_widget_show(check); - GuiReverseCancelOK(GTK_DIALOG(dialog)); } int GuiConfirmImageDeletion(char *file) diff --git a/src/preferences.c b/src/preferences.c index 2321174..641390a 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -383,7 +383,6 @@ enum TOGGLE_RAW_21H, TOGGLE_RAW_OTHER, TOGGLE_CACHE_DEFECTIVE, - TOGGLE_CANCEL_OK, TOGGLE_FATAL_SENSE, TOGGLE_EJECT, TOGGLE_VERBOSE, @@ -487,12 +486,6 @@ static void toggle_cb(GtkWidget *widget, gpointer data) activate_toggle_button(GTK_TOGGLE_BUTTON(pc->logFileB), state); break; - case TOGGLE_CANCEL_OK: - Closure->reverseCancelOK = state; - activate_toggle_button(GTK_TOGGLE_BUTTON(pc->cancelOKA), state); - activate_toggle_button(GTK_TOGGLE_BUTTON(pc->cancelOKB), state); - break; - case TOGGLE_SIZEDRIVE: Closure->ignoreIsoSize = state; activate_toggle_button(GTK_TOGGLE_BUTTON(pc->ignoreISOSizeA), state); @@ -843,8 +836,6 @@ static void color_choose_cb(GtkWidget *widget, gpointer data) csd = (GtkColorSelectionDialog*)cbi->dialog; g_signal_connect(G_OBJECT(csd->cancel_button), "clicked", G_CALLBACK(color_cancel_cb), cbi); g_signal_connect(G_OBJECT(csd->ok_button), "clicked", G_CALLBACK(color_ok_cb), cbi); - - GuiReverseCancelOK(GTK_DIALOG(cbi->dialog)); } gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(((GtkColorSelectionDialog*)cbi->dialog)->colorsel), cbi->color); @@ -1222,7 +1213,6 @@ static void cache_defective_dir_cb(GtkWidget *widget, gpointer data) { char filename[strlen(Closure->dDumpDir)+10]; pc->cacheDefectiveChooser = gtk_file_selection_new(_utf("Raw sector caching")); - GuiReverseCancelOK(GTK_DIALOG(pc->cacheDefectiveChooser)); g_signal_connect(G_OBJECT(pc->cacheDefectiveChooser), "destroy", G_CALLBACK(cache_defective_select_cb), @@ -1294,7 +1284,6 @@ static void logfile_cb(GtkWidget *widget, gpointer data) if(!pc->logFileChooser) { pc->logFileChooser = gtk_file_selection_new(_utf("Log file")); - GuiReverseCancelOK(GTK_DIALOG(pc->logFileChooser)); g_signal_connect(G_OBJECT(pc->logFileChooser), "destroy", G_CALLBACK(logfile_select_cb), @@ -1318,7 +1307,6 @@ static void logfile_cb(GtkWidget *widget, gpointer data) "%s", _utf("Delete the log file?")); int answer; - GuiReverseCancelOK(GTK_DIALOG(dialog)); answer = gtk_dialog_run(GTK_DIALOG(dialog)); if(answer == GTK_RESPONSE_OK) @@ -3121,42 +3109,6 @@ void GuiCreatePreferencesWindow(void) g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(default_color_cb), NULL); - /** Reverse OK and Cancel buttons */ - - frame = gtk_frame_new(_utf("Dialog boxes")); - gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); - - lwoh = GuiCreateLabelWithOnlineHelp(_("Reverse OK / Cancel buttons"), - _("Reverse OK / Cancel buttons")); - GuiRegisterPreferencesHelpWindow(lwoh); - - for(i=0; i<2; i++) - { GtkWidget *hbox = gtk_hbox_new(FALSE, 0); - GtkWidget *button = gtk_check_button_new(); - - gtk_container_set_border_width(GTK_CONTAINER(hbox), 10); - gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), i ? lwoh->normalLabel : lwoh->linkBox, FALSE, FALSE, 0); - if (!i) gtk_box_pack_start(GTK_BOX(hbox), lwoh->tooltip, FALSE, FALSE, 0); - activate_toggle_button(GTK_TOGGLE_BUTTON(button), Closure->reverseCancelOK); - g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), GINT_TO_POINTER(TOGGLE_CANCEL_OK)); - - if(!i) - { pc->cancelOKA = button; - gtk_container_add(GTK_CONTAINER(frame), hbox); - } - else - { pc->cancelOKB = button; - GuiAddHelpWidget(lwoh, hbox); - } - } - - GuiAddHelpParagraph(lwoh, - _("Reverse OK / Cancel buttons\n\n" - "This switch reverses the order of dialog buttons " - "(e.g. OK, Cancel).\n\n" - "Changes will become active after restarting dvdisaster.")); - /*** "Misc" page */ vbox = create_page(notebook, _utf("Misc")); diff --git a/src/raw-editor.c b/src/raw-editor.c index 41a804a..5adace3 100644 --- a/src/raw-editor.c +++ b/src/raw-editor.c @@ -297,7 +297,6 @@ static void file_select_cb(GtkWidget *widget, gpointer data) { char filename[strlen(Closure->dDumpDir)+10]; rec->fileSel = gtk_file_selection_new(_utf("windowtitle|Raw sector dump selection")); - GuiReverseCancelOK(GTK_DIALOG(rec->fileSel)); g_signal_connect(G_OBJECT(rec->fileSel), "destroy", G_CALLBACK(file_select_cb), GINT_TO_POINTER(ACTION_FILESEL_DESTROY)); g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(rec->fileSel)->ok_button),"clicked", @@ -418,7 +417,6 @@ static void buffer_io_cb(GtkWidget *widget, gpointer data) { char filename[strlen(Closure->dDumpDir)+10]; rec->loadBufSel = gtk_file_selection_new(_utf("windowtitle|Load buffer from file")); - GuiReverseCancelOK(GTK_DIALOG(rec->loadBufSel)); g_signal_connect(G_OBJECT(rec->loadBufSel), "destroy", G_CALLBACK(buffer_io_cb), GINT_TO_POINTER(ACTION_FILESEL_LOAD_DESTROY)); g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(rec->loadBufSel)->ok_button),"clicked", @@ -436,7 +434,6 @@ static void buffer_io_cb(GtkWidget *widget, gpointer data) { char filename[strlen(Closure->dDumpDir)+10]; rec->saveBufSel = gtk_file_selection_new(_utf("windowtitle|Save buffer to file")); - GuiReverseCancelOK(GTK_DIALOG(rec->saveBufSel)); g_signal_connect(G_OBJECT(rec->saveBufSel), "destroy", G_CALLBACK(buffer_io_cb), GINT_TO_POINTER(ACTION_FILESEL_SAVE_DESTROY)); g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(rec->saveBufSel)->ok_button),"clicked",