From 02697d206df1958c32aead9a44dda8e19e10f3da Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Fri, 30 Apr 2021 14:01:34 +0200 Subject: [client] Remove start command pane on QEMU VM upload page --- .../dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java | 15 --------------- .../openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java | 9 +-------- .../src/main/properties/i18n/page_layout.properties | 1 - .../src/main/properties/i18n/page_layout_de_DE.properties | 1 - .../src/main/properties/i18n/page_layout_tr_TR.properties | 1 - 5 files changed, 1 insertion(+), 26 deletions(-) (limited to 'dozentenmodul/src') diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java index f607e3da..8ba73589 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java @@ -23,9 +23,6 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { protected final QLabel lblOperatingSystem; protected final JComboBox cboOperatingSystem; protected final JEditorPane txtDescription; - protected final JTextArea startCommand; - protected final QLabel sCommandCaption; - protected final JScrollPane startCommandPane; protected final JCheckBox chkLicenseRestricted; protected final JCheckBox chkIsTemplate; @@ -54,18 +51,6 @@ public abstract class ImageMetaDataPageLayout extends WizardPage { grid.add(cboOperatingSystem); grid.nextRow(); - sCommandCaption = new QLabel(I18n.PAGE_LAYOUT.getString("ImageMetaData.Label.startCommand.text")); - startCommand = new JTextArea(1, 50); - startCommand.setMinimumSize(Gui.getScaledDimension(0, 35)); - startCommand.setLineWrap(true); - startCommand.setWrapStyleWord(true); - startCommandPane = new JScrollPane(startCommand, JScrollPane.VERTICAL_SCROLLBAR_NEVER, - JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); - startCommandPane.setMinimumSize(startCommand.getMinimumSize()); - grid.add(sCommandCaption); - grid.add(startCommandPane).fill(true, false).expand(true, false); - grid.nextRow(); - // description QLabel descriptionCaption = new QLabel( I18n.PAGE_LAYOUT.getString("ImageMetaData.Label.description.text")); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java index 7314d5e3..e6fcc783 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java @@ -14,7 +14,6 @@ import org.openslx.thrifthelper.Comparators; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; import org.openslx.virtualization.configuration.VirtualizationConfigurationDocker; -import org.openslx.virtualization.configuration.VirtualizationConfigurationQemu; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -78,8 +77,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { } else if (state.selectedOs == null) { cboOperatingSystem.setSelectedItem(null); } - sCommandCaption.setVisible(false); - startCommandPane.setVisible(false); + chkIsTemplate.setSelected(state.isTemplate); chkLicenseRestricted.setSelected(state.isRestricted); reactToUserInput(); @@ -115,11 +113,6 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout { return; } - if (state.virtualizationConfig instanceof VirtualizationConfigurationQemu) { - sCommandCaption.setVisible(true); - startCommandPane.setVisible(true); - } - if (state.virtualizationConfig instanceof VirtualizationConfigurationDocker) { // TODO we need Information about a OS in Container? Currently use "Other (32 Bit)" as default lblOperatingSystem.setVisible(false); diff --git a/dozentenmodul/src/main/properties/i18n/page_layout.properties b/dozentenmodul/src/main/properties/i18n/page_layout.properties index 34e7d58e..bc282897 100644 --- a/dozentenmodul/src/main/properties/i18n/page_layout.properties +++ b/dozentenmodul/src/main/properties/i18n/page_layout.properties @@ -25,7 +25,6 @@ ImageTypePageLayout.button.newDocker=New Docker Image ImageMetaData.WizardPage.title=Metadata ImageMetaData.WizardPage.description=Please enter a meaningful name for the new VM. ImageMetaData.Label.OS.text=Operating system -ImageMetaData.Label.startCommand.text=Start command ImageMetaData.Label.description.text=Description ImageMetaData.CheckBox.licenseRestricted.text=VM contains software requiring a license ImageMetaData.CheckBox.isTemplate.text=Create template diff --git a/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties b/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties index 10491635..cd5b7f9e 100644 --- a/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties +++ b/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties @@ -25,7 +25,6 @@ ImageTypePageLayout.button.newDocker=Neues Docker-Image ImageMetaData.WizardPage.title=Metadaten ImageMetaData.WizardPage.description=Geben Sie bitte einen aussagekräftigen Namen für die neue VM ein. ImageMetaData.Label.OS.text=Betriebssystem -ImageMetaData.Label.startCommand.text=Startbefehl ImageMetaData.Label.description.text=Beschreibung ImageMetaData.CheckBox.licenseRestricted.text=VM enthält lizenzpflichtige Software ImageMetaData.CheckBox.isTemplate.text=Vorlage erstellen diff --git a/dozentenmodul/src/main/properties/i18n/page_layout_tr_TR.properties b/dozentenmodul/src/main/properties/i18n/page_layout_tr_TR.properties index a791c740..ec69138a 100644 --- a/dozentenmodul/src/main/properties/i18n/page_layout_tr_TR.properties +++ b/dozentenmodul/src/main/properties/i18n/page_layout_tr_TR.properties @@ -14,7 +14,6 @@ ImageCustomPermission.CheckBox.permissionAdmin.text=Yönetim ImageMetaData.WizardPage.title=Meta veriler ImageMetaData.WizardPage.description=Lütfen yeni sanal makine için anlamlı bir isim girin. ImageMetaData.Label.OS.text=İşletim sistemi -ImageMetaData.Label.startCommand.text=Başlangıç komutu ImageMetaData.Label.description.text=Açıklama ImageMetaData.CheckBox.licenseRestricted.text=Sanal makine lisans gerektiren yazılım içeriyor ImageMetaData.CheckBox.isTemplate.text=Şablon oluştur -- cgit v1.2.3-55-g7522