gnome-split-team team mailing list archive
-
gnome-split-team team
-
Mailing list archive
-
Message #00121
[Branch ~respawneral/gnome-split/mainline] Rev 249: java-gnome 4.0.19 support.
------------------------------------------------------------
revno: 249
committer: Guillaume Mazoyer <respawneral@xxxxxxxxx>
branch nick: java-gnome-4.0.19
timestamp: Mon 2011-02-14 17:25:27 +0100
message:
java-gnome 4.0.19 support.
Don't use deprecated constructor from Notification class.
Use the new Action constructor that take an Icon argument.
modified:
README
src/org/gnome/split/gtk/DefaultEngineListener.java
src/org/gnome/split/gtk/MainWindow.java
src/org/gnome/split/gtk/action/Action.java
src/org/gnome/split/gtk/action/SendEmailAction.java
--
lp:gnome-split
https://code.launchpad.net/~respawneral/gnome-split/mainline
Your team GNOME Split developers is subscribed to branch lp:gnome-split.
To unsubscribe from this branch go to https://code.launchpad.net/~respawneral/gnome-split/mainline/+edit-subscription
=== modified file 'README'
--- README 2010-11-06 15:32:55 +0000
+++ README 2011-02-14 16:25:27 +0000
@@ -35,7 +35,7 @@
* **java-gnome**
Bindings around the GTK and GNOME user interface libraries,
<http://java-gnome.sourceforge.net/>
- You'll need a version `>= 4.0.17`
+ You'll need a version `>= 4.0.19`
* **dbus-java**
Bindings around the DBus interface library and its dependencies,
=== modified file 'src/org/gnome/split/gtk/DefaultEngineListener.java'
--- src/org/gnome/split/gtk/DefaultEngineListener.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/gtk/DefaultEngineListener.java 2011-02-14 16:25:27 +0000
@@ -272,7 +272,7 @@
gtk.getInfoBar().showInfo(title, body);
} else {
// Use notification
- Notification notify = new Notification(title, body, null, gtk.getAreaStatusIcon());
+ Notification notify = new Notification(title, body, null);
notify.setIcon(Constants.PROGRAM_LOGO);
notify.show();
}
=== modified file 'src/org/gnome/split/gtk/MainWindow.java'
--- src/org/gnome/split/gtk/MainWindow.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/gtk/MainWindow.java 2011-02-14 16:25:27 +0000
@@ -20,15 +20,11 @@
*/
package org.gnome.split.gtk;
-import org.freedesktop.icons.ActionIcon;
import org.gnome.gdk.Cursor;
import org.gnome.gdk.Event;
import org.gnome.gtk.AcceleratorGroup;
import org.gnome.gtk.Frame;
import org.gnome.gtk.HSeparator;
-import org.gnome.gtk.IconSize;
-import org.gnome.gtk.Image;
-import org.gnome.gtk.ImageMenuItem;
import org.gnome.gtk.Menu;
import org.gnome.gtk.MenuBar;
import org.gnome.gtk.MenuItem;
@@ -248,9 +244,6 @@
items[6] = actions.getAction(ActionId.DELETE).createMenuItem();
items[7] = actions.getAction(ActionId.EXIT).createMenuItem();
- // Custom image for item
- ((ImageMenuItem) items[2]).setImage(new Image(ActionIcon.MAIL_SEND, IconSize.MENU));
-
// Add menu items to the menu
fileItem.setSubmenu(fileMenu);
fileMenu.append(items[0]);
=== modified file 'src/org/gnome/split/gtk/action/Action.java'
--- src/org/gnome/split/gtk/action/Action.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/gtk/action/Action.java 2011-02-14 16:25:27 +0000
@@ -20,6 +20,7 @@
*/
package org.gnome.split.gtk.action;
+import org.freedesktop.icons.Icon;
import org.gnome.gtk.Stock;
import org.gnome.split.GnomeSplit;
@@ -67,6 +68,17 @@
}
/**
+ * Create a new action using a name, a label, a tooltip and a {@link Icon}
+ * icon.
+ */
+ protected Action(final GnomeSplit app, String name, String label, String tooltip, Icon icon) {
+ super(name, label, tooltip, icon);
+
+ this.app = app;
+ this.connect((Action.Activate) this);
+ }
+
+ /**
* Get the current program instance.
*/
protected GnomeSplit getApplication() {
=== modified file 'src/org/gnome/split/gtk/action/SendEmailAction.java'
--- src/org/gnome/split/gtk/action/SendEmailAction.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/gtk/action/SendEmailAction.java 2011-02-14 16:25:27 +0000
@@ -22,7 +22,7 @@
import java.util.List;
-import org.gnome.gtk.Stock;
+import org.freedesktop.icons.ActionIcon;
import org.gnome.split.GnomeSplit;
import static org.freedesktop.bindings.Internationalization._;
@@ -36,7 +36,7 @@
{
protected SendEmailAction(final GnomeSplit app) {
super(app, "send-email-action", _("Send by _email"), _("Send one or several files by email"),
- Stock.MISSING_IMAGE);
+ ActionIcon.MAIL_SEND);
}
@Override