Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Some first tests on Linux/Gnome after reintegrating the branch and fi…

…nishing cross plattform support
  • Loading branch information...
commit 77936e6700a327c9811bdf150ab164ec8276aa34 1 parent 51456c1
@basti1302 authored
View
79 misc/merges/merge.out.txt
@@ -0,0 +1,79 @@
+merge --depth=infinity -r108:HEAD https://startexplorer.svn.sourceforge.net/svnroot/startexplorer/plugin/trunk /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer
+ --- Merging r108 through r146 into /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/todo.txt
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/preferences/PreferenceModel.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/preferences/StartExplorerContentProposalProvider.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/preferences/PreferenceConstantsAndDefaults.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/preferences/SeparatorData.java
+ C /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/preferences/StartExplorerPreferencePage.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/preferences/PreferenceUtil.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/preferences/EditCommandConfigPane.java
+ D /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/preferences/CommandConfig.java
+ D /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/CustomCommandResourceViewMenuProvider.java
+ D /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/releases
+ D /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/AbstractCustomCommandMenuProvider.java
+ D /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/CustomCommandEditorMenuProvider.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/StartSystemApplicationFromEditorHandler.java
+ C /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/AbstractStartExplorerHandler.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/StartSystemApplicationFromResourceHandler.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/CopyResourcePathToClipboardResourceViewHandler.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/CustomCommandForEditorHandler.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/CustomCommandForResourceHandler.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/CopyResourcePathToClipboardEditorHandler.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/StartExplorerFromEditorHandler.java
+ C /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/StartExplorerFromResourceHandler.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/AbstractStartFromEditorHandler.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/AbstractStartFromResourceHandler.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/StartCmdExeFromEditorHandler.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/StartCmdExeFromResourceHandler.java
+ C /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/StartSystemApplicationFromStringHandler.java
+ D /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/CopyResourcePathToClipboardHandler.java
+ D /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/CustomCommandForStringHandler.java
+ C /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/StartExplorerFromStringHandler.java
+ D /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/AbstractStartFromStringHandler.java
+ C /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/popup/actions/StartCmdExeFromStringHandler.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/TextSelectionPropertyTester.java
+ C /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/RuntimeExecCalls.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/ResourceType.java
+ C /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/Activator.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/customcommands
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/customcommands/CustomCommandEditorMenuProvider.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/customcommands/CommandConfig.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/customcommands/CustomCommandResourceViewFactory.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/customcommands/AbstractCustomCommandFactory.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/customcommands/CustomCommandEditorFactory.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/customcommands/CustomCommandResourceViewMenuProvider.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/util/PathChecker.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src/de/bastiankrol/startexplorer/util/IMessageDialogHelper.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/help/04_custom_commands.html
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/help/05_preference_page.html
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/help/01_introduction.html
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/help/03_selected_text_regions.html
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/help/02_resources.html
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/build.properties
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/misc/release-notes
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/misc/release-notes/README.txt
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/plugin.xml
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/.classpath
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/META-INF/MANIFEST.MF
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/plugin.xml.backup
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src-test/de/bastiankrol/startexplorer/ActivatorInstanceInjector.java
+ C /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src-test/de/bastiankrol/startexplorer/RuntimeExecCallsTest.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src-test/de/bastiankrol/startexplorer/customcommands
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src-test/de/bastiankrol/startexplorer/customcommands/CommandConfigTest.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src-test/de/bastiankrol/startexplorer/customcommands/CustomCommandResourceViewFactoryTest.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src-test/de/bastiankrol/startexplorer/customcommands/AbstractCustomCommandFactoryTest.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src-test/de/bastiankrol/startexplorer/customcommands/CustomCommandEditorFactoryTest.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src-test/de/bastiankrol/startexplorer/customcommands/CommandConfigObjectMother.java
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/src-test/de/bastiankrol/startexplorer/util/PathCheckerTest.java
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/HOWTO-PUBLISH-A-NEW-VERSION.TXT
+ U /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/.settings/org.eclipse.jdt.core.prefs
+ A /home/bastian/eclipse/workspace/de.bastiankrol.startexplorer/.settings/org.eclipse.jdt.ui.prefs
+ Merge complete.
+ ===== File Statistics: =====
+ Deleted: 8
+ Added: 29
+ Updated: 23
+ ==== Conflict Statistics: =====
+ File conflicts: 5
+ Tree conflicts: 4
View
0  reintegrate-linux-branch.merge.out.txt → ...es/reintegrate-linux-branch.merge.out.txt
File renamed without changes
View
5 todo.txt
@@ -12,9 +12,6 @@ Compare
- on KDE
* Document new features in help files!
-== BUGS ==
-
-* Custom commands are disabled when custom desktop environment is selected
== Mac support ==
* Auto-Detection for Mac
@@ -22,6 +19,8 @@ Compare
== HIGH PRIO ==
+* Resource specific defaults for custom commands
+
* Bug: If content assist in preference page for custom command is triggered by
auto activation character, the activation character is not deleted which leads
to duplicate $ or { characters.
Please sign in to comment.
Something went wrong with that request. Please try again.