Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-10-21 03:42:18 +0000
committerJean Michel-Lemieux2003-10-21 03:42:18 +0000
commit4e0e20262157aaf21b6e08ae5b1eaa11e00efec7 (patch)
tree69d60a1df6a272241fa06d52b0f9a8de376480cb
parent137b7e17e85579acf274bcd840f5f6df859f303a (diff)
downloadeclipse.platform.team-4e0e20262157aaf21b6e08ae5b1eaa11e00efec7.tar.gz
eclipse.platform.team-4e0e20262157aaf21b6e08ae5b1eaa11e00efec7.tar.xz
eclipse.platform.team-4e0e20262157aaf21b6e08ae5b1eaa11e00efec7.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSWorkspaceSynchronizeParticipant.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/SubscriberSynchronizeViewPage.java21
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/ToolItemActionContributionItem.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/actions/DirectionFilterActionGroup.java4
6 files changed, 31 insertions, 14 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index c57b7423c..5bc3477a0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -1031,12 +1031,12 @@ RemoteRevisionQuickDiffProvider.readingFile=Error reading remote file
RemoteRevisionQuickDiffProvider.closingFile=Error closing remote file
RemoteRevisionQuickDiffProvider.fetchingFile=CVS QuickDiff: fetching remote contents for ''{0}''
-action.SynchronizeViewCommit.label=Commit All Outgoing Changes
+action.SynchronizeViewCommit.label=Commit
action.SynchronizeViewCommit.tooltip=Commit All Outgoing Changes
action.SynchronizeViewCommit.description=Commit All Outgoing Changes
action.SynchronizeViewCommit.image=checkin_action.gif
-action.SynchronizeViewUpdate.label=Update All Incoming Changes
+action.SynchronizeViewUpdate.label=Update
action.SynchronizeViewUpdate.tooltip=Update All Incoming Changes
action.SynchronizeViewUpdate.description=Update All Incoming Changes
action.SynchronizeViewUpdate.image=checkout_action.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSWorkspaceSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSWorkspaceSynchronizeParticipant.java
index 5a4cfc67a..9802b99db 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSWorkspaceSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSWorkspaceSynchronizeParticipant.java
@@ -43,13 +43,12 @@ public class CVSWorkspaceSynchronizeParticipant extends CVSSynchronizeParticipan
public void setActionsBars(IActionBars actionBars, IToolBarManager detailsToolbar) {
if(actionBars != null) {
IToolBarManager toolbar = actionBars.getToolBarManager();
- toolbar.add(new Separator());
- toolbar.add(new Separator());
- actionBars.getToolBarManager().add(updateAdapter);
- actionBars.getToolBarManager().add(commitAdapter);
}
if(detailsToolbar != null) {
modes.fillToolBar(detailsToolbar);
+ detailsToolbar.add(new Separator());
+ detailsToolbar.add(updateAdapter);
+ detailsToolbar.add(commitAdapter);
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index 21943598f..f542d4fbc 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -354,22 +354,22 @@ action.refreshWithRemote.tooltip=Refresh with remote
action.refreshWithRemote.description=Refresh with remote
action.refreshWithRemote.image=refresh.gif
-action.directionFilterIncoming.label=0
+action.directionFilterIncoming.label=Incoming
action.directionFilterIncoming.tooltip=Incoming Mode
action.directionFilterIncoming.description=Incoming Mode (shows incoming changes and conflicts)
action.directionFilterIncoming.image=catchup_rls.gif
-action.directionFilterOutgoing.label=0
+action.directionFilterOutgoing.label=Outgoing
action.directionFilterOutgoing.tooltip=Outgoing Mode
action.directionFilterOutgoing.description=Outgoing Mode (shows outgoing changes and conflicts)
action.directionFilterOutgoing.image=release_rls.gif
-action.directionFilterConflicts.label=0
+action.directionFilterConflicts.label=Conflicts
action.directionFilterConflicts.tooltip=Conflicts Mode
action.directionFilterConflicts.description=Conflicts Mode (shows conflicts)
action.directionFilterConflicts.image=conflict_synch.gif
-action.directionFilterBoth.label=0
+action.directionFilterBoth.label=Both
action.directionFilterBoth.tooltip=Incoming/Outgoing mode
action.directionFilterBoth.description=Incoming/Outgoing mode (shows outgoing changes, incoming changes, and conflicts)
action.directionFilterBoth.image=catchuprelease_rls.gif
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/SubscriberSynchronizeViewPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/SubscriberSynchronizeViewPage.java
index 8bef8ce90..b23d84463 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/SubscriberSynchronizeViewPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/SubscriberSynchronizeViewPage.java
@@ -27,6 +27,7 @@ import org.eclipse.team.ui.sync.actions.*;
import org.eclipse.team.ui.sync.actions.workingsets.WorkingSetDropDownAction;
import org.eclipse.team.ui.sync.actions.workingsets.WorkingSetFilterActionGroup;
import org.eclipse.ui.*;
+import org.eclipse.ui.internal.util.StatusLineContributionItem;
import org.eclipse.ui.part.*;
import org.eclipse.ui.views.navigator.ResourceSorter;
@@ -38,6 +39,7 @@ public class SubscriberSynchronizeViewPage implements IPageBookViewPage, IProper
// the viewer type is switched.
private Composite composite = null;
private TextToolbarManager tbMgr;
+ private StatusLineManager slMgr;
// Viewer type constants
private int layout;
@@ -238,7 +240,24 @@ public class SubscriberSynchronizeViewPage implements IPageBookViewPage, IProper
case TeamSubscriberParticipant.TABLE_LAYOUT:
createTableViewerPartControl(parent);
break;
- }
+ }
+ StatusLineContributionItem item1 = new StatusLineContributionItem("1", 20) {
+ public void run() {}};
+ StatusLineContributionItem item2 = new StatusLineContributionItem("2", 2) {
+ public void run() {}};
+ StatusLineContributionItem item3 = new StatusLineContributionItem("3", 2) {
+ public void run() {}};
+ StatusLineContributionItem item4 = new StatusLineContributionItem("4", 2) {
+ public void run() {}};
+ IStatusLineManager mgr = view.getViewSite().getActionBars().getStatusLineManager();
+ item1.setText("1.2");
+ item2.setText("1/3");
+ item3.setText("5/6");
+ item4.setText("Working Set: <None>");
+ mgr.add(item1);
+ mgr.add(item2);
+ mgr.add(item3);
+ mgr.add(item4);
viewer.setInput(input);
viewer.getControl().setFocus();
initializeListeners();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/ToolItemActionContributionItem.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/ToolItemActionContributionItem.java
index 8f4b88eb9..266755837 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/ToolItemActionContributionItem.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/pages/ToolItemActionContributionItem.java
@@ -624,7 +624,6 @@ public void update(String propertyName) {
if (ti.getEnabled() != shouldBeEnabled)
ti.setEnabled(shouldBeEnabled);
}
- if(preferedSize > 0) ti.setWidth(preferedSize);
if (checkChanged) {
boolean bv = action.isChecked();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/actions/DirectionFilterActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/actions/DirectionFilterActionGroup.java
index 2aed2eafd..2d2fdc8cd 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/actions/DirectionFilterActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/actions/DirectionFilterActionGroup.java
@@ -77,7 +77,7 @@ public class DirectionFilterActionGroup extends ActionGroup implements IProperty
page.addPropertyChangeListener(this);
page.getInput().registerListeners(this);
checkMode(page.getMode());
- updateStats();
+ //updateStats();
}
/**
@@ -173,7 +173,7 @@ public class DirectionFilterActionGroup extends ActionGroup implements IProperty
* @see org.eclipse.team.internal.ui.sync.sets.ISyncSetChangedListener#syncSetChanged(org.eclipse.team.internal.ui.sync.sets.SyncSetChangedEvent)
*/
public void syncSetChanged(SyncSetChangedEvent event) {
- updateStats();
+ //updateStats();
}
private void updateStats() {

Back to the top