diff --git a/plugin.xml b/plugin.xml index e910f1e..a07e361 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,6 +1,6 @@ - @@ -23,7 +23,7 @@ - + @@ -31,7 +31,7 @@ - - + + diff --git a/src/help/de_de/org.reactos.ev.jameicaplugin.gui.view.DonationHelper.txt b/src/help/de_de/org.reactos.ev.jameicaplugin.gui.view.PublicDonationList.txt similarity index 89% rename from src/help/de_de/org.reactos.ev.jameicaplugin.gui.view.DonationHelper.txt rename to src/help/de_de/org.reactos.ev.jameicaplugin.gui.view.PublicDonationList.txt index e0fabf8..15de5d0 100644 --- a/src/help/de_de/org.reactos.ev.jameicaplugin.gui.view.DonationHelper.txt +++ b/src/help/de_de/org.reactos.ev.jameicaplugin.gui.view.PublicDonationList.txt @@ -1,6 +1,6 @@

- Spenden-Helfer + Öffentliche Spender-Liste

diff --git a/src/help/en_us/org.reactos.ev.jameicaplugin.gui.view.DonationHelper.txt b/src/help/en_us/org.reactos.ev.jameicaplugin.gui.view.PublicDonationList.txt similarity index 89% rename from src/help/en_us/org.reactos.ev.jameicaplugin.gui.view.DonationHelper.txt rename to src/help/en_us/org.reactos.ev.jameicaplugin.gui.view.PublicDonationList.txt index fff5ca6..d041bf9 100644 --- a/src/help/en_us/org.reactos.ev.jameicaplugin.gui.view.DonationHelper.txt +++ b/src/help/en_us/org.reactos.ev.jameicaplugin.gui.view.PublicDonationList.txt @@ -1,6 +1,6 @@

- Donation Helper + Public Donation List

