diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2014-09-24 10:30:32 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-24 19:08:31 +0000 |
commit | 16ea2665cdfa0b3d7b0d7abcdaae8d60f7654d24 (patch) | |
tree | 2bdb0a49ca0095caafb710c0dacbd2dd69940074 /cui/uiconfig/ui | |
parent | 2f59a1c8169f1492c00d884b6eb3ce954645546f (diff) |
fdo#64302: Writer’s Special Character dialog could be simpler
Change-Id: Ia321a9df77a8741245378e5b995b3bc6922266e8
Reviewed-on: https://gerrit.libreoffice.org/11621
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'cui/uiconfig/ui')
-rw-r--r-- | cui/uiconfig/ui/specialcharacters.ui | 247 |
1 files changed, 102 insertions, 145 deletions
diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index 961021fdae58..edfbc30fa40b 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -59,35 +59,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkButton" id="deletelast"> - <property name="label" translatable="yes">Delete _Last</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="delete"> - <property name="label">gtk-delete</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <property name="image_position">bottom</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -97,80 +68,26 @@ </packing> </child> <child> - <object class="GtkBox" id="box1"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="fontft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="fontft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Font</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fontlb</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="subsetft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Subset</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">subsetlb</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="fontlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="subsetlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <property name="label" translatable="yes">Font</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fontlb</property> </object> <packing> <property name="left_attach">0</property> @@ -180,57 +97,66 @@ </packing> </child> <child> - <object class="GtkGrid" id="grid3"> + <object class="GtkLabel" id="subsetft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Subset</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">subsetlb</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="fontlb"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child> - <object class="GtkLabel" id="charcodeft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="no"> U+FFFF(65535) </property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="cuilo-SvxShowText" id="showchar"> - <property name="width_request">100</property> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="svxlo-SvxShowCharSet" id="showcharset"> - <property name="width_request">400</property> - <property name="height_request">250</property> + <object class="GtkComboBox" id="subsetlb"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <object class="GtkLabel" id="charcodeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label"> U+FFFF(65535) </property> </object> <packing> <property name="left_attach">0</property> @@ -240,13 +166,43 @@ </packing> </child> <child> - <placeholder/> + <object class="cuilo-SvxShowText" id="showchar"> + <property name="width_request">100</property> + <property name="height_request">150</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="svxlo-SvxShowCharSet" id="showcharset"> + <property name="width_request">400</property> + <property name="height_request">250</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -268,27 +224,29 @@ </packing> </child> <child> - <object class="cuilo-SvxShowText" id="showtext"> + <object class="GtkEntry" id="showtext"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="valign">center</property> + <property name="invisible_char">•</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -299,7 +257,6 @@ <action-widget response="0">ok</action-widget> <action-widget response="0">cancel</action-widget> <action-widget response="0">help</action-widget> - <action-widget response="0">delete</action-widget> </action-widgets> </object> </interface> |