propagate button in track properties popup

diff --git a/disobedience/client.c b/disobedience/client.c
index 8abc243ddd8b612df5b693e316ee8fa7c287fe77..506212bb3bcadad4465c417cdf1aae8be5dc9c3f 100644 (file)
--- a/disobedience/client.c
+++ b/disobedience/client.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

diff --git a/disobedience/control.c b/disobedience/control.c
index 1d051672000f1d766b9f6b192a6705fd73af1fd3..f4541f73be55e30f459d5cb2623db97ad83b62cf 100644 (file)
--- a/disobedience/control.c
+++ b/disobedience/control.c
@@ -28,7 +28,6 @@
 WT(adjustment);
 WT(hscale);
 WT(hbox);
-WT(tooltips);
 WT(button);
 WT(image);
 WT(label);
@@ -125,11 +124,9 @@ GtkWidget *control_widget(void) {
   GtkWidget *content;
   GdkPixbuf *pb;
   GtkWidget *v, *b;
-  GtkTooltips *tips = gtk_tooltips_new();
   int n;
 
   NW(hbox);
-  NW(tooltips);
   D(("control_widget"));
   for(n = 0; n < NICONS; ++n) {
     NW(button);

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index dc80d0cbcc1951cb4701f767b94ebc85f808b0ab..c95b3284e32aa8a6662f7d5b8f4ac306c40b6a47 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -75,6 +75,9 @@ int choosealpha;
 /** @brief True if a NOP is in flight */
 static int nop_in_flight;
 
+/** @brief Global tooltip group */
+GtkTooltips *tips;
+
 /* Window creation --------------------------------------------------------- */
 
 /* Note that all the client operations kicked off from here will only complete
@@ -389,6 +392,8 @@ int main(int argc, char **argv) {
    * unresponsiveness.  It's not very useful in production use. */
   if(0)
     g_timeout_add(1000/*milliseconds*/, heartbeat, 0);
+  /* global tooltips */
+  tips = gtk_tooltips_new();
   make_toplevel_window();
   /* reset styles now everything has its name */
   gtk_rc_reset_styles(gtk_settings_get_for_screen(gdk_screen_get_default()));

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 9443864d56caf14bd7ebe20597aa575262086431..c3acca7e51059577fab8b44bf10f99f68ff6e3c5 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -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
@@ -88,6 +88,7 @@ extern int playing;                     /* true if playing some track */
 extern int volume_l, volume_r;          /* current volume */
 extern double goesupto;                 /* volume upper bound */
 extern int choosealpha;                 /* break up choose by letter */
+extern GtkTooltips *tips;
 
 extern const disorder_eclient_log_callbacks log_callbacks;
 

diff --git a/disobedience/log.c b/disobedience/log.c
index 11bad246f396051dd8a5891d9ecaae70ed6cb123..83db82e1396256416bc6c6fbea46577ef28213e9 100644 (file)
--- a/disobedience/log.c
+++ b/disobedience/log.c
@@ -148,6 +148,7 @@ static void log_recent_removed(void attribute((unused)) *v,
 static void log_removed(void attribute((unused)) *v,
                         const char attribute((unused)) *id,
                         const char attribute((unused)) *user) {
+
   queue_update();
 }
 

diff --git a/disobedience/properties.c b/disobedience/properties.c
index 8ff284fe1a58226814e5ba5ef68f0b8e08c30f86..ddcaa4d0133c4dec4be206dc059f74fe3858c6ad 100644 (file)
--- a/disobedience/properties.c
+++ b/disobedience/properties.c
@@ -27,17 +27,20 @@ struct prefdata;
 static void kickoff_namepart(struct prefdata *f);
 static void completed_namepart(struct prefdata *f);
 static const char *get_edited_namepart(struct prefdata *f);
+static void set_edited_namepart(struct prefdata *f, const char *value);
 static void set_namepart(struct prefdata *f, const char *value);
 static void set_namepart_completed(void *v);
 
 static void kickoff_string(struct prefdata *f);
 static void completed_string(struct prefdata *f);
 static const char *get_edited_string(struct prefdata *f);
+static void set_edited_string(struct prefdata *f, const char *value);
 static void set_string(struct prefdata *f, const char *value);
 
 static void kickoff_boolean(struct prefdata *f);
 static void completed_boolean(struct prefdata *f);
 static const char *get_edited_boolean(struct prefdata *f);
+static void set_edited_boolean(struct prefdata *f, const char *value);
 static void set_boolean(struct prefdata *f, const char *value);
 
 static void prefdata_completed(void *v, const char *value);
@@ -73,6 +76,9 @@ struct preftype {
   const char *(*get_edited)(struct prefdata *f);
   /* Get the edited value from the widget. */
 
+  /** @brief Update the edited value */
+  void (*set_edited)(struct prefdata *f, const char *value);
+
   void (*set)(struct prefdata *f, const char *value);
   /* Set the new value and (if necessary) arrange for our display to update. */
 };
@@ -82,6 +88,7 @@ static const struct preftype preftype_namepart = {
   kickoff_namepart,
   completed_namepart,
   get_edited_namepart,
+  set_edited_namepart,
   set_namepart
 };
 
@@ -90,6 +97,7 @@ static const struct preftype preftype_string = {
   kickoff_string,
   completed_string,
   get_edited_string,
+  set_edited_string,
   set_string
 };
 
@@ -98,6 +106,7 @@ static const struct preftype preftype_boolean = {
   kickoff_boolean,
   completed_boolean,
   get_edited_boolean,
+  set_edited_boolean,
   set_boolean
 };
 
@@ -136,10 +145,24 @@ static GtkWidget *properties_window;
 static GtkWidget *properties_table;
 static GtkWidget *progress_window, *progress_bar;
 
+static void propagate_clicked(GtkButton attribute((unused)) *button,
+                              gpointer userdata) {
+  struct prefdata *f = (struct prefdata *)userdata, *g;
+  int p;
+  const char *value = f->p->type->get_edited(f);
+  
+  for(p = 0; p < prefs_total; ++p) {
+    g = &prefdatas[p];
+    if(f->p == g->p && f != g)
+      g->p->type->set_edited(g, value);
+  }
+}
+
 void properties(int ntracks, char **tracks) {
   int n, m;
   struct prefdata *f;
-  GtkWidget *hbox, *vbox, *button, *label, *entry;
+  GtkWidget *hbox, *vbox, *button, *label, *entry, *propagate, *content;
+  GdkPixbuf *pb;
 
   /* If there is a properties window open then just bring it to the
    * front.  It might not have the right values in... */
@@ -158,7 +181,8 @@ void properties(int ntracks, char **tracks) {
   g_signal_connect(properties_window, "destroy",
                   G_CALLBACK(gtk_widget_destroyed), &properties_window);
   /* Most of the action is the table of preferences */
-  properties_table = gtk_table_new((NPREFS + 1) * ntracks, 2, FALSE);
+  properties_table = gtk_table_new((NPREFS + 1) * ntracks, 2 + ntracks > 1,
+                                   FALSE);
   g_signal_connect(properties_table, "destroy",
                   G_CALLBACK(gtk_widget_destroyed), &properties_table);
   gtk_window_set_title(GTK_WINDOW(properties_window), "Track Properties");
@@ -167,6 +191,8 @@ void properties(int ntracks, char **tracks) {
   prefs_total = NPREFS * ntracks;
   prefdatas = xcalloc(prefs_total, sizeof *prefdatas);
   for(n = 0; n < ntracks; ++n) {
+    /* The track itself */
+    /* Caption */
     label = gtk_label_new("Track");
     gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
     gtk_table_attach(GTK_TABLE(properties_table),
@@ -175,6 +201,7 @@ void properties(int ntracks, char **tracks) {
                     (NPREFS + 1) * n, (NPREFS + 1) * n + 1,
                     GTK_FILL, 0,
                     1, 1);
+    /* The track name */
     entry = gtk_entry_new();
     gtk_entry_set_text(GTK_ENTRY(entry), tracks[n]);
     gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
@@ -184,7 +211,9 @@ void properties(int ntracks, char **tracks) {
                     (NPREFS + 1) * n, (NPREFS + 1) * n + 1,
                     GTK_EXPAND|GTK_FILL, 0,
                     1, 1);
+    /* Each preference */
     for(m = 0; m < NPREFS; ++m) {
+      /* Caption */
       label = gtk_label_new(prefs[m].label);
       gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
       gtk_table_attach(GTK_TABLE(properties_table),
@@ -193,11 +222,30 @@ void properties(int ntracks, char **tracks) {
                       (NPREFS + 1) * n + 1 + m, (NPREFS + 1) * n + 2 + m,
                       GTK_FILL/*xoptions*/, 0/*yoptions*/,
                       1, 1);
+      /* Editing the preference is specific */
       f = &prefdatas[NPREFS * n + m];
       f->track = tracks[n];
       f->row = (NPREFS + 1) * n + 1 + m;
       f->p = &prefs[m];
       prefs[m].type->kickoff(f);
+      if(ntracks > 1) {
+        /* Propagation button */
+        propagate = gtk_button_new();
+        if((pb = find_image("propagate.png")))
+          content = gtk_image_new_from_pixbuf(pb);
+        else
+          content = gtk_label_new("propagate.png");
+        gtk_container_add(GTK_CONTAINER(propagate), content);
+        gtk_tooltips_set_tip(tips, propagate, "Copy to other tracks", "");
+        g_signal_connect(G_OBJECT(propagate), "clicked",
+                         G_CALLBACK(propagate_clicked), f);
+        gtk_table_attach(GTK_TABLE(properties_table),
+                         propagate,
+                         2/*left*/, 3/*right*/,
+                         (NPREFS + 1) * n + 1 + m, (NPREFS + 1) * n + 2 + m,
+                         GTK_FILL/*xoptions*/, 0/*yoptions*/,
+                         1/*xpadding*/, 1/*ypadding*/);
+      }
     }
   }
   prefs_unfilled = prefs_total;
@@ -260,13 +308,16 @@ static void completed_namepart(struct prefdata *f) {
     f->value = "";
   }
   f->widget = gtk_entry_new();
-  gtk_entry_set_text(GTK_ENTRY(f->widget), f->value);
 }
 
 static const char *get_edited_namepart(struct prefdata *f) {
   return gtk_entry_get_text(GTK_ENTRY(f->widget));
 }
 
+static void set_edited_namepart(struct prefdata *f, const char *value) {
+  gtk_entry_set_text(GTK_ENTRY(f->widget), value);
+}
+
 static void set_namepart(struct prefdata *f, const char *value) {
   char *s;
   struct callbackdata *cbd = xmalloc(sizeof *cbd);
@@ -301,13 +352,16 @@ static void completed_string(struct prefdata *f) {
     /* No setting, use the default value instead */
     f->value = f->p->default_value;
   f->widget = gtk_entry_new();
-  gtk_entry_set_text(GTK_ENTRY(f->widget), f->value);
 }
 
 static const char *get_edited_string(struct prefdata *f) {
   return gtk_entry_get_text(GTK_ENTRY(f->widget));
 }
 
+static void set_edited_string(struct prefdata *f, const char *value) {
+  gtk_entry_set_text(GTK_ENTRY(f->widget), value);
+}
+
 static void set_string(struct prefdata *f, const char *value) {
   if(strcmp(f->p->default_value, value))
     /* Different from default, set it */
@@ -331,8 +385,6 @@ static void completed_boolean(struct prefdata *f) {
   if(!f->value)
     /* Not set, use the default */
     f->value = f->p->default_value;
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(f->widget),
-                               strcmp(f->value, "0"));
 }
 
 static const char *get_edited_boolean(struct prefdata *f) {
@@ -340,6 +392,11 @@ static const char *get_edited_boolean(struct prefdata *f) {
           ? "1" : "0");
 }
 
+static void set_edited_boolean(struct prefdata *f, const char *value) {
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(f->widget),
+                               strcmp(value, "0"));
+}
+
 static void set_boolean(struct prefdata *f, const char *value) {
   char *s;
 
@@ -382,6 +439,7 @@ static void prefdata_completed_common(struct prefdata *f,
                                       const char *value) {
   f->value = value;
   f->p->type->completed(f);
+  f->p->type->set_edited(f, f->value);
   assert(f->value != 0);                /* Had better set a default */
   gtk_table_attach(GTK_TABLE(properties_table), f->widget,
                    1, 2,

diff --git a/disobedience/queue.c b/disobedience/queue.c
index 33f7e482c5b652b0363481c47b2f59c0e4465160..d18baf497d9a45e6ff2c809f25aa5b7ffbf29004 100644 (file)
--- a/disobedience/queue.c
+++ b/disobedience/queue.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

diff --git a/images/Makefile.am b/images/Makefile.am
index 8dc96076727584e457df30f8d2754dd0f65e319b..90f3a22a46bdac8b31f75951c8e927198ed3894b 100644 (file)
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -20,7 +20,8 @@
 
 static_DATA=cross.png down.png downdown.png edit.png nocross.png       \
 nodown.png nodowndown.png noup.png noupup.png tick.png up.png upup.png  \
-notes.png play.png pause.png random.png randomcross.png notescross.png
+notes.png play.png pause.png random.png randomcross.png notescross.png  \
+propagate.png
 
 staticdir=${pkgdatadir}/static
 

diff --git a/images/propagate.png b/images/propagate.png
new file mode 100644 (file)
index 0000000..4b2c133
Binary files /dev/null and b/images/propagate.png differ