[Xfce4-commits] r30185 - terminal/trunk
Nick Schermer
nick at xfce.org
Fri Jul 3 16:25:06 CEST 2009
Author: nick
Date: 2009-07-03 14:25:06 +0000 (Fri, 03 Jul 2009)
New Revision: 30185
Modified:
terminal/trunk/Terminal.glade
Log:
Make a separate label for the cursor color (bug #2875).
Modified: terminal/trunk/Terminal.glade
===================================================================
--- terminal/trunk/Terminal.glade 2009-07-03 14:08:38 UTC (rev 30184)
+++ terminal/trunk/Terminal.glade 2009-07-03 14:25:06 UTC (rev 30185)
@@ -784,93 +784,65 @@
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="border_width">6</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
+ <property name="spacing">12</property>
+ <property name="homogeneous">True</property>
<child>
- <object class="GtkLabel" id="label15">
+ <object class="GtkTable" id="table3">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Text and cursor color:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">color-foreground</property>
- <accessibility>
- <relation type="label-for" target="color-foreground"/>
- <relation type="label-for" target="color-cursor"/>
- </accessibility>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Background color:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">color-background</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Tab activit_y color:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">tab-activity-color</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment8">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
<child>
- <object class="GtkColorButton" id="tab-activity-color">
+ <object class="GtkLabel" id="label15">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Text color:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">color-foreground</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorButton" id="color-foreground">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="title" translatable="yes">Choose tab activity color</property>
+ <property name="title" translatable="yes">Choose terminal text color</property>
<property name="color">#000000000000</property>
<child internal-child="accessible">
- <object class="AtkObject" id="tab-activity-color-atkobject">
+ <object class="AtkObject" id="color-foreground-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
<property name="AtkObject::accessible-description" translatable="yes">Open a dialog to specify the color</property>
</object>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
</child>
- </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="GtkAlignment" id="alignment9">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
<child>
+ <object class="GtkLabel" id="label38">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Background color:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">color-background</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkColorButton" id="color-background">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -884,67 +856,99 @@
</object>
</child>
</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">GTK_FILL</property>
+ </packing>
</child>
</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="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment10">
+ <object class="GtkTable" id="table6">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkColorButton" id="tab-activity-color">
<property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkColorButton" id="color-foreground">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="title" translatable="yes">Choose terminal text color</property>
- <property name="color">#000000000000</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="color-foreground-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
- <property name="AtkObject::accessible-description" translatable="yes">Open a dialog to specify the color</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="title" translatable="yes">Choose tab activity color</property>
+ <property name="color">#000000000000</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="tab-activity-color-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
+ <property name="AtkObject::accessible-description" translatable="yes">Open a dialog to specify the color</property>
</object>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkColorButton" id="color-cursor">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="title" translatable="yes">Choose terminal cursor color</property>
- <property name="color">#000000000000</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="color-cursor-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
- <property name="AtkObject::accessible-description" translatable="yes">Open a dialog to specify the color</property>
- </object>
- </child>
+ </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">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Tab activit_y color:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">tab-activity-color</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Cu_rsor color:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">color-cursor</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorButton" id="color-cursor">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="title" translatable="yes">Choose terminal cursor color</property>
+ <property name="color">#000000000000</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="color-cursor-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
+ <property name="AtkObject::accessible-description" translatable="yes">Open a dialog to specify the color</property>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
More information about the Xfce4-commits
mailing list