diff options
author | heiko tietze <tietze.heiko@gmail.com> | 2018-06-13 13:11:50 +0200 |
---|---|---|
committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2018-06-14 18:34:57 +0200 |
commit | 4b1490406d5ff419f632b581bed9744291600dc0 (patch) | |
tree | a555bddab7b751bad35a863e4bf8efb101b7b9b2 /svx/uiconfig | |
parent | 90d77c7d18050437d47ba967e4c4ad7e523ced0e (diff) |
tdf#118110 - Mouse wheel should work with the shapes desk
scrollwindow removed
Change-Id: Id38dd75120effe63314fb3665417c728f3822712
Reviewed-on: https://gerrit.libreoffice.org/55748
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
(cherry picked from commit dc5a7f14cb44c06c19772249973d06df1f4eccaa)
Reviewed-on: https://gerrit.libreoffice.org/55797
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'svx/uiconfig')
-rw-r--r-- | svx/uiconfig/ui/defaultshapespanel.ui | 549 |
1 files changed, 271 insertions, 278 deletions
diff --git a/svx/uiconfig/ui/defaultshapespanel.ui b/svx/uiconfig/ui/defaultshapespanel.ui index e211bdf62a84..6350f9b82220 100644 --- a/svx/uiconfig/ui/defaultshapespanel.ui +++ b/svx/uiconfig/ui/defaultshapespanel.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.22.1 --> <interface domain="svx"> <requires lib="gtk+" version="3.18"/> <requires lib="LibreOffice" version="1.0"/> @@ -16,391 +16,384 @@ <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkViewport" id="viewport1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can_focus">False</property> <child> - <object class="GtkViewport" id="viewport1"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkFrame" id="LinesFrame"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">3</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="LinesFrame"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="svtlo-ValueSet" id="LinesArrows"> + <property name="height_request">50</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="LinesArrows"> - <property name="height_request">50</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label1">Lines & Arrows</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label1">Lines & Arrows</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="CurveFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="CurveFrame"> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="Curves"> - <property name="height_request">50</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label2"> + <object class="svtlo-ValueSet" id="Curves"> + <property name="height_request">50</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label2">Curve</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label2">Curve</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="ConnectorFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="ConnectorFrame"> + <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="Connectors"> - <property name="height_request">50</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label3"> + <object class="svtlo-ValueSet" id="Connectors"> + <property name="height_request">50</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label3">Connectors</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label3">Connectors</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="BasicShapesFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="BasicShapesFrame"> + <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="BasicShapes"> - <property name="height_request">100</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label4"> + <object class="svtlo-ValueSet" id="BasicShapes"> + <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label4">Basic Shapes</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label4">Basic Shapes</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="Symbols"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="Symbols"> + <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="SymbolShapes"> - <property name="height_request">75</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label5"> + <object class="svtlo-ValueSet" id="SymbolShapes"> + <property name="height_request">75</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label5">Symbols</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label5">Symbols</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="BlockArrowFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="BlockArrowFrame"> + <object class="GtkAlignment" id="alignment6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="BlockArrows"> - <property name="height_request">125</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label6"> + <object class="svtlo-ValueSet" id="BlockArrows"> + <property name="height_request">125</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label6">Block Arrows</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label6">Block Arrows</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="FlowchartFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="FlowchartFrame"> + <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment7"> + <object class="svtlo-ValueSet" id="Flowcharts"> + <property name="height_request">125</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="Flowcharts"> - <property name="height_request">125</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label7">Flowchart</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label7">Flowchart</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="CalloutFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="CalloutFrame"> + <object class="GtkAlignment" id="alignment8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="Callouts"> - <property name="height_request">50</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label8"> + <object class="svtlo-ValueSet" id="Callouts"> + <property name="height_request">50</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label8">Callouts</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">7</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label8">Callouts</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="StarsFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="StarsFrame"> + <object class="GtkAlignment" id="alignment9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="Stars"> - <property name="height_request">50</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label9"> + <object class="svtlo-ValueSet" id="Stars"> + <property name="height_request">50</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label9">Stars</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">8</property> - </packing> </child> + <child type="label"> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label9">Stars</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="3DObjectsFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="3DObjectsFrame"> + <object class="GtkAlignment" id="alignment10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment10"> + <object class="svtlo-ValueSet" id="3DObjects"> + <property name="height_request">50</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="svtlo-ValueSet" id="3DObjects"> - <property name="height_request">50</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="defaultshapespanel|label10">3D Objects</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">9</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="defaultshapespanel|label10">3D Objects</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> </child> </object> </child> |