diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-10-15 11:14:02 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-15 21:02:23 +0200 |
commit | ec548bce309d965a25e807ae79432114926e06f3 (patch) | |
tree | 525284db036785ff1e606e65edcc75a66ede4d3d /chart2/uiconfig | |
parent | ff643eb3c5b1a50aab5e544ea689e227eecc751d (diff) |
weld ChartTypeDialog and SchLayoutTabPage
Change-Id: I101c56b855d0bdc43559ca4561d298fa4ad92572
Reviewed-on: https://gerrit.libreoffice.org/61797
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/uiconfig')
-rw-r--r-- | chart2/uiconfig/ui/charttypedialog.ui | 8 | ||||
-rw-r--r-- | chart2/uiconfig/ui/tp_ChartType.ui | 188 |
2 files changed, 114 insertions, 82 deletions
diff --git a/chart2/uiconfig/ui/charttypedialog.ui b/chart2/uiconfig/ui/charttypedialog.ui index 5823f293f9fd..def049f9b774 100644 --- a/chart2/uiconfig/ui/charttypedialog.ui +++ b/chart2/uiconfig/ui/charttypedialog.ui @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.22.1 --> <interface domain="chart"> <requires lib="gtk+" version="3.18"/> <object class="GtkDialog" id="ChartTypeDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes" context="charttypedialog|ChartTypeDialog">Chart Type</property> + <property name="modal">True</property> + <property name="default_width">0</property> + <property name="default_height">0</property> <property name="type_hint">dialog</property> + <child> + <placeholder/> + </child> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui index a38a30daae4b..987a7097d9e7 100644 --- a/chart2/uiconfig/ui/tp_ChartType.ui +++ b/chart2/uiconfig/ui/tp_ChartType.ui @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.22.1 --> <interface domain="chart"> <requires lib="gtk+" version="3.18"/> - <!-- interface-requires LibreOffice 1.0 --> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">100</property> @@ -12,7 +11,9 @@ </object> <object class="GtkListStore" id="liststore1"> <columns> - <!-- column-name gchararray1 --> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> <column type="gchararray"/> </columns> <data> @@ -30,6 +31,16 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> + <!-- column-name image --> + <column type="GdkPixbuf"/> + </columns> + </object> <object class="GtkBox" id="tp_ChartType"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -47,10 +58,9 @@ <property name="spacing">6</property> <child> <object class="GtkLabel" id="FT_CAPTION_FOR_WIZARD"> - <property name="visible">False</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="tp_ChartType|FT_CAPTION_FOR_WIZARD">Choose a Chart Type</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -75,16 +85,31 @@ <property name="hexpand">True</property> <property name="row_spacing">6</property> <child> - <object class="svtlo-ValueSet" id="subtype:border"> - <property name="visible">False</property> - <property name="can_focus">False</property> + <object class="GtkScrolledWindow" id="subtypewin"> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkDrawingArea" id="subtype"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + </object> + </child> + </object> + </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> @@ -100,7 +125,6 @@ <child> <object class="GtkCheckButton" id="3dlook"> <property name="label" translatable="yes" context="tp_ChartType|3dlook">_3D Look</property> - <property name="visible">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> @@ -113,13 +137,10 @@ <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="GtkComboBoxText" id="3dscheme"> - <property name="visible">False</property> <property name="can_focus">False</property> <items> <item translatable="yes" context="tp_ChartType|3dscheme">Simple</item> @@ -132,57 +153,70 @@ <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> </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="shapeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="tp_ChartType|shapeft">Sh_ape</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">shape:border</property> + <property name="mnemonic_widget">shape</property> <property name="angle">0.02</property> + <property name="xalign">0</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="GtkTreeView" id="shape:border"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">liststore1</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection"/> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="shape"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="model">liststore1</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> </child> </object> <packing> <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="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -193,7 +227,6 @@ <child> <object class="GtkCheckButton" id="stack"> <property name="label" translatable="yes" context="tp_ChartType|stack">_Stack series</property> - <property name="visible">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> @@ -203,8 +236,6 @@ <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> @@ -220,44 +251,36 @@ <child> <object class="GtkRadioButton" id="ontop"> <property name="label" translatable="yes" context="tp_ChartType|ontop">On top</property> - <property name="visible">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <property name="group">percent</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="GtkRadioButton" id="percent"> <property name="label" translatable="yes" context="tp_ChartType|percent">Percent</property> - <property name="visible">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> - <property name="group">deep</property> + <property name="group">ontop</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="GtkRadioButton" id="deep"> <property name="label" translatable="yes" context="tp_ChartType|deep">Deep</property> - <property name="visible">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> @@ -268,8 +291,6 @@ <packing> <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> @@ -278,8 +299,6 @@ <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> @@ -289,24 +308,19 @@ <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="linetypeft"> - <property name="visible">False</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="tp_ChartType|linetypeft">_Line type</property> <property name="use_underline">True</property> <property name="mnemonic_widget">linetype</property> - <property name="ellipsize">end</property> + <property name="xalign">0</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="GtkComboBoxText" id="linetype"> - <property name="visible">False</property> <property name="can_focus">False</property> <items> <item translatable="yes" context="tp_ChartType|linetype">Straight</item> @@ -317,14 +331,11 @@ <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="GtkButton" id="properties"> <property name="label" translatable="yes" context="tp_ChartType|properties">Properties...</property> - <property name="visible">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_underline">True</property> @@ -332,22 +343,17 @@ <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> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="sort"> <property name="label" translatable="yes" context="tp_ChartType|sort">_Sort by X values</property> - <property name="visible">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> @@ -357,8 +363,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -370,70 +374,92 @@ <object class="GtkLabel" id="nolinesft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="tp_ChartType|nolinesft">_Number of lines</property> <property name="use_underline">True</property> <property name="mnemonic_widget">nolines</property> <property name="ellipsize">end</property> + <property name="xalign">0</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="GtkSpinButton" id="nolines"> <property name="can_focus">True</property> <property name="no_show_all">True</property> + <property name="activates_default">True</property> <property name="adjustment">adjustment1</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> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">4</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">2</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">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkTreeView" id="charttype:border"> - <property name="visible">False</property> - <property name="can_focus">True</property> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="charttype"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="model">liststore2</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection2"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn3"> + <child> + <object class="GtkCellRendererPixbuf" id="cellrenderertext3"/> + <attributes> + <attribute name="pixbuf">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> </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> </object> |