reactos/rosev_jameicaplugin
1
0
Fork 0
mirror of https://github.com/reactos/rosev_jameicaplugin.git synced 2024-11-23 11:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ROSEV_JAMEICAPLUGIN]

Browse Source 
- Rename DonationHelper class to PublicDonationList to prepare for the soon coming PayPalDonationImporter.
- Adapt our plugin to JVerein 2.8.13.
- Bump version to 1.1.

All in preparation for ONLINE-629

svn path=/trunk/rosev_jameicaplugin/; revision=2274
This commit is contained in:
Colin Finck 2016-08-08 15:37:17 +00:00
parent d8421d5b40
commit f220d61b23
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<plugin name="rosev_jameicaplugin" version="1.0" <plugin name="rosev_jameicaplugin" version="1.1"
class="org.reactos.ev.jameicaplugin.JameicaPlugin" class="org.reactos.ev.jameicaplugin.JameicaPlugin"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.willuhn.de/schema/jameica-plugin-1.0.xsd"> xsi:noNamespaceSchemaLocation="http://www.willuhn.de/schema/jameica-plugin-1.0.xsd">
@ -23,7 +23,7 @@
<navigation> <navigation>
<item name="ReactOS Deutschland e.V. Helper Plugin" icon-close="folder.png" icon-open="folder-open.png" action="org.reactos.ev.jameicaplugin.gui.action.Welcome"> <item name="ReactOS Deutschland e.V. Helper Plugin" icon-close="folder.png" icon-open="folder-open.png" action="org.reactos.ev.jameicaplugin.gui.action.Welcome">
<item name="Donation Helper" icon-close="preferences-system-windows.png" action="org.reactos.ev.jameicaplugin.gui.action.DonationHelper" /> <item name="Public Donation List" icon-close="preferences-system-windows.png" action="org.reactos.ev.jameicaplugin.gui.action.PublicDonationList" />
</item> </item>
</navigation> </navigation>
@ -31,7 +31,7 @@
<service name="database" depends="" autostart="true" class="org.reactos.ev.jameicaplugin.rmi.JameicaPluginDBService" /> <service name="database" depends="" autostart="true" class="org.reactos.ev.jameicaplugin.rmi.JameicaPluginDBService" />
</services> </services>
<requires jameica="2.4.0+"> <requires jameica="2.6.4+">
<import plugin="jverein" version="2.4.2+" /> <import plugin="jverein" version="2.8.13+" />
</requires> </requires>
</plugin> </plugin>

2
src/help/de_de/org.reactos.ev.jameicaplugin.gui.view.DonationHelper.txt → src/help/de_de/org.reactos.ev.jameicaplugin.gui.view.PublicDonationList.txt
View File

@ -1,6 +1,6 @@
<form> <form>
<p> <p>
<span color="header" font="header">Spenden-Helfer</span> <span color="header" font="header">Öffentliche Spender-Liste</span>
</p> </p>
<p> <p>

2
src/help/en_us/org.reactos.ev.jameicaplugin.gui.view.DonationHelper.txt → src/help/en_us/org.reactos.ev.jameicaplugin.gui.view.PublicDonationList.txt
View File

@ -1,6 +1,6 @@
<form> <form>
<p> <p>
<span color="header" font="header">Donation Helper</span> <span color="header" font="header">Public Donation List</span>
</p> </p>
<p> <p>

4
src/lang/rosev_jameicaplugin_messages_de_DE.properties
View File

@ -11,7 +11,7 @@ Delete=L
Delete\ donations=Spenden löschen Delete\ donations=Spenden löschen
Do\ you\ really\ want\ to\ delete\ these\ donations?=Möchten Sie diese Spenden wirklich löschen? Do\ you\ really\ want\ to\ delete\ these\ donations?=Möchten Sie diese Spenden wirklich löschen?
Donation=Spende Donation=Spende
Donation\ Helper=Spenden-Helfer Public\ Donation\ List=Öffentliche Spender-Liste
Donation\ saved=Spende gespeichert Donation\ saved=Spende gespeichert
Donations\ deleted=Spenden gelöscht Donations\ deleted=Spenden gelöscht
Edit=Bearbeiten Edit=Bearbeiten
@ -28,4 +28,4 @@ Show\ invalid\ donations\ only=Nur ung
Source=Quelle Source=Quelle
This\ plugin\ extends\ the\ foundation\ management\ software\ for\ ReactOS-specific\ tasks.=Dieses Plugin erweitert die Vereinsverwaltungssoftware für ReactOS-spezifische Aufgaben. 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! You\ can\ only\ delete\ additional\ donations\ here!=Sie können hier nur zusätzliche Spenden löschen!
Welcome=Willkommen Welcome=Willkommen

