Skip to content

Commit

Permalink
Text und Icon Korrektur für alle Menü Items (#115)
Browse files Browse the repository at this point in the history
Menü Items unter de.jost_net.JVerein.gui.menu angepasst:

Großschrift
Entfernen/Löschen Icon durch user-trash-full.png ersetzt wie in Hibiscus.
Zuordnen Icon (zuordnung.png) hat nicht existiert. Ersetzt durch view-refresh genauso wie exchange-alt.png damit ersetzt
  • Loading branch information
JohannMaierhofer authored Jan 23, 2024
1 parent 755ee59 commit 26b3d02
Show file tree
Hide file tree
Showing 38 changed files with 102 additions and 102 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ public AbrechnungslaufBuchungenMenu()
addItem(new CheckedContextMenuItem("Sollbuchung bearbeiten",
new PreNotificationAction(), "file.png"));
addItem(new CheckedContextMenuItem("Sollbuchung löschen",
new AbrechnungslaufDeleteAction(), "trash-alt.png"));
new AbrechnungslaufDeleteAction(), "user-trash-full.png"));
}
}
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/menu/AbrechnungslaufMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ public AbrechnungslaufMenu()
"edit.png"));
addItem(new AbgeschlossenDisabledItem("Pre-Notification",
new PreNotificationAction(), "file.png"));
addItem(new AbgeschlossenDisabledItem("löschen...",
new AbrechnungslaufDeleteAction(), "trash-alt.png"));
addItem(new AbgeschlossenDisabledItem("Löschen...",
new AbrechnungslaufDeleteAction(), "user-trash-full.png"));
try
{
if (Einstellungen.getEinstellung().getAbrlAbschliessen())
{
addItem(ContextMenuItem.SEPARATOR);
addItem(new AbgeschlossenDisabledItem("abschließen...",
addItem(new AbgeschlossenDisabledItem("Abschließen...",
new AbrechnungslaufAbschliessenAction(), "lock.png"));
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/AdresstypMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class AdresstypMenu extends ContextMenu
*/
public AdresstypMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new AdresstypDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new AdresstypDeleteAction(), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/AnfangsbestandMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class AnfangsbestandMenu extends ContextMenu
*/
public AnfangsbestandMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new AnfangsbestandDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new AnfangsbestandDeleteAction(), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/ArbeitseinsatzMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ArbeitseinsatzMenu extends ContextMenu
*/
public ArbeitseinsatzMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new ArbeitseinsatzDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new ArbeitseinsatzDeleteAction(), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/BeitragsgruppeMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class BeitragsgruppeMenu extends ContextMenu
*/
public BeitragsgruppeMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new BeitragsgruppeDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new BeitragsgruppeDeleteAction(), "user-trash-full.png"));
}
}
18 changes: 9 additions & 9 deletions src/de/jost_net/JVerein/gui/menu/BuchungMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,24 @@ public class BuchungMenu extends ContextMenu

public BuchungMenu(BuchungsControl control)
{
addItem(new ContextMenuItem("neue Buchung", new BuchungNeuAction(),
addItem(new ContextMenuItem("Neue Buchung", new BuchungNeuAction(),
"file.png"));
addItem(new CheckedSingleContextMenuItem("bearbeiten",
addItem(new CheckedSingleContextMenuItem("Bearbeiten",
new BuchungAction(false), "edit.png"));
addItem(new SingleBuchungItem("duplizieren", new BuchungDuplizierenAction(),
addItem(new SingleBuchungItem("Duplizieren", new BuchungDuplizierenAction(),
"copy.png"));
addItem(new SingleBuchungItem("Splitbuchung", new SplitBuchungAction(),
"edit.png"));
addItem(new CheckedContextMenuItem("Buchungsart zuordnen",
new BuchungBuchungsartZuordnungAction(control), "exchange-alt.png"));
new BuchungBuchungsartZuordnungAction(control), "view-refresh.png"));
addItem(new CheckedContextMenuItem("Mitgliedskonto zuordnen",
new BuchungMitgliedskontoZuordnungAction(control), "exchange-alt.png"));
new BuchungMitgliedskontoZuordnungAction(control), "view-refresh.png"));
addItem(new CheckedContextMenuItem("Projekt zuordnen",
new BuchungProjektZuordnungAction(control), "exchange-alt.png"));
new BuchungProjektZuordnungAction(control), "view-refresh.png"));
addItem(new CheckedContextMenuItem("Kontoauszug zuordnen",
new BuchungKontoauszugZuordnungAction(control), "exchange-alt.png"));
addItem(new BuchungItem("löschen...", new BuchungDeleteAction(false),
"trash-alt.png"));
new BuchungKontoauszugZuordnungAction(control), "view-refresh.png"));
addItem(new BuchungItem("Löschen...", new BuchungDeleteAction(false),
"user-trash-full.png"));
}

