diff options
| author | jstebbins <[email protected]> | 2008-11-26 22:40:15 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2008-11-26 22:40:15 +0000 |
| commit | 51ed02779e9f755f7b011904f613409e2d2b56e2 (patch) | |
| tree | 98dcceae8f59837b768273cbcb2c45d92d496034 /gtk/src | |
| parent | f9b799e8a1a4bbf8cec4a5887d4c7241785c99c5 (diff) | |
LinGui: remove etched frame clutter from the preview window
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1962 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
| -rw-r--r-- | gtk/src/ghb.ui | 195 | ||||
| -rw-r--r-- | gtk/src/resource_data.h | 301 | ||||
| -rw-r--r-- | gtk/src/resources.plist | 195 |
3 files changed, 248 insertions, 443 deletions
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index a88f7d9d6..3de227584 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -3806,105 +3806,38 @@ location as the movie.</property> <child> <object class="GtkVBox" id="vbox32"> <property name="visible">True</property> + <child> - <object class="GtkFrame" id="frame15"> + <object class="GtkAlignment" id="alignment_j24"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="top_padding">2</property> + <property name="bottom_padding">2</property> + <property name="left_padding">2</property> + <property name="right_padding">2</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> - <object class="GtkAlignment" id="alignment22"> + <object class="GtkDrawingArea" id="preview_image"> <property name="visible">True</property> - <property name="top_padding">4</property> - <property name="bottom_padding">4</property> - <property name="left_padding">12</property> - <property name="right_padding">4</property> - <child> - <object class="GtkTable" id="table1"> - <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">3</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkLabel" id="label45"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label44"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label43"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label42"> - <property name="visible">True</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <object class="GtkDrawingArea" id="preview_image"> - <property name="visible">True</property> - <property name="app_paintable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label56"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Preview</b></property> - <property name="use_markup">True</property> + <property name="app_paintable">True</property> </object> </child> </object> </child> + + <child> + <object class="GtkAlignment" id="alignment_j25"> + <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="left_padding">10</property> + <property name="right_padding">10</property> + <child> <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> + <property name="spacing">5</property> <child> <object class="GtkButton" id="live_preview_play"> <property name="height_request">30</property> @@ -4011,11 +3944,15 @@ location as the movie.</property> </packing> </child> </object> + </child> + + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> + <child> <object class="GtkHBox" id="hbox8"> <property name="visible">True</property> @@ -4024,25 +3961,12 @@ location as the movie.</property> <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_ETCHED_OUT</property> - <child> - <object class="GtkAlignment" id="alignment24"> - <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="top_padding">2</property> - <property name="bottom_padding">2</property> - <property name="left_padding">12</property> - <property name="right_padding">2</property> + <property name="shadow_type">none</property> + <child> <object class="GtkVBox" id="vbox39"> <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> - <child> - <object class="GtkAlignment" id="alignment37"> - <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="xalign">0.34000000357627869</property> - <property name="xscale">0.37999999523162842</property> <child> <object class="GtkTable" id="table6"> <property name="visible">True</property> @@ -4110,6 +4034,7 @@ location as the movie.</property> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options"/> </packing> </child> <child> @@ -4122,6 +4047,7 @@ location as the movie.</property> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> + <property name="x_options"/> </packing> </child> <child> @@ -4152,6 +4078,7 @@ location as the movie.</property> <property name="right_attach">3</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> + <property name="x_options"/> </packing> </child> <child> @@ -4214,15 +4141,15 @@ location as the movie.</property> <property name="right_attach">5</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options"/> </packing> </child> </object> + <packing> + <property name="expand">False</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - </packing> - </child> + <child> <object class="GtkCheckButton" id="PictureAutoCrop"> <property name="visible">True</property> @@ -4238,8 +4165,7 @@ location as the movie.</property> </child> </object> </child> - </object> - </child> + <child type="label"> <object class="GtkLabel" id="label82"> <property name="visible">True</property> @@ -4250,16 +4176,25 @@ location as the movie.</property> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="padding">2</property> </packing> </child> <child> + <object class="GtkVSeparator" id="vseparator_j1"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkFrame" id="frame19"> <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_ETCHED_OUT</property> + <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment43"> <property name="visible">True</property> @@ -4276,6 +4211,7 @@ location as the movie.</property> <child> <object class="GtkHBox" id="hbox50"> <property name="visible">True</property> + <property name="spacing">4</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <object class="GtkLabel" id="label85"> @@ -4283,6 +4219,10 @@ location as the movie.</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" translatable="yes">width:</property> </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> </child> <child> <object class="GtkSpinButton" id="scale_width"> @@ -4294,6 +4234,7 @@ location as the movie.</property> <signal handler="scale_width_changed_cb" name="value_changed"/> </object> <packing> + <property name="expand">False</property> <property name="position">1</property> </packing> </child> @@ -4304,6 +4245,7 @@ location as the movie.</property> <property name="label" translatable="yes">height:</property> </object> <packing> + <property name="expand">False</property> <property name="position">2</property> </packing> </child> @@ -4316,6 +4258,7 @@ location as the movie.</property> <signal handler="scale_height_changed_cb" name="value_changed"/> </object> <packing> + <property name="expand">False</property> <property name="position">3</property> </packing> </child> @@ -4372,7 +4315,7 @@ If not checked, encoding efficiency may be reduced.</property> <object class="GtkHBox" id="hbox53"> <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="spacing">45</property> + <property name="spacing">5</property> <child> <object class="GtkCheckButton" id="anamorphic"> <property name="visible">True</property> @@ -4426,20 +4369,27 @@ the other to maintain the video's original aspect ratio.</property> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="padding">2</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox42"> + <object class="GtkVSeparator" id="vseparator_j1"> <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + <child> <object class="GtkFrame" id="frame4"> <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">etched-out</property> + <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment8"> <property name="visible">True</property> @@ -4640,22 +4590,17 @@ the other to maintain the video's original aspect ratio.</property> <object class="GtkLabel" id="label22"> <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" translatable="yes"><b>Picture Filters</b></property> + <property name="label" translatable="yes"><b>Filters</b></property> <property name="use_markup">True</property> </object> </child> </object> <packing> - <property name="expand">False</property> <property name="padding">2</property> - <property name="position">0</property> + <property name="position">4</property> </packing> </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> + </object> <packing> <property name="expand">False</property> diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h index 238371ca8..3e59fb4c4 100644 --- a/gtk/src/resource_data.h +++ b/gtk/src/resource_data.h @@ -6200,155 +6200,58 @@ " <child>\n" " <object class="GtkVBox" id="vbox32">\n" " <property name="visible">True</property>\n" +"\n" " <child>\n" -" <object class="GtkFrame" id="frame15"&" -"gt;\n" +" <object class="GtkAlignment" id="alignment_" +"j24">\n" " <property name="visible">True</property&" "gt;\n" -" <property name="label_xalign">0</propert" +" <property name="events">GDK_POINTER_MOTION_" +"MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" +"N_RELEASE_MASK</property>\n" +" <property name="top_padding">2</property" +">\n" +" <property name="bottom_padding">2</prope" +"rty>\n" +" <property name="left_padding">2</propert" "y>\n" -" <property name="shadow_type">GTK_SHADOW_ETC" -"HED_OUT</property>\n" +" <property name="right_padding">2</proper" +"ty>\n" +" <property name="xscale">0</property>\n" +" <property name="yscale">0</property>\n" +"\n" " <child>\n" -" <object class="GtkAlignment" id="alignm" -"ent22">\n" +" <object class="GtkDrawingArea" id="prev" +"iew_image">\n" " <property name="visible">True</prope" "rty>\n" -" <property name="top_padding">4</prop" -"erty>\n" -" <property name="bottom_padding">4</p" -"roperty>\n" -" <property name="left_padding">12</pr" -"operty>\n" -" <property name="right_padding">4</pr" -"operty>\n" -" <child>\n" -" <object class="GtkTable" id="table1" -"">\n" -" <property name="visible">True</p" -"roperty>\n" -" <property name="n_rows">3</prope" -"rty>\n" -" <property name="n_columns">3</pr" -"operty>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <placeholder/>\n" -" </child>\n" -" <child>\n" -" <object class="GtkLabel" id="la" -"bel45">\n" -" <property name="visible">True&l" -"t;/property>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach">2&" -"lt;/property>\n" -" <property name="right_attach">3" -"</property>\n" -" <property name="top_attach">1&l" -"t;/property>\n" -" <property name="bottom_attach">" -"2</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkLabel" id="la" -"bel44">\n" -" <property name="visible">True&l" -"t;/property>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach">1&" -"lt;/property>\n" -" <property name="right_attach">2" -"</property>\n" -" <property name="top_attach">2&l" -"t;/property>\n" -" <property name="bottom_attach">" -"3</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkLabel" id="la" -"bel43">\n" -" <property name="visible">True&l" -"t;/property>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach">1&" -"lt;/property>\n" -" <property name="right_attach">2" -"</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkLabel" id="la" -"bel42">\n" -" <property name="visible">True&l" -"t;/property>\n" -" </object>\n" -" <packing>\n" -" <property name="top_attach">1&l" -"t;/property>\n" -" <property name="bottom_attach">" -"2</property>\n" -" </packing>\n" -" </child>\n" -" <child>\n" -" <object class="GtkDrawingArea" id=&q" -"uot;preview_image">\n" -" <property name="visible">True&l" -"t;/property>\n" -" <property name="app_paintable">" -"True</property>\n" -" </object>\n" -" <packing>\n" -" <property name="left_attach">1&" -"lt;/property>\n" -" <property name="right_attach">2" -"</property>\n" -" <property name="top_attach">1&l" -"t;/property>\n" -" <property name="bottom_attach">" -"2</property>\n" -" <property name="x_options"><" -"/property>\n" -" <property name="y_options"><" +" <property name="app_paintable">True<" "/property>\n" -" </packing>\n" -" </child>\n" -" </object>\n" -" </child>\n" -" </object>\n" -" </child>\n" -" <child type="label">\n" -" <object class="GtkLabel" id="label56&qu" -"ot;>\n" -" <property name="visible">True</prope" -"rty>\n" -" <property name="label" translatable="" -"yes">&lt;b&gt;Preview&lt;/b&gt;</property>" -";\n" -" <property name="use_markup">True</pr" -"operty>\n" " </object>\n" " </child>\n" " </object>\n" " </child>\n" +"\n" +" <child>\n" +" <object class="GtkAlignment" id="alignment_" +"j25">\n" +" <property name="visible">True</property&" +"gt;\n" +" <property name="events">GDK_POINTER_MOTION_" +"MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" +"N_RELEASE_MASK</property>\n" +" <property name="left_padding">10</proper" +"ty>\n" +" <property name="right_padding">10</prope" +"rty>\n" +"\n" " <child>\n" " <object class="GtkHBox" id="hbox7">" "\n" " <property name="visible">True</property&" "gt;\n" +" <property name="spacing">5</property>" +"\n" " <child>\n" " <object class="GtkButton" id="live_prev" "iew_play">\n" @@ -6514,6 +6417,9 @@ " </packing>\n" " </child>\n" " </object>\n" +" </child>\n" +"\n" +" </object>\n" " <packing>\n" " <property name="expand">False</property&" "gt;\n" @@ -6521,6 +6427,7 @@ ";\n" " </packing>\n" " </child>\n" +"\n" " <child>\n" " <object class="GtkHBox" id="hbox8">" "\n" @@ -6536,24 +6443,9 @@ "UTTON_RELEASE_MASK</property>\n" " <property name="label_xalign">0</pro" "perty>\n" -" <property name="shadow_type">GTK_SHADOW" -"_ETCHED_OUT</property>\n" -" <child>\n" -" <object class="GtkAlignment" id="al" -"ignment24">\n" -" <property name="visible">True</p" +" <property name="shadow_type">none</p" "roperty>\n" -" <property name="events">GDK_POINTER" -"_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | G" -"DK_BUTTON_RELEASE_MASK</property>\n" -" <property name="top_padding">2</" -"property>\n" -" <property name="bottom_padding">2&l" -"t;/property>\n" -" <property name="left_padding">12<" -";/property>\n" -" <property name="right_padding">2<" -";/property>\n" +"\n" " <child>\n" " <object class="GtkVBox" id="vbo" "x39">\n" @@ -6562,18 +6454,6 @@ " <property name="events">GDK_POI" "NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK" " | GDK_BUTTON_RELEASE_MASK</property>\n" -" <child>\n" -" <object class="GtkAlignment" id=" -""alignment37">\n" -" <property name="visible">Tr" -"ue</property>\n" -" <property name="events">GDK" -"_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" -"MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="xalign">0.3" -"4000000357627869</property>\n" -" <property name="xscale">0.3" -"7999999523162842</property>\n" " <child>\n" " <object class="GtkTable" id=" ""table6">\n" @@ -6655,6 +6535,8 @@ "quot;>2</property>\n" " <property name="bottom_atta" "ch">3</property>\n" +" <property name="x_options&q" +"uot;/>\n" " </packing>\n" " </child>\n" " <child>\n" @@ -6675,6 +6557,8 @@ "">2</property>\n" " <property name="right_attac" "h">3</property>\n" +" <property name="x_options&q" +"uot;/>\n" " </packing>\n" " </child>\n" " <child>\n" @@ -6727,6 +6611,8 @@ "quot;>4</property>\n" " <property name="bottom_atta" "ch">5</property>\n" +" <property name="x_options&q" +"uot;/>\n" " </packing>\n" " </child>\n" " <child>\n" @@ -6835,16 +6721,17 @@ "quot;>2</property>\n" " <property name="bottom_atta" "ch">3</property>\n" +" <property name="x_options&q" +"uot;/>\n" " </packing>\n" " </child>\n" " </object>\n" +" <packing>\n" +" <property name="expand">" +";False</property>\n" +" </packing>\n" " </child>\n" -" </object>\n" -" <packing>\n" -" <property name="expand">Fal" -"se</property>\n" -" </packing>\n" -" </child>\n" +"\n" " <child>\n" " <object class="GtkCheckButton" i" "d="PictureAutoCrop">\n" @@ -6869,8 +6756,7 @@ " </child>\n" " </object>\n" " </child>\n" -" </object>\n" -" </child>\n" +"\n" " <child type="label">\n" " <object class="GtkLabel" id="label8" "2">\n" @@ -6888,13 +6774,26 @@ " </child>\n" " </object>\n" " <packing>\n" -" <property name="expand">False</prope" -"rty>\n" +" <property name="expand">True</proper" +"ty>\n" " <property name="padding">2</property" ">\n" " </packing>\n" " </child>\n" " <child>\n" +" <object class="GtkVSeparator" id="vsepa" +"rator_j1">\n" +" <property name="visible">True</prope" +"rty>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">False</prope" +"rty>\n" +" <property name="position">1</propert" +"y>\n" +" </packing>\n" +" </child>\n" +" <child>\n" " <object class="GtkFrame" id="frame19&qu" "ot;>\n" " <property name="visible">True</prope" @@ -6904,8 +6803,8 @@ "UTTON_RELEASE_MASK</property>\n" " <property name="label_xalign">0</pro" "perty>\n" -" <property name="shadow_type">GTK_SHADOW" -"_ETCHED_OUT</property>\n" +" <property name="shadow_type">none</p" +"roperty>\n" " <child>\n" " <object class="GtkAlignment" id="al" "ignment43">\n" @@ -6937,6 +6836,8 @@ ";hbox50">\n" " <property name="visible">Tr" "ue</property>\n" +" <property name="spacing">4&" +"lt;/property>\n" " <property name="events">GDK" "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" "MASK | GDK_BUTTON_RELEASE_MASK</property>\n" @@ -6951,6 +6852,12 @@ " <property name="label" tra" "nslatable="yes">width:</property>\n" " </object>\n" +" <packing>\n" +" <property name="expand">" +";False</property>\n" +" <property name="position"&" +"gt;0</property>\n" +" </packing>\n" " </child>\n" " <child>\n" " <object class="GtkSpinButton"" @@ -6970,6 +6877,8 @@ "anged_cb" name="value_changed"/>\n" " </object>\n" " <packing>\n" +" <property name="expand">" +";False</property>\n" " <property name="position"&" "gt;1</property>\n" " </packing>\n" @@ -6986,6 +6895,8 @@ "nslatable="yes">height:</property>\n" " </object>\n" " <packing>\n" +" <property name="expand">" +";False</property>\n" " <property name="position"&" "gt;2</property>\n" " </packing>\n" @@ -7006,6 +6917,8 @@ "hanged_cb" name="value_changed"/>\n" " </object>\n" " <packing>\n" +" <property name="expand">" +";False</property>\n" " <property name="position"&" "gt;3</property>\n" " </packing>\n" @@ -7098,8 +7011,8 @@ " <property name="events">GDK" "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" "MASK | GDK_BUTTON_RELEASE_MASK</property>\n" -" <property name="spacing">45" -"</property>\n" +" <property name="spacing">5&" +"lt;/property>\n" " <child>\n" " <object class="GtkCheckButton&quo" "t; id="anamorphic">\n" @@ -7189,19 +7102,28 @@ " </child>\n" " </object>\n" " <packing>\n" -" <property name="expand">False</prope" -"rty>\n" +" <property name="expand">True</proper" +"ty>\n" " <property name="padding">2</property" ">\n" -" <property name="position">1</propert" +" <property name="position">2</propert" "y>\n" " </packing>\n" " </child>\n" " <child>\n" -" <object class="GtkVBox" id="vbox42"" -";>\n" +" <object class="GtkVSeparator" id="vsepa" +"rator_j1">\n" " <property name="visible">True</prope" "rty>\n" +" </object>\n" +" <packing>\n" +" <property name="expand">False</prope" +"rty>\n" +" <property name="position">3</propert" +"y>\n" +" </packing>\n" +" </child>\n" +"\n" " <child>\n" " <object class="GtkFrame" id="frame4" "">\n" @@ -7212,8 +7134,8 @@ "DK_BUTTON_RELEASE_MASK</property>\n" " <property name="label_xalign">0<" "/property>\n" -" <property name="shadow_type">etched" -"-out</property>\n" +" <property name="shadow_type">none&l" +"t;/property>\n" " <child>\n" " <object class="GtkAlignment" id=&quo" "t;alignment8">\n" @@ -7546,28 +7468,21 @@ "NTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK" " | GDK_BUTTON_RELEASE_MASK</property>\n" " <property name="label" translatabl" -"e="yes">&lt;b&gt;Picture Filters&lt;/b&gt;" -"</property>\n" +"e="yes">&lt;b&gt;Filters&lt;/b&gt;</pro" +"perty>\n" " <property name="use_markup">Tru" "e</property>\n" " </object>\n" " </child>\n" " </object>\n" " <packing>\n" -" <property name="expand">False</p" -"roperty>\n" " <property name="padding">2</prop" "erty>\n" -" <property name="position">0</pro" +" <property name="position">4</pro" "perty>\n" " </packing>\n" " </child>\n" -" </object>\n" -" <packing>\n" -" <property name="position">2</propert" -"y>\n" -" </packing>\n" -" </child>\n" +"\n" " </object>\n" " <packing>\n" " <property name="expand">False</property&" diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist index 0ef336a7b..29b044bb2 100644 --- a/gtk/src/resources.plist +++ b/gtk/src/resources.plist @@ -3811,105 +3811,38 @@ location as the movie.</property> <child> <object class="GtkVBox" id="vbox32"> <property name="visible">True</property> + <child> - <object class="GtkFrame" id="frame15"> + <object class="GtkAlignment" id="alignment_j24"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="top_padding">2</property> + <property name="bottom_padding">2</property> + <property name="left_padding">2</property> + <property name="right_padding">2</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> - <object class="GtkAlignment" id="alignment22"> + <object class="GtkDrawingArea" id="preview_image"> <property name="visible">True</property> - <property name="top_padding">4</property> - <property name="bottom_padding">4</property> - <property name="left_padding">12</property> - <property name="right_padding">4</property> - <child> - <object class="GtkTable" id="table1"> - <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">3</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkLabel" id="label45"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label44"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label43"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label42"> - <property name="visible">True</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <object class="GtkDrawingArea" id="preview_image"> - <property name="visible">True</property> - <property name="app_paintable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label56"> - <property name="visible">True</property> - <property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property> - <property name="use_markup">True</property> + <property name="app_paintable">True</property> </object> </child> </object> </child> + + <child> + <object class="GtkAlignment" id="alignment_j25"> + <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="left_padding">10</property> + <property name="right_padding">10</property> + <child> <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> + <property name="spacing">5</property> <child> <object class="GtkButton" id="live_preview_play"> <property name="height_request">30</property> @@ -4016,11 +3949,15 @@ location as the movie.</property> </packing> </child> </object> + </child> + + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> + <child> <object class="GtkHBox" id="hbox8"> <property name="visible">True</property> @@ -4029,25 +3966,12 @@ location as the movie.</property> <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_ETCHED_OUT</property> - <child> - <object class="GtkAlignment" id="alignment24"> - <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="top_padding">2</property> - <property name="bottom_padding">2</property> - <property name="left_padding">12</property> - <property name="right_padding">2</property> + <property name="shadow_type">none</property> + <child> <object class="GtkVBox" id="vbox39"> <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> - <child> - <object class="GtkAlignment" id="alignment37"> - <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="xalign">0.34000000357627869</property> - <property name="xscale">0.37999999523162842</property> <child> <object class="GtkTable" id="table6"> <property name="visible">True</property> @@ -4115,6 +4039,7 @@ location as the movie.</property> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options"/> </packing> </child> <child> @@ -4127,6 +4052,7 @@ location as the movie.</property> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> + <property name="x_options"/> </packing> </child> <child> @@ -4157,6 +4083,7 @@ location as the movie.</property> <property name="right_attach">3</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> + <property name="x_options"/> </packing> </child> <child> @@ -4219,15 +4146,15 @@ location as the movie.</property> <property name="right_attach">5</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options"/> </packing> </child> </object> + <packing> + <property name="expand">False</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - </packing> - </child> + <child> <object class="GtkCheckButton" id="PictureAutoCrop"> <property name="visible">True</property> @@ -4243,8 +4170,7 @@ location as the movie.</property> </child> </object> </child> - </object> - </child> + <child type="label"> <object class="GtkLabel" id="label82"> <property name="visible">True</property> @@ -4255,16 +4181,25 @@ location as the movie.</property> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="padding">2</property> </packing> </child> <child> + <object class="GtkVSeparator" id="vseparator_j1"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkFrame" id="frame19"> <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_ETCHED_OUT</property> + <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment43"> <property name="visible">True</property> @@ -4281,6 +4216,7 @@ location as the movie.</property> <child> <object class="GtkHBox" id="hbox50"> <property name="visible">True</property> + <property name="spacing">4</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <object class="GtkLabel" id="label85"> @@ -4288,6 +4224,10 @@ location as the movie.</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" translatable="yes">width:</property> </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> </child> <child> <object class="GtkSpinButton" id="scale_width"> @@ -4299,6 +4239,7 @@ location as the movie.</property> <signal handler="scale_width_changed_cb" name="value_changed"/> </object> <packing> + <property name="expand">False</property> <property name="position">1</property> </packing> </child> @@ -4309,6 +4250,7 @@ location as the movie.</property> <property name="label" translatable="yes">height:</property> </object> <packing> + <property name="expand">False</property> <property name="position">2</property> </packing> </child> @@ -4321,6 +4263,7 @@ location as the movie.</property> <signal handler="scale_height_changed_cb" name="value_changed"/> </object> <packing> + <property name="expand">False</property> <property name="position">3</property> </packing> </child> @@ -4377,7 +4320,7 @@ If not checked, encoding efficiency may be reduced.</property> <object class="GtkHBox" id="hbox53"> <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="spacing">45</property> + <property name="spacing">5</property> <child> <object class="GtkCheckButton" id="anamorphic"> <property name="visible">True</property> @@ -4431,20 +4374,27 @@ the other to maintain the video's original aspect ratio.</property> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="padding">2</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox42"> + <object class="GtkVSeparator" id="vseparator_j1"> <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + <child> <object class="GtkFrame" id="frame4"> <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">etched-out</property> + <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment8"> <property name="visible">True</property> @@ -4645,22 +4595,17 @@ the other to maintain the video's original aspect ratio.</property> <object class="GtkLabel" id="label22"> <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" translatable="yes">&lt;b&gt;Picture Filters&lt;/b&gt;</property> + <property name="label" translatable="yes">&lt;b&gt;Filters&lt;/b&gt;</property> <property name="use_markup">True</property> </object> </child> </object> <packing> - <property name="expand">False</property> <property name="padding">2</property> - <property name="position">0</property> + <property name="position">4</property> </packing> </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> + </object> <packing> <property name="expand">False</property> |