Merge branch 'release'

.gitattributes

@@ -4,3 +4,4 @@ Makefile export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 .hg* export-ignore
+.tx export-ignore

.gitignore

@@ -1,2 +1,2 @@
 *.py[cod]
-
+.idea

.tx/config

@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[sunflower.main]
+file_filter = translations/<lang>/LC_MESSAGES/sunflower.po
+source_lang = en
+type = PO
+

AUTHORS

@@ -5,9 +5,11 @@ Programming:
   Sebastian Gaul <[email protected]>
   Arseniy Krasnov <[email protected]> 
   Sevka Fedoroff <[email protected]>
+  multiSnow <[email protected]>
 
 Artists:
   Andrea Pavlović <[email protected]>
+  Michael Kerch <[email protected]>
 
 Translations:
   Radek Tříška <[email protected]>

CHANGES

@@ -1,3 +1,50 @@
+Version 0.3-60
+  + Ability to find text inside remote directories.
+  + Add MTP, Gphoto2 and GIO Provider to handle Android phones and other multimedia devices.
+  + Add context menu items to copy path or file name of selected item.
+  + Add option to support second level extension.
+  + Add support for GVFS archive mounts.
+  + Added 'skip all' option to operation dialogs.
+  + Added keyboard shortcuts for menus.
+  + Added ability to lock session.
+  + Added option to avoid following symlinks in operations.
+  + Added support for calculating directory usage.
+  + Added viewer word wrap option.
+  + Check collisions on changed accelerators.
+  + Custom dialog for confirming removal.
+  + Enabled mnemonics in bookmark list.
+  + Hide files listed in .hidden file.
+  + Initial archive support.
+  + Initial support for trash.
+  + List of paths to be treated as always visible.
+  + Main window: Add %P,%M and %U variables in commands.
+  + Make viewer try to detect character encoding of file in order to better handle none ASCII/UTF-8 cases.
+  + Operation queue implemented.
+  + Option to turn on network path completion.
+  + Properly handle system signals.
+  + Properly support symbolic links.
+  + Set 'sunflower' as process name if setproctitle module available.
+  + Single instance support through DBus and fnctl.
+  + Support for horizontal split.
+  + Support for multiple patterns when matching items in find files tool.
+  + Support for saving previously used patterns in find files tool.
+  + Support link emblems though emblem manager.
+  * Switched to GitHub API for version check.
+  * Show extensions tabs first in viewer.
+  * Set buffer size from system block size to improve performance in operations.
+  * Selecting "open file list" will open current terminal path instead of initial.
+  * Select first item when selected item is parent directory.
+  * Scroll to item after applying sort function.
+  * Improved path entry dialog.
+  * Fixed some issues with making hard links.
+  * Fixed setting emblems on expanded directories.
+  * Fixed issues with overwriting files in multiple rename tool.
+  * Fix issues with threads on some systems.
+  * Fix issues with opening files and setting current working directory.
+  * Changed the way application imports plugins.
+  * Change operations to work with expanded directories.
+  * Always show tree expanders when option is turned on.
+
 Version 0.2-59
   + Support for multiple file system monitors.
   + Support for drag and drop in same directory.

DEPENDS

@@ -7,3 +7,4 @@ Optional:
   python-gnome2
   python-argparse
   mutagen
+  python-setproctitle

Makefile

@@ -41,6 +41,7 @@ Usage:
 	dist-rpm-pclinuxos - create a .rpm package for PCLinuxOS
 	dist-all           - create all packages
 	language-template  - update language template
+	language-compile   - compile language files to .mo format
 	clean              - remove all build files
 	version            - print Sunflower version
 	help               - print this help
@@ -55,7 +56,7 @@ export HELP
 define dist_install
 	@mkdir -p $(install_directory)
 	# untar archive
-	@cd $(build_directory); tar -xf $(file_path).tar
+	@tar -xf $(file_path).tar -C $(build_directory)
 	# install files
 	@install -Dm755 $(working_directory)/dist/sunflower "$(install_directory)/usr/bin/sunflower"
 	@install -d "$(install_directory)/usr/share/sunflower"
@@ -86,7 +87,7 @@ define create_rpm
 endef
 
 # configuration options
-default: version help
+all: version help
 
 $(file_path).tgz:
 	$(info Preparing release...)
@@ -183,6 +184,10 @@ language-template:
 	$(info Updating language template...)
 	find . -iname "*.py" | xargs xgettext --language=Python --package-name=Sunflower --package-version=0.1 --output $(working_directory)/translations/sunflower.pot
 
+language-compile:
+	$(info Compiling language templates...)
+	find translations -iname "*.po" -execdir msgfmt sunflower.po -o sunflower.mo \;
+
 clean:
 	rm -rf $(build_directory)
 

