From e7902e07065361440a61300a99bdf3f2241afdf5 Mon Sep 17 00:00:00 2001 From: Brian Pepple <bpepple@fedoraproject.org> Date: Sun, 3 Apr 2011 17:02:56 -0400 Subject: [PATCH] Show text in progressbars --- data/progress.ui | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/data/progress.ui b/data/progress.ui index 6b7d304..d3f7675 100644 --- a/data/progress.ui +++ b/data/progress.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy project-wide --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="progress_dialog"> <property name="width_request">290</property> <property name="height_request">150</property> + <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">Converting Progress</property> <property name="resizable">False</property> @@ -12,16 +12,20 @@ <property name="icon_name">audio-x-generic</property> <property name="type_hint">normal</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">2</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkProgressBar" id="file_progressbar"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_text">True</property> </object> <packing> <property name="expand">False</property> @@ -33,6 +37,8 @@ <child> <object class="GtkProgressBar" id="speed_progressbar"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_text">True</property> </object> <packing> <property name="expand">False</property> @@ -43,12 +49,15 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> + <object class="GtkButtonBox" id="dialog-action_area1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> @@ -56,6 +65,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -65,11 +75,6 @@ </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> </child> </object> </child> -- 1.7.4.1