X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/16e145a5cf55ff3826656faedfba13460e4ab28b..3c46e7df09417e867dd7e632fe9bea13f1cc513d:/disobedience/properties.c

diff --git a/disobedience/properties.c b/disobedience/properties.c
index e02bb28..d306b56 100644
--- a/disobedience/properties.c
+++ b/disobedience/properties.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2006 Richard Kettlewell
+ * Copyright (C) 2006, 2007 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -127,11 +127,7 @@ static const struct pref {
 #define NPREFS (int)(sizeof prefs / sizeof *prefs)
 
 /* Buttons that appear at the bottom of the window */
-static const struct button {
-  const gchar *stock;
-  void (*clicked)(GtkButton *button, gpointer userdata);
-  const char *tip;
-} buttons[] = {
+static const struct button buttons[] = {
   {
     GTK_STOCK_OK,
     properties_ok,
@@ -156,7 +152,7 @@ static int prefs_total;                 /* Total prefs */
 static struct prefdata *prefdatas;      /* Current prefdatas */
 static GtkWidget *properties_window;
 static GtkWidget *properties_table;
-static GtkWidget *progress_window, *progress_bar;
+static struct progress_window *pw;
 
 static void propagate_clicked(GtkButton attribute((unused)) *button,
                               gpointer userdata) {
@@ -174,9 +170,12 @@ static void propagate_clicked(GtkButton attribute((unused)) *button,
 void properties(int ntracks, const char **tracks) {
   int n, m;
   struct prefdata *f;
-  GtkWidget *hbox, *vbox, *button, *label, *entry, *propagate, *content;
+  GtkWidget *buttonbox, *vbox, *label, *entry, *propagate, *content;
   GdkPixbuf *pb;
-
+  
+  /* If no tracks, do nothign */
+  if(!ntracks)
+    return;
   /* If there is a properties window open then just bring it to the
    * front.  It might not have the right values in... */
   if(properties_window) {
@@ -186,7 +185,7 @@ void properties(int ntracks, const char **tracks) {
   }
   assert(properties_table == 0);
   if(ntracks > INT_MAX / NPREFS) {
-    popup_error("Too many tracks selected");
+    popup_msg(GTK_MESSAGE_ERROR, "Too many tracks selected");
     return;
   }
   /* Create a new properties window */
@@ -263,42 +262,32 @@ void properties(int ntracks, const char **tracks) {
   }
   prefs_unfilled = prefs_total;
   /* Buttons */
-  hbox = gtk_hbox_new(FALSE, 1);
-  for(n = 0; n < NBUTTONS; ++n) {
-    button = gtk_button_new_from_stock(buttons[n].stock);
-    g_signal_connect(G_OBJECT(button), "clicked",
-                     G_CALLBACK(buttons[n].clicked), 0);
-    gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);
-    gtk_tooltips_set_tip(tips, button, buttons[n].tip, "");
-  }
+  buttonbox = create_buttons(buttons, NBUTTONS);
   /* Put it all together */
   vbox = gtk_vbox_new(FALSE, 1);
   gtk_box_pack_start(GTK_BOX(vbox), 
                      scroll_widget(properties_table,
                                    "properties"),
                      TRUE, TRUE, 1);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 1);
+  gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 1);
   gtk_container_add(GTK_CONTAINER(properties_window), vbox);
   /* The table only really wants to be vertically scrollable */
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(GTK_WIDGET(properties_table)->parent->parent),
                                  GTK_POLICY_NEVER,
                                  GTK_POLICY_AUTOMATIC);
+  /* Zot any pre-existing progress window just in case */
+  if(pw)
+    progress_window_progress(pw, 0, 0);
   /* Pop up a progress bar while we're waiting */
-  progress_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  g_signal_connect(progress_window, "destroy",
-		   G_CALLBACK(gtk_widget_destroyed), &progress_window);
-  gtk_window_set_default_size(GTK_WINDOW(progress_window), 360, -1);
-  gtk_window_set_title(GTK_WINDOW(progress_window),
-                       "Fetching Track Properties");
-  progress_bar = gtk_progress_bar_new();
-  gtk_container_add(GTK_CONTAINER(progress_window), progress_bar);
-  gtk_widget_show_all(progress_window);
+  pw = progress_window_new("Fetching Track Properties");
 }
 
 /* Everything is filled in now */
 static void prefdata_alldone(void) {
-  if(progress_window)
-    gtk_widget_destroy(progress_window);
+  if(pw) {
+    progress_window_progress(pw, 0, 0);
+    pw = 0;
+  }
   /* Default size may be too small */
   gtk_window_set_default_size(GTK_WINDOW(properties_window), 480, 512);
   /* TODO: relate default size to required size more closely */
@@ -461,9 +450,8 @@ static void prefdata_completed_common(struct prefdata *f,
                    GTK_EXPAND|GTK_FILL/*xoptions*/, 0/*yoptions*/,
                    1, 1);
   --prefs_unfilled;
-  if(prefs_total && progress_window)
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar),
-                                  1.0 - (double)prefs_unfilled / prefs_total);
+  if(prefs_total)
+    progress_window_progress(pw, prefs_total - prefs_unfilled, prefs_total);
   if(!prefs_unfilled)
     prefdata_alldone();
 }
@@ -500,6 +488,15 @@ static void properties_cancel(GtkButton attribute((unused)) *button,
   gtk_widget_destroy(properties_window);
 }
 
+/** @brief Called on client reset
+ *
+ * Destroys the current properties window.
+ */
+void properties_reset(void) {
+  if(properties_window)
+    gtk_widget_destroy(properties_window);
+}
+
 /*
 Local Variables:
 c-basic-offset:2