Skip to content

C
core
Kaydet (Commit) 64d65620 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

pretty up assign events dialog 

Change-Id: I80ffba5d456e8b41613e0b8df577c614ce23adab
Reviewed-on: https://gerrit.libreoffice.org/63983
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c987e731
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 80 deletions
cui/source/customize/cfgutil.cxx
Dosyayı görüntüle @ 64d65620
...@@ -369,7 +369,7 @@ CuiConfigFunctionListBox::CuiConfigFunctionListBox(std::unique_ptr<weld::TreeVie ...@@ -369,7 +369,7 @@ CuiConfigFunctionListBox::CuiConfigFunctionListBox(std::unique_ptr<weld::TreeVie
: m_xTreeView(std::move(xTreeView)) : m_xTreeView(std::move(xTreeView))
{ {
m_xTreeView->make_sorted(); m_xTreeView->make_sorted();
m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 20, m_xTreeView->get_height_rows(9)); m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 35, m_xTreeView->get_height_rows(9));
} }
CuiConfigFunctionListBox::~CuiConfigFunctionListBox() CuiConfigFunctionListBox::~CuiConfigFunctionListBox()
...@@ -1272,7 +1272,7 @@ CuiConfigGroupListBox::CuiConfigGroupListBox(std::unique_ptr<weld::TreeView> xTr ...@@ -1272,7 +1272,7 @@ CuiConfigGroupListBox::CuiConfigGroupListBox(std::unique_ptr<weld::TreeView> xTr
{ {
m_xTreeView->connect_row_activated(LINK(this, CuiConfigGroupListBox, OpenCurrentHdl)); m_xTreeView->connect_row_activated(LINK(this, CuiConfigGroupListBox, OpenCurrentHdl));
m_xTreeView->connect_expanding(LINK(this, CuiConfigGroupListBox, ExpandingHdl)); m_xTreeView->connect_expanding(LINK(this, CuiConfigGroupListBox, ExpandingHdl));
m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 20, m_xTreeView->get_height_rows(9)); m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 35, m_xTreeView->get_height_rows(9));
} }
IMPL_LINK_NOARG(CuiConfigGroupListBox, OpenCurrentHdl, weld::TreeView&, void) IMPL_LINK_NOARG(CuiConfigGroupListBox, OpenCurrentHdl, weld::TreeView&, void)
......
cui/source/customize/macropg.cxx
Dosyayı görüntüle @ 64d65620
...@@ -199,7 +199,7 @@ CuiMacroEventListBox::CuiMacroEventListBox(std::unique_ptr<weld::TreeView> xTree ...@@ -199,7 +199,7 @@ CuiMacroEventListBox::CuiMacroEventListBox(std::unique_ptr<weld::TreeView> xTree
: m_xTreeView(std::move(xTreeView)) : m_xTreeView(std::move(xTreeView))
{ {
m_xTreeView->set_help_id(HID_MACRO_HEADERTABLISTBOX); m_xTreeView->set_help_id(HID_MACRO_HEADERTABLISTBOX);
m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 40, m_xTreeView->get_height_rows(9)); m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 70, m_xTreeView->get_height_rows(9));
} }
CuiMacroEventListBox::~CuiMacroEventListBox() CuiMacroEventListBox::~CuiMacroEventListBox()
......
cui/uiconfig/ui/eventassignpage.ui
Dosyayı görüntüle @ 64d65620
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<property name="row_homogeneous">True</property> <property name="row_homogeneous">True</property>
<child> <child>
<object class="GtkFrame" id="macroframe"> <object class="GtkFrame" id="frame1">
<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>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment" id="alignment3"> <object class="GtkAlignment" id="alignment1">
<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>
...@@ -64,29 +64,39 @@ ...@@ -64,29 +64,39 @@
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTreeView" id="macros"> <object class="GtkTreeView" id="assignments">
<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="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="model">liststore2</property> <property name="model">liststore3</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property> <property name="search_column">0</property>
<property name="headers_visible">True</property>
<property name="show_expanders">False</property> <property name="show_expanders">False</property>
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection" id="Tree List-selection1"/> <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1"> <object class="GtkTreeViewColumn" id="treeviewcolumn3">
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="title" translatable="yes" context="eventassignpage|eventft">Event</property>
<child> <child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext5"/> <object class="GtkCellRendererText" id="cellrenderer1"/>
<attributes> <attributes>
<attribute name="pixbuf">0</attribute> <attribute name="text">0</attribute>
</attributes> </attributes>
</child> </child>
</object>
</child>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderertext1"/> <object class="GtkTreeViewColumn" id="treeviewcolumn4">
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="title" translatable="yes" context="eventassignpage|assignft">Assigned Action</property>
<child>
<object class="GtkCellRendererText" id="cellrenderer2"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
...@@ -100,22 +110,70 @@ ...@@ -100,22 +110,70 @@
</object> </object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="existingmacrosft"> <object class="GtkLabel" id="libraryft1">
<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" translatable="yes" context="eventassignpage|existingmacrosft">Existing Macros</property> <property name="label" translatable="yes" context="eventassignpage|libraryft1">Assignments</property>
<property name="track_visited_links">False</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
</object> </object>
</child> </child>
</object> </object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="assign">
<property name="label" translatable="yes" context="eventassignpage|assign">Assign</property>
<property name="visible">True</property>
<property name="sensitive">False</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">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="delete">
<property name="label" translatable="yes" context="eventassignpage|delete">Remove</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">2</property>
</packing>
</child>
</object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">0</property>
<property name="height">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">6</property>
<property name="column_homogeneous">True</property>
<child> <child>
<object class="GtkFrame" id="groupframe"> <object class="GtkFrame" id="groupframe">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -192,11 +250,11 @@ ...@@ -192,11 +250,11 @@
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkFrame" id="frame1"> <object class="GtkFrame" id="macroframe">
<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>
...@@ -204,7 +262,7 @@ ...@@ -204,7 +262,7 @@
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment" id="alignment1"> <object class="GtkAlignment" id="alignment3">
<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>
...@@ -219,38 +277,29 @@ ...@@ -219,38 +277,29 @@
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTreeView" id="assignments"> <object class="GtkTreeView" id="macros">
<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="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="model">liststore3</property> <property name="model">liststore2</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property> <property name="search_column">0</property>
<property name="show_expanders">False</property> <property name="show_expanders">False</property>
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library List-selection2"/> <object class="GtkTreeSelection"/>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn" id="treeviewcolumn3"> <object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="title" translatable="yes" context="eventassignpage|eventft">Event</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderer1"/> <object class="GtkCellRendererPixbuf" id="cellrenderertext5"/>
<attributes> <attributes>
<attribute name="text">0</attribute> <attribute name="pixbuf">0</attribute>
</attributes> </attributes>
</child> </child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn4">
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="title" translatable="yes" context="eventassignpage|assignft">Assigned Action</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderer2"/> <object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes> <attributes>
<attribute name="text">1</attribute> <attribute name="text">1</attribute>
</attributes> </attributes>
...@@ -264,10 +313,11 @@ ...@@ -264,10 +313,11 @@
</object> </object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="libraryft1"> <object class="GtkLabel" id="existingmacrosft">
<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" translatable="yes" context="eventassignpage|libraryft1">Assignments</property> <property name="label" translatable="yes" context="eventassignpage|existingmacrosft">Existing Macros</property>
<property name="track_visited_links">False</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
...@@ -275,52 +325,14 @@ ...@@ -275,52 +325,14 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="assign">
<property name="label" translatable="yes" context="eventassignpage|assign">Assign</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">0</property>
<property name="fill">True</property> <property name="top_attach">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="delete">
<property name="label" translatable="yes" context="eventassignpage|delete">Remove</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">2</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="height">2</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