diff --git a/src/lang/rosev_jameicaplugin_messages_de_DE.properties b/src/lang/rosev_jameicaplugin_messages_de_DE.properties index e9b5f9c..bb4567e 100644 --- a/src/lang/rosev_jameicaplugin_messages_de_DE.properties +++ b/src/lang/rosev_jameicaplugin_messages_de_DE.properties @@ -11,7 +11,7 @@ Delete=L Delete\ donations=Spenden löschen Do\ you\ really\ want\ to\ delete\ these\ donations?=Möchten Sie diese Spenden wirklich löschen? Donation=Spende -Donation\ Helper=Spenden-Helfer +Public\ Donation\ List=Öffentliche Spender-Liste Donation\ saved=Spende gespeichert Donations\ deleted=Spenden gelöscht Edit=Bearbeiten @@ -28,4 +28,4 @@ Show\ invalid\ donations\ only=Nur ung Source=Quelle This\ plugin\ extends\ the\ foundation\ management\ software\ for\ ReactOS-specific\ tasks.=Dieses Plugin erweitert die Vereinsverwaltungssoftware für ReactOS-spezifische Aufgaben. You\ can\ only\ delete\ additional\ donations\ here!=Sie können hier nur zusätzliche Spenden löschen! -Welcome=Willkommen \ No newline at end of file +Welcome=Willkommen \ No newline at end of file diff --git a/src/org/reactos/ev/jameicaplugin/gui/action/DeleteDonation.java b/src/org/reactos/ev/jameicaplugin/gui/action/DeleteDonation.java index 563a82b..4355e15 100644 --- a/src/org/reactos/ev/jameicaplugin/gui/action/DeleteDonation.java +++ b/src/org/reactos/ev/jameicaplugin/gui/action/DeleteDonation.java @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Deutschland e.V. Helper Plugin * LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation - * COPYRIGHT: Copyright 2010 ReactOS Deutschland e.V. + * COPYRIGHT: Copyright 2010-2016 ReactOS Deutschland e.V. * AUTHORS: Colin Finck */ @@ -14,7 +14,7 @@ import de.willuhn.jameica.system.Application; import de.willuhn.logging.Logger; import de.willuhn.util.ApplicationException; import org.reactos.ev.jameicaplugin.JameicaPlugin; -import org.reactos.ev.jameicaplugin.gui.view.DonationHelper; +import org.reactos.ev.jameicaplugin.gui.view.PublicDonationList; import org.reactos.ev.jameicaplugin.rmi.AdditionalDonation; import org.reactos.ev.jameicaplugin.rmi.Donation; @@ -66,7 +66,7 @@ public class DeleteDonation implements Action // Update the donation list manually as Jameica cannot know that // this affects all_donations. - DonationHelper view = (DonationHelper) GUI.getCurrentView(); + PublicDonationList view = (PublicDonationList) GUI.getCurrentView(); view.getDonationControl().getDonationList(); } catch (Exception e) diff --git a/src/org/reactos/ev/jameicaplugin/gui/action/DonationDetail.java b/src/org/reactos/ev/jameicaplugin/gui/action/DonationDetail.java index 15e5618..b279074 100644 --- a/src/org/reactos/ev/jameicaplugin/gui/action/DonationDetail.java +++ b/src/org/reactos/ev/jameicaplugin/gui/action/DonationDetail.java @@ -39,7 +39,7 @@ public class DonationDetail implements Action // This is a donation added through a JVerein booking. // Open it in JVerein's editor. Buchung b = (Buchung) Einstellungen.getDBService().createObject(Buchung.class, d.getJVereinID().toString()); - new BuchungAction().handleAction(b); + new BuchungAction(false).handleAction(b); } } catch (RemoteException e) diff --git a/src/org/reactos/ev/jameicaplugin/gui/action/DonationHelper.java b/src/org/reactos/ev/jameicaplugin/gui/action/PublicDonationList.java similarity index 65% rename from src/org/reactos/ev/jameicaplugin/gui/action/DonationHelper.java rename to src/org/reactos/ev/jameicaplugin/gui/action/PublicDonationList.java index ca5d077..93ad39d 100644 --- a/src/org/reactos/ev/jameicaplugin/gui/action/DonationHelper.java +++ b/src/org/reactos/ev/jameicaplugin/gui/action/PublicDonationList.java @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Deutschland e.V. Helper Plugin * LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation - * COPYRIGHT: Copyright 2010 ReactOS Deutschland e.V. + * COPYRIGHT: Copyright 2010-2016 ReactOS Deutschland e.V. * AUTHORS: Colin Finck */ @@ -11,10 +11,10 @@ import de.willuhn.jameica.gui.Action; import de.willuhn.jameica.gui.GUI; import de.willuhn.util.ApplicationException; -public class DonationHelper implements Action +public class PublicDonationList implements Action { public void handleAction(Object context) throws ApplicationException { - GUI.startView(org.reactos.ev.jameicaplugin.gui.view.DonationHelper.class.getName(), null); + GUI.startView(org.reactos.ev.jameicaplugin.gui.view.PublicDonationList.class.getName(), null); } } diff --git a/src/org/reactos/ev/jameicaplugin/gui/view/DonationHelper.java b/src/org/reactos/ev/jameicaplugin/gui/view/PublicDonationList.java similarity index 86% rename from src/org/reactos/ev/jameicaplugin/gui/view/DonationHelper.java rename to src/org/reactos/ev/jameicaplugin/gui/view/PublicDonationList.java index b98b87b..40ce9e1 100644 --- a/src/org/reactos/ev/jameicaplugin/gui/view/DonationHelper.java +++ b/src/org/reactos/ev/jameicaplugin/gui/view/PublicDonationList.java @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Deutschland e.V. Helper Plugin * LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation - * COPYRIGHT: Copyright 2010 ReactOS Deutschland e.V. + * COPYRIGHT: Copyright 2010-2016 ReactOS Deutschland e.V. * AUTHORS: Colin Finck */ @@ -16,13 +16,13 @@ import org.reactos.ev.jameicaplugin.gui.action.HTMLOutput; import org.reactos.ev.jameicaplugin.gui.action.NewAdditionalDonation; import org.reactos.ev.jameicaplugin.gui.control.DonationControl; -public class DonationHelper extends AbstractView +public class PublicDonationList extends AbstractView { DonationControl control = null; public void bind() throws Exception { - GUI.getView().setTitle(JameicaPlugin.i18n().tr("Donation Helper")); + GUI.getView().setTitle(JameicaPlugin.i18n().tr("Public Donation List")); control = new DonationControl(this); control.getShowInvalidCheckbox().paint(this.getParent());