mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug #229771 Usability: Bad Environment preference dialog layout

Browse source
This commit is contained in:
Oleg Krasilnikov 2008-05-13 08:47:37 +00:00
parent 28a6dc5f30
commit 6be6c455c6
2 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java
View file

@ -103,26 +103,34 @@ public class CDTPrefUtil {
setStr(KEY_PREFTC, b.toString().trim()); setStr(KEY_PREFTC, b.toString().trim());
} }
@SuppressWarnings("fallthrough")
public static String getDMode() { public static String getDMode() {
String s = null; String s = null;
switch(CDTPrefUtil.getInt(CDTPrefUtil.KEY_DMODE)) { switch(getInt(KEY_DMODE)) {
case CDTPrefUtil.DMODE_CONJUNCTION: default:
setInt(KEY_DMODE, DMODE_CONJUNCTION);
// fallthrough
case DMODE_CONJUNCTION:
s = UIMessages.getString("EnvironmentTab.17"); //$NON-NLS-1$ s = UIMessages.getString("EnvironmentTab.17"); //$NON-NLS-1$
break; break;
case CDTPrefUtil.DMODE_DISJUNCTION: case DMODE_DISJUNCTION:
s = UIMessages.getString("EnvironmentTab.18"); //$NON-NLS-1$ s = UIMessages.getString("EnvironmentTab.18"); //$NON-NLS-1$
break; break;
} }
return UIMessages.getString("EnvironmentTab.19") + s; //$NON-NLS-1$ return UIMessages.getString("EnvironmentTab.19") + s; //$NON-NLS-1$
} }
@SuppressWarnings("fallthrough")
public static String getWMode() { public static String getWMode() {
String s = null; String s = null;
switch(CDTPrefUtil.getInt(CDTPrefUtil.KEY_WMODE)) { switch(getInt(KEY_WMODE)) {
case CDTPrefUtil.WMODE_MODIFY: default:
setInt(KEY_WMODE, WMODE_MODIFY);
// fallthrough
case WMODE_MODIFY:
s = UIMessages.getString("EnvironmentTab.24"); //$NON-NLS-1$ s = UIMessages.getString("EnvironmentTab.24"); //$NON-NLS-1$
break; break;
case CDTPrefUtil.WMODE_REPLACE: case WMODE_REPLACE:
s = UIMessages.getString("EnvironmentTab.21"); //$NON-NLS-1$ s = UIMessages.getString("EnvironmentTab.21"); //$NON-NLS-1$
break; break;
} }

29
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java
View file

@ -207,7 +207,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
b1.setText(UIMessages.getString("EnvironmentTab.3")); //$NON-NLS-1$ b1.setText(UIMessages.getString("EnvironmentTab.3")); //$NON-NLS-1$
b1.setToolTipText(UIMessages.getString("EnvironmentTab.3")); //$NON-NLS-1$ b1.setToolTipText(UIMessages.getString("EnvironmentTab.3")); //$NON-NLS-1$
gd = new GridData(GridData.FILL_HORIZONTAL); gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2; gd.horizontalSpan = 3;
b1.setLayoutData(gd); b1.setLayoutData(gd);
b1.addSelectionListener(new SelectionAdapter() { b1.addSelectionListener(new SelectionAdapter() {
@Override @Override
@ -219,21 +219,11 @@ public class EnvironmentTab extends AbstractCPropertyTab {
updateData(); updateData();
}}); }});
lb1 = new Label(usercomp, SWT.BORDER | SWT.CENTER);
lb1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
lb1.setToolTipText(UIMessages.getString("EnvironmentTab.15")); //$NON-NLS-1$
lb1.addMouseListener(new MouseAdapter() {
@Override
public void mouseDoubleClick(MouseEvent e) {
CDTPrefUtil.spinDMode();
updateData();
}});
b2 = new Button(usercomp, SWT.RADIO); b2 = new Button(usercomp, SWT.RADIO);
b2.setText(UIMessages.getString("EnvironmentTab.4")); //$NON-NLS-1$ b2.setText(UIMessages.getString("EnvironmentTab.4")); //$NON-NLS-1$
b2.setToolTipText(UIMessages.getString("EnvironmentTab.4")); //$NON-NLS-1$ b2.setToolTipText(UIMessages.getString("EnvironmentTab.4")); //$NON-NLS-1$
gd = new GridData(GridData.FILL_HORIZONTAL); gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2; gd.horizontalSpan = 3;
b2.setLayoutData(gd); b2.setLayoutData(gd);
b2.addSelectionListener(new SelectionAdapter() { b2.addSelectionListener(new SelectionAdapter() {
@Override @Override
@ -245,6 +235,20 @@ public class EnvironmentTab extends AbstractCPropertyTab {
updateData(); updateData();
}}); }});
if (!page.isForPrefs()) {
// dummy placeholder
new Label(usercomp, SWT.NONE).setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
lb1 = new Label(usercomp, SWT.BORDER | SWT.CENTER);
lb1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
lb1.setToolTipText(UIMessages.getString("EnvironmentTab.15")); //$NON-NLS-1$
lb1.addMouseListener(new MouseAdapter() {
@Override
public void mouseDoubleClick(MouseEvent e) {
CDTPrefUtil.spinDMode();
updateData();
}});
lb2 = new Label(usercomp, SWT.BORDER | SWT.CENTER); lb2 = new Label(usercomp, SWT.BORDER | SWT.CENTER);
lb2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); lb2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
lb2.setToolTipText(UIMessages.getString("EnvironmentTab.23")); //$NON-NLS-1$ lb2.setToolTipText(UIMessages.getString("EnvironmentTab.23")); //$NON-NLS-1$
@ -254,6 +258,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
CDTPrefUtil.spinWMode(); CDTPrefUtil.spinWMode();
updateLbs(null, lb2); updateLbs(null, lb2);
}}); }});
}
initButtons(new String[] {UIMessages.getString("EnvironmentTab.5"),UIMessages.getString("EnvironmentTab.6"),UIMessages.getString("EnvironmentTab.7"),UIMessages.getString("EnvironmentTab.8"),UIMessages.getString("EnvironmentTab.9")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ initButtons(new String[] {UIMessages.getString("EnvironmentTab.5"),UIMessages.getString("EnvironmentTab.6"),UIMessages.getString("EnvironmentTab.7"),UIMessages.getString("EnvironmentTab.8"),UIMessages.getString("EnvironmentTab.9")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
} }