[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source sfx2/uiconfig
Jan Holesovsky
kendy at collabora.com
Fri Jul 3 12:53:41 PDT 2015
sfx2/source/dialog/backingwindow.cxx | 14 ----
sfx2/source/dialog/backingwindow.hxx | 4 -
sfx2/uiconfig/ui/startcenter.ui | 104 +++++++++--------------------------
3 files changed, 29 insertions(+), 93 deletions(-)
New commits:
commit abbccd9e1c0f5ec231bf8b53878ce1f043ef26e1
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Jun 30 16:28:27 2015 +0200
tdf#90452: Remove the frame around the Help and Extension buttons.
Change-Id: I86d2daec6dcbd6af3a8da1b8329417bae46c8079
Reviewed-on: https://gerrit.libreoffice.org/16623
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 5430c76..e58505b 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -143,10 +143,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
get(mpAllButtonsBox, "all_buttons_box");
get(mpButtonsBox, "buttons_box");
get(mpSmallButtonsBox, "small_buttons_box");
- get(mpThinBox1, "thin_box1");
- get(mpThinBox2, "thin_box2");
- get(mpHelpBox, "help_box");
- get(mpExtensionsBox, "extensions_box");
get(mpAllRecentThumbnails, "all_recent");
get(mpLocalView, "local_view");
@@ -233,10 +229,6 @@ void BackingWindow::dispose()
mpAllButtonsBox.clear();
mpButtonsBox.clear();
mpSmallButtonsBox.clear();
- mpThinBox1.clear();
- mpThinBox2.clear();
- mpHelpBox.clear();
- mpExtensionsBox.clear();
mpAllRecentThumbnails.clear();
mpLocalView.clear();
vcl::Window::dispose();
@@ -323,8 +315,6 @@ void BackingWindow::initControls()
mpAllButtonsBox->SetBackground(aButtonsBackground);
mpSmallButtonsBox->SetBackground(aButtonsBackground);
- mpHelpBox->SetBackground(aButtonsBackground);
- mpExtensionsBox->SetBackground(aButtonsBackground);
// motif image under the buttons
Wallpaper aWallpaper(get<FixedImage>("motif")->GetImage().GetBitmapEx());
@@ -333,10 +323,6 @@ void BackingWindow::initControls()
mpButtonsBox->SetBackground(aWallpaper);
- // thin white rectangle around the Help and Extensions buttons
- mpThinBox1->SetBackground(maButtonsTextColor);
- mpThinBox2->SetBackground(maButtonsTextColor);
-
Resize();
// compute the menubar height
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 8ef01fb..c2c1462 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -78,10 +78,6 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer
VclPtr<VclBox> mpAllButtonsBox;
VclPtr<VclBox> mpButtonsBox;
VclPtr<VclBox> mpSmallButtonsBox;
- VclPtr<VclBox> mpThinBox1;
- VclPtr<VclBox> mpThinBox2;
- VclPtr<VclBox> mpHelpBox;
- VclPtr<VclBox> mpExtensionsBox;
VclPtr<RecentDocsView> mpAllRecentThumbnails;
VclPtr<TemplateDefaultView> mpLocalView;
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 2362028..57b7198 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkImage" id="calc_all_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -353,53 +353,35 @@
</packing>
</child>
<child>
+ <object class="GtkSeparator" id="separator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkBox" id="small_buttons_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
- <property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="spacing">6</property>
<property name="homogeneous">True</property>
<child>
- <object class="GtkBox" id="thin_box1">
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="help_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">1</property>
- <property name="margin_right">1</property>
- <property name="margin_top">1</property>
- <property name="margin_bottom">1</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="relief">none</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -408,42 +390,14 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="thin_box2">
+ <object class="GtkButton" id="extensions">
+ <property name="label" translatable="yes">E_xtensions</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="extensions_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">1</property>
- <property name="margin_right">1</property>
- <property name="margin_top">1</property>
- <property name="margin_bottom">1</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkButton" id="extensions">
- <property name="label" translatable="yes">E_xtensions</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="relief">none</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -455,7 +409,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list