Changeset 4521

Timestamp:

Sep 10, 2013, 4:52:26 PM (10 years ago)

Author:

Fredrik Levander

Message:

Refs #816. Added symbols and new commands to project home view.

Location:

trunk/client/servlet/src

Files:

• icons/default (modified) (4 diffs)
• locale/en/dictionary (modified) (3 diffs)
• org/proteios/action/feature/FeatureSequencePropagatorForm.java (modified) (1 diff)
• org/proteios/action/project/ViewProjectHome.java (modified) (4 diffs)

trunk/client/servlet/src/icons/default

@@ -42 +42 @@
 ClearSpecialHits=icons/delete.gif
 Close=icons/close.gif
+CombinedHitsMenu=icons/filter.gif
 CombinedHitsReport=icons/filter.gif
+CreateFeatureReport=icons/export.gif
 CreateJobs=icons/runplugin.gif
 Delete=icons/delete.gif
@@ -55 +57 @@
 ExtensionsForFileTypes=icons/runplugin.gif
 ExtensionsForHits=icons/runplugin.gif
+Features=icons/columns.gif
+HitsReport=icons/columns.gif
+HitsComparisonMenu=icons/export.gif
 HitsComparisonReportBtn=icons/export.gif
 HitsImportNonGelWizard=icons/new_wizard.gif
@@ -61 +66 @@
 Login=icons/login.png
 Logout=icons/logout.png
+MatchFeaturesHits=icons/runplugin.gif
 Move=icons/move.gif
 New=icons/new.gif
@@ -109 +115 @@
 Previous=icons/goback.gif
 PrideExportBtn=icons/export.gif
+PropagateFeatureSequences=icons/new_pooled.gif
 Properties=icons/view.gif
 ProteinAssembly=icons/filter.gif

trunk/client/servlet/src/locale/en/dictionary

@@ -111 +111 @@
 CombinedFDR=Combined Search FDR
 CombinedFDRUpperCutoff=Combined search FDR upper cutoff
-CombinedHitsMenu=Combined Hits
+CombinedHitsMenu=Combine Hits
 CombinedHitsReport=Combined Hits Report
 comment=Comment
@@ -445 +445 @@
 MatchedPeaks=Matched Peaks
 MatchFeaturesHits=Match Features and Hits
+MatchingBetweenFractions=Match between fractions
 MaxNumMissedCleavages=Max Number of Missed Cleavages
 Md5=MD5
@@ -728 +729 @@
 Projects=Projects
 ProjectType=Project Type
-PropagateFeatureSequences=Propagate Feature Sequences
+PropagateFeatureSequences=Propagate Feature Identities
 PropertiesFor=Properties for
 PropertiesForHitsToDelete=Properties for hits to delete

trunk/client/servlet/src/org/proteios/action/feature/FeatureSequencePropagatorForm.java

@@ -13 +13 @@
 import org.proteios.gui.form.Fieldset;
 import org.proteios.gui.form.Form;
-import org.proteios.gui.form.TextField;
 import org.proteios.gui.layout.RowLayout;
 

trunk/client/servlet/src/org/proteios/action/project/ViewProjectHome.java

@@ -34 +34 @@
 import org.proteios.action.ActionFactory;
 import org.proteios.action.ProteiosAction;
+import org.proteios.action.feature.FeatureComparisonForm;
+import org.proteios.action.feature.FeatureHitMatchForm;
+import org.proteios.action.feature.FeatureSequencePropagatorForm;
 import org.proteios.action.file.PerformMascotSearch;
 import org.proteios.action.file.PerformOMSSASearch;
@@ -105 +108 @@
     RowContainer leftCol, rightCol, hitsC, searchC;
     Button reportBtn, wizardBtn, wizardNonGelBtn, searchMascotBtn, searchOmssaBtn, searchXtandemBtn;
-    Button combinedBtn, proteinAssemblyBtn, hitsComparisonBtn, featureBtn;
+    Button combinedBtn, proteinAssemblyBtn, hitsComparisonBtn, featureCompBtn, featureBtn, matchBtn, propagateBtn;
     Project activeProject;
 
@@ -138 +141 @@
     reportBtn = new Button(hitsReportLink);
     featureBtn = new Button(featureLink);
+    matchBtn = guiFactory.getButton(FeatureHitMatchForm.class,"MatchFeaturesHits");
+    propagateBtn = guiFactory.getButton(FeatureSequencePropagatorForm.class, "PropagateFeatureSequences");
+    featureCompBtn = guiFactory.getButton(FeatureComparisonForm.class, "CreateFeatureReport");
     wizardBtn = guiFactory.getButton(ImportHitsWizard.class,
       "HitsImportWizard");
@@ -171 +177 @@
     hitsC.add(hitsComparisonBtn);
     hitsC.add(featureBtn);
+    hitsC.add(matchBtn);
+    hitsC.add(propagateBtn);
+    hitsC.add(featureCompBtn);
 
     searchC.add(searchMascotBtn);