High-Contrast Cleanup Phase #1

6 files changed, 38 insertions, 73 deletions

diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 5f52b042edf3..17897aece094 100755
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -57,7 +57,6 @@
 #define FL_LICENSE                              69
 #define FI_LICENSE_ARROW1                       60
 #define FI_LICENSE_ARROW2                       61
-#define IMG_LICENCE_ARROW_HC                    62
 #define BTN_LICENSE_ACCEPT                      63
 
 // local RIDs for "Download and Install" dialog
@@ -94,28 +93,28 @@
 #define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES        (RID_DEPLOYMENT_GUI_START + 8)
 #define RID_WARNINGBOX_INSTALL_EXTENSION                          (RID_DEPLOYMENT_GUI_START + 9)
 
-#define RID_DLG_UPDATE (RID_DEPLOYMENT_GUI_START + 10)
-
-#define RID_DLG_UPDATE_CHECKING 1
-#define RID_DLG_UPDATE_THROBBER 2
-#define RID_DLG_UPDATE_UPDATE 3
-#define RID_DLG_UPDATE_UPDATES 4
-#define RID_DLG_UPDATE_ALL 5
-#define RID_DLG_UPDATE_DESCRIPTION 6
-#define RID_DLG_UPDATE_DESCRIPTIONS 7
-#define RID_DLG_UPDATE_LINE 8
-#define RID_DLG_UPDATE_HELP 9
-#define RID_DLG_UPDATE_OK 10
-#define RID_DLG_UPDATE_CANCEL 11
-#define RID_DLG_UPDATE_NORMALALERT 12
-#define RID_DLG_UPDATE_HIGHCONTRASTALERT 13
-#define RID_DLG_UPDATE_ERROR 14
-#define RID_DLG_UPDATE_NONE 15
-#define RID_DLG_UPDATE_NOINSTALLABLE 16
-#define RID_DLG_UPDATE_FAILURE 17
-#define RID_DLG_UPDATE_UNKNOWNERROR 18
-#define RID_DLG_UPDATE_NODESCRIPTION 19
-#define RID_DLG_UPDATE_NOINSTALL 20
+#define RID_DLG_UPDATE                      (RID_DEPLOYMENT_GUI_START + 10)
+
+#define RID_DLG_UPDATE_CHECKING             1
+#define RID_DLG_UPDATE_THROBBER             2
+#define RID_DLG_UPDATE_UPDATE               3
+#define RID_DLG_UPDATE_UPDATES              4
+#define RID_DLG_UPDATE_ALL                  5
+#define RID_DLG_UPDATE_DESCRIPTION          6
+#define RID_DLG_UPDATE_DESCRIPTIONS         7
+#define RID_DLG_UPDATE_LINE                 8
+#define RID_DLG_UPDATE_HELP                 9
+#define RID_DLG_UPDATE_OK                   10
+#define RID_DLG_UPDATE_CANCEL               11
+#define RID_DLG_UPDATE_NORMALALERT          12
+#define RID_DLG_UPDATE_HIGHCONTRASTALERT    13
+#define RID_DLG_UPDATE_ERROR                14
+#define RID_DLG_UPDATE_NONE                 15
+#define RID_DLG_UPDATE_NOINSTALLABLE        16
+#define RID_DLG_UPDATE_FAILURE              17
+#define RID_DLG_UPDATE_UNKNOWNERROR         18
+#define RID_DLG_UPDATE_NODESCRIPTION        19
+#define RID_DLG_UPDATE_NOINSTALL            20
 #define RID_DLG_UPDATE_NODEPENDENCY         21
 #define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER 22
 #define RID_DLG_UPDATE_NOPERMISSION         23
@@ -133,13 +132,9 @@
 #define RID_INFOBOX_UPDATE_SHARED_EXTENSION    (RID_DEPLOYMENT_GUI_START + 21)
 
 #define RID_IMG_WARNING                        (RID_DEPLOYMENT_GUI_START+56)
-#define RID_IMG_WARNING_HC                     (RID_DEPLOYMENT_GUI_START+57)
 #define RID_IMG_LOCKED                         (RID_DEPLOYMENT_GUI_START+58)
