summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2013-11-14 14:24:56 +0100
committerJan Holesovsky <kendy@collabora.com>2013-11-14 14:25:57 +0100
commit50cf694b04bb3bc327887aed5a996a96da45e0c6 (patch)
tree664c1a4d5bafe5087540358cdae8e48f4db599da
parenta14dc51f9e8fc1fb4adac21722790a0a254ccd60 (diff)
startcenter: Motif image now works too.
Change-Id: Ieecd2e8ee010b06b64a792e0fcad744c66c5f79e
-rw-r--r--icon-themes/galaxy/sfx2/res/startcenter-logo.pngbin6389 -> 11690 bytes
-rw-r--r--sfx2/source/dialog/backingwindow.cxx9
-rw-r--r--sfx2/uiconfig/ui/startcenter.ui44
3 files changed, 35 insertions, 18 deletions
diff --git a/icon-themes/galaxy/sfx2/res/startcenter-logo.png b/icon-themes/galaxy/sfx2/res/startcenter-logo.png
index f94ad943f326..fd38134f5515 100644
--- a/icon-themes/galaxy/sfx2/res/startcenter-logo.png
+++ b/icon-themes/galaxy/sfx2/res/startcenter-logo.png
Binary files differ
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 8dc4663c6c03..50db1f7a8c3e 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -235,11 +235,18 @@ void BackingWindow::initControls()
mpExtensionsButton->SetControlForeground(aButtonsText);
mpAllButtonsBox->SetBackground(aButtonsBackground);
- mpButtonsBox->SetBackground(aButtonsBackground);
mpSmallButtonsBox->SetBackground(aButtonsBackground);
mpHelpBox->SetBackground(aButtonsBackground);
mpExtensionsBox->SetBackground(aButtonsBackground);
+ // motif image under the buttons
+ Wallpaper aWallpaper(get<FixedImage>("motif")->GetImage().GetBitmapEx());
+ aWallpaper.SetStyle(WALLPAPER_BOTTOMRIGHT);
+ aWallpaper.SetColor(aButtonsBackground);
+
+ mpButtonsBox->SetBackground(aWallpaper);
+
+ // thin white rectangle aronud the Help and Extensions buttons
mpThinBox1->SetBackground(aButtonsText);
mpThinBox2->SetBackground(aButtonsText);
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 92ddaffc79c4..8af9ad8f028c 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -2,6 +2,21 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkImage" id="calc_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/ods_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="database_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odb_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="draw_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odg_32_8.png</property>
+ </object>
<object class="GtkBox" id="StartCenter">
<property name="can_focus">False</property>
<child>
@@ -10,7 +25,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="border_width">12</property>
+ <property name="border_width">6</property>
<child>
<object class="GtkBox" id="all_buttons_box">
<property name="visible">True</property>
@@ -206,6 +221,17 @@
<property name="position">9</property>
</packing>
</child>
+ <child>
+ <object class="GtkImage" id="motif">
+ <property name="can_focus">False</property>
+ <property name="pixbuf">sfx2/res/startcenter-logo.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">10</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -346,25 +372,9 @@
</packing>
</child>
</object>
- <object class="GtkImage" id="calc_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/ods_32_8.png</property>
- </object>
- <object class="GtkImage" id="database_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odb_32_8.png</property>
- </object>
- <object class="GtkImage" id="draw_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odg_32_8.png</property>
- </object>
<object class="GtkImage" id="impress_all_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">New Presentation</property>
<property name="pixbuf">res/odp_32_8.png</property>
</object>
<object class="GtkImage" id="math_all_image">