[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - icon-themes/galaxy icon-themes/hicontrast sw/source

[Jan Holesovsky]

 dev/null                                              |binary
 icon-themes/galaxy/sw/res/emptypage_10x14.png         |binary
 icon-themes/galaxy/sw/res/emptypage_a_10x14.png       |binary
 icon-themes/galaxy/sw/res/twopages_10x24.png          |binary
 icon-themes/galaxy/sw/res/twopages_a_10x24.png        |binary
 icon-themes/hicontrast/svx/res/doublepage_10x22.png   |binary
 icon-themes/hicontrast/svx/res/doublepage_a_10x22.png |binary
 icon-themes/hicontrast/svx/res/emptypage_10x14.png    |binary
 icon-themes/hicontrast/svx/res/emptypage_a_10x14.png  |binary
 icon-themes/hicontrast/svx/res/slidezoombutton_10.png |binary
 icon-themes/hicontrast/svx/res/slidezoomin_10.png     |binary
 icon-themes/hicontrast/svx/res/slidezoomout_10.png    |binary
 icon-themes/hicontrast/svx/res/twopages_10x24.png     |binary
 icon-themes/hicontrast/svx/res/twopages_a_10x24.png   |binary
 sw/source/ui/utlui/utlui.src                          |    8 ++++----
 sw/source/ui/utlui/viewlayoutctrl.cxx                 |    4 ++--
 16 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit fa1e8be2825ca1f4210f3066e05da9ff54d3ed75
Author: Mirek Mazel <mazelm at gmail.com>
Date:   Tue Jun 5 15:30:05 2012 +0200

    hicontrast icons for layout status and zoom slider controls.
    
    Change-Id: I247d792e3e912ea1f51bc363aca14c43bb72546e

diff --git a/icon-themes/hicontrast/svx/res/doublepage_10x22.png b/icon-themes/hicontrast/svx/res/doublepage_10x22.png
new file mode 100644
index 0000000..c986b93
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/doublepage_10x22.png differ
diff --git a/icon-themes/hicontrast/svx/res/doublepage_a_10x22.png b/icon-themes/hicontrast/svx/res/doublepage_a_10x22.png
new file mode 100644
index 0000000..db398f9
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/doublepage_a_10x22.png differ
diff --git a/icon-themes/hicontrast/svx/res/emptypage_10x14.png b/icon-themes/hicontrast/svx/res/emptypage_10x14.png
new file mode 100644
index 0000000..451dcbd
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/emptypage_10x14.png differ
diff --git a/icon-themes/hicontrast/svx/res/emptypage_a_10x14.png b/icon-themes/hicontrast/svx/res/emptypage_a_10x14.png
new file mode 100644
index 0000000..01541da
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/emptypage_a_10x14.png differ
diff --git a/icon-themes/hicontrast/svx/res/slidezoombutton_10.png b/icon-themes/hicontrast/svx/res/slidezoombutton_10.png
new file mode 100644
index 0000000..5ee7630
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/slidezoombutton_10.png differ
diff --git a/icon-themes/hicontrast/svx/res/slidezoomin_10.png b/icon-themes/hicontrast/svx/res/slidezoomin_10.png
new file mode 100644
index 0000000..e8027ec
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/slidezoomin_10.png differ
diff --git a/icon-themes/hicontrast/svx/res/slidezoomout_10.png b/icon-themes/hicontrast/svx/res/slidezoomout_10.png
new file mode 100644
index 0000000..a99db1b
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/slidezoomout_10.png differ
diff --git a/icon-themes/hicontrast/svx/res/twopages_10x24.png b/icon-themes/hicontrast/svx/res/twopages_10x24.png
new file mode 100644
index 0000000..d1eb252
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/twopages_10x24.png differ
diff --git a/icon-themes/hicontrast/svx/res/twopages_a_10x24.png b/icon-themes/hicontrast/svx/res/twopages_a_10x24.png
new file mode 100644
index 0000000..cc475d9
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/twopages_a_10x24.png differ
commit cfc690e06f373b162a84277d9c473b66d9df3cc6
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jun 5 15:22:02 2012 +0200

    layout status control: Improved artwork by Mirek M.
    
    Change-Id: I0584f4d158225dc28518fb67185d0a704bfe10d1

diff --git a/icon-themes/galaxy/sw/res/emptypage_10x14.png b/icon-themes/galaxy/sw/res/emptypage_10x14.png
new file mode 100644
index 0000000..d564bfd
Binary files /dev/null and b/icon-themes/galaxy/sw/res/emptypage_10x14.png differ
diff --git a/icon-themes/galaxy/sw/res/emptypage_10x22.png b/icon-themes/galaxy/sw/res/emptypage_10x22.png
deleted file mode 100644
index b72bbdc..0000000
Binary files a/icon-themes/galaxy/sw/res/emptypage_10x22.png and /dev/null differ
diff --git a/icon-themes/galaxy/sw/res/emptypage_a_10x14.png b/icon-themes/galaxy/sw/res/emptypage_a_10x14.png
new file mode 100644
index 0000000..4359b49
Binary files /dev/null and b/icon-themes/galaxy/sw/res/emptypage_a_10x14.png differ
diff --git a/icon-themes/galaxy/sw/res/emptypage_a_10x22.png b/icon-themes/galaxy/sw/res/emptypage_a_10x22.png
deleted file mode 100644
index ac011b8..0000000
Binary files a/icon-themes/galaxy/sw/res/emptypage_a_10x22.png and /dev/null differ
diff --git a/icon-themes/galaxy/sw/res/twopages_10x22.png b/icon-themes/galaxy/sw/res/twopages_10x22.png
deleted file mode 100644
index 9c95268..0000000
Binary files a/icon-themes/galaxy/sw/res/twopages_10x22.png and /dev/null differ
diff --git a/icon-themes/galaxy/sw/res/twopages_10x24.png b/icon-themes/galaxy/sw/res/twopages_10x24.png
new file mode 100644
index 0000000..2a44966
Binary files /dev/null and b/icon-themes/galaxy/sw/res/twopages_10x24.png differ
diff --git a/icon-themes/galaxy/sw/res/twopages_a_10x22.png b/icon-themes/galaxy/sw/res/twopages_a_10x22.png
deleted file mode 100644
index 1e095f8..0000000
Binary files a/icon-themes/galaxy/sw/res/twopages_a_10x22.png and /dev/null differ
diff --git a/icon-themes/galaxy/sw/res/twopages_a_10x24.png b/icon-themes/galaxy/sw/res/twopages_a_10x24.png
new file mode 100644
index 0000000..c79eede
Binary files /dev/null and b/icon-themes/galaxy/sw/res/twopages_a_10x24.png differ
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 0895b43..69d9920 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -323,7 +323,7 @@ Image IMG_VIEWLAYOUT_AUTOMATIC
 {
     ImageBitmap = Bitmap
     {
-        File = "twopages_10x22.png" ;
+        File = "twopages_10x24.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
@@ -331,7 +331,7 @@ Image IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE
 {
     ImageBitmap = Bitmap
     {
-        File = "twopages_a_10x22.png" ;
+        File = "twopages_a_10x24.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
@@ -357,7 +357,7 @@ Image IMG_VIEWLAYOUT_SINGLECOLUMN
 {
     ImageBitmap = Bitmap
     {
-        File = "emptypage_10x22.png" ;
+        File = "emptypage_10x14.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
@@ -365,7 +365,7 @@ Image IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE
 {
     ImageBitmap = Bitmap
     {
-        File = "emptypage_a_10x22.png" ;
+        File = "emptypage_a_10x14.png" ;
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index d811d9d..7b0376d 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -41,8 +41,8 @@
 
 SFX_IMPL_STATUSBAR_CONTROL( SwViewLayoutControl, SvxViewLayoutItem );
 
-const long nImageWidthSingle = 22;
-const long nImageWidthAuto = 22;
+const long nImageWidthSingle = 14;
+const long nImageWidthAuto = 24;
 const long nImageWidthBook = 22;
 const long nImageWidthSum = nImageWidthSingle + nImageWidthAuto + nImageWidthBook;
 const long nImageHeight = 10;