-#define RID_IMG_LOCKED_HC                      (RID_DEPLOYMENT_GUI_START+59)
 #define RID_IMG_EXTENSION                      (RID_DEPLOYMENT_GUI_START+60)
-#define RID_IMG_EXTENSION_HC                   (RID_DEPLOYMENT_GUI_START+61)
 #define RID_IMG_SHARED                         (RID_DEPLOYMENT_GUI_START+62)
-#define RID_IMG_SHARED_HC                      (RID_DEPLOYMENT_GUI_START+63)
 
 #define RID_STR_ADD_PACKAGES                   (RID_DEPLOYMENT_GUI_START+70)
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index 15823288ee20..2ea6fefff877 100755
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -31,27 +31,33 @@ String RID_STR_ADD_PACKAGES
 {
     Text [ en-US ] = "Add Extension(s)";
 };
+
 String RID_CTX_ITEM_REMOVE
 {
     Text [ en-US ] = "~Remove";
 };
+
 String RID_CTX_ITEM_ENABLE
 {
     Text [ en-US ] = "~Enable";
 };
+
 String RID_CTX_ITEM_DISABLE
 {
     Text [ en-US ] = "~Disable";
 };
+
 String RID_CTX_ITEM_CHECK_UPDATE
 {
     Text [ en-US ] = "~Update...";
 };
+
 String RID_CTX_ITEM_OPTIONS
 {
     Text [ en-US ] = "~Options...";
 };
 
+
 String RID_STR_ADDING_PACKAGES
 {
     Text [ en-US ] = "Adding %EXTENSION_NAME";
@@ -177,7 +183,6 @@ ModalDialog RID_DLG_LICENSE
     Moveable = TRUE;
     Closeable = TRUE;
     Sizeable = FALSE;
-//    Hide = TRUE;
 
     MultiLineEdit ML_LICENSE
     {
@@ -196,6 +201,7 @@ ModalDialog RID_DLG_LICENSE
         NoLabel = TRUE;
         Text [ en-US ] = "Please follow these steps to proceed with the installation of the extension:";
     };
+
     FixedText FT_LICENSE_BODY_1
     {
         Pos = MAP_APPFONT(COL2_X, ROW3_Y);
@@ -203,6 +209,7 @@ ModalDialog RID_DLG_LICENSE
         NoLabel = TRUE;
         Text [ en-US ] = "1.";
     };
+
     //spans col3 + col4
     FixedText FT_LICENSE_BODY_1_TXT
     {
@@ -212,6 +219,7 @@ ModalDialog RID_DLG_LICENSE
         NoLabel = TRUE;
         Text [ en-US ] = "Read the complete License Agreement. Use the scroll bar or the \'Scroll Down\' button in this dialog to view the entire license text.";
     };
+
     FixedText FT_LICENSE_BODY_2
     {
         Pos = MAP_APPFONT(COL2_X, ROW4_Y);
@@ -219,6 +227,7 @@ ModalDialog RID_DLG_LICENSE
         NoLabel = TRUE;
         Text [ en-US ] = "2.";
     };
+
     FixedText FT_LICENSE_BODY_2_TXT
     {
         Pos = MAP_APPFONT(COL3_X, ROW4_Y);
@@ -228,6 +237,7 @@ ModalDialog RID_DLG_LICENSE
         Text [ en-US ] = "Accept the License Agreement for the extension by pressing the \'Accept\' button.";
 
     };
+
     PushButton PB_LICENSE_DOWN
     {
         TabStop = TRUE ;
@@ -236,6 +246,7 @@ ModalDialog RID_DLG_LICENSE
         Text [ en-US ] = "~Scroll Down";
 
     };
+
     FixedLine FL_LICENSE
     {
         Pos = MAP_APPFONT ( 0, ROW5_Y) ;
@@ -264,12 +275,6 @@ ModalDialog RID_DLG_LICENSE
         };
     };
 