6
src/org/reactos/ev/jameicaplugin/gui/action/DeleteDonation.java
View File

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS Deutschland e.V. Helper Plugin * PROJECT: ReactOS Deutschland e.V. Helper Plugin
* LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation * LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation
* COPYRIGHT: Copyright 2010 ReactOS Deutschland e.V. <deutschland@reactos.org> * COPYRIGHT: Copyright 2010-2016 ReactOS Deutschland e.V. <deutschland@reactos.org>
* AUTHORS: Colin Finck <colin@reactos.org> * AUTHORS: Colin Finck <colin@reactos.org>
*/ */
@ -14,7 +14,7 @@ import de.willuhn.jameica.system.Application;
import de.willuhn.logging.Logger; import de.willuhn.logging.Logger;
import de.willuhn.util.ApplicationException; import de.willuhn.util.ApplicationException;
import org.reactos.ev.jameicaplugin.JameicaPlugin; 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.AdditionalDonation;
import org.reactos.ev.jameicaplugin.rmi.Donation; 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 // Update the donation list manually as Jameica cannot know that
// this affects all_donations. // this affects all_donations.
DonationHelper view = (DonationHelper) GUI.getCurrentView(); PublicDonationList view = (PublicDonationList) GUI.getCurrentView();
view.getDonationControl().getDonationList(); view.getDonationControl().getDonationList();
} }
catch (Exception e) catch (Exception e)

2
src/org/reactos/ev/jameicaplugin/gui/action/DonationDetail.java
View File

@ -39,7 +39,7 @@ public class DonationDetail implements Action
// This is a donation added through a JVerein booking. // This is a donation added through a JVerein booking.
// Open it in JVerein's editor. // Open it in JVerein's editor.
Buchung b = (Buchung) Einstellungen.getDBService().createObject(Buchung.class, d.getJVereinID().toString()); Buchung b = (Buchung) Einstellungen.getDBService().createObject(Buchung.class, d.getJVereinID().toString());
new BuchungAction().handleAction(b); new BuchungAction(false).handleAction(b);
} }
} }
catch (RemoteException e) catch (RemoteException e)

6
src/org/reactos/ev/jameicaplugin/gui/action/DonationHelper.java → src/org/reactos/ev/jameicaplugin/gui/action/PublicDonationList.java
View File

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS Deutschland e.V. Helper Plugin * PROJECT: ReactOS Deutschland e.V. Helper Plugin
* LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation * LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation
* COPYRIGHT: Copyright 2010 ReactOS Deutschland e.V. <deutschland@reactos.org> * COPYRIGHT: Copyright 2010-2016 ReactOS Deutschland e.V. <deutschland@reactos.org>
* AUTHORS: Colin Finck <colin@reactos.org> * AUTHORS: Colin Finck <colin@reactos.org>
*/ */
@ -11,10 +11,10 @@ import de.willuhn.jameica.gui.Action;
import de.willuhn.jameica.gui.GUI; import de.willuhn.jameica.gui.GUI;
import de.willuhn.util.ApplicationException; import de.willuhn.util.ApplicationException;
public class DonationHelper implements Action public class PublicDonationList implements Action
{ {
public void handleAction(Object context) throws ApplicationException 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);
} }
} }

6
src/org/reactos/ev/jameicaplugin/gui/view/DonationHelper.java → src/org/reactos/ev/jameicaplugin/gui/view/PublicDonationList.java
View File

@ -1,7 +1,7 @@
/* /*
* PROJECT: ReactOS Deutschland e.V. Helper Plugin * PROJECT: ReactOS Deutschland e.V. Helper Plugin
* LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation * LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation
* COPYRIGHT: Copyright 2010 ReactOS Deutschland e.V. <deutschland@reactos.org> * COPYRIGHT: Copyright 2010-2016 ReactOS Deutschland e.V. <deutschland@reactos.org>
* AUTHORS: Colin Finck <colin@reactos.org> * AUTHORS: Colin Finck <colin@reactos.org>
*/ */
@ -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.action.NewAdditionalDonation;
import org.reactos.ev.jameicaplugin.gui.control.DonationControl; import org.reactos.ev.jameicaplugin.gui.control.DonationControl;
public class DonationHelper extends AbstractView public class PublicDonationList extends AbstractView
{ {
DonationControl control = null; DonationControl control = null;
public void bind() throws Exception 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 = new DonationControl(this);
control.getShowInvalidCheckbox().paint(this.getParent()); control.getShowInvalidCheckbox().paint(this.getParent());