mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

Bug 496187 Clean up the add Qt Install UI.

Browse source 
Change-Id: I2a315366690dc68d18bfff2bfde4c8fb58cf509c
This commit is contained in:
Doug Schaefer 2016-06-15 11:25:34 -04:00
parent a41ffeaf34
commit 4b43360130
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java
View file

@ -70,7 +70,7 @@ public class QtInstallManager implements IQtInstallManager {
// Remove ones that aren't valid // Remove ones that aren't valid
for (String key : prefs.keys()) { for (String key : prefs.keys()) {
if (installs.get(key) == null) { if (installs.get(Paths.get(key)) == null) {
prefs.remove(key); prefs.remove(key);
} }
} }

4
qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/messages.properties
View file

@ -11,8 +11,8 @@ NewQtInstallWizardPage_7=qmake
NewQtInstallWizardPage_8=Get Qt Spec NewQtInstallWizardPage_8=Get Qt Spec
NewQtInstallWizardPage_9=mkspec: NewQtInstallWizardPage_9=mkspec:
QtPreferencePage_0=Qt Installs QtPreferencePage_0=Qt Installs
QtPreferencePage_1=Name QtPreferencePage_1=Location
QtPreferencePage_2=Location QtPreferencePage_2=mkspec
QtPreferencePage_3=Add QtPreferencePage_3=Add
QtPreferencePage_4=Remove QtPreferencePage_4=Remove
QtPreferencePage_5=Remove Qt Install QtPreferencePage_5=Remove Qt Install

4
qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/NewQtInstallWizardPage.java
View file

@ -48,10 +48,6 @@ public class NewQtInstallWizardPage extends WizardPage {
comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
comp.setLayout(new GridLayout(2, false)); 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); Label locationLabel = new Label(comp, SWT.NONE);
locationLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false)); locationLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
locationLabel.setText(Messages.NewQtInstallWizardPage_3); locationLabel.setText(Messages.NewQtInstallWizardPage_3);

4
qt/org.eclipse.cdt.qt.ui/src/org/eclipse/cdt/internal/qt/ui/preferences/QtPreferencePage.java
View file

@ -85,8 +85,8 @@ public class QtPreferencePage extends PreferencePage implements IWorkbenchPrefer
locationColumn.setText(Messages.QtPreferencePage_2); locationColumn.setText(Messages.QtPreferencePage_2);
TableColumnLayout tableLayout = new TableColumnLayout(); TableColumnLayout tableLayout = new TableColumnLayout();
tableLayout.setColumnData(nameColumn, new ColumnWeightData(25, 50, true)); tableLayout.setColumnData(nameColumn, new ColumnWeightData(75, 350, true));
tableLayout.setColumnData(locationColumn, new ColumnWeightData(75, 150, true)); tableLayout.setColumnData(locationColumn, new ColumnWeightData(25, 100, true));
installTableComp.setLayout(tableLayout); installTableComp.setLayout(tableLayout);
Composite buttonsComp = new Composite(installsGroup, SWT.NONE); Composite buttonsComp = new Composite(installsGroup, SWT.NONE);