diff options
author | Doug Schaefer | 2016-06-15 15:25:34 +0000 |
---|---|---|
committer | Doug Schaefer | 2016-06-15 15:25:34 +0000 |
commit | 4b43360130b0573a083124883555d09a483e5921 (patch) | |
tree | d2ace47b6d7e0726908dd42a3079761646758e07 /qt | |
parent | a41ffeaf34ed3b1d7b55e76971c4dd68efd6efff (diff) | |
download | org.eclipse.cdt-4b43360130b0573a083124883555d09a483e5921.tar.gz org.eclipse.cdt-4b43360130b0573a083124883555d09a483e5921.tar.xz org.eclipse.cdt-4b43360130b0573a083124883555d09a483e5921.zip |
Bug 496187 Clean up the add Qt Install UI.
Change-Id: I2a315366690dc68d18bfff2bfde4c8fb58cf509c
Diffstat (limited to 'qt')
4 files changed, 5 insertions, 9 deletions
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java index 2e9e11fce9c..abe183c208a 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java @@ -70,7 +70,7 @@ public class QtInstallManager implements IQtInstallManager { // Remove ones that aren't valid for (String key : prefs.keys()) { - if (installs.get(key) == null) { + if (installs.get(Paths.get(key)) == null) { prefs.remove(key); } } diff --git a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/messages.properties b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/messages.properties index cdf9f362646..5654d25abc8 100644 --- a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/messages.properties +++ b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/messages.properties @@ -11,8 +11,8 @@ NewQtInstallWizardPage_7=qmake NewQtInstallWizardPage_8=Get Qt Spec NewQtInstallWizardPage_9=mkspec: QtPreferencePage_0=Qt Installs -QtPreferencePage_1=Name -QtPreferencePage_2=Location +QtPreferencePage_1=Location +QtPreferencePage_2=mkspec QtPreferencePage_3=Add QtPreferencePage_4=Remove QtPreferencePage_5=Remove Qt Install diff --git a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/NewQtInstallWizardPage.java b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/NewQtInstallWizardPage.java index 10965837736..bb7d113d173 100644 --- a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/NewQtInstallWizardPage.java +++ b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/NewQtInstallWizardPage.java @@ -48,10 +48,6 @@ public class NewQtInstallWizardPage extends WizardPage { comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); comp.setLayout(new GridLayout(2, false)); - Label nameLabel = new Label(comp, SWT.NONE); - nameLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false)); - nameLabel.setText(Messages.NewQtInstallWizardPage_2); - Label locationLabel = new Label(comp, SWT.NONE); locationLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false)); locationLabel.setText(Messages.NewQtInstallWizardPage_3); diff --git a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/QtPreferencePage.java b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/QtPreferencePage.java index d0260e57cea..142e87a5b0d 100644 --- a/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/QtPreferencePage.java +++ b/qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/QtPreferencePage.java @@ -85,8 +85,8 @@ public class QtPreferencePage extends PreferencePage implements IWorkbenchPrefer locationColumn.setText(Messages.QtPreferencePage_2); TableColumnLayout tableLayout = new TableColumnLayout(); - tableLayout.setColumnData(nameColumn, new ColumnWeightData(25, 50, true)); - tableLayout.setColumnData(locationColumn, new ColumnWeightData(75, 150, true)); + tableLayout.setColumnData(nameColumn, new ColumnWeightData(75, 350, true)); + tableLayout.setColumnData(locationColumn, new ColumnWeightData(25, 100, true)); installTableComp.setLayout(tableLayout); Composite buttonsComp = new Composite(installsGroup, SWT.NONE); |