[cheese/noflicker: 1/4] window: remove aspectframe
- From: Filippo Argiolas <fargiolas src gnome org>
- To: svn-commits-list gnome org
- Subject: [cheese/noflicker: 1/4] window: remove aspectframe
- Date: Sun, 24 May 2009 11:45:24 -0400 (EDT)
commit 923174cc4714e195ca5587726b78006a8ad362cc
Author: Filippo Argiolas <filippo argiolas gmail com>
Date: Sun May 24 11:07:25 2009 +0200
window: remove aspectframe
GtkAspectFrame doesn't really suit our needs here, it hardcodes an
aspect ratio that obviously cannot be valid for every format webcams
support. Render the video directly to the drawing area with no external
aspect ratio restriction. Fixes bug #559188
---
data/cheese.glade | 112 ++++++++++++++++++++++++++++++++---------------------
data/cheese.ui | 100 +++++++++++++++++++++++++++++++---------------
2 files changed, 135 insertions(+), 77 deletions(-)
diff --git a/data/cheese.glade b/data/cheese.glade
index b97c4a0..36342c2 100644
--- a/data/cheese.glade
+++ b/data/cheese.glade
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.16 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="cheese_window">
<property name="title" translatable="yes">Cheese</property>
<property name="default_width">640</property>
@@ -36,22 +36,14 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkAspectFrame" id="video_frame">
+ <widget class="GtkDrawingArea" id="video_screen">
+ <property name="width_request">320</property>
+ <property name="height_request">240</property>
<property name="visible">True</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>
- <widget class="GtkDrawingArea" id="video_screen">
- <property name="width_request">320</property>
- <property name="height_request">240</property>
- <property name="visible">True</property>
- </widget>
- </child>
</widget>
<packing>
<property name="position">1</property>
@@ -76,13 +68,16 @@
<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="shadow_type">none</property>
<property name="ratio">1.3300000429153442</property>
<property name="obey_child">False</property>
<child>
<placeholder/>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkAlignment" id="effect_alignment">
@@ -112,7 +107,7 @@
<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="shadow_type">none</property>
<property name="ratio">1.3300000429153442</property>
<property name="obey_child">False</property>
<child>
@@ -130,6 +125,9 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkNotebook" id="notebook_bar">
@@ -158,7 +156,6 @@
<property name="can_focus">True</property>
<property name="receives_default">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="response_id">0</property>
<child>
<widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
@@ -172,9 +169,12 @@
<widget class="GtkImage" id="image4">
<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="icon_size">2</property>
<property name="icon_name">camera-photo</property>
+ <property name="icon-size">2</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label_photo">
@@ -197,6 +197,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -205,7 +206,6 @@
<property name="can_focus">True</property>
<property name="receives_default">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="response_id">0</property>
<child>
<widget class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
@@ -219,9 +219,12 @@
<widget class="GtkImage" id="image5">
<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="icon_size">2</property>
<property name="icon_name">camera-video</property>
+ <property name="icon-size">2</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label_video">
@@ -250,12 +253,15 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="take_picture">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<child>
<widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
@@ -273,6 +279,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -309,7 +316,6 @@
<property name="can_focus">True</property>
<property name="receives_default">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="response_id">0</property>
<child>
<widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
@@ -323,9 +329,12 @@
<widget class="GtkImage" id="image2">
<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="icon_size">3</property>
<property name="icon_name">browse-webcam-effects</property>
+ <property name="icon-size">3</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label_effects">
@@ -349,12 +358,13 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">24</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
<packing>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
@@ -406,7 +416,7 @@
</child>
</widget>
<packing>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -414,8 +424,8 @@
</child>
</widget>
<widget class="GtkWindow" id="fullscreen_popup">
- <property name="type">GTK_WINDOW_POPUP</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+ <property name="type">popup</property>
+ <property name="type_hint">utility</property>
<child>
<widget class="GtkNotebook" id="fullscreen_notebook_bar">
<property name="visible">True</property>
@@ -444,8 +454,7 @@
<property name="receives_default">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="tooltip" translatable="yes">Switch to the Effects Selector</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="response_id">0</property>
+ <property name="relief">none</property>
<child>
<widget class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
@@ -459,9 +468,12 @@
<widget class="GtkImage" id="image6">
<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="icon_size">3</property>
<property name="icon_name">browse-webcam-effects</property>
+ <property name="icon-size">3</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
</child>
@@ -471,6 +483,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -480,8 +493,7 @@
<property name="receives_default">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="tooltip" translatable="yes">Switch to Photo Mode</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="response_id">0</property>
+ <property name="relief">none</property>
<child>
<widget class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
@@ -495,9 +507,12 @@
<widget class="GtkImage" id="image1">
<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="icon_size">2</property>
<property name="icon_name">camera-photo</property>
+ <property name="icon-size">2</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
</child>
@@ -517,8 +532,7 @@
<property name="receives_default">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="tooltip" translatable="yes">Switch to Video Mode</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="response_id">0</property>
+ <property name="relief">none</property>
<child>
<widget class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
@@ -532,9 +546,12 @@
<widget class="GtkImage" id="image3">
<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="icon_size">2</property>
<property name="icon_name">camera-video</property>
+ <property name="icon-size">2</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
</child>
@@ -550,6 +567,9 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkVBox" id="vbox1">
@@ -563,8 +583,8 @@
<widget class="GtkButton" id="take_picture_fullscreen">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
<child>
<widget class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
@@ -582,6 +602,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -628,9 +649,8 @@
<property name="can_focus">True</property>
<property name="receives_default">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="relief">GTK_RELIEF_NONE</property>
+ <property name="relief">none</property>
<property name="xalign">1</property>
- <property name="response_id">0</property>
<child>
<widget class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
@@ -645,8 +665,11 @@
<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="stock">gtk-leave-fullscreen</property>
- <property name="icon_size">3</property>
+ <property name="icon-size">3</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label_exit_fullscreen">
@@ -669,7 +692,8 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
diff --git a/data/cheese.ui b/data/cheese.ui
index 53593d6..1e38dd3 100644
--- a/data/cheese.ui
+++ b/data/cheese.ui
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <!-- interface-requires gtk+ 2.16 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="cheese_window">
<property name="title" translatable="yes">Cheese</property>
<property name="default_width">640</property>
@@ -35,22 +36,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkAspectFrame" id="video_frame">
+ <object class="GtkDrawingArea" id="video_screen">
+ <property name="width_request">320</property>
+ <property name="height_request">240</property>
<property name="visible">True</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>
- <object class="GtkDrawingArea" id="video_screen">
- <property name="width_request">320</property>
- <property name="height_request">240</property>
- <property name="visible">True</property>
- </object>
- </child>
</object>
<packing>
<property name="position">1</property>
@@ -69,13 +62,16 @@
<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="shadow_type">none</property>
<property name="ratio">1.3300000429153442</property>
<property name="obey_child">False</property>
<child>
<placeholder/>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkAlignment" id="effect_alignment">
@@ -99,7 +95,7 @@
<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="shadow_type">none</property>
<property name="ratio">1.3300000429153442</property>
<property name="obey_child">False</property>
<child>
@@ -111,6 +107,9 @@
<placeholder/>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkNotebook" id="notebook_bar">
@@ -152,9 +151,12 @@
<object class="GtkImage" id="image4">
<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="icon_size">2</property>
<property name="icon_name">camera-photo</property>
+ <property name="icon-size">2</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label_photo">
@@ -177,6 +179,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -198,9 +201,12 @@
<object class="GtkImage" id="image5">
<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="icon_size">2</property>
<property name="icon_name">camera-video</property>
+ <property name="icon-size">2</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label_video">
@@ -229,11 +235,15 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="take_picture">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
@@ -251,6 +261,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -300,9 +311,12 @@
<object class="GtkImage" id="image2">
<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="icon_size">3</property>
<property name="icon_name">browse-webcam-effects</property>
+ <property name="icon-size">3</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label_effects">
@@ -326,12 +340,13 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">24</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
@@ -374,7 +389,7 @@
</child>
</object>
<packing>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -382,8 +397,8 @@
</child>
</object>
<object class="GtkWindow" id="fullscreen_popup">
- <property name="type">GTK_WINDOW_POPUP</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+ <property name="type">popup</property>
+ <property name="type_hint">utility</property>
<child>
<object class="GtkNotebook" id="fullscreen_notebook_bar">
<property name="visible">True</property>
@@ -412,7 +427,7 @@
<property name="receives_default">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="tooltip-text" translatable="yes">Switch to the Effects Selector</property>
- <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="relief">none</property>
<child>
<object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
@@ -426,9 +441,12 @@
<object class="GtkImage" id="image6">
<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="icon_size">3</property>
<property name="icon_name">browse-webcam-effects</property>
+ <property name="icon-size">3</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
@@ -438,6 +456,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -447,7 +466,7 @@
<property name="receives_default">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="tooltip-text" translatable="yes">Switch to Photo Mode</property>
- <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="relief">none</property>
<child>
<object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
@@ -461,9 +480,12 @@
<object class="GtkImage" id="image1">
<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="icon_size">2</property>
<property name="icon_name">camera-photo</property>
+ <property name="icon-size">2</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
@@ -483,7 +505,7 @@
<property name="receives_default">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="tooltip-text" translatable="yes">Switch to Video Mode</property>
- <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="relief">none</property>
<child>
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
@@ -497,9 +519,12 @@
<object class="GtkImage" id="image3">
<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="icon_size">2</property>
<property name="icon_name">camera-video</property>
+ <property name="icon-size">2</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
@@ -515,6 +540,9 @@
</object>
</child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
@@ -528,7 +556,8 @@
<object class="GtkButton" id="take_picture_fullscreen">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
<child>
<object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
@@ -546,6 +575,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -592,7 +622,7 @@
<property name="can_focus">True</property>
<property name="receives_default">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="relief">GTK_RELIEF_NONE</property>
+ <property name="relief">none</property>
<property name="xalign">1</property>
<child>
<object class="GtkAlignment" id="alignment11">
@@ -608,8 +638,11 @@
<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="stock">gtk-leave-fullscreen</property>
- <property name="icon_size">3</property>
+ <property name="icon-size">3</property>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label_exit_fullscreen">
@@ -632,7 +665,8 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
