Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.10 #312

Merged
merged 4 commits into from
Apr 17, 2024
Merged

3.10 #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1608fb8
[26141] added message dialog for outdated views
Feb 1, 2024
8c9aa42
[26141] added message dialog for outdated views
Feb 1, 2024
8cf974b
[26141] adjusted code
Feb 1, 2024
33b1c8f
[26141] adjusted code
Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions bundles/ch.elexis.agenda/src/ch/elexis/agenda/ui/AgendaParallel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;

Expand All @@ -53,6 +55,7 @@ public class AgendaParallel extends BaseView {
private ProportionalSheet sheet;
private ColumnHeader header;
private Composite wrapper;
private boolean isFirstTime = true;

public AgendaParallel() {

Expand Down Expand Up @@ -87,6 +90,12 @@ protected void create(Composite parent) {

@Override
public void setFocus() {
if (isFirstTime) {
MessageDialog.openInformation(Display.getDefault().getActiveShell(), "Ansicht veraltet", "Die Ansicht "
+ getTitle()
+ " ist veraltet und wird nicht mehr unterstützt. Bitte verwenden Sie die Agenda Web Ansicht.");
isFirstTime = false;
}
Comment on lines +94 to +98
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In AgendaWeek (unteres file) werden die messages verwendet, und hier nicht. Bitte hier auch die dafür im core angelegten messages verwenden.

sheet.setFocus();
}

Expand Down
13 changes: 11 additions & 2 deletions bundles/ch.elexis.agenda/src/ch/elexis/agenda/ui/week/AgendaWeek.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;

Expand All @@ -45,7 +47,7 @@ public class AgendaWeek extends BaseView {

private ProportionalSheet sheet;
private ColumnHeader header;

private boolean isFirstTime = true;
public AgendaWeek() {

}
Expand Down Expand Up @@ -98,11 +100,18 @@ protected void refresh() {

showCalendarAction.setText(sb.toString());
sheet.refresh();

}

@Override
public void setFocus() {
if (isFirstTime) {
MessageDialog.openInformation(Display.getDefault().getActiveShell(), (Messages.OUTDATED_VIEW),
(Messages.THE_VIEW)
+ getTitle() + " "
+ (Messages.OUTDATED_USE_OTHER_VIEW));
isFirstTime = false;
}
refresh();
}

Expand Down
Loading