cheese r1102 - in trunk: . data src

[kaserf svn gnome org]

Author: kaserf
Date: Sun Oct 12 19:26:04 2008
New Revision: 1102
URL: http://svn.gnome.org/viewvc/cheese?rev=1102&view=rev

Log:
Some ui changes to solve bug #548546! When in fullscreen and effects chooser mode the fullscreen toolbar will remain visible! This has been considered the best way.


Modified:
   trunk/ChangeLog
   trunk/data/cheese.glade
   trunk/data/cheese.ui
   trunk/src/cheese-window.c

Modified: trunk/data/cheese.glade
==============================================================================
--- trunk/data/cheese.glade	(original)
+++ trunk/data/cheese.glade	Sun Oct 12 19:26:04 2008
@@ -69,15 +69,32 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkAspectFrame" id="effect_frame">
+                  <widget class="GtkVBox" id="vbox3">
                     <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                    <property name="ratio">1.3300000429153442</property>
-                    <property name="obey_child">False</property>
                     <child>
-                      <placeholder/>
+                      <widget class="GtkAspectFrame" id="effect_frame">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="ratio">1.3300000429153442</property>
+                        <property name="obey_child">False</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="effect_alignment">
+                        <property name="visible">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </widget>
                   <packing>
@@ -454,7 +471,6 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -491,6 +507,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
@@ -527,6 +544,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </widget>

Modified: trunk/data/cheese.ui
==============================================================================
--- trunk/data/cheese.ui	(original)
+++ trunk/data/cheese.ui	Sun Oct 12 19:26:04 2008
@@ -62,15 +62,32 @@
                   <placeholder/>
                 </child>
                 <child>
-                  <object class="GtkAspectFrame" id="effect_frame">
+                  <object class="GtkVBox" id="vbox3">
                     <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                    <property name="ratio">1.3300000429153442</property>
-                    <property name="obey_child">False</property>
                     <child>
-                      <placeholder/>
+                      <object class="GtkAspectFrame" id="effect_frame">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <property name="ratio">1.3300000429153442</property>
+                        <property name="obey_child">False</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="effect_alignment">
+                        <property name="visible">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
@@ -421,7 +438,6 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -457,6 +473,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
@@ -492,6 +509,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>

Modified: trunk/src/cheese-window.c
==============================================================================
--- trunk/src/cheese-window.c	(original)
+++ trunk/src/cheese-window.c	Sun Oct 12 19:26:04 2008
@@ -109,6 +109,7 @@
   GtkWidget *video_vbox;
 
   GtkWidget *effect_frame;
+  GtkWidget *effect_alignment;
   GtkWidget *effect_chooser;
   GtkWidget *throbber_frame;
   GtkWidget *throbber;
@@ -283,12 +284,8 @@
   GSource *source;
 
   cheese_window_fullscreen_clear_timeout (cheese_window);
-
-  /* make a difference between effects page and video preview */
-  if (gtk_notebook_get_current_page (GTK_NOTEBOOK (cheese_window->notebook)) == 0)
-    source = g_timeout_source_new (FULLSCREEN_TIMEOUT);
-  else
-    source = g_timeout_source_new (FULLSCREEN_EFFECTS_TIMEOUT);
+  
+  source = g_timeout_source_new (FULLSCREEN_TIMEOUT);
 
   g_source_set_callback (source, cheese_window_fullscreen_timeout_cb, cheese_window, NULL);
   g_source_attach (source, NULL);
@@ -321,8 +318,10 @@
     {
       cheese_window_fullscreen_show_bar (cheese_window);
     }
-
-    cheese_window_fullscreen_set_timeout (cheese_window);
+    
+    //don't set the timeout in effect-chooser mode
+    if (gtk_notebook_get_current_page (GTK_NOTEBOOK (cheese_window->notebook)) != 1)
+      cheese_window_fullscreen_set_timeout (cheese_window);
   }
   return FALSE;
 }
@@ -354,9 +353,13 @@
                       cheese_window);
 
     gtk_window_fullscreen (GTK_WINDOW (cheese_window->window));
-
+    
+    gtk_widget_set_size_request (cheese_window->effect_alignment, -1, FULLSCREEN_POPUP_HEIGHT);
     cheese_window_fullscreen_show_bar (cheese_window);
-    cheese_window_fullscreen_set_timeout (cheese_window);
+    
+    //don't set the timeout in effect-chooser mode
+    if (gtk_notebook_get_current_page (GTK_NOTEBOOK (cheese_window->notebook)) != 1)
+      cheese_window_fullscreen_set_timeout (cheese_window);
 
     cheese_window->isFullscreen = TRUE;
   }
@@ -365,13 +368,14 @@
     gtk_widget_show_all (cheese_window->window);
     gtk_widget_hide_all (cheese_window->fullscreen_popup);
     gtk_widget_modify_bg (cheese_window->window, GTK_STATE_NORMAL, NULL);
-
+    
     g_signal_handlers_disconnect_by_func (cheese_window->window,
                                           (gpointer) cheese_window_fullscreen_motion_notify_cb, cheese_window);
     g_signal_handlers_disconnect_by_func (cheese_window->screen,
                                           (gpointer) cheese_window_fullscreen_motion_notify_cb, cheese_window);
 
     gtk_window_unfullscreen (GTK_WINDOW (cheese_window->window));
+    gtk_widget_set_size_request (cheese_window->effect_alignment, -1, -1);
     cheese_window->isFullscreen = FALSE;
 
     cheese_window_fullscreen_clear_timeout (cheese_window);
@@ -1571,6 +1575,7 @@
   cheese_window->throbber_frame              = GTK_WIDGET (gtk_builder_get_object (builder, "throbber_frame"));
   cheese_window->countdown_frame             = GTK_WIDGET (gtk_builder_get_object (builder, "countdown_frame"));
   cheese_window->effect_frame                = GTK_WIDGET (gtk_builder_get_object (builder, "effect_frame"));
+  cheese_window->effect_alignment            = GTK_WIDGET (gtk_builder_get_object (builder, "effect_alignment"));
   cheese_window->message_area_frame          = GTK_WIDGET (gtk_builder_get_object (builder, "message_area_frame"));
   cheese_window->fullscreen_popup            = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_popup"));
   cheese_window->fullscreen_bar              = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_notebook_bar"));