Permalink
Browse files

Merge pull request #212 from candlepin/awood/826739

826739, 827553: Combine Service Level and Service Type and move up in di...
  • Loading branch information...
2 parents 78bcf96 + e8118cd commit 00a242847259fac0aeea5fe7ce4241e6b7d96804 @jbowes jbowes committed Aug 16, 2012
@@ -32,7 +32,7 @@
<child>
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
- <property name="n_rows">5</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">8</property>
<child>
@@ -69,16 +69,16 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="products_label">
+ <widget class="GtkLabel" id="products_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Products:&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_padding">10</property>
@@ -100,15 +100,15 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="support_level_label">
+ <widget class="GtkLabel" id="support_level_and_type_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Service Level:&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Service Level, Type:&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -121,31 +121,15 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="support_type_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;b&gt;Service Type:&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="x_padding">10</property>
- <property name="y_padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTextView" id="support_level_text">
+ <widget class="GtkTextView" id="support_level_and_type_text">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="pixels_above_lines">5</property>
<property name="editable">False</property>
<property name="left_margin">10</property>
<property name="cursor_visible">False</property>
<accessibility>
- <atkproperty name="AtkObject::accessible-name" translatable="yes">Support Level Text</atkproperty>
+ <atkproperty name="AtkObject::accessible-name" translatable="yes">Support Level And Type Text</atkproperty>
</accessibility>
</widget>
<packing>
@@ -158,27 +142,6 @@
</packing>
</child>
<child>
- <widget class="GtkTextView" id="support_type_text">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="pixels_above_lines">5</property>
- <property name="editable">False</property>
- <property name="left_margin">10</property>
- <property name="cursor_visible">False</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible-name" translatable="yes">Support Type Text</atkproperty>
- </accessibility>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
<widget class="GtkLabel" id="sku_label">
<property name="visible">True</property>
<property name="xalign">0</property>
Oops, something went wrong.

0 comments on commit 00a2428

Please sign in to comment.