[Gnash-commit] gnash ChangeLog gui/gnash.cpp gui/gtk.cpp gui/g...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/09/25 09:44:45

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp gtk.cpp gui.cpp gui.h 

Log message:
                * gui/gtk.cpp: clean up properties dialogue.
                * gui/gui.{h,cpp}: add menu_refresh_view() and refresh_view() 
to gui
                  with shortcut Ctrl-L. Now forces full redraw of next frame, 
but
                  should in future force immediate redraw.
                * gui/gnash.cpp: add Ctrl-L to gnash -h.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4400&r2=1.4401
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.63&r2=1.64

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4400
retrieving revision 1.4401
diff -u -b -r1.4400 -r1.4401
--- ChangeLog   25 Sep 2007 09:39:48 -0000      1.4400
+++ ChangeLog   25 Sep 2007 09:44:45 -0000      1.4401
@@ -1,3 +1,11 @@
+2007-09-25 Benjamin Wolsey <address@hidden>
+
+       * gui/gtk.cpp: clean up properties dialogue.
+       * gui/gui.{h,cpp}: add menu_refresh_view() and refresh_view() to gui
+         with shortcut Ctrl-L. Now forces full redraw of next frame, but
+         should in future force immediate redraw.
+       * gui/gnash.cpp: add Ctrl-L to gnash -h.
+
 2007-09-25 Chad Musick <address@hidden>
 
        * macros/boost.m4: Look for multi_index directory in boost include

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- gui/gnash.cpp       4 Sep 2007 00:07:44 -0000       1.90
+++ gui/gnash.cpp       25 Sep 2007 09:44:45 -0000      1.91
@@ -137,11 +137,13 @@
 #endif // def GNASH_FPS_DEBUG
         "\n"
         "keys:\n"
+       "\n"
         "  CTRL-Q, CTRL-W, ESC   Quit/Exit\n"
         "  CTRL-P          Toggle Pause\n"
         "  CTRL-R          Restart the movie\n"
         "  CTRL-[ or kp-   Step back one frame\n"
         "  CTRL-] or kp+   Step forward one frame\n"
+       "  CTRL-L          Force full redraw of next frame\n"
         "  CTRL-B          Toggle background color\n"
 /*
         "  CTRL-A          Toggle antialiasing (doesn't work)\n"

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- gui/gtk.cpp 24 Sep 2007 13:43:08 -0000      1.112
+++ gui/gtk.cpp 25 Sep 2007 09:44:45 -0000      1.113
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.112 2007/09/24 13:43:08 bwy Exp $ */
+/* $Id: gtk.cpp,v 1.113 2007/09/25 09:44:45 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1072,7 +1072,7 @@
             renderer = gtk_cell_renderer_text_new ();
             g_object_set (renderer, "xalign", 0.0, NULL);
             col_offset = gtk_tree_view_insert_column_with_attributes 
(GTK_TREE_VIEW(treeview),
-                                                              -1, "Node",
+                                                              -1, "Depth",
                                                               renderer, "text",
                                                               NODENAME_COLUMN,
                                                               NULL);
@@ -1100,17 +1100,6 @@
                                                               NULL);
             column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 
col_offset - 1);
 
-            //Third column:
-
-            renderer = gtk_cell_renderer_text_new ();
-            g_object_set (renderer, "xalign", 0.0, NULL);
-            col_offset = gtk_tree_view_insert_column_with_attributes 
(GTK_TREE_VIEW(treeview),
-                                                              -1, "Comment",
-                                                              renderer, "text",
-                                                              COMMENT_COLUMN,
-                                                              NULL);
-            column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 
col_offset - 1);
-
             //Add tree to scrollwindow.
             gtk_container_add (GTK_CONTAINER (scrollwindow1), treeview);
 
@@ -1143,14 +1132,12 @@
        NODENAME_COLUMN = 0,
        STRING1_COLUMN,
        STRING2_COLUMN,
-       COMMENT_COLUMN,
        NUM_COLUMNS
      };
     
      GtkTreeStore *model = gtk_tree_store_new (NUM_COLUMNS,
                           G_TYPE_STRING,
                           G_TYPE_STRING,
-                          G_TYPE_STRING,
                           G_TYPE_STRING);
     
      GtkTreeIter iter;
@@ -1174,7 +1161,7 @@
           }
 
           if (info.depth(i) < depth) {        // Align Gtk tree depth.
-               depth -= (depth - info.depth(i));
+               depth = info.depth(i);
                gtk_tree_model_iter_parent (GTK_TREE_MODEL(model), 
&parent_iter, &iter);  // Get parent iter.
                iter = parent_iter;
           }
@@ -1187,7 +1174,6 @@
                             NODENAME_COLUMN, buf,   //infotree
                             STRING1_COLUMN, p.first.c_str(),     //infotree
                            STRING2_COLUMN, p.second.c_str(),     //infotree
-                            COMMENT_COLUMN, "Comment",     //infotree
                            -1);
 
      }

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- gui/gui.cpp 24 Sep 2007 15:54:28 -0000      1.98
+++ gui/gui.cpp 25 Sep 2007 09:44:45 -0000      1.99
@@ -137,6 +137,12 @@
 }
 
 void
+Gui::menu_refresh_view()
+{
+       refresh_view();
+}
+
+void
 Gui::menu_restart()
 {
 //    GNASH_REPORT_FUNCTION;
@@ -339,6 +345,9 @@
                case gnash::key::p:
                        menu_pause();
                        break;
+               case gnash::key::l:
+                       menu_refresh_view();
+                       break;
                case gnash::key::q:
                case gnash::key::w:
                        menu_quit();

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- gui/gui.h   19 Sep 2007 06:36:28 -0000      1.63
+++ gui/gui.h   25 Sep 2007 09:44:45 -0000      1.64
@@ -201,6 +201,11 @@
     /// interval specified in the call to setInterval().
     static bool advance_movie(Gui* gui);
 
+    /// Force redraw of next frame manually
+    ///
+    /// TODO: force immediate redraw
+    void refresh_view() { _redraw_flag=true; }
+
     /// Put the application in "stop" mode
     //
     /// When in stop mode the application won't be advanced.
@@ -230,6 +235,7 @@
     void menu_quit();
     void menu_about();
     void menu_play();
+    void menu_refresh_view();
     void menu_pause();
     void menu_stop();
     void menu_step_forward();