Changeset 521

Timestamp:

11/11/07 19:17:56 (1 year ago)

Author:

kickback

Message:

sweep: switch to gtk_file_chooser_dialog for open/save. revert to previous escaping for @PACKAGE_DATA_DIR@ in src/Makefile.am

Files:

• sweep/trunk/src/Makefile.am (modified) (1 diff)
• sweep/trunk/src/file_dialogs.c (modified) (6 diffs)
• sweep/trunk/src/view.c (modified) (3 diffs)

sweep/trunk/src/Makefile.am

@@ -80 +80 @@
-sweep_LDFLAGS = @EXPORT_DYNAMIC_FLAGS@
-
-@PACKAGE_DATA_DIR@
+'@PACKAGE_DATA_DIR@'

sweep/trunk/src/file_dialogs.c

@@ -273 +273 @@
-}
-
-static void
-sample_load_destroy_cb (GtkWidget * widget, gpointer data)
-{
-  sample_bank_remove (NULL);
-}
-
-static void
-sample_load_ok_cb(GtkWidget * widget, gpointer data)
-{
-  gchar **dir;
-  gint i;
-
-  dir = (gchar **)gtk_file_selection_get_selections(GTK_FILE_SELECTION(data));
-  for( i = 0; dir[i]; i++)
-    {
-      sample_load(dir[i]);
-    }
-
-  gtk_widget_destroy(GTK_WIDGET(data));
-}
-
-static void
-sample_load_cancel_cb(GtkWidget * widget, gpointer data)
-{
-  gtk_widget_destroy(GTK_WIDGET(data));
-}
-
-void
-sample_load_cb(GtkWidget * widget, gpointer data)
-{
-
-
+
+
+
-  gint win_width, win_height;
- 
@@ -310 +284 @@
-  win_height = gdk_screen_height () / 2;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  load_current_file = prefs_get_string (LAST_LOAD_KEY);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -558 +537 @@
-
-static void
-sample_save_as_ok_cb(GtkWidget * widget, gpointer data)
-{
-  sw_view * view = (sw_view *)data;
-  sw_sample * sample;
-  GtkWidget * filesel;
-  gchar * pathname;
-  struct stat statbuf;
-
-  save_as_data * sd;
-
-#undef BUF_LEN
-#define BUF_LEN 512
-  char buf[BUF_LEN];
-    
-  sample = view->sample;
-  filesel = gtk_widget_get_toplevel (widget);
-
-  pathname =
-    g_strdup (gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel)));
-
-  if (!sweep_dir_exists (pathname)) {
-    g_free (pathname);
-    return;
-  }
-
-  sd = g_malloc (sizeof (save_as_data));
-  sd->sample = sample;
-  sd->pathname = pathname;
-
-  if (stat (pathname, &statbuf) == -1) {
-    switch (errno) {
-    case ENOENT:
-      /* If it doesn't exist, it's ok to save as */
-      overwrite_ok_cb (NULL, sd);
-      break;
-    default:
-      sweep_perror (errno, pathname);
-      break;
-    }
-  } else {
-    /* file exists */
-    if (access(pathname, W_OK) == -1) {
-      sweep_perror (errno, _("You are not allowed to write to\n%s"), pathname);
-      g_free (sd);
-    } else {
-      snprintf (buf, BUF_LEN, _("%s exists. Overwrite?"), pathname);
-      question_dialog_new (sample, _("File exists"), buf,
-                           _("Overwrite"), _("Don't overwrite"),
-                           G_CALLBACK (overwrite_ok_cb), sd, G_CALLBACK (overwrite_cancel_cb), sd,
-                           SWEEP_EDIT_MODE_META);
-    }
-  }
-
-  gtk_widget_destroy(GTK_WIDGET(filesel));
-}
-
-static void
-sample_save_as_cancel_cb(GtkWidget * widget, gpointer data)
-{
-  gtk_widget_destroy(GTK_WIDGET(data));
-}
-
-static void
-file_set_format_cb (GtkWidget * widget, gpointer data)
-{
@@ -748 +664 @@
-sample_save_as_cb(GtkWidget * widget, gpointer data)
-{
+  GtkWidget *dialog;
+  gint win_width, win_height;
-  sw_view * view = (sw_view *)data;
-  sw_sample * sample;
-  GtkWidget * filesel;
-  GtkWidget * save_options;
-  GtkWidget * frame;
@@ -757 +674 @@
-  GtkWidget * option_menu;
-  GtkWidget * save_menu;
+  struct stat statbuf;
+  gchar *filename;
+  gint retval;
+
+  save_as_data * sd;
+
+#undef BUF_LEN
+#define BUF_LEN 512
+  char buf[BUF_LEN];
-
-  char * last_save;
-
-  gint win_width, win_height;
-
-  win_width = gdk_screen_width () / 2;
-  win_height = gdk_screen_height () / 2;
-
+
-  sample = view->sample;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  save_options = gtk_hbox_new (TRUE, 1);
-
@@ -820 +728 @@
-
-  /* pack the containing save_options hbox into the save-dialog */
-end (GTK_BOX (GTK_FILE_SELECTION (filesel)->main_
+start (GTK_BOX (GTK_DIALOG (dialog)->
-                    save_options, FALSE, FALSE, 0);
-
-  gtk_widget_show (save_options);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

sweep/trunk/src/view.c

@@ -458 +458 @@
-  create_view_menu_item (submenu, _("Open ..."), "<Sweep-View>/File/Open ...", view,
-                                                  sample_load_cb, FALSE,
-
+->window
-    
-#if GTK_CHECK_VERSION (2, 10, 0)
@@ -477 +477 @@
-    gtk_recent_chooser_set_limit (GTK_RECENT_CHOOSER(recent_menu), 20);
-    gtk_recent_chooser_set_show_tips (GTK_RECENT_CHOOSER(recent_menu), TRUE);
+    gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER(recent_menu), 
+                                      GTK_RECENT_SORT_MRU);
-     
-    filter = gtk_recent_filter_new();                
@@ -1773 +1775 @@
-  button = create_pixmap_button (window, open_xpm, _("Open ..."),
-                                 NULL, VIEW_TOOLBAR_BUTTON,
-NULL
+window
-  gtk_button_set_relief (GTK_BUTTON(button), GTK_RELIEF_NONE);
-  gtk_box_pack_start (GTK_BOX (tool_hbox), button, FALSE, TRUE, 0);