Menu
▾
▴
[Jcommander-commit] plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks BookmarkComposite.java, 1.23, 1.23.6.1 BookmarkPanel.java, 1.19, 1.19.6.1
|
From: Dan C. <cor...@us...> - 2010-05-07 20:17:57
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28707/src/org/jcommander/ui/filepanel/bookmarks Modified Files: Tag: VER_0_7_2 BookmarkComposite.java BookmarkPanel.java Log Message: Fixed some layout problems. Index: BookmarkPanel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks/BookmarkPanel.java,v retrieving revision 1.19 retrieving revision 1.19.6.1 diff -C2 -d -r1.19 -r1.19.6.1 *** BookmarkPanel.java 6 Aug 2006 10:33:24 -0000 1.19 --- BookmarkPanel.java 7 May 2010 20:17:45 -0000 1.19.6.1 *************** *** 21,30 **** public class BookmarkPanel extends Composite { - // private Button leftScrollButton = null; private BookmarkComposite bookmarkComposite = null; - // private Button rightScrollButton = null; private Button goToParentGroupButton = null; - // private Button startScrollButton = null; - // private Button endScrollButton = null; protected ArrayList bookmarkSelectionListeners; protected MouseAdapter focusFileControlAdapter; --- 21,26 ---- *************** *** 58,79 **** bookmarkSelectionListeners = new ArrayList(); - GridData gridData5 = new GridData(); - GridLayout gridLayout1 = new GridLayout(); createComposite2(); - // startScrollButton = new Button(this, SWT.ARROW | SWT.LEFT | SWT.BORDER); - - // startScrollButton.setEnabled(false); - // - // leftScrollButton = new Button(this, SWT.ARROW | SWT.LEFT); - // leftScrollButton.setEnabled(false); - // createComposite(); - // rightScrollButton = new Button(this, SWT.ARROW | SWT.RIGHT); - // rightScrollButton.setEnabled(false); - // - // endScrollButton = new Button(this, SWT.ARROW | SWT.RIGHT | SWT.BORDER); - // endScrollButton.setEnabled(false); ! this.setLayout(gridLayout1); gridLayout1.numColumns = 6; gridLayout1.marginHeight = 2; --- 54,61 ---- bookmarkSelectionListeners = new ArrayList(); createComposite2(); createComposite(); ! GridLayout gridLayout1 = new GridLayout(); gridLayout1.numColumns = 6; gridLayout1.marginHeight = 2; *************** *** 81,98 **** gridLayout1.verticalSpacing = 2; gridLayout1.horizontalSpacing = 2; ! // leftScrollButton.setText("<"); ! // leftScrollButton.setToolTipText("Scroll left"); ! // leftScrollButton.setBackground(org.eclipse.swt.widgets.Display.getDefault().getSystemColor(org.eclipse.swt.SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT)); ! // rightScrollButton.setText(">"); ! // rightScrollButton.setToolTipText("Scroll right"); ! // startScrollButton.setText("|<"); ! // startScrollButton.setToolTipText("Scroll to start"); ! // startScrollButton.setForeground(org.eclipse.swt.widgets.Display.getDefault().getSystemColor(org.eclipse.swt.SWT.COLOR_BLACK)); ! // startScrollButton.setLayoutData(gridData5); ! // endScrollButton.setText(">|"); ! // endScrollButton.setToolTipText("Scroll to end"); ! gridData5.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER; ! gridData5.grabExcessVerticalSpace = false; ! this.setSize(new Point(482, 90)); goToParentGroupButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { --- 63,67 ---- gridLayout1.verticalSpacing = 2; gridLayout1.horizontalSpacing = 2; ! this.setLayout(gridLayout1); goToParentGroupButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { *************** *** 101,126 **** } }); - // endScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { - // public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { - // bookmarkComposite.scrollEnd(); - // } - // }); - // startScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { - // public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { - // bookmarkComposite.scrollStart(); - // } - // }); - // rightScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { - // public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { - // bookmarkComposite.scrollRight(); - // } - // }); - // leftScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { - // public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { - // bookmarkComposite.scrollLeft(); - // } - // - // }); } /** * This method initializes composite --- 70,75 ---- } }); } + /** * This method initializes composite *************** *** 128,149 **** */ private void createComposite() { ! GridData gridData2 = new GridData(); bookmarkComposite = new BookmarkComposite(this, focusFileControlAdapter, SWT.NONE); ! gridData2.grabExcessHorizontalSpace = true; ! gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; ! gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.FILL; ! bookmarkComposite.setLayoutData(gridData2); ! bookmarkComposite.setLayout(null); ! } ! ! /** ! * TODO remove ! * ! * @deprecated ! */ ! public void setBookmarks(BookmarkGroup bkGroup) { ! // do nothing ! ! // setBookmarks(bkGroup); } --- 77,86 ---- */ private void createComposite() { ! GridData gridData = new GridData(); bookmarkComposite = new BookmarkComposite(this, focusFileControlAdapter, SWT.NONE); ! gridData.grabExcessHorizontalSpace = true; ! gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; ! gridData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL; ! bookmarkComposite.setLayoutData(gridData); } *************** *** 208,214 **** */ private void createComposite2() { - GridData gridData11 = new GridData(); - GridLayout gridLayout2 = new GridLayout(); - GridData gridData1 = new GridData(); composite = new Composite(this, SWT.NONE); crtGroupLabel = new Label(composite, SWT.NONE); --- 145,148 ---- *************** *** 220,238 **** goToParentGroupButton.setEnabled(true); goToParentGroupButton.setSize(goToParentGroupButton.getSize().x, crtBookmarkParentLabel.getSize().y); ! gridData1.horizontalSpan = 6; ! gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; ! gridData1.grabExcessHorizontalSpace = true; ! composite.setLayoutData(gridData1); ! composite.setLayout(gridLayout2); crtBookmarkParentLabel.setText(""); - crtBookmarkParentLabel.setLayoutData(gridData11); - gridLayout2.marginHeight = 1; - gridLayout2.numColumns = 3; - gridLayout2.marginWidth = 1; - gridLayout2.horizontalSpacing = 1; - gridLayout2.verticalSpacing = 1; - gridData11.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; - gridData11.grabExcessHorizontalSpace = true; } --- 154,177 ---- goToParentGroupButton.setEnabled(true); goToParentGroupButton.setSize(goToParentGroupButton.getSize().x, crtBookmarkParentLabel.getSize().y); ! ! GridData gridData = new GridData(); ! gridData.horizontalSpan = 6; ! gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; ! gridData.grabExcessHorizontalSpace = true; ! composite.setLayoutData(gridData); ! ! GridLayout gridLayout = new GridLayout(); ! gridLayout.marginHeight = 1; ! gridLayout.numColumns = 3; ! gridLayout.marginWidth = 1; ! gridLayout.horizontalSpacing = 1; ! gridLayout.verticalSpacing = 1; ! composite.setLayout(gridLayout); crtBookmarkParentLabel.setText(""); + gridData = new GridData(); + gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; + gridData.grabExcessHorizontalSpace = true; + crtBookmarkParentLabel.setLayoutData(gridData); } *************** *** 250,254 **** public Point computeSize(int wHint, int hHint, boolean changed) { ! return new Point(wHint, composite.computeSize(wHint, hHint, changed).y + bookmarkComposite.computeSize(wHint, hHint, changed).y); } } // @jve:decl-index=0:visual-constraint="10,10" --- 189,194 ---- public Point computeSize(int wHint, int hHint, boolean changed) { ! return super.computeSize(wHint, hHint, changed); ! //return new Point(wHint, composite.computeSize(wHint, hHint, changed).y + bookmarkComposite.computeSize(wHint, hHint, changed).y); } } // @jve:decl-index=0:visual-constraint="10,10" Index: BookmarkComposite.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks/BookmarkComposite.java,v retrieving revision 1.23 retrieving revision 1.23.6.1 diff -C2 -d -r1.23 -r1.23.6.1 *** BookmarkComposite.java 6 Aug 2006 10:33:24 -0000 1.23 --- BookmarkComposite.java 7 May 2010 20:17:45 -0000 1.23.6.1 *************** *** 13,17 **** --- 13,19 ---- import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.*; + import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.*; + import org.eclipse.swt.widgets.Layout; import org.jcommander.phileas.bookmarks.*; import org.jcommander.ui.filepanel.*; *************** *** 119,123 **** // setFocusFileControlAdapter(focusFileControlAdapter); ! setLayout(null); toolbar = new ToolBar(this, SWT.RIGHT | SWT.FLAT); --- 121,130 ---- // setFocusFileControlAdapter(focusFileControlAdapter); ! RowLayout layout = new RowLayout(); ! layout.type = SWT.HORIZONTAL; ! layout.pack = true; ! layout.wrap = true; ! layout.justify = true; ! setLayout(layout); toolbar = new ToolBar(this, SWT.RIGHT | SWT.FLAT); *************** *** 193,196 **** --- 200,204 ---- toolbar.setSize(toolbar.computeSize(1000, 1000)); toolbar.setBackground(backColor); + toolbar.pack(true); } |
