Tools__ChangeSetBrowser2.st
branchjv
changeset 12274 1e0599b8a007
parent 12272 13be62c15611
child 12282 f2499734636a
--- a/Tools__ChangeSetBrowser2.st	Mon Jul 30 18:15:03 2012 +0100
+++ b/Tools__ChangeSetBrowser2.st	Fri Aug 03 14:08:30 2012 +0100
@@ -295,13 +295,19 @@
 'Deletes changes from the selected one to the end.'
 
 #fileLoad
-'Opens a dialog for selecting and loading another changes file.'
+'Open a changeset file (.chg or .st)'
+
+#fileOpenSelection
+''
 
 #fileReload
 'Reloads the changes file (undo your modifications).'
 
 #fileSave
-'Saves the list of changes into the current changes file.'
+'Saves changes to current change file.'
+
+#fileSaveAs
+'Save changes to a file'
 
 #filterField
 'Matching patterns filtering the changes (separate patterns by blanks).'
@@ -343,9 +349,17 @@
 'Searches forward for the next snapshot entry.'
 
 #testFindPreviousSnapshot
-''
+'Searches backward for the previous snapshot entry.'
+
+#fileOpenCurrent
+'Open current system changeset'
+
+#fileOpenSelection
+'Opens a new browser on currently selected changes'
 
 )
+
+    "Modified: / 01-08-2012 / 18:40:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetBrowser2 class methodsFor:'image specs'!
@@ -678,8 +692,17 @@
 
     browser := self new.
     browser open.
-    browser builder window sensor 
-        pushUserEvent: #doOpenCurrent for: browser.
+    "JV: I would like to open current changefile only if the tool is opened from
+     launcher toolbar button"
+
+    (thisContext sender sender receiver isKindOf: AbstractLauncherApplication) ifTrue:[
+        browser builder window sensor 
+            pushUserEvent: #doOpenCurrent for: browser.
+    ] ifFalse:[
+        browser builder window sensor 
+            pushUserEvent: #doOpenNew for: browser.
+
+    ]
 
     "Created: / 25-01-2012 / 17:16:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -1393,6 +1416,32 @@
            (Menu
               (
                (MenuItem
+                  label: 'New'
+                  translateLabel: true
+                  submenu: 
+                 (Menu
+                    (
+                     (MenuItem
+                        activeHelpKey: fileNew
+                        label: 'New Changeset'
+                        itemValue: doOpenNew
+                        translateLabel: true
+                      )
+                     (MenuItem
+                        label: 'New Window'
+                        itemValue: doOpenNewWindow
+                        translateLabel: true
+                      )
+                     )
+                    nil
+                    nil
+                  )
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  activeHelpKey: fileLoad
                   enabled: isWorkingNotHolder
                   label: 'Open...'
                   itemValue: doOpen
@@ -1401,6 +1450,7 @@
                   shortcutKey: Ctrlo
                 )
                (MenuItem
+                  activeHelpKey: fileOpenCurrent
                   enabled: isWorkingNotHolder
                   label: 'Open Current'
                   itemValue: doOpenCurrent
@@ -1408,6 +1458,7 @@
                   isVisible: allowOpenHolder
                 )
                (MenuItem
+                  activeHelpKey: fileOpenSelection
                   enabled: isWorkingNotHolder
                   label: 'Open on Selection'
                   itemValue: doOpenOnSelection
@@ -1415,6 +1466,7 @@
                   isVisible: allowOpenHolder
                 )
                (MenuItem
+                  activeHelpKey: fileSaveAs
                   enabled: isWorkingNotHolder
                   label: 'Save'
                   itemValue: doSave
@@ -2537,6 +2589,29 @@
     "Created: / 09-02-2012 / 19:11:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+doOpenNew
+    self doOpen: ChangeSet new.
+    self showFilterHolder value: false.
+    self infoPanel
+        reset;
+        beInformation;
+        message: (resources string:'Open file or drag''n''drop changes from other changeset/diff browser');
+        addButtonWithLabel: (resources string:'Open File') action:[self doOpen];
+        addButtonOK;
+        show.
+
+    "Modified: / 01-08-2012 / 18:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+doOpenNewWindow
+    | new |
+
+    new := self class new.
+    new open.
+
+    "Created: / 01-08-2012 / 18:22:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 doOpenOnSelection
 
     | selection |
@@ -3584,7 +3659,7 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__ChangeSetBrowser2.st 8031 2012-07-27 16:17:58Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st 8034 2012-08-03 13:08:30Z vranyj1 $'
 !
 
 version_CVS
@@ -3592,5 +3667,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetBrowser2.st 8031 2012-07-27 16:17:58Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st 8034 2012-08-03 13:08:30Z vranyj1 $'
 ! !