Skip to content

C
core
Kaydet (Commit) 1515b7b9 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Tomaž Vajngerl
Dosyalara gözat
Seçenekler

Improve 2 dialogs for data Statistics 

Tweak 2 dialogs for Calc Data Statistics, seeking consistency and using HIG guidelines

Change-Id: Ie87413dd820315eaf68eafdbd7381ec1f3744b4d
Reviewed-on: https://gerrit.libreoffice.org/10673Reviewed-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
Tested-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
üst a5834132
Hide whitespace changes
Inline Side-by-side
Showing with 363 additions and 309 deletions
sc/uiconfig/scalc/ui/correlationdialog.ui
Dosyayı görüntüle @ 1515b7b9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Sun Nov 3 11:48:01 2013 --> <!-- Generated with glade 3.16.1 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="CorrelationDialog"> <object class="GtkDialog" id="CorrelationDialog">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">5</property> <property name="border_width">6</property>
<property name="title" translatable="yes">Correlation</property> <property name="title" translatable="yes">Correlation</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">2</property> <property name="spacing">12</property>
<child internal-child="action_area"> <child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1"> <object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -58,181 +58,208 @@ ...@@ -58,181 +58,208 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkGrid" id="grid1"> <object class="GtkFrame" id="frame4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="row_spacing">6</property> <property name="label_xalign">0</property>
<property name="column_spacing">12</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkLabel" id="input-range-label"> <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="top_padding">6</property>
<property name="label" translatable="yes">Input Range</property> <property name="bottom_padding">6</property>
<property name="use_underline">True</property> <property name="left_padding">12</property>
<property name="mnemonic_widget">input-range-edit</property> <child>
</object> <object class="GtkGrid" id="grid3">
<packing> <property name="visible">True</property>
<property name="left_attach">0</property> <property name="can_focus">False</property>
<property name="top_attach">0</property> <property name="row_spacing">6</property>
<property name="width">1</property> <property name="column_spacing">12</property>
<property name="height">1</property> <child>
</packing> <object class="GtkLabel" id="input-range-label">
</child> <property name="visible">True</property>
<child> <property name="can_focus">False</property>
<object class="foruilo-RefEdit" id="input-range-edit"> <property name="xalign">0</property>
<property name="visible">True</property> <property name="label" translatable="yes">Input Range</property>
<property name="can_focus">True</property> <property name="use_underline">True</property>
<property name="valign">center</property> <property name="mnemonic_widget">input-range-edit</property>
<property name="hexpand">True</property> </object>
<property name="invisible_char">•</property> <packing>
<property name="width_chars">30</property> <property name="left_attach">0</property>
</object> <property name="top_attach">0</property>
<packing> <property name="width">1</property>
<property name="left_attach">1</property> <property name="height">1</property>
<property name="top_attach">0</property> </packing>
<property name="width">1</property> </child>
<property name="height">1</property> <child>
</packing> <object class="GtkLabel" id="output-range-label">
</child> <property name="visible">True</property>
<child> <property name="can_focus">False</property>
<object class="foruilo-RefButton" id="input-range-button"> <property name="xalign">0</property>
<property name="visible">True</property> <property name="label" translatable="yes">Results to</property>
<property name="can_focus">False</property> <property name="use_underline">True</property>
<property name="receives_default">True</property> <property name="mnemonic_widget">output-range-edit</property>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">1</property>
<property name="width">1</property> <property name="width">1</property>
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="output-range-label"> <object class="foruilo-RefEdit" id="input-range-edit">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="xalign">0</property> <property name="valign">center</property>
<property name="label" translatable="yes">Results to</property> <property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="invisible_char">•</property>
<property name="mnemonic_widget">output-range-edit</property> <property name="width_chars">30</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <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="width">1</property>
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="foruilo-RefEdit" id="output-range-edit"> <object class="foruilo-RefEdit" id="output-range-edit">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
<property name="width_chars">30</property> <property name="width_chars">30</property>
</object>
<packing>
<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="foruilo-RefButton" id="input-range-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</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="foruilo-RefButton" id="output-range-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
</child>
</object> </object>
<packing>
<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>
<child> <child type="label">
<object class="foruilo-RefButton" id="output-range-button"> <object class="GtkLabel" id="label4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="receives_default">True</property> <property name="label" translatable="yes">Data</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child> </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child> <child>
<object class="GtkFrame" id="frame2"> <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label_xalign">0</property> <property name="top_padding">6</property>
<property name="shadow_type">none</property> <property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child> <child>
<object class="GtkAlignment" id="alignment2"> <object class="GtkGrid" id="grid2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property> <property name="row_spacing">6</property>
<property name="bottom_padding">6</property> <property name="column_spacing">12</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child> <child>
<object class="GtkGrid" id="grid2"> <object class="GtkRadioButton" id="groupedby-columns-radio">
<property name="label" translatable="yes">Columns</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="row_spacing">6</property> <property name="receives_default">False</property>
<property name="column_spacing">12</property> <property name="xalign">0</property>
<child> <property name="active">True</property>
<object class="GtkRadioButton" id="groupedby-columns-radio"> <property name="draw_indicator">True</property>
<property name="label" translatable="yes">Columns</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">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>
<child>
<object class="GtkRadioButton" id="groupedby-rows-radio">
<property name="label" translatable="yes">Rows</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">groupedby-columns-radio</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> </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="groupedby-rows-radio">
<property name="label" translatable="yes">Rows</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">groupedby-columns-radio</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>
</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">Grouped by</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
</child> </child>
</object> </object>
<packing> </child>
<property name="left_attach">0</property> <child type="label">
<property name="top_attach">2</property> <object class="GtkLabel" id="label2">
<property name="width">3</property> <property name="visible">True</property>
<property name="height">1</property> <property name="can_focus">False</property>
</packing> <property name="label" translatable="yes">Grouped by</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>
......
sc/uiconfig/scalc/ui/covariancedialog.ui
Dosyayı görüntüle @ 1515b7b9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Sun Nov 3 11:48:59 2013 --> <!-- Generated with glade 3.16.1 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires LibreOffice 1.0 -->
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="CovarianceDialog"> <object class="GtkDialog" id="CovarianceDialog">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">5</property> <property name="border_width">6</property>
<property name="title" translatable="yes">Covariance</property> <property name="title" translatable="yes">Covariance</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">2</property> <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<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="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="input-range-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Input Range</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">input-range-edit</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="foruilo-RefEdit" id="input-range-edit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="width_chars">30</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="foruilo-RefButton" id="input-range-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</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="GtkLabel" id="output-range-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Results to</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">output-range-edit</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="foruilo-RefEdit" id="output-range-edit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="width_chars">30</property>
</object>
<packing>
<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="foruilo-RefButton" id="output-range-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</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">Data</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child internal-child="action_area"> <child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1"> <object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -58,181 +188,78 @@ ...@@ -58,181 +188,78 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkGrid" id="grid1"> <object class="GtkFrame" id="frame2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="row_spacing">6</property> <property name="label_xalign">0</property>
<property name="column_spacing">12</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkLabel" id="input-range-label"> <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="top_padding">6</property>
<property name="label" translatable="yes">Input Range</property> <property name="bottom_padding">6</property>
<property name="use_underline">True</property> <property name="left_padding">12</property>
<property name="mnemonic_widget">input-range-edit</property> <property name="right_padding">12</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="foruilo-RefEdit" id="input-range-edit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="width_chars">30</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="foruilo-RefButton" id="input-range-button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</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="GtkLabel" id="output-range-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Results to</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">output-range-edit</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="foruilo-RefEdit" id="output-range-edit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="width_chars">30</property>
</object>
<packing>
<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="foruilo-RefButton" id="output-range-button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment" id="alignment2"> <object class="GtkGrid" id="grid2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property> <property name="row_spacing">6</property>
<property name="bottom_padding">6</property> <property name="column_spacing">12</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child> <child>
<object class="GtkGrid" id="grid2"> <object class="GtkRadioButton" id="groupedby-columns-radio">
<property name="label" translatable="yes">Columns</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="row_spacing">6</property> <property name="receives_default">False</property>
<property name="column_spacing">12</property> <property name="xalign">0</property>
<child> <property name="active">True</property>
<object class="GtkRadioButton" id="groupedby-columns-radio"> <property name="draw_indicator">True</property>
<property name="label" translatable="yes">Columns</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">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>
<child>
<object class="GtkRadioButton" id="groupedby-rows-radio">
<property name="label" translatable="yes">Rows</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">groupedby-columns-radio</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> </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="groupedby-rows-radio">
<property name="label" translatable="yes">Rows</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">groupedby-columns-radio</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>
</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">Grouped by</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
</child> </child>
</object> </object>
<packing> </child>
<property name="left_attach">0</property> <child type="label">
<property name="top_attach">2</property> <object class="GtkLabel" id="label2">
<property name="width">3</property> <property name="visible">True</property>
<property name="height">1</property> <property name="can_focus">False</property>
</packing> <property name="label" translatable="yes">Grouped by</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
</object> </object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment