1 files changed, 82 insertions, 15 deletions

diff --git a/trace-dialog.c b/trace-dialog.c
index a87118c..89415dd 100644
--- a/trace-dialog.c
+++ b/trace-dialog.c
@@ -305,18 +305,22 @@ GtkResponseType trace_dialog(GtkWindow *parent, enum trace_dialog_type type,
  * trace_get_file_dialog - pop up a file dialog to get a file
  * @title: the title of the dialog
  * @open: the text for the "open" button (NULL for default)
+ * @ftype: What extension the dialog should default filter on.
  * @warn: if the file exists, warn and let them choose again.
  *
  * Returns: the filename if it should be used. NULL otherwise.
  *  The filename needs to be freed with g_free().
  */
-gchar *trace_get_file_dialog(const gchar *title, const char *open,
-                             gboolean warn)
+gchar *trace_get_file_dialog_filter(const gchar *title, const char *open,
+                             enum trace_dialog_filter ftype, gboolean warn)
 {
         struct stat st;
         GtkWidget *dialog;
         GtkResponseType ret;
+        GtkFileFilter *filter;
+        GtkFileFilter *setfilter;
         gchar *filename = NULL;
+        gchar *ext = NULL;
 
         if (!open)
                 open = GTK_STOCK_OPEN;
@@ -328,20 +332,71 @@ gchar *trace_get_file_dialog(const gchar *title, const char *open,
                                              open, GTK_RESPONSE_ACCEPT,
                                              NULL);
 
+        setfilter = filter = gtk_file_filter_new();
+        gtk_file_filter_set_name(filter, "All Files");
+        gtk_file_filter_add_pattern(filter, "*");
+        gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+
+        filter = gtk_file_filter_new();
+        gtk_file_filter_set_name(filter, "trace-cmd .dat files");
+        gtk_file_filter_add_pattern(filter, "*.dat");
+        gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+
+        if (ftype == TRACE_DIALOG_FILTER_DATA) {
+                setfilter = filter;
+                ext = ".dat";
+        }
+
+        filter = gtk_file_filter_new();
+        gtk_file_filter_set_name(filter, "KernelShark filter files");
+        gtk_file_filter_add_pattern(filter, "*.ksf");
+        gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+
+        if (ftype == TRACE_DIALOG_FILTER_FILTER) {
+                setfilter = filter;
+                ext = ".ksf";
+        }
+
+        filter = gtk_file_filter_new();
+        gtk_file_filter_set_name(filter, "KernelShark setting files");
+        gtk_file_filter_add_pattern(filter, "*.kss");
+        gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+
+        if (ftype == TRACE_DIALOG_FILTER_SETTING) {
+                setfilter = filter;
+                ext = ".kss";
+        }
+
+        gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), setfilter);
+
  again:
         ret = gtk_dialog_run(GTK_DIALOG(dialog));
 
         if (ret == GTK_RESPONSE_ACCEPT) {
                 filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-                if (filename && warn && (stat(filename, &st) >= 0)) {
-                        ret = trace_dialog(GTK_WINDOW(dialog), TRACE_GUI_ASK,
-                                           "The file '%s' already exists.\n"
-                                           "Are you sure you want to replace it",
-                                           filename);
-                        if (ret == GTK_RESPONSE_NO) {
-                                g_free(filename);
-                                filename = NULL;
-                                goto again;
+                if (filename && warn) {
+                        if (ext) {
+                                int len = strlen(filename);
+                                gchar *tmp;
+
+                                /* Add extension if not already there */
+                                if (strcmp(filename + (len - 4), ext) != 0) {
+                                        tmp = filename;
+                                        filename = g_strdup_printf("%s%s",
+                                                                   tmp, ext);
+                                        g_free(tmp);
+                                }
+                        }
+                        if (stat(filename, &st) >= 0) {
+                                ret = trace_dialog(GTK_WINDOW(dialog), TRACE_GUI_ASK,
+                                                   "The file '%s' already exists.\n"
+                                                   "Are you sure you want to replace it",
+                                                   filename);
+                                if (ret == GTK_RESPONSE_NO) {
+                                        g_free(filename);
+                                        filename = NULL;
+                                        goto again;
+                                }
                         }
                 }
         }
@@ -351,6 +406,12 @@ gchar *trace_get_file_dialog(const gchar *title, const char *open,
         return filename;
 }
 
+gchar *trace_get_file_dialog(const gchar *title, const char *open,
+                             gboolean warn)
+{
+        return trace_get_file_dialog_filter(title, open, TRACE_DIALOG_FILTER_NONE, warn);
+}
+
 /**
  * trace_create_combo_box - helper function to create a label and combo box
  * @hbox: The hbox to add the label and combo box to
@@ -358,6 +419,9 @@ gchar *trace_get_file_dialog(const gchar *title, const char *open,
  * @combo_model_create: The function used to create the combo model
  * @data: data to pass to the combo_model_create.
  *
+ * If no @hbox is given, the @text is ignored, and only the combo box
+ * is created.
+ *
  * Returns the combo box in the hbox.
  */
 GtkWidget *
@@ -370,9 +434,11 @@ trace_create_combo_box(GtkWidget *hbox, const gchar *text,
         GtkWidget *label;
         GtkWidget *combo;
 
-        label = gtk_label_new(text);
-        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-        gtk_widget_show(label);
+        if (hbox) {
+                label = gtk_label_new(text);
+                gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+                gtk_widget_show(label);
+        }
 
         /* --- Set up the selection combo box --- */
 
@@ -381,7 +447,8 @@ trace_create_combo_box(GtkWidget *hbox, const gchar *text,
         renderer = gtk_cell_renderer_text_new();
 
         combo = gtk_combo_box_new_with_model(model);
-        gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
+        if (hbox)
+                gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
         gtk_widget_show(combo);
 
         /* Free model with combobox */