README.md

@@ -15,7 +15,7 @@ Sunflower package can be downloaded from following locations:
 * [Gentoo](http://packages.gentoo.org/package/x11-misc/sunflower)
     Installation: `emerge --ask x11-misc/sunflower`
 
-[Official packages can be downloaded from here](http://sunflower-fm.org/pub) or releases page above.
+[Official packages can be downloaded from here](http://sunflower-fm.org/download) or releases page above.
 
 ### Plugins
 
@@ -29,14 +29,14 @@ Plugins can be installed locally to: `~/.config/sunflower/user_plugins/<plugin_n
 ### How to contribute
 You can be a part of this project in many ways. We suggest posting on our mailing list or visiting our IRC channel on FreeNode and we'll try to help you get started.
 
-And as usual testers are more than welcome.
+And as usual testers are more than welcome. If you wish to help translate program to your language please join translation team(s) on [Transifex](http://transifex.com/projects/p/sunflower/).
 
 ### Staying in touch
 Preferred way of getting in touch with us is through [mailing list](https://groups.google.com/forum/#!forum/sunflower-fm).
 
 I like talking to people a lot so please feel free to contact me any time. You can always follow me on my [twitter account](http://twitter.com/MeanEYE_rcf) and [Google+](http://gplus.to/MeanEYE). We also have IRC channel, `#sunflower` on `irc.freenode.org`. Central place for news is now on Google+ [page](https://plus.google.com/104972396836379309898).
 
 ### Screenshots
-Check out [screenshots](https://picasaweb.google.com/MeanEYE.rcf/Sunflower).
+Check out [screenshots](http://sunflower-fm.org/screenshots).
 
 Please note that screen shots and videos are months old, but they will help you know a little bit more what you are getting with this program. 

Sunflower.py

@@ -22,7 +22,8 @@
 import sys
 import subprocess
 
-search_paths = os.environ["PATH"].split(os.pathsep)
+default_paths = os.pathsep.join(('/bin', '/usr/bin', '/usr/local/bin'))
+search_paths = os.environ.get('PATH', default_paths).split(os.pathsep)
 interpreter_list = ('python2.9', 'python2.8', 'python2.7', 'python2.6')
 application_file = os.path.join(os.path.dirname(sys.argv[0]), 'application', 'main.py')
 
@@ -57,6 +58,7 @@ def _get_interpreters():
 
 	return result
 
+
 # get 2.x interpreter
 interpreters = _get_interpreters()
 

TODO

@@ -20,14 +20,10 @@ are same and only one file is selected offer this option by default.
 
 - Show rename when moving a single file in same directory
 
-- Mark symbolic links somehow
-
 - Space counts directory size in separate thread
 
 - Upon receiving focus file list should check validity of its current path
 
-- Set tooltip text for long filenames in file list
-
 - Letter accelerators on labels
 
 - Create GObject signals for main windows

application/accelerator_group.py

@@ -72,11 +72,11 @@ def _create_accelerators(self, primary=True):
 			if accelerator is not None and accelerator[0] > 0:
 				keyval = accelerator[0]
 				modifier = accelerator[1]
-	
+
 				# create method name cache based on key combination
 				label = gtk.accelerator_get_label(keyval, modifier)
 				self._method_names[label] = method_name
-	
+
 				# connect accelerator
 				self._accel_group.connect_group(keyval, modifier, 0, self._handle_activate)
 
@@ -101,11 +101,11 @@ def activate(self, window):
 		"""Activate accelerator group for specified window"""
 		if not self._active:
 			self._window = window
-	
+
 			# connect accelerators if they are not already
 			if self._accel_group is None:
 				self._create_group()
-	
+
 			# add accelerator group to specified window
 			self._window.add_accel_group(self._accel_group)
 

application/accelerator_manager.py

@@ -77,7 +77,7 @@ def check_collisions(self, keyval, modifier, group_type):
 		result = []
 		groups = self._get_group_by_type(group_type)
 
-		for group in self._groups:
+		for group in groups:
 			result.extend(group.get_collisions(keyval, modifier))
 
 		return result
@@ -90,7 +90,7 @@ def register_group(self, group):
 		# add group name to the list
 		if group._name not in self._group_names:
 			self._group_names.append(group._name)
-		
+
 		# add group to internal list
 		self._groups.append(group)
 
@@ -159,7 +159,7 @@ def get_accelerator(self, group, name, primary=True):
 
 			if group is not None:
 				accelerator = group.get_accelerator(name, primary)
-				
+
 		return accelerator
 
 	def schedule_groups_for_deactivation(self, groups, owner):