Skip to content

Commit

Permalink
Habe die "..." aus den Menüs und Buttons entfernt (#301)
Browse files Browse the repository at this point in the history
  • Loading branch information
JohannMaierhofer authored Aug 20, 2024
1 parent 3637944 commit 0c0547d
Show file tree
Hide file tree
Showing 38 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/control/KontoControl.java
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ public Object extract(ResultSet rs) throws RemoteException, SQLException

Buchungsart b = konto.getBuchungsart();
buchungsart = new SelectInput(liste, b);
buchungsart.setPleaseChoose("Bitte wählen...");
buchungsart.setPleaseChoose("Bitte wählen");

switch (Einstellungen.getEinstellung().getBuchungsartSort())
{
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/control/MitgliedControl.java
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,7 @@ public void handleAction(Object context) throws ApplicationException

public Button getVorlagenCsvEditButton()
{
Button b = new Button("CSV Vorlagen...", new Action()
Button b = new Button("CSV Vorlagen", new Action()
{
@Override
public void handleAction(Object context)
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/input/BuchungsartInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public Object extract(ResultSet rs) throws RemoteException, SQLException
break;
}
((BuchungsartSearchInput) buchungsart)
.setSearchString("Zum Suchen tippen ...");
.setSearchString("Zum Suchen tippen");
}
buchungsart.setValue(bart);
return buchungsart;
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/input/KontoInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public KontoInput(Konto konto) throws RemoteException
{
super(init(), konto);
setName(i18n.tr("Konto"));
setPleaseChoose(i18n.tr("Bitte wählen..."));
setPleaseChoose(i18n.tr("Bitte wählen"));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/AbrechnungslaufMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ public AbrechnungslaufMenu()
"calculator.png"));
addItem(new AbgeschlossenDisabledItem("Pre-Notification",
new PreNotificationAction(), "document-new.png"));
addItem(new AbgeschlossenDisabledItem("Löschen...",
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
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new AnfangsbestandDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new ArbeitseinsatzDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new BeitragsgruppeDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/BuchungMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public BuchungMenu(BuchungsControl control)
new BuchungProjektZuordnungAction(control), "view-refresh.png"));
addItem(new CheckedContextMenuItem("Kontoauszug zuordnen",
new BuchungKontoauszugZuordnungAction(control), "view-refresh.png"));
addItem(new BuchungItem("Löschen...", new BuchungDeleteAction(false),
addItem(new BuchungItem("Löschen", new BuchungDeleteAction(false),
"user-trash-full.png"));
}

Expand Down
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new BuchungsartDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new BuchungsklasseDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/DokumentMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public DokumentMenu(boolean enabled)
if (enabled)
{
addItem(ContextMenuItem.SEPARATOR);
addItem(new CheckedContextMenuItem("Löschen...",
addItem(new CheckedContextMenuItem("Löschen",
new DokumentDeleteAction(), "user-trash-full.png"));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public EigenschaftGruppeMenu()
{
addItem(new ContextMenuItem("Neu", new EigenschaftGruppeDetailAction(true),
"document-new.png"));
addItem(new CheckedContextMenuItem("Löschen...",
addItem(new CheckedContextMenuItem("Löschen",
new EigenschaftGruppeDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/EigenschaftMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public EigenschaftMenu()
{
addItem(new ContextMenuItem("Neu", new EigenschaftDetailAction(true),
"document-new.png"));
addItem(new CheckedContextMenuItem("Löschen...",
addItem(new CheckedContextMenuItem("Löschen",
new EigenschaftDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new FelddefinitionDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/FormularMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public FormularMenu(FormularControl control)
addItem(new CheckedSingleContextMenuItem("Duplizieren",
new FormularDuplizierenAction(control), "edit-copy.png"));
addItem(ContextMenuItem.SEPARATOR);
addItem(new CheckedContextMenuItem("Löschen...", new FormularDeleteAction(),
addItem(new CheckedContextMenuItem("Löschen", new FormularDeleteAction(),
"user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new FormularfeldDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new InventarLagerortDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new JahresabschlussDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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(), "document-new.png"));
addItem(new CheckedContextMenuItem("Löschen...", new KontoDeleteAction(),
addItem(new CheckedContextMenuItem("Löschen", new KontoDeleteAction(),
"user-trash-full.png"));
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/menu/KursteilnehmerMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ public class KursteilnehmerMenu extends ContextMenu
*/
public KursteilnehmerMenu(TablePart table)
{
addItem(new CheckedContextMenuItem("Abbuchungsdatum löschen...",
addItem(new CheckedContextMenuItem("Abbuchungsdatum löschen",
new KursteilnehmerAbuResetAction(table), "user-trash-full.png"));
addItem(new CheckedContextMenuItem("Zum Mitglied machen",
new KursteilnehmerWirdMitgliedAction(), "view-refresh.png"));
addItem(new CheckedContextMenuItem("Löschen...",
addItem(new CheckedContextMenuItem("Löschen",
new KursteilnehmerDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/LastschriftMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public LastschriftMenu()
{
addItem(new CheckedContextMenuItem("Pre-Notification",
new PreNotificationAction(), "document-new.png"));
addItem(new CheckedContextMenuItem("Löschen...", new LastschriftDeleteAction(),
addItem(new CheckedContextMenuItem("Löschen", new LastschriftDeleteAction(),
"user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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(),
addItem(new CheckedContextMenuItem("Löschen", new LehrgangDeleteAction(),
"user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new LehrgangsartDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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(),
addItem(new CheckedContextMenuItem("Löschen", new MailDeleteAction(),
"user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new MailVorlageDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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...",
addItem(new CheckedContextMenuItem("Löschen",
new MailemfaengerDeleteAction(mc), "user-trash-full.png"));
}
}
8 changes: 4 additions & 4 deletions src/de/jost_net/JVerein/gui/menu/MitgliedMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -174,16 +174,16 @@ public void handleAction(Object context) throws ApplicationException
}
if (detailaction instanceof NichtMitgliedDetailAction)
{
addItem(new CheckedSingleContextMenuItem("Löschen...",
addItem(new CheckedSingleContextMenuItem("Löschen",
new NichtMitgliedDeleteAction(), "user-trash-full.png"));
}
else
{
addItem(new CheckedSingleContextMenuItem("Löschen...",
addItem(new CheckedSingleContextMenuItem("Löschen",
new MitgliedDeleteAction(), "user-trash-full.png"));
}
addItem(ContextMenuItem.SEPARATOR);
addItem(new CheckedContextMenuItem("Mail senden ...",
addItem(new CheckedContextMenuItem("Mail senden",
new MitgliedMailSendenAction(), "envelope-open.png"));
addItem(new CheckedContextMenuItem("vCard-Datei",
new MitgliedVCardDateiAction(), "address-card.png"));
Expand All @@ -206,7 +206,7 @@ public void handleAction(Object context) throws ApplicationException
new SpendenbescheinigungAction(Spendenart.SACHSPENDE), "file-invoice.png"));
addItem(new CheckedContextMenuItem("Personalbogen",
new PersonalbogenAction(), "file-invoice.png"));
addItem(new CheckedSingleContextMenuItem("Manuelle Lastschrift ...",
addItem(new CheckedSingleContextMenuItem("Manuelle Lastschrift",
new MitgliedLastschriftAction(), "file-invoice.png"));
DBIterator<Formular> it = Einstellungen.getDBService()
.createList(Formular.class);
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/MitgliedstypMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class MitgliedstypMenu extends ContextMenu
*/
public MitgliedstypMenu()
{
addItem(new CheckedContextMenuItem("Löschen...",
addItem(new CheckedContextMenuItem("Löschen",
new MitgliedstypDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion 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(),
addItem(new CheckedContextMenuItem("Löschen", new ProjektDeleteAction(),
"user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/SplitBuchungMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public SplitBuchungMenu(BuchungsControl control)
new BuchungProjektZuordnungAction(control), "view-refresh.png"));
addItem(new CheckedSplitBuchungItem("Kontoauszug zuordnen",
new BuchungKontoauszugZuordnungAction(control), "view-refresh.png"));*/
addItem(new DeleteSplitBuchungItem("Löschen...",
addItem(new DeleteSplitBuchungItem("Löschen",
new SplitBuchungDeleteAction(control), "user-trash-full.png"));
addItem(new RestoreSplitBuchungItem());
}
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/SuchprofilMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public SuchprofilMenu(MitgliedSuchProfilControl control)
{
addItem(new CheckedContextMenuItem("Laden", new SuchprofilLadenAction(),
"document-open.png"));
addItem(new CheckedContextMenuItem("Löschen...",
addItem(new CheckedContextMenuItem("Löschen",
new SuchprofilDeleteAction(control), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/WiedervorlageMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public WiedervorlageMenu(TablePart table)
{
addItem(new CheckedContextMenuItem("Erledigt",
new WiedervorlageErledigungAction(table), "check.png"));
addItem(new CheckedContextMenuItem("Löschen...",
addItem(new CheckedContextMenuItem("Löschen",
new WiedervorlageDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/ZusatzbetraegeMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public ZusatzbetraegeMenu(TablePart table)
addItem(ContextMenuItem.SEPARATOR);
addItem(new CheckedSingleContextMenuItem("Erneut ausführen",
new ZusatzbetraegeResetAction(table), "view-refresh.png"));
addItem(new CheckedContextMenuItem("Löschen...",
addItem(new CheckedContextMenuItem("Löschen",
new ZusatzbetraegeDeleteAction(), "user-trash-full.png"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ZusatzbetragVorlageMenu extends ContextMenu
*/
public ZusatzbetragVorlageMenu()
{
addItem(new CheckedContextMenuItem("Löschen...",
addItem(new CheckedContextMenuItem("Löschen",
new ZusatzbetragVorlageDeleteAction(), "user-trash-full.png"));
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/view/AboutView.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public AboutView(int position)
{
super(position);
this.setSize(460, SWT.DEFAULT);
this.setTitle("Über...");
this.setTitle("Über");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public void bind() throws Exception
compButtons.setLayout(new RowLayout());

loadButton = new Button(compButtons, SWT.PUSH);
loadButton.setText("Vorlage laden...");
loadButton.setText("Vorlage laden");
loadButton.addSelectionListener(new SelectionAdapter()
{
@Override
Expand All @@ -200,7 +200,7 @@ public void widgetSelected(SelectionEvent e)
});

saveAsButton = new Button(compButtons, SWT.PUSH);
saveAsButton.setText("Vorlage speichern unter...");
saveAsButton.setText("Vorlage speichern unter");
saveAsButton.addSelectionListener(new SelectionAdapter()
{
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public void bind() throws Exception
group.addLabelPair("JVerein Konto", control.getAuswahlJVereinKonto());

LabelGroup poslistGroup = new LabelGroup(getParent(),
"Importierbare Buchungen im gewählten Konto...", true);
"Importierbare Buchungen im gewählten Konto", true);
control.getImportKontoPosList(new QIFBuchungsartAction())
.paint(poslistGroup.getComposite());

Expand Down

0 comments on commit 0c0547d

Please sign in to comment.