Skip to content

C
core
Kaydet (Commit) abbccd9e authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

tdf#90452: Remove the frame around the Help and Extension buttons. 

Change-Id: I86d2daec6dcbd6af3a8da1b8329417bae46c8079
Reviewed-on: https://gerrit.libreoffice.org/16623Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c3a36a67
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 78 deletions
sfx2/source/dialog/backingwindow.cxx
Dosyayı görüntüle @ abbccd9e
...@@ -143,10 +143,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) : ...@@ -143,10 +143,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
get(mpAllButtonsBox, "all_buttons_box"); get(mpAllButtonsBox, "all_buttons_box");
get(mpButtonsBox, "buttons_box"); get(mpButtonsBox, "buttons_box");
get(mpSmallButtonsBox, "small_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(mpAllRecentThumbnails, "all_recent");
get(mpLocalView, "local_view"); get(mpLocalView, "local_view");
...@@ -233,10 +229,6 @@ void BackingWindow::dispose() ...@@ -233,10 +229,6 @@ void BackingWindow::dispose()
mpAllButtonsBox.clear(); mpAllButtonsBox.clear();
mpButtonsBox.clear(); mpButtonsBox.clear();
mpSmallButtonsBox.clear(); mpSmallButtonsBox.clear();
mpThinBox1.clear();
mpThinBox2.clear();
mpHelpBox.clear();
mpExtensionsBox.clear();
mpAllRecentThumbnails.clear(); mpAllRecentThumbnails.clear();
mpLocalView.clear(); mpLocalView.clear();
vcl::Window::dispose(); vcl::Window::dispose();
...@@ -323,8 +315,6 @@ void BackingWindow::initControls() ...@@ -323,8 +315,6 @@ void BackingWindow::initControls()
mpAllButtonsBox->SetBackground(aButtonsBackground); mpAllButtonsBox->SetBackground(aButtonsBackground);
mpSmallButtonsBox->SetBackground(aButtonsBackground); mpSmallButtonsBox->SetBackground(aButtonsBackground);
mpHelpBox->SetBackground(aButtonsBackground);
mpExtensionsBox->SetBackground(aButtonsBackground);
// motif image under the buttons // motif image under the buttons
Wallpaper aWallpaper(get<FixedImage>("motif")->GetImage().GetBitmapEx()); Wallpaper aWallpaper(get<FixedImage>("motif")->GetImage().GetBitmapEx());
...@@ -333,10 +323,6 @@ void BackingWindow::initControls() ...@@ -333,10 +323,6 @@ void BackingWindow::initControls()
mpButtonsBox->SetBackground(aWallpaper); mpButtonsBox->SetBackground(aWallpaper);
// thin white rectangle around the Help and Extensions buttons
mpThinBox1->SetBackground(maButtonsTextColor);
mpThinBox2->SetBackground(maButtonsTextColor);
Resize(); Resize();
// compute the menubar height // compute the menubar height
......
sfx2/source/dialog/backingwindow.hxx
Dosyayı görüntüle @ abbccd9e
...@@ -78,10 +78,6 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer ...@@ -78,10 +78,6 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer
VclPtr<VclBox> mpAllButtonsBox; VclPtr<VclBox> mpAllButtonsBox;
VclPtr<VclBox> mpButtonsBox; VclPtr<VclBox> mpButtonsBox;
VclPtr<VclBox> mpSmallButtonsBox; VclPtr<VclBox> mpSmallButtonsBox;
VclPtr<VclBox> mpThinBox1;
VclPtr<VclBox> mpThinBox2;
VclPtr<VclBox> mpHelpBox;
VclPtr<VclBox> mpExtensionsBox;
VclPtr<RecentDocsView> mpAllRecentThumbnails; VclPtr<RecentDocsView> mpAllRecentThumbnails;
VclPtr<TemplateDefaultView> mpLocalView; VclPtr<TemplateDefaultView> mpLocalView;
......
sfx2/uiconfig/ui/startcenter.ui
Dosyayı görüntüle @ abbccd9e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 --> <!-- Generated with glade 3.18.3 -->
<interface> <interface>
<requires lib="gtk+" version="3.0"/> <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 --> <requires lib="LibreOffice" version="1.0"/>
<object class="GtkImage" id="calc_all_image"> <object class="GtkImage" id="calc_all_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -352,30 +352,26 @@ ...@@ -352,30 +352,26 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </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> <child>
<object class="GtkBox" id="small_buttons_box"> <object class="GtkBox" id="small_buttons_box">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">6</property> <property name="margin_left">6</property>
<property name="margin_right">6</property> <property name="margin_right">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property> <property name="margin_bottom">6</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
<child>
<object class="GtkBox" id="thin_box1">
<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> <child>
<object class="GtkButton" id="help"> <object class="GtkButton" id="help">
<property name="label">gtk-help</property> <property name="label">gtk-help</property>
...@@ -393,34 +389,6 @@ ...@@ -393,34 +389,6 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
</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>
<child>
<object class="GtkBox" id="thin_box2">
<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> <child>
<object class="GtkButton" id="extensions"> <object class="GtkButton" id="extensions">
<property name="label" translatable="yes">E_xtensions</property> <property name="label" translatable="yes">E_xtensions</property>
...@@ -431,20 +399,6 @@ ...@@ -431,20 +399,6 @@
<property name="relief">none</property> <property name="relief">none</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </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>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
...@@ -455,7 +409,7 @@ ...@@ -455,7 +409,7 @@
<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>
......
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