mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 01:15:29 +02:00
Code Issues Wiki Activity

Bug 509631 - Missing Scroll Lock icon in Terminal View on Oxygen

Browse source 
The Terminal used to "re-use" icons from org.eclipse.ui.console -
this did not work any more when that plugin changed .gif icons
to .png for better HiDPI support. Copying icons into the terminal
view plugin resolves the problem for all Eclipse versions.
This commit is contained in:
Martin Oberhuber 2016-12-22 11:34:34 +01:00
parent c0335a085e
commit e0cd31ea7d
10 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/lock_co.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 560 B

BIN
plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/lock_co@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/lock_co.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 462 B

BIN
plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/lock_co@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 916 B

BIN
plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/lock_co.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 560 B

BIN
plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/lock_co@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/console_view.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 452 B

BIN
plugins/org.eclipse.tm.terminal.view.ui/icons/eview16/console_view@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 729 B

4
plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
View file

@ -152,7 +152,7 @@
label="%toolbar.terminal.label">
<command
commandId="org.eclipse.tm.terminal.view.ui.command.launchToolbar"
icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"
icon="icons/eview16/console_view.png"
id="org.eclipse.tm.terminal.view.ui.commands.launchToolbar"
label="%command.launch.label"
style="push"
@ -163,7 +163,7 @@
<menuContribution locationURI="toolbar:org.eclipse.tm.terminal.view.ui.TerminalsView">
<command
commandId="org.eclipse.tm.terminal.view.ui.command.launchToolbar"
icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"
icon="icons/eview16/console_view.png"
id="org.eclipse.tm.terminal.view.ui.commands.launchToolbarTerminalsView"
label="%command.launch.label"
style="push"

24
plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java
View file

@ -14,7 +14,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.swt.custom.CTabFolder;
@ -211,21 +210,18 @@ public class UIPlugin extends AbstractUIPlugin {
*/
@Override
protected void initializeImageRegistry(ImageRegistry registry) {
Bundle bundle = Platform.getBundle("org.eclipse.ui.console"); //$NON-NLS-1$
if (bundle != null) {
URL url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + "full/" + ImageConsts.IMAGE_DIR_EVIEW + "console_view.gif"); //$NON-NLS-1$ //$NON-NLS-2$
registry.put(ImageConsts.VIEW_Terminals, ImageDescriptor.createFromURL(url));
Bundle bundle = getBundle();
URL url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_EVIEW + "console_view.png"); //$NON-NLS-1$
registry.put(ImageConsts.VIEW_Terminals, ImageDescriptor.createFromURL(url));
url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + "full/" + ImageConsts.IMAGE_DIR_CLCL + "lock_co.gif"); //$NON-NLS-1$ //$NON-NLS-2$
registry.put(ImageConsts.ACTION_ScrollLock_Hover, ImageDescriptor.createFromURL(url));
url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + "full/" + ImageConsts.IMAGE_DIR_ELCL + "lock_co.gif"); //$NON-NLS-1$ //$NON-NLS-2$
registry.put(ImageConsts.ACTION_ScrollLock_Enabled, ImageDescriptor.createFromURL(url));
url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + "full/" + ImageConsts.IMAGE_DIR_DLCL + "lock_co.gif"); //$NON-NLS-1$ //$NON-NLS-2$
registry.put(ImageConsts.ACTION_ScrollLock_Disabled, ImageDescriptor.createFromURL(url));
}
url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_CLCL + "lock_co.png"); //$NON-NLS-1$
registry.put(ImageConsts.ACTION_ScrollLock_Hover, ImageDescriptor.createFromURL(url));
url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_ELCL + "lock_co.png"); //$NON-NLS-1$
registry.put(ImageConsts.ACTION_ScrollLock_Enabled, ImageDescriptor.createFromURL(url));
url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_DLCL + "lock_co.png"); //$NON-NLS-1$
registry.put(ImageConsts.ACTION_ScrollLock_Disabled, ImageDescriptor.createFromURL(url));
bundle = getBundle();
URL url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_CLCL + "command_input_field.gif"); //$NON-NLS-1$
url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_CLCL + "command_input_field.gif"); //$NON-NLS-1$
registry.put(ImageConsts.ACTION_ToggleCommandField_Hover, ImageDescriptor.createFromURL(url));
url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_ELCL + "command_input_field.gif"); //$NON-NLS-1$
registry.put(ImageConsts.ACTION_ToggleCommandField_Enabled, ImageDescriptor.createFromURL(url));