-    Image IMG_LICENCE_ARROW_HC
-    {
-        ImageBitmap = Bitmap { File = "sch06300.png"; };
-        MASKCOLOR
-    };
-
     OKButton BTN_LICENSE_ACCEPT
     {
         Pos = MAP_APPFONT(COL4_X, ROW6_Y);
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index 7c47365999a0..5233890d1da8 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -158,41 +158,21 @@ Image RID_IMG_WARNING
     ImageBitmap = Bitmap { File = "caution_16.png"; };
 };
 
-Image RID_IMG_WARNING_HC
-{
-    ImageBitmap = Bitmap { File = "caution_16_h.png"; };
-};
-
 Image RID_IMG_LOCKED
 {
     ImageBitmap = Bitmap { File = "lock_16.png"; };
 };
 
-Image RID_IMG_LOCKED_HC
-{
-    ImageBitmap = Bitmap { File = "lock_16_h.png"; };
-};
-
 Image RID_IMG_SHARED
 {
     ImageBitmap = Bitmap { File = "shared_16.png"; };
 };
 
-Image RID_IMG_SHARED_HC
-{
-    ImageBitmap = Bitmap { File = "shared_16_h.png"; };
-};
-
 Image RID_IMG_EXTENSION
 {
     ImageBitmap = Bitmap { File = "extension_32.png"; };
 };
 
-Image RID_IMG_EXTENSION_HC
-{
-    ImageBitmap = Bitmap { File = "extension_32_h.png"; };
-};
-
 QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
 {
     Buttons = WB_YES_NO_CANCEL;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 2e4cac48457b..36c7afe46ea7 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -179,13 +179,9 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan
     m_nActiveHeight( 0 ),
     m_nExtraHeight( 2 ),
     m_aSharedImage( DialogHelper::getResId( RID_IMG_SHARED ) ),
-    m_aSharedImageHC( DialogHelper::getResId( RID_IMG_SHARED_HC ) ),
     m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
-    m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ),
     m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
-    m_aWarningImageHC( DialogHelper::getResId( RID_IMG_WARNING_HC ) ),
     m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),
-    m_aDefaultImageHC( DialogHelper::getResId( RID_IMG_EXTENSION_HC ) ),
     m_pScrollBar( NULL ),
     m_pManager( pManager )
 {
@@ -526,7 +522,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     aPos += Point( TOP_OFFSET, TOP_OFFSET );
     Image aImage;
     if ( ! pEntry->m_aIcon )
-        aImage = isHCMode() ? m_aDefaultImageHC : m_aDefaultImage;
+        aImage = m_aDefaultImage;
     else
         aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon;
     Size aImageSize = aImage.GetSizePixel();
@@ -634,14 +630,14 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     {
         aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET );
         if ( pEntry->m_bLocked )
-            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aLockedImage );
         else
-            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aSharedImageHC : m_aSharedImage );
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aSharedImage );
     }
     if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps || pEntry->m_bMissingLic )
     {
         aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET );
-        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aWarningImageHC : m_aWarningImage );
+        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aWarningImage );
     }
 
     SetLineColor( Color( COL_LIGHTGRAY ) );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 8120d3b3bfad..f0122aba71e6 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -137,13 +137,9 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     long            m_nExtraHeight;
     Size            m_aOutputSize;
     Image           m_aSharedImage;
-    Image           m_aSharedImageHC;
     Image           m_aLockedImage;
-    Image           m_aLockedImageHC;
     Image           m_aWarningImage;
-    Image           m_aWarningImageHC;
     Image           m_aDefaultImage;
-    Image           m_aDefaultImageHC;
     Link            m_aClickHdl;
 
     ScrollBar      *m_pScrollBar;
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 2ebd75cbc377..32faa7123b5b 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -215,13 +215,6 @@ LicenseDialogImpl::LicenseDialogImpl(
 
 {
 
-    if (GetSettings().GetStyleSettings().GetHighContrastMode())
-    {
-        // high contrast mode needs other images
-        m_fiArrow1.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC)));
-        m_fiArrow2.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC)));
-    }
-
     FreeResource();
 
     m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT);