mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change up/down to just be images

Browse Source 
and add parent boxes to the toplevels and set their names
so that we don't get warnings from the vcl builder

and add a stub to glade

and change a ComboBox to ComboBoxText so glade won't
clobber its items

Change-Id: I436736e96883b319b635fe87b539e829bc5595b8
This commit is contained in:
Caolán McNamara
2013-09-14 17:20:19 +01:00
parent a382dad6af
commit 5480482b74
3 changed files with 679 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extras/source/glade/libreoffice-catalog.xml.in
View File

@@ -392,6 +392,9 @@
<glade-widget-class title="DD ListBox" name="swuilo-DDListBox" <glade-widget-class title="DD ListBox" name="swuilo-DDListBox"
generic-name="DD ListBox" parent="svtlo-SvTreeListBox" generic-name="DD ListBox" parent="svtlo-SvTreeListBox"
icon-name="widget-gtk-treeview"/> icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Custom Animation ListBox" name="sdlo-CustomAnimationList"
generic-name="Custom Animation ListBox" parent="svtlo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Tab List" name="svtlo-SvTabListBox" <glade-widget-class title="Tab List" name="svtlo-SvTabListBox"
generic-name="Tab List" parent="svtlo-SvTreeListBox" generic-name="Tab List" parent="svtlo-SvTreeListBox"
icon-name="widget-gtk-treeview"/> icon-name="widget-gtk-treeview"/>

75
sd/uiconfig/simpress/ui/customanimationspanel.ui
View File

@@ -1,7 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="CustomAnimationPanel"> <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-up</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-go-down</property>
</object>
<object class="GtkBox" id="CustomAnimationsPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
@@ -12,7 +28,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkBox" id="box2"> <object class="GtkBox" id="box2">
<property name="visible">True</property> <property name="visible">True</property>
@@ -21,11 +36,9 @@
<child> <child>
<object class="GtkButton" id="add_effect"> <object class="GtkButton" id="add_effect">
<property name="label" translatable="yes">_Add...</property> <property name="label" translatable="yes">_Add...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
<packing> <packing>
@@ -37,11 +50,9 @@
<child> <child>
<object class="GtkButton" id="change_effect"> <object class="GtkButton" id="change_effect">
<property name="label" translatable="yes">_Change...</property> <property name="label" translatable="yes">_Change...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
<packing> <packing>
@@ -53,11 +64,9 @@
<child> <child>
<object class="GtkButton" id="remove_effect"> <object class="GtkButton" id="remove_effect">
<property name="label" translatable="yes">_Remove</property> <property name="label" translatable="yes">_Remove</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
<packing> <packing>
@@ -91,7 +100,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkBox" id="box3"> <object class="GtkBox" id="box3">
<property name="visible">True</property> <property name="visible">True</property>
@@ -109,9 +117,9 @@
<object class="GtkLabel" id="start_effect"> <object class="GtkLabel" id="start_effect">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Start:</property> <property name="label" translatable="yes">_Start:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">end</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@@ -124,9 +132,9 @@
<object class="GtkLabel" id="effect_property"> <object class="GtkLabel" id="effect_property">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Direction:</property> <property name="label" translatable="yes">_Direction:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">end</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@@ -139,9 +147,9 @@
<object class="GtkLabel" id="effect_speed"> <object class="GtkLabel" id="effect_speed">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Sp_eed:</property> <property name="label" translatable="yes">Sp_eed:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="halign">end</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@@ -154,9 +162,9 @@
<object class="GtkComboBoxText" id="start_effect_list"> <object class="GtkComboBoxText" id="start_effect_list">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="entry_text_column">0</property> <property name="entry_text_column">0</property>
<property name="id_column">1</property> <property name="id_column">1</property>
<property name="hexpand">True</property>
<items> <items>
<item translatable="yes">On click</item> <item translatable="yes">On click</item>
<item translatable="yes">With previous</item> <item translatable="yes">With previous</item>
@@ -181,7 +189,14 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
@@ -194,11 +209,9 @@
<child> <child>
<object class="GtkButton" id="more_properties"> <object class="GtkButton" id="more_properties">
<property name="label" translatable="yes">_...</property> <property name="label" translatable="yes">_...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
<packing> <packing>
@@ -212,9 +225,9 @@
<object class="GtkComboBoxText" id="effect_speed_list"> <object class="GtkComboBoxText" id="effect_speed_list">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="entry_text_column">0</property> <property name="entry_text_column">0</property>
<property name="id_column">1</property> <property name="id_column">1</property>
<property name="hexpand">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@@ -239,7 +252,10 @@
<child> <child>
<object class="sdlo-CustomAnimationList" id="custom_animation_list"> <object class="sdlo-CustomAnimationList" id="custom_animation_list">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Custom Animation ListBox-selection"/>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@@ -251,8 +267,8 @@
<object class="GtkBox" id="box4"> <object class="GtkBox" id="box4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="halign">end</property> <property name="halign">end</property>
<property name="hexpand">True</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="change_order"> <object class="GtkLabel" id="change_order">
@@ -268,13 +284,10 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="move_up"> <object class="GtkButton" id="move_up">
<property name="label">gtk-go-up</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property> <property name="image">image1</property>
<property name="use_stock">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -284,13 +297,10 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="move_down"> <object class="GtkButton" id="move_down">
<property name="label">gtk-go-down</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property> <property name="image">image2</property>
<property name="use_stock">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -338,11 +348,9 @@
<child> <child>
<object class="GtkButton" id="play"> <object class="GtkButton" id="play">
<property name="label" translatable="yes">_Play</property> <property name="label" translatable="yes">_Play</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
<packing> <packing>
@@ -354,11 +362,9 @@
<child> <child>
<object class="GtkButton" id="slideshow"> <object class="GtkButton" id="slideshow">
<property name="label" translatable="yes">S_lide Show</property> <property name="label" translatable="yes">S_lide Show</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
<packing> <packing>
@@ -391,11 +397,9 @@
<child> <child>
<object class="GtkCheckButton" id="auto_preview"> <object class="GtkCheckButton" id="auto_preview">
<property name="label" translatable="yes">Automatic pre_view</property> <property name="label" translatable="yes">Automatic pre_view</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@@ -415,4 +419,11 @@
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</interface> </interface>

40
sd/uiconfig/simpress/ui/slidetransitionspanel.ui
View File

@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="SlideTransitionsPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box1"> <object class="GtkBox" id="box1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="border_width">6</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkFrame" id="frame3"> <object class="GtkFrame" id="frame3">
@@ -24,7 +29,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/> <object class="GtkTreeSelection" id="treeview-selection"/>
</child> </child>
</object> </object>
</child> </child>
@@ -83,10 +88,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="speed_list"> <object class="GtkComboBoxText" id="speed_list">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items> <items>
<item translatable="yes">Slow</item> <item translatable="yes">Slow</item>
<item translatable="yes">Medium</item> <item translatable="yes">Medium</item>
@@ -128,6 +135,8 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items> <items>
<item translatable="yes">No Sound</item> <item translatable="yes">No Sound</item>
<item translatable="yes">Stop Previous Sound</item> <item translatable="yes">Stop Previous Sound</item>
@@ -207,7 +216,6 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">rb_mouse_click</property> <property name="group">rb_mouse_click</property>
</object> </object>
@@ -225,7 +233,6 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">rb_mouse_click</property> <property name="group">rb_mouse_click</property>
</object> </object>
@@ -241,6 +248,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="invisible_char">●</property> <property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@@ -252,21 +260,6 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
</child> </child>
</object> </object>
@@ -355,4 +348,11 @@
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</interface> </interface>