Switch log file picker to GtkFileChooserDialog
This commit is contained in:
committed by
Stéphane Lesimple
parent
8469a933e4
commit
8504386fb1
@@ -1248,73 +1248,43 @@ static void cache_defective_dir_cb(GtkWidget *widget, gpointer data)
|
|||||||
|
|
||||||
static void logfile_select_cb(GtkWidget *widget, gpointer data)
|
static void logfile_select_cb(GtkWidget *widget, gpointer data)
|
||||||
{ prefs_context *pc = (prefs_context*)Closure->prefsContext;
|
{ prefs_context *pc = (prefs_context*)Closure->prefsContext;
|
||||||
int action = GPOINTER_TO_INT(data);
|
GtkWidget *dialog;
|
||||||
|
|
||||||
switch(action)
|
if(!pc->logFileChooser)
|
||||||
{ case 0: /* destroy */
|
{ dialog = gtk_file_chooser_dialog_new("Log file",
|
||||||
pc->logFileChooser = NULL;
|
Closure->window,
|
||||||
break;
|
GTK_FILE_CHOOSER_ACTION_SAVE,
|
||||||
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
||||||
|
_("_Open"), GTK_RESPONSE_ACCEPT,
|
||||||
|
NULL);
|
||||||
|
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), Closure->logFile);
|
||||||
|
|
||||||
case 1: /* OK */
|
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
|
||||||
g_free(Closure->logFile);
|
{ g_free(Closure->logFile);
|
||||||
Closure->logFile = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(pc->logFileChooser)));
|
Closure->logFile = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
|
||||||
Closure->logFileStamped = FALSE;
|
Closure->logFileStamped = FALSE;
|
||||||
if(pc->logFilePathA)
|
if(pc->logFilePathA)
|
||||||
gtk_label_set_text(GTK_LABEL(pc->logFilePathA), Closure->logFile);
|
gtk_label_set_text(GTK_LABEL(pc->logFilePathA), Closure->logFile);
|
||||||
if(pc->logFilePathB)
|
if(pc->logFilePathB)
|
||||||
gtk_label_set_text(GTK_LABEL(pc->logFilePathB), Closure->logFile);
|
gtk_label_set_text(GTK_LABEL(pc->logFilePathB), Closure->logFile);
|
||||||
gtk_widget_hide(pc->logFileChooser);
|
}
|
||||||
break;
|
gtk_widget_destroy (dialog);
|
||||||
|
|
||||||
case 2: /* Cancel */
|
|
||||||
gtk_widget_hide(pc->logFileChooser);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define LOGFILE_SELECT 1
|
static void logfile_delete_cb(GtkWidget *widget, gpointer data)
|
||||||
#define LOGFILE_DELETE 2
|
{ GtkWidget *dialog = gtk_message_dialog_new(Closure->prefsWindow,
|
||||||
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
|
GTK_MESSAGE_QUESTION,
|
||||||
|
GTK_BUTTONS_OK_CANCEL,
|
||||||
|
"%s", _utf("Delete the log file?"));
|
||||||
|
int answer;
|
||||||
|
|
||||||
static void logfile_cb(GtkWidget *widget, gpointer data)
|
answer = gtk_dialog_run(GTK_DIALOG(dialog));
|
||||||
{ prefs_context *pc = (prefs_context*)Closure->prefsContext;
|
|
||||||
int action = GPOINTER_TO_INT(data);
|
|
||||||
|
|
||||||
switch(action)
|
if(answer == GTK_RESPONSE_OK)
|
||||||
{ case LOGFILE_SELECT:
|
LargeUnlink(Closure->logFile);
|
||||||
if(!pc->logFileChooser)
|
gtk_widget_destroy(dialog);
|
||||||
{
|
|
||||||
pc->logFileChooser = gtk_file_selection_new(_utf("Log file"));
|
|
||||||
|
|
||||||
g_signal_connect(G_OBJECT(pc->logFileChooser), "destroy",
|
|
||||||
G_CALLBACK(logfile_select_cb),
|
|
||||||
GINT_TO_POINTER(0));
|
|
||||||
g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(pc->logFileChooser)->ok_button),
|
|
||||||
"clicked", G_CALLBACK(logfile_select_cb), GINT_TO_POINTER(1));
|
|
||||||
g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(pc->logFileChooser)->cancel_button),
|
|
||||||
"clicked", G_CALLBACK(logfile_select_cb), GINT_TO_POINTER(2));
|
|
||||||
|
|
||||||
gtk_file_selection_set_filename(GTK_FILE_SELECTION(pc->logFileChooser),
|
|
||||||
Closure->logFile);
|
|
||||||
}
|
|
||||||
gtk_widget_show(pc->logFileChooser);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case LOGFILE_DELETE:
|
|
||||||
{ GtkWidget *dialog = gtk_message_dialog_new(Closure->prefsWindow,
|
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
|
||||||
GTK_MESSAGE_QUESTION,
|
|
||||||
GTK_BUTTONS_OK_CANCEL,
|
|
||||||
"%s", _utf("Delete the log file?"));
|
|
||||||
int answer;
|
|
||||||
|
|
||||||
answer = gtk_dialog_run(GTK_DIALOG(dialog));
|
|
||||||
|
|
||||||
if(answer == GTK_RESPONSE_OK)
|
|
||||||
LargeUnlink(Closure->logFile);
|
|
||||||
gtk_widget_destroy(dialog);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/***
|
/***
|
||||||
@@ -3185,13 +3155,11 @@ void GuiCreatePreferencesWindow(void)
|
|||||||
|
|
||||||
gtk_table_attach(GTK_TABLE(table), select,
|
gtk_table_attach(GTK_TABLE(table), select,
|
||||||
2, 3, 0, 2, GTK_SHRINK, GTK_SHRINK, 10, 0);
|
2, 3, 0, 2, GTK_SHRINK, GTK_SHRINK, 10, 0);
|
||||||
g_signal_connect(G_OBJECT(select), "clicked", G_CALLBACK(logfile_cb),
|
g_signal_connect(G_OBJECT(select), "clicked", G_CALLBACK(logfile_select_cb), 0);
|
||||||
GINT_TO_POINTER(LOGFILE_SELECT));
|
|
||||||
|
|
||||||
gtk_table_attach(GTK_TABLE(table), delete,
|
gtk_table_attach(GTK_TABLE(table), delete,
|
||||||
3, 4, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
|
3, 4, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
|
||||||
g_signal_connect(G_OBJECT(delete), "clicked", G_CALLBACK(logfile_cb),
|
g_signal_connect(G_OBJECT(delete), "clicked", G_CALLBACK(logfile_delete_cb), 0);
|
||||||
GINT_TO_POINTER(LOGFILE_DELETE));
|
|
||||||
|
|
||||||
|
|
||||||
if(!i)
|
if(!i)
|
||||||
|
|||||||
Reference in New Issue
Block a user