From 44eddcb9a806013a086e489dea077e72939ab7eb Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 21 Jan 2009 14:43:28 +0000
Subject: [PATCH] Fix for issue 3732 (Incosistency in use of icons in dialogs of setup and control panel) Remove the icons from the dialogs in the QuickSetup.
---
/dev/null | 0
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java | 2 +-
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java | 16 ----------------
opendj-sdk/opends/src/messages/messages/quicksetup.properties | 3 ---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java | 2 +-
5 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/quicksetup.properties b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
index 6f74034..c58b69c 100644
--- a/opendj-sdk/opends/src/messages/messages/quicksetup.properties
+++ b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
@@ -664,9 +664,6 @@
INFO_OPEN_LDIF_FILE_DIALOG_TITLE=Choose an LDIF File
INFO_OPEN_SERVER_LOCATION_DIALOG_TITLE=Choose Installation Path
INFO_OPEN_ZIP_FILE_DIALOG_TITLE=Choose an OpenDS Installation Package (.zip)
-# Only translate if the image is specific to the local
-INFO_OPENDS_SMALL_ICON=images/opends_logo_small.png
-INFO_OPENDS_SMALL_ICON_DESCRIPTION=OpenDS icon.
# Only translate if the color is specific to the local
INFO_OPTIONPANE_BACKGROUND_COLOR=255,255,255
INFO_ORACLE_ACTION_PROMPT=Have you performed the tasks described?
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/images/opends_logo_small.png b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/images/opends_logo_small.png
deleted file mode 100644
index 0e20fce..0000000
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/images/opends_logo_small.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
index c43418d..fe66fa2 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
@@ -608,7 +608,7 @@
gbc.gridwidth = 4;
gbc.insets = UIFactory.getEmptyInsets();
gbc.insets.left = UIFactory.getCurrentStepPanelInsets().left;
- buttonsPanel.add(UIFactory.makeJLabel(UIFactory.IconType.OPENDS_SMALL,
+ buttonsPanel.add(UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
null, UIFactory.TextStyle.NO_STYLE), gbc);
gbc.weightx = 1.0;
gbc.gridwidth--;
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
index 54fcd14..4e99e1c 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
@@ -350,7 +350,7 @@
gbc.gridwidth = 4;
gbc.insets = UIFactory.getEmptyInsets();
gbc.insets.left = UIFactory.getCurrentStepPanelInsets().left;
- buttonsPanel.add(UIFactory.makeJLabel(UIFactory.IconType.OPENDS_SMALL,
+ buttonsPanel.add(UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
null, UIFactory.TextStyle.NO_STYLE), gbc);
gbc.weightx = 1.0;
gbc.gridwidth--;
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
index 1f68ab2..419caba 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
@@ -613,10 +613,6 @@
*/
INFORMATION_LARGE,
/**
- * Icon of OpenDS.
- */
- OPENDS_SMALL,
- /**
* Icon to create subsection title in Status Panel.
*/
SUBSECTION_LEFT,
@@ -1516,10 +1512,6 @@
key = INFO_INFORMATION_LARGE_ICON.get();
break;
- case OPENDS_SMALL:
- key = INFO_OPENDS_SMALL_ICON.get();
- break;
-
case SUBSECTION_LEFT:
key = INFO_SUBSECTION_LEFT_ICON.get();
break;
@@ -1608,10 +1600,6 @@
description = INFO_INFORMATION_ICON_DESCRIPTION.get();
break;
- case OPENDS_SMALL:
- description = INFO_OPENDS_SMALL_ICON_DESCRIPTION.get();
- break;
-
case SUBSECTION_LEFT:
description = INFO_SUBSECTION_LEFT_ICON_DESCRIPTION.get();
break;
@@ -1700,10 +1688,6 @@
tooltip = INFO_INFORMATION_ICON_TOOLTIP.get();
break;
- case OPENDS_SMALL:
- tooltip = null;
- break;
-
case SUBSECTION_LEFT:
tooltip = null;
break;
--
Gitblit v1.10.0