[snappy/touch-based] ui: add quit button

[Luis de Bethencourt <luisbg src gnome org>]

commit eff67d576484ebae7de237e9e8c4f6086cec7a13
Author: Luis de Bethencourt <luis debethencourt com>
Date:   Thu Aug 16 13:27:41 2012 +0100

    ui: add quit button
    
    switch the subtitle toggle for a quit button, so in touch based devices snappy
    can be closed from the on-screen controls.

 data/Makefile.am         |    2 +-
 data/quit.png            |  Bin 0 -> 3810 bytes
 data/subtitle-toggle.png |  Bin 2035 -> 0 bytes
 src/user_interface.c     |   22 +++++++++++-----------
 src/user_interface.h     |    4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index ede2dd2..8831645 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,7 +5,7 @@ icons_DATA = \
     media-actions-pause.png \
     media-actions-segment-point.png \
     media-actions-start.png \
-    subtitle-toggle.png \
+    quit.png \
     video-stream-toggle.png \
     vid-panel.png
 iconsdir = $(datadir)/snappy
diff --git a/data/quit.png b/data/quit.png
new file mode 100644
index 0000000..35b1714
Binary files /dev/null and b/data/quit.png differ
diff --git a/src/user_interface.c b/src/user_interface.c
index d0e4455..c23612e 100644
--- a/src/user_interface.c
+++ b/src/user_interface.c
@@ -349,8 +349,8 @@ event_cb (ClutterStage * stage, ClutterEvent * event, UserInterface * ui)
         } else if (actor == ui->audio_stream_toggle) {
           cycle_streams (ui->engine, STREAM_AUDIO);
 
-        } else if (actor == ui->subtitle_toggle) {
-          toggle_subtitles (ui->engine);
+        } else if (actor == ui->quit_button) {
+          clutter_main_quit ();
 
         } else if (actor == ui->video_stream_toggle) {
           cycle_streams (ui->engine, STREAM_VIDEO);
@@ -407,8 +407,8 @@ load_controls (UserInterface * ui)
       "audio-volume-low.png", NULL);
   ui->volume_high_png = g_build_filename (ui->data_dir,
       "audio-volume-high.png", NULL);
-  ui->subtitle_toggle_png = g_build_filename (ui->data_dir,
-      "subtitle-toggle.png", NULL);
+  ui->quit_png = g_build_filename (ui->data_dir,
+      "quit.png", NULL);
   ui->video_stream_toggle_png = g_build_filename (ui->data_dir,
       "video-stream-toggle.png", NULL);
   ui->audio_stream_toggle_png = g_build_filename (ui->data_dir,
@@ -419,7 +419,7 @@ load_controls (UserInterface * ui)
   icon_files[2] = ui->pause_png;
   icon_files[3] = ui->volume_low_png;
   icon_files[4] = ui->volume_high_png;
-  icon_files[5] = ui->subtitle_toggle_png;
+  icon_files[5] = ui->quit_png;
   icon_files[6] = ui->video_stream_toggle_png;
   icon_files[7] = ui->audio_stream_toggle_png;
 
@@ -633,16 +633,16 @@ load_controls (UserInterface * ui)
   clutter_box_pack (CLUTTER_BOX (bottom_box), ui->audio_stream_toggle,
       "x-align", CLUTTER_BOX_ALIGNMENT_END, NULL);
 
-  // Controls subtitle toggle
-  ui->subtitle_toggle = clutter_texture_new_from_file (ui->subtitle_toggle_png,
+  // Controls quit button
+  ui->quit_button = clutter_texture_new_from_file (ui->quit_png,
       &error);
-  if (!ui->subtitle_toggle && error)
+  if (!ui->quit_button && error)
     g_debug ("Clutter error: %s", error->message);
   if (error) {
     g_error_free (error);
     error = NULL;
   }
-  clutter_box_pack (CLUTTER_BOX (bottom_box), ui->subtitle_toggle, "x-align",
+  clutter_box_pack (CLUTTER_BOX (bottom_box), ui->quit_button, "x-align",
       CLUTTER_BOX_ALIGNMENT_END, NULL);
 
   clutter_box_layout_pack (CLUTTER_BOX_LAYOUT (info_box_layout),
@@ -957,7 +957,7 @@ update_controls_size (UserInterface * ui)
   icon_size = ctl_height * VOLUME_ICON_RATIO;
   clutter_actor_set_size (ui->volume_low, icon_size, icon_size);
   clutter_actor_set_size (ui->volume_high, icon_size * 1.2f, icon_size);        /* originally 120x100 */
-  clutter_actor_set_size (ui->subtitle_toggle, icon_size, icon_size);
+  clutter_actor_set_size (ui->quit_button, icon_size, icon_size);
   clutter_actor_set_size (ui->video_stream_toggle, icon_size, icon_size);
   clutter_actor_set_size (ui->audio_stream_toggle, icon_size, icon_size);
 
@@ -990,7 +990,7 @@ interface_init (UserInterface * ui)
   ui->volume_low_png = NULL;
   ui->volume_high_png = NULL;
 
-  ui->subtitle_toggle_png = NULL;
+  ui->quit_png = NULL;
   ui->video_stream_toggle_png = NULL;
   ui->audio_stream_toggle_png = NULL;
 
diff --git a/src/user_interface.h b/src/user_interface.h
index 6264141..7866dde 100644
--- a/src/user_interface.h
+++ b/src/user_interface.h
@@ -89,7 +89,7 @@ struct _UserInterface
   gchar *play_png, *pause_png;
   gchar *segment_png;
   gchar *volume_low_png, *volume_high_png;
-  gchar *subtitle_toggle_png;
+  gchar *quit_png;
   gchar *video_stream_toggle_png, *audio_stream_toggle_png;
   gchar *data_dir;
   gchar *duration_str;
@@ -106,7 +106,7 @@ struct _UserInterface
   ClutterActor *control_pos;
   ClutterActor *volume_box;
   ClutterActor *volume_low, *volume_high;
-  ClutterActor *subtitle_toggle;
+  ClutterActor *quit_button;
   ClutterActor *video_stream_toggle, *audio_stream_toggle;
   ClutterActor *vol_int, *vol_int_bg, *volume_point;
   ClutterActor *info_box;