diff options
| author | Michael Wilson | 2014-10-02 14:26:51 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-10-02 14:26:51 +0200 |
| commit | da08822fc12f4fb5a798ef9ba7b93139832daae1 (patch) | |
| tree | 799b5faf4ff6905b6525f0fda5a881671c59af35 /dozentenmodul/src/main/java/gui/image | |
| parent | -Suchfenster "Image bearbeiten", "Image löschen", Veranstaltung bearbeiten", ... (diff) | |
| parent | • added warning for 'back' on ftp upload task (diff) | |
| download | tutor-module-da08822fc12f4fb5a798ef9ba7b93139832daae1.tar.gz tutor-module-da08822fc12f4fb5a798ef9ba7b93139832daae1.tar.xz tutor-module-da08822fc12f4fb5a798ef9ba7b93139832daae1.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image')
3 files changed, 42 insertions, 12 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 62937f60..743d9165 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -371,7 +371,7 @@ public class FTPCreateUploader_GUI extends JFrame implements } }); btnUploadStoppen.setEnabled(false); - btnUploadStoppen.setBounds(318, 200, 173, 23); + btnUploadStoppen.setBounds(307, 200, 173, 23); contentPanel.add(btnUploadStoppen); { JPanel buttonPane = new JPanel(); @@ -447,9 +447,24 @@ public class FTPCreateUploader_GUI extends JFrame implements }// end if choice } else { - dispose(); - PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(); - m.setVisible(true); + + int selectedOption = JOptionPane.showConfirmDialog(null, + "<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>", + "Abbrechen und zurück", + JOptionPane.YES_NO_OPTION); + if (selectedOption == JOptionPane.YES_OPTION) + { + dispose(); + PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(); + m.setVisible(true); + } + else + { + //for actions if "no" is selected. tbd. + } + + + }// end else }// end action }); diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index ec97287f..a1465a86 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -275,7 +275,7 @@ public class FTPEditUploader_GUI extends JFrame implements panel.setBounds(10, 11, 577, 57); contentPanel.add(panel); - JLabel lblUploadIhresImage = new JLabel("Upload Ihres Image"); + JLabel lblUploadIhresImage = new JLabel("Upload Ihres Images"); lblUploadIhresImage.setFont(new Font("Tahoma", Font.BOLD, 18)); lblUploadIhresImage.setBounds(10, 11, 509, 22); panel.add(lblUploadIhresImage); @@ -354,7 +354,7 @@ public class FTPEditUploader_GUI extends JFrame implements }); btnUploadStoppen.setEnabled(false); - btnUploadStoppen.setBounds(301, 200, 173, 23); + btnUploadStoppen.setBounds(307, 200, 173, 23); contentPanel.add(btnUploadStoppen); { JPanel buttonPane = new JPanel(); @@ -429,9 +429,24 @@ public class FTPEditUploader_GUI extends JFrame implements }// end if coice } else { - dispose(); - PermissionEditImage_GUI ei = new PermissionEditImage_GUI(); - ei.setVisible(true); + + + int selectedOption = JOptionPane.showConfirmDialog(null, + "<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>", + "Abbrechen und zurück", + JOptionPane.YES_NO_OPTION); + if (selectedOption == JOptionPane.YES_OPTION) + { + dispose(); + PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(); + m.setVisible(true); + } + else + { + //for actions if "no" is selected. tbd. + } + + }// end else }// end action }); diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index 64c76bed..fe2b5017 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -295,7 +295,7 @@ public class SearchImage_GUI extends JFrame { @Override
public void keyReleased(KeyEvent e) {
// Textfield eingabe auslesen
- String stext = textFieldName.getText();
+ String stext = textFieldName.getText().trim();
// Wenn Textfield nicht leer
if (stext != "") {
@@ -307,8 +307,8 @@ public class SearchImage_GUI extends JFrame { textFieldName.getText(), 0));
rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
textFieldName.getText(), 0));
-
- } else {
+
+ } else { //refresh list (deprecated, remove tabfolder)
activeSearch = false;
String username = person.verantwortlicher.getName() + " "
+ person.verantwortlicher.getVorname();
|