rpms/azureus/devel azureus-themed.patch, NONE, 1.1 Azureus.desktop, 1.2, 1.3 azureus.script, 1.2, 1.3 azureus.spec, 1.6, 1.7
Anthony Green (green)
fedora-extras-commits at redhat.com
Thu Jan 26 07:34:09 UTC 2006
Author: green
Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16505
Modified Files:
Azureus.desktop azureus.script azureus.spec
Added Files:
azureus-themed.patch
Log Message:
Revision -18. Theme some icons with java-gnome.
azureus-themed.patch:
--- NEW FILE azureus-themed.patch ---
--- org/gudy/azureus2/ui/swt/ImageRepository.java~ 2006-01-25 23:03:14.000000000 -0800
+++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-01-25 23:08:05.000000000 -0800
@@ -18,6 +18,8 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.util.*;
/**
@@ -45,6 +47,25 @@
loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
}
+ private static org.gnu.gtk.IconTheme iconTheme;
+
+ public static String getThemedIcon (String name, String def)
+ {
+ try
+ {
+ if (iconTheme == null)
+ iconTheme = org.gnu.gtk.IconTheme.getDefault();
+
+ return iconTheme.lookupIcon (name, 24,
+ org.gnu.gtk.IconLookupFlags.NO_SVG)
+ .getFilename();
+ }
+ catch (Exception ex)
+ {
+ return def;
+ }
+ }
+
public static void loadImages(Display display) {
loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32");
loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64");
@@ -88,20 +109,44 @@
//ToolBar Icons
loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif", "cb_open_no_default");
+ loadImage(display,
+ getThemedIcon ("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"),
+ "cb_open_no_default");
loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_folder.gif", "cb_open_folder");
loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_url.gif", "cb_open_url");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/new.gif", "cb_new");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/up.gif", "cb_up");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/down.gif", "cb_down");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/top.gif", "cb_top");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/bottom.gif", "cb_bottom");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/run.gif", "cb_run");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/start.gif", "cb_start");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/stop.gif", "cb_stop");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/remove.gif", "cb_remove");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/host.gif", "cb_host");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/publish.gif", "cb_publish");
+ loadImage(display,
+ getThemedIcon ("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"),
+ "cb_new");
+ loadImage(display,
+ getThemedIcon ("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"),
+ "cb_up");
+ loadImage(display,
+ getThemedIcon ("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"),
+ "cb_down");
+ loadImage(display,
+ getThemedIcon ("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"),
+ "cb_top");
+ loadImage(display,
+ getThemedIcon ("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"),
+ "cb_bottom");
+ loadImage(display,
+ getThemedIcon ("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"),
+ "cb_run");
+ loadImage(display,
+ getThemedIcon ("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"),
+ "cb_start");
+ loadImage(display,
+ getThemedIcon ("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"),
+ "cb_stop");
+ loadImage(display,
+ getThemedIcon ("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"),
+ "cb_remove");
+ loadImage(display,
+ getThemedIcon ("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"),
+ "cb_host");
+ loadImage(display,
+ getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"),
+ "cb_publish");
//Status icons
loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
@@ -138,6 +183,16 @@
Image im = getImage(name,false);
if(null == im) {
InputStream is = loader.getResourceAsStream(res);
+ if (is == null)
+ {
+ try
+ {
+ is = new FileInputStream (res);
+ }
+ catch (FileNotFoundException fnf)
+ {
+ }
+ }
if(null != is) {
if(alpha == 255) {
im = new Image(display, is);
Index: Azureus.desktop
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/Azureus.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Azureus.desktop 22 Jan 2006 05:51:23 -0000 1.2
+++ Azureus.desktop 26 Jan 2006 07:34:09 -0000 1.3
@@ -7,5 +7,5 @@
Terminal=false
Type=Application
MimeType=application/x-bittorrent
-Categories=Application;Network;FileTransfer;P2P;GTK;Java
+Categories=Application;Network;FileTransfer;P2P;GTK;Java;
Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus.script 21 Jan 2006 17:04:07 -0000 1.2
+++ azureus.script 26 Jan 2006 07:34:09 -0000 1.3
@@ -1,3 +1,3 @@
#!/bin/sh
-CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"
+CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"
Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- azureus.spec 22 Jan 2006 05:53:36 -0000 1.6
+++ azureus.spec 26 Jan 2006 07:34:09 -0000 1.7
@@ -1,6 +1,6 @@
Name: azureus
Version: 2.3.0.6
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
@@ -29,11 +29,12 @@
Patch9: azureus-no-bouncycastle.patch
Patch10: azureus-cache-size.patch
Patch11: azureus-remove-manifest-classpath.patch
+Patch12: azureus-themed.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis
-BuildRequires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
-Requires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
+BuildRequires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto, libgtk-java, glib-java
+Requires: jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto, libgtk-java, glib-java
Requires: libgcj >= 4.1.0-0.15
BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
@@ -61,12 +62,13 @@
%patch9 -p0
%patch10 -p0
%patch11 -p0
+%patch12 -p0
cp %{SOURCE4} License.txt
cp %{SOURCE5} ChangeLog.txt
%build
mkdir -p build/libs
-build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto
+build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2
find ./ -name osx | xargs rm -r
find ./ -name macosx | xargs rm -r
find ./ -name [Ww]in32\* | xargs rm -r
@@ -144,6 +146,12 @@
%{_libdir}/gcj/*
%changelog
+* Wed Jan 25 2006 Anthony Green <green at redhat.com> - 2.3.0.6-18
+- Theme CoolBar icons with azureus-themed.patch.
+- Add libgtk-java and glib-java dependencies to spec file.
+- Add gtk2.8 and glib0.2 to azureus.script.
+- Add missing semi-colon to Azureus.desktop.
+
* Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-17
- Use "$@" instead of $* in azureus.script (thanks ivazquez).
- Improve .desktop file.
More information about the fedora-extras-commits
mailing list