Add Next/Back buttons to slides.

diff --git a/examples/simple/15-second.html b/examples/simple/15-second.html
new file mode 100644 (file)
index 0000000..5c764f9
--- /dev/null
+++ b/examples/simple/15-second.html
@@ -0,0 +1 @@
+This is the second slide.

diff --git a/examples/simple/20-shell.sh b/examples/simple/20-shell.sh
index 4b6f763..675ed36 100755 (executable)
--- a/examples/simple/20-shell.sh
+++ b/examples/simple/20-shell.sh
@@ -1,9 +1,6 @@
 #!/bin/bash -
 
 source functions
-
-cat > $HISTFILE <<EOF
-echo "This is a Tech Talk PSE example"
-EOF
-
+add_history guestfish -a vm1.img
+add_history guestfish -a vm2.img -m /dev/sda1
 terminal

diff --git a/examples/simple/functions b/examples/simple/functions
index 9c2ed48..2ea2994 100644 (file)
--- a/examples/simple/functions
+++ b/examples/simple/functions
@@ -3,6 +3,13 @@
 export PS1="$ "
 export HISTFILE=/tmp/history
 
+rm -f $HISTFILE
+
+add_history ()
+{
+    echo "$@" >> $HISTFILE
+}
+
 terminal ()
 {
     gnome-terminal \

diff --git a/techtalk-pse.pl b/techtalk-pse.pl
index 5ea122c..8a3abb6 100755 (executable)
--- a/techtalk-pse.pl
+++ b/techtalk-pse.pl
@@ -168,21 +168,43 @@ die "techtalk-pse: cannot use --start and --last options together\n"
 # --mozembed runs Gtk2::MozEmbed as a subprocess, because MozEmbed
 # is very crashy.
 if ($mozembed) {
+    my $r = 0;
+
     my $w = Gtk2::Window->new ();
+    my $vbox = Gtk2::VBox->new ();
     my $moz = Gtk2::MozEmbed->new ();
+    my $bbox = Gtk2::HButtonBox->new ();
+
+    $vbox->pack_start ($bbox, 0, 0, 0);
+    $vbox->add ($moz);
+    $w->fullscreen ();
+    #$w->set_default_size (640, 480);
+    $w->add ($vbox);
+
+    $bbox->set_layout ('start');
+    my $bnext = Gtk2::Button->new ("Next slide");
+    $bnext->signal_connect (clicked => sub { $r = 0; Gtk2->main_quit });
+    $bbox->add ($bnext);
+
+    my $bback = Gtk2::Button->new ("Back");
+    $bback->signal_connect (clicked => sub { $r = 1; Gtk2->main_quit });
+    $bbox->add ($bback);
+
+    my $bquit = Gtk2::Button->new ("Quit");
+    $bquit->signal_connect (clicked => sub { $r = 2; Gtk2->main_quit });
+    $bbox->add ($bquit);
+    $bbox->set_child_secondary ($bquit, 1);
 
     $w->signal_connect (delete_event => sub {
         Gtk2->main_quit;
         return FALSE;
-                        });
-
-    $w->set_default_size (600, 400);
-    $w->add ($moz);
+    });
     $w->show_all ();
+
     $moz->load_url ($ARGV[0]);
     Gtk2->main;
 
-    exit 0;
+    exit $r;
 }
 
 die "techtalk-pse: too many arguments\n" if @ARGV >= 2;
@@ -267,12 +289,13 @@ if ($splash) {
     Gtk2->main;
 }
 
-my $quit;
-while (!$quit) {
+MAIN: while (1) {
     if (defined $current) {
         my $go = show_slide ($current);
-        if (defined $go && ($go eq "PREV" || $go eq "NEXT")) {
+        if (defined $go) {
             print STDERR "go = $go\n" if $verbose;
+            last MAIN if $go eq "QUIT";
+
             my $i = 0;
           FOUND: {
               foreach (@files) {