Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-12-15 22:35:17 -0500
committerJean Michel-Lemieux2003-12-15 22:35:17 -0500
commit3ce5880c1feebc1a1f3b14f40dacc13dda1c70c0 (patch)
tree2a6ab1cf0962773748e10d616be68507cab6f383
parent07ace86a1de1f16989a1c09a8cc32e7269b61fbb (diff)
downloadeclipse.platform.team-3ce5880c1feebc1a1f3b14f40dacc13dda1c70c0.tar.gz
eclipse.platform.team-3ce5880c1feebc1a1f3b14f40dacc13dda1c70c0.tar.xz
eclipse.platform.team-3ce5880c1feebc1a1f3b14f40dacc13dda1c70c0.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.ui/TODO-syncview.txt9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ParticipantComposite.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SummarySection.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSubscriberParticipantComposite.java59
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/widgets/HyperlinkSettings.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java2
7 files changed, 47 insertions, 35 deletions
diff --git a/bundles/org.eclipse.team.ui/TODO-syncview.txt b/bundles/org.eclipse.team.ui/TODO-syncview.txt
index 69b484e56..e73df9bcd 100644
--- a/bundles/org.eclipse.team.ui/TODO-syncview.txt
+++ b/bundles/org.eclipse.team.ui/TODO-syncview.txt
@@ -4,18 +4,19 @@
- P3 status message could be more precise instead of simply "Working". But to do this we need access to the job progress monitor
and it isn't available API from the UI.
- P1 end of refresh prompt should be a property change notice, and let the participant decide what to do!
+- P2 decide overview page contents and how it should be used
- P1 mode switching at the end of a refresh to ensure that changes are shown if available
- P2 need an event for adding roots to a subscriber to update the list shown
-- P2 support for table widget in changes page
+- P3 support for table widget in changes page
- remove duplicated tree/table viewers classes. the orignial ones simply have the INavigable behavior.
-- make changes section only be a pagebook. this would easily allow adding any number of composites to the page?
+- P1 make changes section only be a pagebook. this would easily allow adding any number of composites to the page?
- compareeditorinput fetcheds remote content outside of a progress monitor
- decorations for SyncInfoDiffElements (of which type.. project persistent property setting?)
- labels for compare editors (text merge viewers and title for diff viewer)
-x generic navigate support for SyncInfoDiffTreeViewer
+x generic navigate support for SyncInfoDiffTreeViewer, PRd compare for API support
- readonly state for compare panes
- progress support added when fetching (e.g. caching contents in ITypedElement). This will require compare to add some API.
-- INavigable in compare needs to be made API.
+x INavigable in compare needs to be made API.
- details dialog needs to create composites once then display them. Or only create once!!!!
- sync set filtering creation must be more precise. For example you should be able to specify a root and a direction.
- cvs update/commit action in sync view toolbar are not updating their state anymore :( \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
index 7baef2ac8..c1f487e87 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
@@ -43,6 +43,7 @@ public class ChangesSection extends FormSection {
setCollapsed(false);
setDescription("");
calculateDescription();
+ updateHeaderRightText();
}
/*
@@ -125,4 +126,9 @@ public class ChangesSection extends FormSection {
super.dispose();
participant.getInput().deregisterListeners(changedListener);
}
+
+ public void updateHeaderRightText() {
+ setHeaderRightText("Inc: 1 Out: 2 Con: 3");
+ reflow();
+ }
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ParticipantComposite.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ParticipantComposite.java
index 2ef66c553..b1cc4d337 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ParticipantComposite.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ParticipantComposite.java
@@ -63,7 +63,7 @@ public class ParticipantComposite extends Composite {
{
final Label label = factory.createLabel(composite, participant.getName(), SWT.WRAP);
label.setLayoutData(new GridData());
- label.setFont(JFaceResources.getHeaderFont());
+ label.setFont(JFaceResources.getBannerFont());
label.setText(participant.getName());
}
{
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SummarySection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SummarySection.java
index 46329ba3e..1589388e4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SummarySection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SummarySection.java
@@ -40,7 +40,7 @@ public class SummarySection extends FormSection {
* org.eclipse.team.internal.ui.widgets.FormWidgetFactory)
*/
public Composite createClient(Composite parent, IControlFactory factory) {
- client = participant.createOverviewComposite(parent, factory, view);
+ client = new TeamSubscriberParticipantComposite(parent, false, factory, participant, view);
return client;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSubscriberParticipantComposite.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSubscriberParticipantComposite.java
index 0c0b04a3e..2ed734cdc 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSubscriberParticipantComposite.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSubscriberParticipantComposite.java
@@ -68,9 +68,11 @@ public class TeamSubscriberParticipantComposite extends Composite implements IPr
}
};
+ private boolean shortStyle;
- public TeamSubscriberParticipantComposite(Composite parent, IControlFactory factory, TeamSubscriberParticipant participant, ISynchronizeView view) {
+ public TeamSubscriberParticipantComposite(Composite parent, boolean shortStyle, IControlFactory factory, TeamSubscriberParticipant participant, ISynchronizeView view) {
super(parent, SWT.NONE);
+ this.shortStyle = shortStyle;
this.factory = factory;
this.participant = participant;
this.view = view;
@@ -89,8 +91,8 @@ public class TeamSubscriberParticipantComposite extends Composite implements IPr
protected Composite createComposite(Composite area) {
GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
+ //layout.marginHeight = 0;
+ //layout.marginWidth = 0;
area.setLayout(layout);
setBackground(factory.getBackgroundColor());
{
@@ -103,24 +105,24 @@ public class TeamSubscriberParticipantComposite extends Composite implements IPr
composite_1.setLayout(gridLayout_1);
composite_1.setLayoutData(gridData);
{
- final Label label = factory.createLabel(composite_1, "Last Sync");
+ final Label label = factory.createLabel(composite_1, "Last Refresh:");
gridData = new GridData();
label.setLayoutData(gridData);
}
{
lastSyncLabel = factory.createLabel(composite_1, "11/23/03 10:03:12");
- gridData = new GridData();
+ gridData = new GridData(GridData.FILL_HORIZONTAL);
gridData.grabExcessHorizontalSpace = true;
lastSyncLabel.setLayoutData(gridData);
}
{
- final Label label = factory.createLabel(composite_1, "Schedule");
+ final Label label = factory.createLabel(composite_1, "Refresh Schedule:");
gridData = new GridData();
label.setLayoutData(gridData);
}
{
scheduleLabel = factory.createLabel(composite_1, "Every Hour");
- gridData = new GridData();
+ gridData = new GridData(GridData.FILL_HORIZONTAL);
gridData.grabExcessHorizontalSpace = true;
scheduleLabel.setLayoutData(gridData);
}
@@ -131,32 +133,35 @@ public class TeamSubscriberParticipantComposite extends Composite implements IPr
}
{
statusLabel = factory.createLabel(composite_1, "Idle");
- gridData = new GridData();
+ gridData = new GridData(GridData.FILL_HORIZONTAL);
gridData.grabExcessHorizontalSpace = true;
statusLabel.setLayoutData(gridData);
}
}
- {
- final Composite composite_1 = factory.createComposite(area, SWT.NONE);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- final GridLayout gridLayout_1 = new GridLayout();
- gridLayout_1.numColumns = 1;
- gridLayout_1.marginHeight = 0;
- gridLayout_1.marginWidth = 0;
- composite_1.setLayout(gridLayout_1);
- composite_1.setLayoutData(gridData);
+ if(! shortStyle) {
{
- rootsList = new TableViewer(composite_1, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);
- gridData = new GridData(GridData.FILL_BOTH);
- gridData.heightHint = 80;
- rootsList.getTable().setLayoutData(gridData);
- rootsList.setLabelProvider(new WorkbenchLabelProvider());
- rootsList.setContentProvider(new ArrayContentProvider());
- rootsList.setInput(participant.getInput().subscriberRoots());
- factory.paintBordersFor(rootsList.getTable());
- hookContextMenu();
+ final Composite composite_1 = factory.createComposite(area, SWT.NONE);
+ GridData gridData = new GridData(GridData.FILL_BOTH);
+ final GridLayout gridLayout_1 = new GridLayout();
+ gridLayout_1.numColumns = 1;
+ gridLayout_1.marginHeight = 3;
+ gridLayout_1.marginWidth = 3;
+ composite_1.setLayout(gridLayout_1);
+ composite_1.setLayoutData(gridData);
+ {
+ final Label label = factory.createLabel(composite_1, "Synchronized Folders:");
+ rootsList = new TableViewer(composite_1, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);
+ gridData = new GridData(GridData.FILL_BOTH);
+ gridData.heightHint = 80;
+ rootsList.getTable().setLayoutData(gridData);
+ rootsList.setLabelProvider(new WorkbenchLabelProvider());
+ rootsList.setContentProvider(new ArrayContentProvider());
+ rootsList.setInput(participant.getInput().subscriberRoots());
+ factory.paintBordersFor(composite_1);
+ hookContextMenu();
+ }
}
- }
+ }
return area;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/widgets/HyperlinkSettings.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/widgets/HyperlinkSettings.java
index 222d038d1..553a59d02 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/widgets/HyperlinkSettings.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/widgets/HyperlinkSettings.java
@@ -21,7 +21,7 @@ public class HyperlinkSettings {
public static final int UNDERLINE_ALWAYS = 3;
protected boolean hyperlinkCursorUsed = true;
- protected int hyperlinkUnderlineMode = UNDERLINE_ALWAYS;
+ protected int hyperlinkUnderlineMode = UNDERLINE_ROLLOVER;
protected Color background;
protected Color foreground;
protected Color activeBackground;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java
index 40244c1b3..4d68981ac 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java
@@ -243,6 +243,6 @@ public abstract class TeamSubscriberParticipant extends AbstractSynchronizeParti
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#createOverviewPage(org.eclipse.swt.widgets.Composite, org.eclipse.team.ui.synchronize.ISynchronizeView)
*/
public Composite createOverviewComposite(Composite parent, IControlFactory factory, ISynchronizeView view) {
- return new TeamSubscriberParticipantComposite(parent, factory, this, view);
+ return new TeamSubscriberParticipantComposite(parent, true, factory, this, view);
}
} \ No newline at end of file

Back to the top