Skip to content

Commit

Permalink
Buttons und Labels in Views Update (#116)
Browse files Browse the repository at this point in the history 
Buttons und Labels für alle Views/Parts/Control angepasst:

Großschrift
Entfernen/Löschen Icon durch user-trash-full.png ersetzt. Dieses wird auch in Hibiscus dafür verwendet.
Speichern Icon durch document-save.png ersetzt. Dieses wird auch in Hibiscus verwendet.
Ein Menüitem für Kontoauszug korrigiert. Jetzt so wie im "Daten des Mitglieds" View.
  • Loading branch information
@JohannMaierhofer
JohannMaierhofer authored Jan 23, 2024
1 parent 11028df commit 31ef780
Show file tree
Hide file tree
Showing 82 changed files with 180 additions and 180 deletions.
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/control/AbrechnungSEPAControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public SelectInput getAbbuchungsausgabe()

public Button getStartButton()
{
Button button = new Button("starten", new Action()
Button button = new Button("Starten", new Action()
{
@Override
public void handleAction(Object context)
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/control/BuchungsuebernahmeControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public BuchungsuebernahmeControl(AbstractView view)

public Button getStartButton()
{
Button button = new Button("starten", new Action()
Button button = new Button("Starten", new Action()
{
@Override
public void handleAction(Object context)
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/control/KursteilnehmerControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ private void refresh()

public Button getStartAuswertungButton()
{
Button b = new Button("starten", new Action()
Button b = new Button("Starten", new Action()
{

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/control/LehrgangsartControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public DateInput getVon() throws RemoteException
d = null;
}
this.von = new DateInput(d, new JVDateFormatTTMMJJJJ());
this.von.setTitle("von/am");
this.von.setTitle("Von/am");
this.von.setText("Bitte Beginn oder Tag der Veranstaltung wählen");
return von;
}
Expand All @@ -114,7 +114,7 @@ public DateInput getBis() throws RemoteException
d = null;
}
this.bis = new DateInput(d, new JVDateFormatTTMMJJJJ());
this.bis.setTitle("bis");
this.bis.setTitle("Bis");
this.bis.setText("Bitte Ende der Veranstaltung wählen");
return bis;
}
Expand Down
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/control/MitgliedControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2559,7 +2559,7 @@ public SelectInput getMailauswahl() throws RemoteException

public Button getStartAuswertungButton()
{
Button b = new Button("starten", new Action()
Button b = new Button("Starten", new Action()
{

@Override
Expand Down Expand Up @@ -2640,7 +2640,7 @@ public void handleAction(Object context) throws ApplicationException

public Button getStartAdressAuswertungButton()
{
Button b = new Button("starten", new Action()
Button b = new Button("Starten", new Action()
{

@Override
Expand All @@ -2664,7 +2664,7 @@ public void handleAction(Object context) throws ApplicationException

public Button getStartStatistikButton()
{
Button b = new Button("starten", new Action()
Button b = new Button("Starten", new Action()
{

@Override
Expand Down
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/control/MitgliedskontoControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ public String reduceWord(String word)

public Button getStartRechnungButton(final Object currentObject)
{
Button button = new Button("starten", new Action()
Button button = new Button("Starten", new Action()
{

@Override
Expand Down Expand Up @@ -934,7 +934,7 @@ public void handleAction(Object context)
public Button getStartKontoauszugButton(final Object currentObject,
final DateInput von, final DateInput bis)
{
Button button = new Button("starten", new Action()
Button button = new Button("Starten", new Action()
{

@Override
Expand Down Expand Up @@ -970,7 +970,7 @@ private void generiereRechnung(Object currentObject) throws IOException

public Button getStartMahnungButton(final Object currentObject)
{
Button button = new Button("starten", new Action()
Button button = new Button("Starten", new Action()
{

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/control/PreNotificationControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public TextInput getVerwendungszweck()

public Button getStartButton(final Object currentObject)
{
Button button = new Button("starten", new Action()
Button button = new Button("Starten", new Action()
{

@Override
Expand Down Expand Up @@ -273,7 +273,7 @@ public void handleAction(Object context)

public Button getStart1ctUeberweisungButton(final Object currentObject)
{
Button button = new Button("starten", new Action()
Button button = new Button("Starten", new Action()
{

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/menu/MitgliedMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
"receipt.png"));
"file-invoice.png"));
addItem(new CheckedSingleContextMenuItem("Spendenbescheinigung",
new SpendenbescheinigungAction(), "file-invoice.png"));
addItem(new CheckedContextMenuItem("Personalbogen",
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/parts/ZusatzbetragPart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void paint(Composite parent) throws RemoteException
{
LabelGroup group = new LabelGroup(parent, "Zusatzbetrag");
group.addLabelPair("Startdatum", getStartdatum(true));
group.addLabelPair("nächste Fälligkeit", getFaelligkeit());
group.addLabelPair("Nächste Fälligkeit", getFaelligkeit());
group.addLabelPair("Intervall", getIntervall());
group.addLabelPair("Endedatum", getEndedatum());
group.addLabelPair("Buchungstext", getBuchungstext());
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/view/AbrechnungslaufView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void handleAction(Object context)
{
control.handleStore();
}
}, null, true, "save.png");
}, null, true, "document-save.png");
buttons.paint(this.getParent());
}

Expand Down
12 changes: 6 additions & 6 deletions src/de/jost_net/JVerein/gui/view/AbstractAdresseDetailView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,21 +204,21 @@ private void zeichneButtonArea(Composite parent) throws RemoteException
// R.M. 27.01.2013 Mitglieder sollten aus dem Dialog raus kopiert werden
// können
buttons
.addButton(new Button("duplizieren", new MitgliedDuplizierenAction(),
.addButton(new Button("Duplizieren", new MitgliedDuplizierenAction(),
control.getCurrentObject(), false, "copy.png"));
}
buttons.addButton("Mail", new MitgliedMailSendenAction(),
getCurrentObject(), false, "envelope-open.png");
// buttons.addButton("neue Mail", new MailDetailAction(),
// control.getCurrentObject(), false, "document-new.png");
buttons.addButton("neu", (isMitgliedDetail() ? new MitgliedDetailAction()
buttons.addButton("Neu", (isMitgliedDetail() ? new MitgliedDetailAction()
: new AdresseDetailAction()), null, false, "file.png");

buttons.addButton("löschen",
buttons.addButton("Löschen",
(isMitgliedDetail() ? new MitgliedDeleteAction()
: new AdresseDeleteAction()),
control.getCurrentObject(), false, "trash-alt.png");
buttons.addButton("speichern", new Action()
control.getCurrentObject(), false, "user-trash-full.png");
buttons.addButton("Speichern", new Action()
{

@Override
Expand All @@ -234,7 +234,7 @@ public void handleAction(Object context)
Logger.error("Fehler", e);
}
}
}, null, true, "save.png");
}, null, true, "document-save.png");
buttons.paint(parent);
}

Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/view/AbstractAdresseSucheView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public Object extract(ResultSet rs) throws SQLException
buttons.addButton(getHilfeButton());
if (anzahlbeitragsgruppe > 0)
{
buttons.addButton("neu", getDetailAction(), null, false, "file.png");
buttons.addButton("Neu", getDetailAction(), null, false, "file.png");
}
buttons.paint(this.getParent());
}
Expand Down
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/view/AdresstypListView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void bind() throws Exception
ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.ADRESSTYPEN, false, "question-circle.png");
buttons.addButton("neu", new AdresstypAction(), null, false, "file.png");
buttons.addButton("Neu", new AdresstypAction(), null, false, "file.png");

DBIterator<Adresstyp> it = Einstellungen.getDBService()
.createList(Adresstyp.class);
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/view/AdresstypView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ public void bind() throws Exception
ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.ADRESSTYPEN, false, "question-circle.png");
buttons.addButton("speichern", new Action()
buttons.addButton("Speichern", new Action()
{
@Override
public void handleAction(Object context)
{
control.handleStore();
}
}, null, true, "save.png");
}, null, true, "document-save.png");
buttons.paint(this.getParent());
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/view/AnfangsbestandListView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void bind() throws Exception
ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.ANFANGSBESTAENDE, false, "question-circle.png");
buttons.addButton("neu", new AnfangsbestandNeuAction(), null, true,
buttons.addButton("Neu", new AnfangsbestandNeuAction(), null, true,
"file.png");
buttons.paint(this.getParent());
}
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/view/AnfangsbestandView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ public void bind() throws Exception
ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.ANFANGSBESTAENDE, false, "question-circle.png");
buttons.addButton("speichern", new Action()
buttons.addButton("Speichern", new Action()
{
@Override
public void handleAction(Object context)
{
control.handleStore();
}
}, null, true, "save.png");
}, null, true, "document-save.png");
buttons.paint(this.getParent());
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/view/ArbeitseinsatzDetailView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ public void bind() throws Exception
ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.ARBEITSEINSATZ, false, "question-circle.png");
buttons.addButton("speichern", new Action()
buttons.addButton("Speichern", new Action()
{
@Override
public void handleAction(Object context)
{
control.handleStore();
}
}, null, true, "save.png");
}, null, true, "document-save.png");
buttons.paint(this.getParent());
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/view/ArbeitseinsatzUeberpruefungView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void handleEvent(Event event)
group.addLabelPair("Auswertung", aui);

ButtonArea buttons = new ButtonArea();
Button button = new Button("suchen", new Action()
Button button = new Button("Suchen", new Action()
{
@Override
public void handleAction(Object context) throws ApplicationException
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/view/AuswertungKursteilnehmerView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public void bind() throws Exception
final KursteilnehmerControl control = new KursteilnehmerControl(this);

LabelGroup grAbu = new LabelGroup(getParent(), "Abbuchungsdatum");
grAbu.addLabelPair("von", control.getAbbuchungsdatumvon());
grAbu.addLabelPair("bis", control.getAbbuchungsdatumbis());
grAbu.addLabelPair("Von", control.getAbbuchungsdatumvon());
grAbu.addLabelPair("Bis", control.getAbbuchungsdatumbis());

ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
Expand Down
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/view/BeitragsgruppeDetailView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ public void bind() throws Exception
ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.BEITRAGSGRUPPEN, false, "question-circle.png");
buttons.addButton("suche", new BeitragsgruppeSucheAction(), null, false,
buttons.addButton("Suche", new BeitragsgruppeSucheAction(), null, false,
"search.png");
buttons.addButton("speichern", new Action()
buttons.addButton("Speichern", new Action()
{
@Override
public void handleAction(Object context)
{
control.handleStore();
}
}, null, true, "save.png");
}, null, true, "document-save.png");
buttons.paint(this.getParent());
}

Expand Down
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/view/BeitragsgruppeSucheView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public void bind() throws Exception
ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.BEITRAGSGRUPPEN, false, "question-circle.png");
buttons.addButton("löschen", new BeitragsgruppeDeleteAction(),
control.getBeitragsgruppeTable(), false, "trash-alt.png");
buttons.addButton("neu", new BeitragsgruppeDetailAction(), null, false,
buttons.addButton("Löschen", new BeitragsgruppeDeleteAction(),
control.getBeitragsgruppeTable(), false, "user-trash-full.png");
buttons.addButton("Neu", new BeitragsgruppeDetailAction(), null, false,
"file.png");
buttons.paint(this.getParent());
}
Expand Down
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/view/BuchungView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ public void bind() throws Exception
DokumentationUtil.BUCHUNGEN, false, "question-circle.png");
if (control.getBuchung().getSpeicherung())
{
buttons.addButton("neu", new BuchungNeuAction(), null, false, "file.png");
buttons.addButton("Neu", new BuchungNeuAction(), null, false, "file.png");
}
Button savButton = new Button("speichern",
control.getBuchungSpeichernAction(), null, true, "save.png");
Button savButton = new Button("Speichern",
control.getBuchungSpeichernAction(), null, true, "document-save.png");
savButton.setEnabled(!buchungabgeschlossen);
buttons.addButton(savButton);
buttons.paint(getParent());
Expand Down
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/view/BuchungsartListView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void bind() throws Exception
group.addLabelPair("Suche", control.getSuchtext());

ButtonArea buttons1 = new ButtonArea();
Button button = new Button("suchen", new Action()
Button button = new Button("Suchen", new Action()
{
@Override
public void handleAction(Object context) throws ApplicationException
Expand All @@ -69,7 +69,7 @@ public void handleAction(Object context) throws ApplicationException
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.BUCHUNGSART, false, "question-circle.png");
buttons.addButton(control.getPDFAusgabeButton());
buttons.addButton("neu", new BuchungsartAction(), null, false, "file.png");
buttons.addButton("Neu", new BuchungsartAction(), null, false, "file.png");
buttons.paint(this.getParent());
}
}
4 changes: 2 additions & 2 deletions src/de/jost_net/JVerein/gui/view/BuchungsartView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ public void bind() throws Exception
ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.BUCHUNGSART, false, "question-circle.png");
buttons.addButton("speichern", new Action()
buttons.addButton("Speichern", new Action()
{
@Override
public void handleAction(Object context)
{
control.handleStore();
}
}, null, true, "save.png");
}, null, true, "document-save.png");
buttons.paint(this.getParent());
}
}
2 changes: 1 addition & 1 deletion src/de/jost_net/JVerein/gui/view/BuchungsklasseListView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void bind() throws Exception
ButtonArea buttons = new ButtonArea();
buttons.addButton("Hilfe", new DokumentationAction(),
DokumentationUtil.BUCHUNGSKLASSEN, false, "question-circle.png");
buttons.addButton("neu", new BuchungsklasseAction(), null, false,
buttons.addButton("Neu", new BuchungsklasseAction(), null, false,
"file.png");
buttons.paint(this.getParent());
}
Expand Down
6 changes: 3 additions & 3 deletions src/de/jost_net/JVerein/gui/view/BuchungsklasseSaldoView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ public void bind() throws Exception
this);

LabelGroup group = new LabelGroup(getParent(), "Zeitraum");
group.addLabelPair("von", control.getDatumvon());
group.addLabelPair("bis", control.getDatumbis());
group.addLabelPair("Von", control.getDatumvon());
group.addLabelPair("Bis", control.getDatumbis());

DBIterator<Buchung> list = Einstellungen.getDBService().createList(Buchung.class);
if (list == null || !list.hasNext())
Expand All @@ -156,7 +156,7 @@ public void bind() throws Exception
quickGroup.addPart(quickBtns);

ButtonArea buttons = new ButtonArea();
Button button = new Button("suchen", new Action()
Button button = new Button("Suchen", new Action()
{
@Override
public void handleAction(Object context) throws ApplicationException
Expand Down
Loading

0 comments on commit 31ef780

Please sign in to comment.