private static class SingleBuchungItem extends CheckedSingleContextMenuItem
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/BuchungsartMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class BuchungsartMenu extends ContextMenu
*/
public BuchungsartMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new BuchungsartDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new BuchungsartDeleteAction(), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/BuchungsklasseMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class BuchungsklasseMenu extends ContextMenu
*/
public BuchungsklasseMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new BuchungsklasseDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new BuchungsklasseDeleteAction(), "user-trash-full.png"));
}
}
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/menu/DokumentMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ public class DokumentMenu extends ContextMenu
public DokumentMenu(boolean enabled)
{
new ContextMenuItem();
addItem(new CheckedContextMenuItem("anzeigen", new DokumentShowAction(),
addItem(new CheckedContextMenuItem("Anzeigen", new DokumentShowAction(),
"eye.png"));
addItem(new CheckedContextMenuItem("Infos bearbeiten",
new DokumentInfoBearbeitenAction(), "edit.png"));
if (enabled)
{
addItem(ContextMenuItem.SEPARATOR);
addItem(new CheckedContextMenuItem("löschen...",
new DokumentDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new DokumentDeleteAction(), "user-trash-full.png"));
}
}
}
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/menu/EigenschaftGruppeMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public class EigenschaftGruppeMenu extends ContextMenu
*/
public EigenschaftGruppeMenu()
{
addItem(new ContextMenuItem("neu", new EigenschaftGruppeDetailAction(true),
addItem(new ContextMenuItem("Neu", new EigenschaftGruppeDetailAction(true),
"file.png"));
addItem(new CheckedContextMenuItem("löschen...",
new EigenschaftGruppeDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new EigenschaftGruppeDeleteAction(), "user-trash-full.png"));
}
}
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/menu/EigenschaftMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public class EigenschaftMenu extends ContextMenu
*/
public EigenschaftMenu()
{
addItem(new ContextMenuItem("neu", new EigenschaftDetailAction(true),
addItem(new ContextMenuItem("Neu", new EigenschaftDetailAction(true),
"file.png"));
addItem(new CheckedContextMenuItem("löschen...",
new EigenschaftDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new EigenschaftDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/FamilienbeitragMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class FamilienbeitragMenu extends ContextMenu
public FamilienbeitragMenu()
{
addItem(new AngehoerigerItem("Aus Familienverband entfernen",
new FamilienmitgliedEntfernenAction(), "trash-alt.png"));
new FamilienmitgliedEntfernenAction(), "user-trash-full.png"));
}

private static class AngehoerigerItem extends CheckedContextMenuItem
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/FelddefinitionMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class FelddefinitionMenu extends ContextMenu
*/
public FelddefinitionMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new FelddefinitionDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new FelddefinitionDeleteAction(), "user-trash-full.png"));
}
}
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/gui/menu/FormularMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ public FormularMenu(FormularControl control)
{
addItem(new CheckedContextMenuItem("Formularfelder",
new FormularfelderListeAction(), "file-invoice.png"));
addItem(new CheckedContextMenuItem("anzeigen", new FormularAnzeigeAction(),
addItem(new CheckedContextMenuItem("Anzeigen", new FormularAnzeigeAction(),
"edit.png"));
addItem(new CheckedSingleContextMenuItem("duplizieren",
addItem(new CheckedSingleContextMenuItem("Duplizieren",
new FormularDuplizierenAction(control), "copy.png"));
addItem(ContextMenuItem.SEPARATOR);
addItem(new CheckedContextMenuItem("löschen...", new FormularDeleteAction(),
"trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...", new FormularDeleteAction(),
"user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/FormularfeldMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class FormularfeldMenu extends ContextMenu
*/
public FormularfeldMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new FormularfeldDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new FormularfeldDeleteAction(), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/InventarLagerortMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class InventarLagerortMenu extends ContextMenu
*/
public InventarLagerortMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new InventarLagerortDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new InventarLagerortDeleteAction(), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/JahresabschlussMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class JahresabschlussMenu extends ContextMenu
*/
public JahresabschlussMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new JahresabschlussDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new JahresabschlussDeleteAction(), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/KontoMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public KontoMenu()
{
addItem(new CheckedContextMenuItem("Anfangsbestand",
new AnfangsbestandNeuAction(), "file.png"));
addItem(new CheckedContextMenuItem("löschen...", new KontoDeleteAction(),
"trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...", new KontoDeleteAction(),
"user-trash-full.png"));
}
}
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/gui/menu/KursteilnehmerMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public class KursteilnehmerMenu extends ContextMenu
public KursteilnehmerMenu(TablePart table)
{
addItem(new CheckedContextMenuItem("Abbuchungsdatum löschen...",
new KursteilnehmerAbuResetAction(table), "trash-alt.png"));
new KursteilnehmerAbuResetAction(table), "user-trash-full.png"));
addItem(new CheckedContextMenuItem("Zum Mitglied machen",
new KursteilnehmerWirdMitgliedAction(), "exchange-alt.png"));
addItem(new CheckedContextMenuItem("löschen...",
new KursteilnehmerDeleteAction(), "trash-alt.png"));
new KursteilnehmerWirdMitgliedAction(), "view-refresh.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new KursteilnehmerDeleteAction(), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/LehrgangMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class LehrgangMenu extends ContextMenu
*/
public LehrgangMenu()
{
addItem(new CheckedContextMenuItem("löschen...", new LehrgangDeleteAction(),
"trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...", new LehrgangDeleteAction(),
"user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/LehrgangsartMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class LehrgangsartMenu extends ContextMenu
*/
public LehrgangsartMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new LehrgangsartDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new LehrgangsartDeleteAction(), "user-trash-full.png"));
}
}
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/menu/MailAnhangMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ public class MailAnhangMenu extends ContextMenu

public MailAnhangMenu(MailControl control)
{
addItem(new CheckedContextMenuItem("anzeigen",
addItem(new CheckedContextMenuItem("Anzeigen",
new MailAnhangAnzeigeAction(), "eye.png"));
addItem(new CheckedContextMenuItem("entfernen",
new MailAnhangDeleteAction(control), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Entfernen",
new MailAnhangDeleteAction(control), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/MailAuswahlMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void handleAction(Object context)
}

}, "edit.png" /* "mail-message-new.png" */));
addItem(new CheckedContextMenuItem("entfernen",
new MailAuswahlDeleteAction(control), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Entfernen",
new MailAuswahlDeleteAction(control), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/MailMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class MailMenu extends ContextMenu

public MailMenu()
{
addItem(new CheckedContextMenuItem("löschen...", new MailDeleteAction(),
"trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...", new MailDeleteAction(),
"user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/MailVorlageMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class MailVorlageMenu extends ContextMenu

public MailVorlageMenu()
{
addItem(new CheckedContextMenuItem("löschen...",
new MailVorlageDeleteAction(), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new MailVorlageDeleteAction(), "user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/MitgliedMailMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class MitgliedMailMenu extends ContextMenu
*/
public MitgliedMailMenu(MitgliedControl mc)
{
addItem(new CheckedContextMenuItem("löschen...",
new MailemfaengerDeleteAction(mc), "trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...",
new MailemfaengerDeleteAction(mc), "user-trash-full.png"));
}
}
14 changes: 7 additions & 7 deletions src/de/jost_net/JVerein/gui/menu/MitgliedMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ public class MitgliedMenu extends ContextMenu
*/
public MitgliedMenu(Action detailaction) throws RemoteException
{
addItem(new CheckedSingleContextMenuItem("bearbeiten", detailaction,
addItem(new CheckedSingleContextMenuItem("Bearbeiten", detailaction,
"edit.png"));
addItem(new CheckedSingleContextMenuItem("duplizieren",
addItem(new CheckedSingleContextMenuItem("Duplizieren",
new MitgliedDuplizierenAction(), "copy.png"));
addItem(new CheckedContextMenuItem("in Zwischenablage kopieren",
addItem(new CheckedContextMenuItem("In Zwischenablage kopieren",
new MitgliedInZwischenablageKopierenAction(), "copy.png"));
if (detailaction instanceof AdresseDetailAction)
{
addItem(new CheckedContextMenuItem("zu Mitglied umwandeln", new Action()
addItem(new CheckedContextMenuItem("Zu Mitglied umwandeln", new Action()
{

@Override
Expand Down Expand Up @@ -105,8 +105,8 @@ public void handleAction(Object context) throws ApplicationException
}
}, "arrows-alt-h.png"));
}
addItem(new CheckedSingleContextMenuItem("löschen...",
new MitgliedDeleteAction(), "trash-alt.png"));
addItem(new CheckedSingleContextMenuItem("Löschen...",
new MitgliedDeleteAction(), "user-trash-full.png"));
addItem(ContextMenuItem.SEPARATOR);
addItem(new CheckedContextMenuItem("Mail senden ...",
new MitgliedMailSendenAction(), "envelope-open.png"));
Expand All @@ -124,7 +124,7 @@ public void handleAction(Object context) throws ApplicationException
addItem(new CheckedContextMenuItem("Zusatzbeträge zuweisen",
new MitgliedZusatzbetraegeZuordnungAction(), "coins.png"));
addItem(new CheckedContextMenuItem("Kontoauszug", new KontoauszugAction(),
"rechnung.png"));
"receipt.png"));
addItem(new CheckedSingleContextMenuItem("Spendenbescheinigung",
new SpendenbescheinigungAction(), "file-invoice.png"));
addItem(new CheckedContextMenuItem("Personalbogen",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ public MitgliedNextBGruppeMenue(MitgliedControl control)
addItem(new ContextMenuItem("Beitragsgruppe hinzufügen",
new MitgliedNextBGruppeNeuAction(control), "file.png"));
addItem(new CheckedContextMenuItem("Beitragsgruppe löschen",
new MitgliedNextBGruppeLoeschenAction(), "trash-alt.png"));
new MitgliedNextBGruppeLoeschenAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/MitgliedskontoMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class MitgliedskontoMenu extends ContextMenu
*/
public MitgliedskontoMenu()
{
addItem(new MitgliedItem("neue Sollbuchung",
addItem(new MitgliedItem("Neue Sollbuchung",
new MitgliedskontoDetailSollNeuAction(), "calculator.png"));
addItem(ContextMenuItem.SEPARATOR);
addItem(new SollItem("Sollbuchung bearbeiten",
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/ProjektMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ProjektMenu extends ContextMenu
*/
public ProjektMenu()
{
addItem(new CheckedContextMenuItem("löschen...", new ProjektDeleteAction(),
"trash-alt.png"));
addItem(new CheckedContextMenuItem("Löschen...", new ProjektDeleteAction(),
"user-trash-full.png"));
}
}
Loading

0 comments on commit 26b3d02

Please sign in to comment.