1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-02 22:55:26 +02:00

2004-06-21 Alain Magloire

It is too late to change the icons, but still
	make a difference in a CFolder(CContainer) and
	a normal folder.
	* icons/full/obj16/sroo_obj.gif
	* src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
	* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
	* src/org/eclipse/cdt/internal/ui/CPluginImages.java
This commit is contained in:
Alain Magloire 2004-06-22 19:16:51 +00:00
parent c8e604403c
commit fdfc59936c
7 changed files with 22 additions and 11 deletions

View file

@ -1,11 +1,20 @@
2004-06-21 Alain Magloire
It is too late to change the icons, but still
make a difference in a CFolder(CContainer) and
a normal folder.
* icons/full/obj16/sroo_obj.gif
* src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
* src/org/eclipse/cdt/internal/ui/CPluginImages.java
2004-06-22 Tanya Wolff
Fix for Bug 49883: duplicate mnemonics on editor preferences page.
Also flipped label/checkbox presentation for "bold" so the mnemonic would work.
Removed unneeded keys.
* src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
2004-06-22 Bogdan Gheorghe
Fix for 68028: Open Declaration into closed project causes PartInitException

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 B

After

Width:  |  Height:  |  Size: 152 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 B

View file

@ -188,9 +188,8 @@ public class BaseCElementContentProvider implements ITreeContentProvider {
ICProject cp= (ICProject)element;
if (!cp.getProject().isOpen()) {
return false;
} else {
return true;
}
return true;
}
if (element instanceof IBinaryContainer) {

View file

@ -79,12 +79,12 @@ public class CElementImageProvider {
private static ImageDescriptor DESC_OBJ_PROJECT_CLOSED;
private static ImageDescriptor DESC_OBJ_PROJECT;
private static ImageDescriptor DESC_OBJ_FOLDER;
//private static ImageDescriptor DESC_OBJ_FOLDER;
{
ISharedImages images= CUIPlugin.getDefault().getWorkbench().getSharedImages();
DESC_OBJ_PROJECT_CLOSED= images.getImageDescriptor(IDE.SharedImages.IMG_OBJ_PROJECT_CLOSED);
DESC_OBJ_PROJECT= images.getImageDescriptor(IDE.SharedImages.IMG_OBJ_PROJECT);
DESC_OBJ_FOLDER= images.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
//DESC_OBJ_FOLDER= images.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
}
public CElementImageProvider() {
@ -138,7 +138,8 @@ public class CElementImageProvider {
return CPluginImages.DESC_OBJS_TUNIT;
case ICElement.C_CCONTAINER:
return DESC_OBJ_FOLDER;
//return DESC_OBJ_FOLDER;
return CPluginImages.DESC_OBJS_CFOLDER;
case ICElement.C_PROJECT:
return DESC_OBJ_PROJECT;
@ -292,7 +293,8 @@ public class CElementImageProvider {
if (celement instanceof ISourceRoot) {
return CPluginImages.DESC_OBJS_SOURCE_ROOT;
}
return DESC_OBJ_FOLDER;
//return DESC_OBJ_FOLDER;
return CPluginImages.DESC_OBJS_CFOLDER;
case ICElement.C_PROJECT:
ICProject cp= (ICProject)celement;

View file

@ -72,7 +72,8 @@ public class CPluginImages {
public static final String IMG_OBJS_TUNIT_HEADER= NAME_PREFIX + "h_file_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_TUNIT_ASM= NAME_PREFIX + "s_file_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_TUNIT_RESOURCE= NAME_PREFIX + "c_resource_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_SOURCE_ROOT= NAME_PREFIX + "cfolder_obj.gif"; // $NON-NLS-1$ //$NON-NLS-1$
public static final String IMG_OBJS_SOURCE_ROOT= NAME_PREFIX + "sroot_obj.gif"; // $NON-NLS-1$ //$NON-NLS-1$
public static final String IMG_OBJS_CFOLDER= NAME_PREFIX + "cfolder_obj.gif"; // $NON-NLS-1$ //$NON-NLS-1$
public static final String IMG_OBJS_ARCHIVE= NAME_PREFIX + "ar_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_BINARY= NAME_PREFIX + "bin_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_SHLIB= NAME_PREFIX + "shlib_obj.gif"; //$NON-NLS-1$
@ -135,6 +136,7 @@ public class CPluginImages {
public static final ImageDescriptor DESC_OBJS_TUNIT_ASM= createManaged(T_OBJ, IMG_OBJS_TUNIT_ASM);
public static final ImageDescriptor DESC_OBJS_TUNIT_RESOURCE= createManaged(T_OBJ, IMG_OBJS_TUNIT_RESOURCE);
public static final ImageDescriptor DESC_OBJS_SOURCE_ROOT= createManaged(T_OBJ, IMG_OBJS_SOURCE_ROOT);
public static final ImageDescriptor DESC_OBJS_CFOLDER= createManaged(T_OBJ, IMG_OBJS_CFOLDER);
public static final ImageDescriptor DESC_OBJS_ARCHIVE= createManaged(T_OBJ, IMG_OBJS_ARCHIVE);
public static final ImageDescriptor DESC_OBJS_ARCHIVE_WSRC= createManaged(T_OBJ, IMG_OBJS_ARCHIVE);
public static final ImageDescriptor DESC_OBJS_BINARY= createManaged(T_OBJ, IMG_OBJS_BINARY);

View file

@ -285,9 +285,8 @@ public class CElementLabelProvider extends LabelProvider {
if (errortick) {
if (extra == null) {
return new IAdornmentProvider[] { new ErrorTickAdornmentProvider() };
} else {
return new IAdornmentProvider[] { new ErrorTickAdornmentProvider(), extra };
}
return new IAdornmentProvider[] { new ErrorTickAdornmentProvider(), extra };
}
if (extra != null) {
return new IAdornmentProvider[] { extra };