Update of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv17315/player/app/gtk

Modified Files:
      Tag: hxclient_3_1_0_atlas
	mainapp.cpp mainapp-private.h hxstatuspositionfield.cpp 
	libgladeemu.cpp contextmenu.cpp Umakefil 
Log Message:
Remove verbose GTK_IS_NOTEBOOK assertion.
This change removes the following most serious error output on the terminal when Superbuffer is activated during playback:

ERROR:
  Gtk-CRITICAL **: gtk_notebook_set_current_page: assertion `GTK_IS_NOTEBOOK (notebook)' failed

The errors came from the status bar being adapted to be the timeline label/position field.

This change creates the HXStatusDisplayPositionField alone, without creating the entire Top level window status bar with other HXStatusDisplay widgets embedded, including a notebook.

Files Modified:
player/netbook/chrome/netbook.glade
player/app/gtk/mainapp.cpp
player/app/gtk/mainapp-private.h
player/app/gtk/hxstatuspositionfield.cpp
player/app/gtk/libgladeemu.cpp
player/app/gtk/contextmenu.cpp
player/app/gtk/Umakefil

Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-October/003971.html



Index: contextmenu.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/contextmenu.cpp,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -d -r1.10.2.4 -r1.10.2.5
--- contextmenu.cpp	10 Oct 2008 06:33:35 -0000	1.10.2.4
+++ contextmenu.cpp	18 Oct 2008 05:34:16 -0000	1.10.2.5
@@ -51,9 +51,6 @@
 
 #include "contextmenu.h"
 
-// Include the mainapp private struct to have access to controls_hbox, menu_bar, and status_hbox.
-#include "mainapp-private.h"
-
 /* right-click context menu */
 typedef struct _HXContextMenu
 {
@@ -201,16 +198,6 @@
     }
 }
 
-static void
-hcm_show_status_bar(HXContextMenu* menu)
-{
-    if(menu->main_window)
-    {
-        gboolean active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu->show_status_bar_menu_item));
-        hxwindow_show_status_bar (menu->main_window, active);
-    }
-}
-
 static HXContextMenu*
 hx_context_menu_new_common(HXBasicPlayback* player)
 {
@@ -334,7 +321,6 @@
 hx_context_menu_popup(HXContextMenu* menu, GdkEventButton* event_button)
 {
     HXContentStateType state;
-    HXMainWindow* window = menu->main_window;
 
     /* Disable play/pause/stop as appropriate */
     state = hx_player_get_content_state(HX_PLAYER(menu->player));
@@ -406,34 +392,12 @@
             gtk_widget_hide(menu->show_separator);
             gtk_widget_hide(menu->show_menu_and_caption_menu_item);
             gtk_widget_hide(menu->show_controls_menu_item);
-            gtk_widget_hide(menu->show_status_bar_menu_item);
         }
         else
         {
             gtk_widget_show(menu->show_separator);
             gtk_widget_show(menu->show_menu_and_caption_menu_item);
             gtk_widget_show(menu->show_controls_menu_item);
-            gtk_widget_show(menu->show_status_bar_menu_item);
-
-            /* Enable/disable as appropriate */
-
-            if(window->controls_hbox)
-            {
-                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu->show_controls_menu_item),
-                                               GTK_WIDGET_VISIBLE(window->controls_hbox));
-            }
-
-            if(window->menu_bar)
-            {
-                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu->show_menu_and_caption_menu_item),
-                                               GTK_WIDGET_VISIBLE(window->menu_bar));
-            }
-
-            if(window->status_hbox)
-            {
-                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu->show_status_bar_menu_item),
-                                               GTK_WIDGET_VISIBLE(window->status_hbox));
-            }
         }
     }
                 

Index: mainapp-private.h
===================================================================
RCS file: /cvsroot/player/app/gtk/mainapp-private.h,v
retrieving revision 1.6.2.11
retrieving revision 1.6.2.12
diff -u -d -r1.6.2.11 -r1.6.2.12
--- mainapp-private.h	26 Sep 2008 17:46:15 -0000	1.6.2.11
+++ mainapp-private.h	18 Oct 2008 05:34:16 -0000	1.6.2.12
@@ -239,8 +239,7 @@
     GtkWidget* mute_button;
     GtkWidget* volume_image;
     GtkWidget* controls_hbox;
-    GtkWidget* status_hbox;
-    GtkWidget* status_bar;
+    GtkWidget* position_field;
 
     GtkWidget* navigation_notebook;         // Contains Now Playing, Media Lib., Playlist.
     GtkWidget* media_lib_category_notebook; // Contains Music, Videos, Photos.

Index: libgladeemu.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/libgladeemu.cpp,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -d -r1.15.2.2 -r1.15.2.3
--- libgladeemu.cpp	4 Sep 2008 21:17:54 -0000	1.15.2.2
+++ libgladeemu.cpp	18 Oct 2008 05:34:16 -0000	1.15.2.3
@@ -167,11 +167,7 @@
 
 GladeemuXML *gladeemu_xml_new(const gchar *name, void*, void*)
 {
-    if(strstr(name, "main.glade"))
-    {
-        return create_hxplayer_main_window();
-    } 
-    else if(strstr(name, "clipdetails.glade"))
+    if(strstr(name, "clipdetails.glade"))
     {
         return create_hxplayer_clip_details_dialog();
     }

Index: hxstatuspositionfield.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/hxstatuspositionfield.cpp,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- hxstatuspositionfield.cpp	12 Sep 2008 17:23:21 -0000	1.22.2.1
+++ hxstatuspositionfield.cpp	18 Oct 2008 05:34:16 -0000	1.22.2.2
@@ -120,7 +120,6 @@
     HXStatusDisplayPositionField* status = (HXStatusDisplayPositionField*)g_object_new(HX_TYPE_STATUS_DISPLAY_POSITION_FIELD, NULL);
 
     status->position_label = gtk_label_new("0:00 / 0:00");
-//    gtk_misc_set_alignment(GTK_MISC(status->position_label), 1.0, 0.5);
     gtk_widget_show(status->position_label);
     g_signal_connect(status->position_label,
                      "size_request",

Index: Umakefil
===================================================================
RCS file: /cvsroot/player/app/gtk/Umakefil,v
retrieving revision 1.103.2.9
retrieving revision 1.103.2.10
diff -u -d -r1.103.2.9 -r1.103.2.10
--- Umakefil	1 Oct 2008 11:51:40 -0000	1.103.2.9
+++ Umakefil	18 Oct 2008 05:34:16 -0000	1.103.2.10
@@ -114,7 +114,6 @@
 else:
     project.AddSources("support.c",
                        "clipdetails_interface.c",
-                       "main_interface.c",
                        "preferences_interface.c",
                        "uri_interface.c",
                        "about_interface.c",

Index: mainapp.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/mainapp.cpp,v
retrieving revision 1.141.2.29
retrieving revision 1.141.2.30
diff -u -d -r1.141.2.29 -r1.141.2.30
--- mainapp.cpp	17 Oct 2008 20:23:11 -0000	1.141.2.29
+++ mainapp.cpp	18 Oct 2008 05:34:16 -0000	1.141.2.30
@@ -274,11 +274,13 @@
 gboolean hmw_seek_start         (GtkWidget* widget);
 gboolean hmw_seek_stop          (GtkWidget* widget);
 
-GtkWidget* hmw_create_status_area(gchar *widget_name,
-                                  gchar *string1,
-                                  gchar *string2,
-                                  gint int1,
-                                  gint int2);
+GtkWidget* hmw_create_position_field(gchar *widget_name,
+                                     gchar *string1,
+                                     gchar *string2,
+                                     gint int1,
+                                     gint int2);
+
+
 
 GtkWidget* hmw_create_position_slider(gchar *widget_name,
                                       gchar *string1,
@@ -522,7 +524,7 @@
         window->active_player = playback;
     }
 
-    hxstatus_display_set_player(HX_STATUS_DISPLAY(window->status_bar),
+    hxstatus_display_set_player(HX_STATUS_DISPLAY(window->position_field),
                                 window->active_player);
     
     hxstatus_display_set_player(HX_STATUS_DISPLAY(window->seek_scale),
@@ -1540,16 +1542,17 @@
 }
 
 GtkWidget*
-hmw_create_status_area(gchar *, gchar *, gchar *, gint, gint)
+hmw_create_position_field(gchar *, gchar *, gchar *, gint, gint)
 {
-    GtkWidget* status_display;
-    status_display = hxstatus_display_top_new();
+    GtkWidget* position_field;
+    position_field = hxstatus_display_position_field_new();
 
-    gtk_widget_show(status_display);
+    gtk_widget_show(position_field);
     
-    return status_display;
+    return position_field;
 }
 
+
 GtkWidget*
 hmw_create_position_slider(gchar *, gchar *, gchar *, gint, gint)
 {
@@ -3193,44 +3196,6 @@
 }
 
 void
-hmw_show_status_bar(GtkWidget* widget)
-{
-    /* Show/hide controls */
-    gboolean show = TRUE;
-    
-    HXMainWindow* window = hxwindow_get_from_widget(widget);
-    
-    if(GTK_IS_CHECK_MENU_ITEM(widget))
-    {
-        show = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
-    }
-
-    hxwindow_show_status_bar(window, show);
-}
-
-void
-hxwindow_show_status_bar(HXMainWindow* window, gboolean show)
-{
-    g_return_if_fail(window->status_hbox);
-    gboolean current_show = GTK_WIDGET_VISIBLE(window->status_hbox)? TRUE: FALSE;
-    
-    if(show != current_show)
-    {
-        if(show)
-        {
-            gtk_widget_show(window->status_hbox);
-        }
-        else
-        {
-            gtk_widget_hide(window->status_hbox);
-        }
-
-        hxwindow_change_layout(window,
-                               FALSE); // resize_top_level
-    }
-}
-
-void
 hxwindow_on_top_never(HXMainWindow* window)
 {
     hxwindow_on_top(window, FALSE);
@@ -4727,11 +4692,8 @@
     window->controls_hbox = glade_xml_get_widget((GladeXML *)window->xml, "hmw_playback_control_hbox");
     g_return_val_if_fail(window->controls_hbox != NULL, FALSE);
 
-    //window->status_hbox = glade_xml_get_widget((GladeXML *)window->xml, "hmw_status_hbox");
-    //g_return_val_if_fail(window->status_hbox != NULL, FALSE);
-
-    window->status_bar = glade_xml_get_widget((GladeXML *)window->xml, "hmw_status_area");
-    g_return_val_if_fail(window->status_bar != NULL, FALSE);
+    window->position_field = glade_xml_get_widget((GladeXML *)window->xml, "hmw_position_field");
+    g_return_val_if_fail(window->position_field != NULL, FALSE);
 
     window->on_top_never_menu_item = glade_xml_get_widget((GladeXML *)window->xml, "hmw_menu_item_never_on_top");
     g_return_val_if_fail(window->on_top_never_menu_item != NULL, FALSE);