nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-02-03 21:52:24 +00:00
Code Issues Projects Releases Wiki Activity

GTK 3 prep: replace GtkFileSelection with GtkFileChooserDialog.

Browse Source 
I've put in a special #define to control this selection, in case I
decide that for reasons of taste I'd prefer to switch back to
GtkFileSelection in GTK2 which supports both!
This commit is contained in:
Simon Tatham 2015-08-08 17:34:25 +01:00
parent 961fd07d08
commit fbb7c8c481
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
unix/gtkdlg.c
View File

@ -30,6 +30,11 @@
#include "dialog.h" #include "dialog.h"
#include "tree234.h" #include "tree234.h"
#if GTK_CHECK_VERSION(2,0,0)
/* Decide which of GtkFileChooserDialog and GtkFileSelection to use */
#define USE_GTK_FILE_CHOOSER_DIALOG
#endif
struct Shortcut { struct Shortcut {
GtkWidget *widget; GtkWidget *widget;
struct uctrl *uc; struct uctrl *uc;
@ -1574,6 +1579,20 @@ static void droplist_selchange(GtkComboBox *combo, gpointer data)
#endif /* !GTK_CHECK_VERSION(2,4,0) */ #endif /* !GTK_CHECK_VERSION(2,4,0) */
#ifdef USE_GTK_FILE_CHOOSER_DIALOG
static void filechoose_response(GtkDialog *dialog, gint response,
gpointer data)
{
/* struct dlgparam *dp = (struct dlgparam *)data; */
struct uctrl *uc = g_object_get_data(G_OBJECT(dialog), "user-data");
if (response == GTK_RESPONSE_ACCEPT) {
gchar *name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
g_free(name);
}
gtk_widget_destroy(GTK_WIDGET(dialog));
}
#else
static void filesel_ok(GtkButton *button, gpointer data) static void filesel_ok(GtkButton *button, gpointer data)
{ {
/* struct dlgparam *dp = (struct dlgparam *)data; */ /* struct dlgparam *dp = (struct dlgparam *)data; */
@ -1583,6 +1602,7 @@ static void filesel_ok(GtkButton *button, gpointer data)
(GTK_FILE_SELECTION(filesel)); (GTK_FILE_SELECTION(filesel));
gtk_entry_set_text(GTK_ENTRY(uc->entry), name); gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
} }
#endif
static void fontsel_ok(GtkButton *button, gpointer data) static void fontsel_ok(GtkButton *button, gpointer data)
{ {
@ -1653,6 +1673,21 @@ static void filefont_clicked(GtkButton *button, gpointer data)
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(button)); struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(button));
if (uc->ctrl->generic.type == CTRL_FILESELECT) { if (uc->ctrl->generic.type == CTRL_FILESELECT) {
#ifdef USE_GTK_FILE_CHOOSER_DIALOG
GtkWidget *filechoose = gtk_file_chooser_dialog_new
(uc->ctrl->fileselect.title, GTK_WINDOW(dp->window),
(uc->ctrl->fileselect.for_writing ?
GTK_FILE_CHOOSER_ACTION_SAVE :
GTK_FILE_CHOOSER_ACTION_OPEN),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
(const gchar *)NULL);
gtk_window_set_modal(GTK_WINDOW(filechoose), TRUE);
g_object_set_data(G_OBJECT(filechoose), "user-data", (gpointer)uc);
g_signal_connect(G_OBJECT(filechoose), "response",
G_CALLBACK(filechoose_response), (gpointer)dp);
gtk_widget_show(filechoose);
#else
GtkWidget *filesel = GtkWidget *filesel =
gtk_file_selection_new(uc->ctrl->fileselect.title); gtk_file_selection_new(uc->ctrl->fileselect.title);
gtk_window_set_modal(GTK_WINDOW(filesel), TRUE); gtk_window_set_modal(GTK_WINDOW(filesel), TRUE);
@ -1670,6 +1705,7 @@ static void filefont_clicked(GtkButton *button, gpointer data)
(G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), "clicked", (G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), "clicked",
G_CALLBACK(gtk_widget_destroy), (gpointer)filesel); G_CALLBACK(gtk_widget_destroy), (gpointer)filesel);
gtk_widget_show(filesel); gtk_widget_show(filesel);
#endif
} }
if (uc->ctrl->generic.type == CTRL_FONTSELECT) { if (uc->ctrl->generic.type == CTRL_FONTSELECT) {