diff options
44 files changed, 2 insertions, 3 deletions
diff --git a/assetstudio/src/images/clipart/big/attach.png b/assetstudio/src/images/clipart/big/attach.png Binary files differnew file mode 100644 index 0000000..cfadc2b --- /dev/null +++ b/assetstudio/src/images/clipart/big/attach.png diff --git a/assetstudio/src/images/clipart/big/call.png b/assetstudio/src/images/clipart/big/call.png Binary files differnew file mode 100644 index 0000000..b642c81 --- /dev/null +++ b/assetstudio/src/images/clipart/big/call.png diff --git a/assetstudio/src/images/clipart/big/copy.png b/assetstudio/src/images/clipart/big/copy.png Binary files differnew file mode 100644 index 0000000..a018ff3 --- /dev/null +++ b/assetstudio/src/images/clipart/big/copy.png diff --git a/assetstudio/src/images/clipart/big/cut.png b/assetstudio/src/images/clipart/big/cut.png Binary files differnew file mode 100644 index 0000000..29034d1 --- /dev/null +++ b/assetstudio/src/images/clipart/big/cut.png diff --git a/assetstudio/src/images/clipart/big/delete.png b/assetstudio/src/images/clipart/big/delete.png Binary files differnew file mode 100644 index 0000000..ea82cc7 --- /dev/null +++ b/assetstudio/src/images/clipart/big/delete.png diff --git a/assetstudio/src/images/clipart/big/done.png b/assetstudio/src/images/clipart/big/done.png Binary files differnew file mode 100644 index 0000000..56e57b9 --- /dev/null +++ b/assetstudio/src/images/clipart/big/done.png diff --git a/assetstudio/src/images/clipart/big/edit.png b/assetstudio/src/images/clipart/big/edit.png Binary files differnew file mode 100644 index 0000000..5a98da6 --- /dev/null +++ b/assetstudio/src/images/clipart/big/edit.png diff --git a/assetstudio/src/images/clipart/big/locate.png b/assetstudio/src/images/clipart/big/locate.png Binary files differnew file mode 100644 index 0000000..222f25c --- /dev/null +++ b/assetstudio/src/images/clipart/big/locate.png diff --git a/assetstudio/src/images/clipart/big/mail.png b/assetstudio/src/images/clipart/big/mail.png Binary files differnew file mode 100644 index 0000000..5f66d14 --- /dev/null +++ b/assetstudio/src/images/clipart/big/mail.png diff --git a/assetstudio/src/images/clipart/big/microphone.png b/assetstudio/src/images/clipart/big/microphone.png Binary files differnew file mode 100644 index 0000000..0ede452 --- /dev/null +++ b/assetstudio/src/images/clipart/big/microphone.png diff --git a/assetstudio/src/images/clipart/big/overflow.png b/assetstudio/src/images/clipart/big/overflow.png Binary files differnew file mode 100644 index 0000000..e88a95a --- /dev/null +++ b/assetstudio/src/images/clipart/big/overflow.png diff --git a/assetstudio/src/images/clipart/big/paste.png b/assetstudio/src/images/clipart/big/paste.png Binary files differnew file mode 100644 index 0000000..5a9a59d --- /dev/null +++ b/assetstudio/src/images/clipart/big/paste.png diff --git a/assetstudio/src/images/clipart/big/photo.png b/assetstudio/src/images/clipart/big/photo.png Binary files differnew file mode 100644 index 0000000..9e52bfb --- /dev/null +++ b/assetstudio/src/images/clipart/big/photo.png diff --git a/assetstudio/src/images/clipart/big/refresh.png b/assetstudio/src/images/clipart/big/refresh.png Binary files differnew file mode 100644 index 0000000..4c4e7cf --- /dev/null +++ b/assetstudio/src/images/clipart/big/refresh.png diff --git a/assetstudio/src/images/clipart/big/search.png b/assetstudio/src/images/clipart/big/search.png Binary files differnew file mode 100644 index 0000000..b5a3572 --- /dev/null +++ b/assetstudio/src/images/clipart/big/search.png diff --git a/assetstudio/src/images/clipart/big/select_all.png b/assetstudio/src/images/clipart/big/select_all.png Binary files differnew file mode 100644 index 0000000..b962a04 --- /dev/null +++ b/assetstudio/src/images/clipart/big/select_all.png diff --git a/assetstudio/src/images/clipart/big/send.png b/assetstudio/src/images/clipart/big/send.png Binary files differnew file mode 100644 index 0000000..e7644cf --- /dev/null +++ b/assetstudio/src/images/clipart/big/send.png diff --git a/assetstudio/src/images/clipart/big/share.png b/assetstudio/src/images/clipart/big/share.png Binary files differnew file mode 100644 index 0000000..95185d5 --- /dev/null +++ b/assetstudio/src/images/clipart/big/share.png diff --git a/assetstudio/src/images/clipart/big/star.png b/assetstudio/src/images/clipart/big/star.png Binary files differnew file mode 100644 index 0000000..0a245ce --- /dev/null +++ b/assetstudio/src/images/clipart/big/star.png diff --git a/assetstudio/src/images/clipart/big/user.png b/assetstudio/src/images/clipart/big/user.png Binary files differnew file mode 100644 index 0000000..bc1d946 --- /dev/null +++ b/assetstudio/src/images/clipart/big/user.png diff --git a/assetstudio/src/images/clipart/big/video.png b/assetstudio/src/images/clipart/big/video.png Binary files differnew file mode 100644 index 0000000..473076f --- /dev/null +++ b/assetstudio/src/images/clipart/big/video.png diff --git a/assetstudio/src/images/clipart/small/android.png b/assetstudio/src/images/clipart/small/android.png Binary files differindex acbfafd..b2c6cd2 100644 --- a/assetstudio/src/images/clipart/small/android.png +++ b/assetstudio/src/images/clipart/small/android.png diff --git a/assetstudio/src/images/clipart/small/attach.png b/assetstudio/src/images/clipart/small/attach.png Binary files differnew file mode 100644 index 0000000..6bfc535 --- /dev/null +++ b/assetstudio/src/images/clipart/small/attach.png diff --git a/assetstudio/src/images/clipart/small/call.png b/assetstudio/src/images/clipart/small/call.png Binary files differnew file mode 100644 index 0000000..9ea8e0f --- /dev/null +++ b/assetstudio/src/images/clipart/small/call.png diff --git a/assetstudio/src/images/clipart/small/copy.png b/assetstudio/src/images/clipart/small/copy.png Binary files differnew file mode 100644 index 0000000..68d31d8 --- /dev/null +++ b/assetstudio/src/images/clipart/small/copy.png diff --git a/assetstudio/src/images/clipart/small/cut.png b/assetstudio/src/images/clipart/small/cut.png Binary files differnew file mode 100644 index 0000000..b94e50b --- /dev/null +++ b/assetstudio/src/images/clipart/small/cut.png diff --git a/assetstudio/src/images/clipart/small/delete.png b/assetstudio/src/images/clipart/small/delete.png Binary files differnew file mode 100644 index 0000000..638c9c8 --- /dev/null +++ b/assetstudio/src/images/clipart/small/delete.png diff --git a/assetstudio/src/images/clipart/small/done.png b/assetstudio/src/images/clipart/small/done.png Binary files differnew file mode 100644 index 0000000..aed3f0c --- /dev/null +++ b/assetstudio/src/images/clipart/small/done.png diff --git a/assetstudio/src/images/clipart/small/edit.png b/assetstudio/src/images/clipart/small/edit.png Binary files differnew file mode 100644 index 0000000..b677a6a --- /dev/null +++ b/assetstudio/src/images/clipart/small/edit.png diff --git a/assetstudio/src/images/clipart/small/locate.png b/assetstudio/src/images/clipart/small/locate.png Binary files differnew file mode 100644 index 0000000..cd16ada --- /dev/null +++ b/assetstudio/src/images/clipart/small/locate.png diff --git a/assetstudio/src/images/clipart/small/mail.png b/assetstudio/src/images/clipart/small/mail.png Binary files differnew file mode 100644 index 0000000..8ae1cde --- /dev/null +++ b/assetstudio/src/images/clipart/small/mail.png diff --git a/assetstudio/src/images/clipart/small/microphone.png b/assetstudio/src/images/clipart/small/microphone.png Binary files differnew file mode 100644 index 0000000..bd58fb3 --- /dev/null +++ b/assetstudio/src/images/clipart/small/microphone.png diff --git a/assetstudio/src/images/clipart/small/overflow.png b/assetstudio/src/images/clipart/small/overflow.png Binary files differnew file mode 100644 index 0000000..d3cd16c --- /dev/null +++ b/assetstudio/src/images/clipart/small/overflow.png diff --git a/assetstudio/src/images/clipart/small/paste.png b/assetstudio/src/images/clipart/small/paste.png Binary files differnew file mode 100644 index 0000000..b022176 --- /dev/null +++ b/assetstudio/src/images/clipart/small/paste.png diff --git a/assetstudio/src/images/clipart/small/photo.png b/assetstudio/src/images/clipart/small/photo.png Binary files differnew file mode 100644 index 0000000..906db99 --- /dev/null +++ b/assetstudio/src/images/clipart/small/photo.png diff --git a/assetstudio/src/images/clipart/small/refresh.png b/assetstudio/src/images/clipart/small/refresh.png Binary files differnew file mode 100644 index 0000000..6482017 --- /dev/null +++ b/assetstudio/src/images/clipart/small/refresh.png diff --git a/assetstudio/src/images/clipart/small/search.png b/assetstudio/src/images/clipart/small/search.png Binary files differnew file mode 100644 index 0000000..fef5270 --- /dev/null +++ b/assetstudio/src/images/clipart/small/search.png diff --git a/assetstudio/src/images/clipart/small/select_all.png b/assetstudio/src/images/clipart/small/select_all.png Binary files differnew file mode 100644 index 0000000..b32de7d --- /dev/null +++ b/assetstudio/src/images/clipart/small/select_all.png diff --git a/assetstudio/src/images/clipart/small/send.png b/assetstudio/src/images/clipart/small/send.png Binary files differnew file mode 100644 index 0000000..b2c768b --- /dev/null +++ b/assetstudio/src/images/clipart/small/send.png diff --git a/assetstudio/src/images/clipart/small/share.png b/assetstudio/src/images/clipart/small/share.png Binary files differnew file mode 100644 index 0000000..11da57d --- /dev/null +++ b/assetstudio/src/images/clipart/small/share.png diff --git a/assetstudio/src/images/clipart/small/star.png b/assetstudio/src/images/clipart/small/star.png Binary files differnew file mode 100644 index 0000000..847937e --- /dev/null +++ b/assetstudio/src/images/clipart/small/star.png diff --git a/assetstudio/src/images/clipart/small/user.png b/assetstudio/src/images/clipart/small/user.png Binary files differnew file mode 100644 index 0000000..9c7a585 --- /dev/null +++ b/assetstudio/src/images/clipart/small/user.png diff --git a/assetstudio/src/images/clipart/small/video.png b/assetstudio/src/images/clipart/small/video.png Binary files differnew file mode 100644 index 0000000..9766009 --- /dev/null +++ b/assetstudio/src/images/clipart/small/video.png diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ConfigureAssetSetPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ConfigureAssetSetPage.java index 3f479c4..b9ecfbc 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ConfigureAssetSetPage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ConfigureAssetSetPage.java @@ -203,7 +203,6 @@ public class ConfigureAssetSetPage extends WizardPage implements SelectionListen mImageRadio.setText("Image"); mClipartRadio = new Button(foregroundComposite, SWT.FLAT | SWT.TOGGLE); - mClipartRadio.setEnabled(false); mClipartRadio.setText("Clipart"); mClipartRadio.addSelectionListener(this); @@ -693,7 +692,7 @@ public class ConfigureAssetSetPage extends WizardPage implements SelectionListen if (icon != null) { Display display = mClipartForm.getDisplay(); Image swtImage = SwtUtils.convertToSwt(display, icon, - false, -1); + true, -1); new ImageControl(mClipartPreviewPanel, SWT.NONE, swtImage); } @@ -716,7 +715,7 @@ public class ConfigureAssetSetPage extends WizardPage implements SelectionListen try { BufferedImage icon = GraphicGenerator.getClipartIcon(name); if (icon != null) { - Image swtImage = SwtUtils.convertToSwt(display, icon, false, -1); + Image swtImage = SwtUtils.convertToSwt(display, icon, true, -1); ImageControl img = new ImageControl(chooserForm, SWT.NONE, swtImage); img.setData(name); |
