Refactored openshot folder to src folder. Improved copyright notice on primary python files. Added root files, README, AUTHORS, COPY, etc...

.project

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>OpenShot 2.0 - Qt</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

.pydevproject

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Python3</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
+</pydev_project>

AUTHORS

@@ -0,0 +1,33 @@
+OpenShot 2.0 is the result of work by (in no particular order):
+
+Coders: 
+
+Jonathan Thomas <jonathan@openshot.org>
+Noah Figg <eggmunkee@hotmail.com>
+Andy Finch <we.rocked.in79@gmail.com>
+Cody Parker <cody@yourcodepro.com>
+Olivier Girard <eolinwen@gmail.com>
+
+
+Documentation:
+
+Jonathan Thomas <jonathan@openshot.org>
+
+
+Packaging:
+
+Jonathan Thomas <jonathan@openshot.org>
+
+
+Artists:
+
+Jonathan Thomas <jonathan@openshot.org>
+
+
+Website:
+
+Jonathan Thomas <jonathan@openshot.org>
+
+
+For the full list of authors, please visit:
+https://launchpad.net/~openshot.developers

MANIFEST.in

@@ -0,0 +1,11 @@
+include AUTHORS
+include COPYING
+include README
+recursive-include bin *
+recursive-include docs *
+recursive-include src *
+recursive-include xdg *
+
+global-exclude *pyc
+global-exclude .project
+global-exclude .pydevproject

README

@@ -0,0 +1,151 @@
+#################
+    COPYRIGHT
+#################
+
+ Copyright (c) 2008-2014 OpenShot Studios, LLC
+ (http://www.openshotstudios.com). This file is part of
+ OpenShot Video Editor (http://www.openshot.org), an open-source project
+ dedicated to delivering high quality video editing and animation solutions
+ to the world.
+
+ OpenShot Video Editor is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenShot Video Editor is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+#################
+  INSTRUCTIONS
+#################
+
+OpenShot Video Editor 2.0 supports Linux, Mac, and Windows. But due to 
+the many dependencies required to run OpenShot, we recommend using an 
+installer for your operating system. Please visit 
+http://www.openshot.org/download/ to find your correct installer.
+
+
+
+#################
+  DEPENDENCIES
+#################
+
+Although installers are much easier to use, if you must build from 
+source, here are some tips: 
+
+OpenShot 2.0 is programmed in Python, and thus does not need
+to be compiled to run.  However, be sure you have the following 
+dependencies in order to run OpenShot successfully: 
+
+1) Python 3.0+ (http://www.python.org)
+2) PyQt5 (http://www.riverbankcomputing.co.uk/software/pyqt/download5)
+3) libopenshot: OpenShot Library (http://www.openshot.org)
+4) FFmpeg or Libav (http://www.ffmpeg.org/ or http://libav.org/)
+5) GCC build tools (or MinGW on Windows)
+
+
+
+To run OpenShot from the command line, use the following syntax:
+(be sure the change the path to match the install location of OpenShot)
+
+$ cd /home/USER/openshot/src
+$ ./openshot   or   $ python openshot.py
+
+
+#################
+  HOW TO INSTALL
+#################
+
+If you would like to install OpenShot, use this command:
+
+$ sudo python setup.py install
+
+Installing OpenShot using this command does a few extra things that
+the build wizard doesn't do.  It adds MIME Types, adds an icon to your
+Application menu, registers icons, adds a /usr/bin/openshot command, and
+copies all the code files to the /site-packages/ folder.
+
+
+
+#################
+    TUTORIAL
+#################
+
+Here is a tutorial of the current development features:
+
+	DO YOU HAVE A HELP MANUAL?
+		1) Yes, go to http://www.openshotusers.com/help/en/
+
+	HOW DO I ADD MEDIA TO MY VIDEO PROJECT?
+		1) Drag and drop videos or music files from gnome into the "Project Files" tree.
+		2) Click the File / Import Files... menu
+		3) Click the "Import Files" icon on the toolbar (at the top of the screen)
+		
+	HOW DO I ADD MEDIA TO MY TIMELINE
+		1) Click on any file in your "Project Files" tree, and drag it onto the timeline (at the bottom of the screen)
+		
+	HOW DO I POSITION CLIPS ON THE TIMELINE
+		1) Simply click on any clips already on the timeline, and drag them to their new location
+		2) Use the magnet icon to have your clips magically stick to their closest neighbor clips.
+		
+	HOW DO I TRIM / UN-TRIM CLIPS
+		1) Use the toolbar above the timeline (i.e. in the middle of the screen) and select the TRIM button
+		2) Then, move your mouse over the edges of any clips.  Click and drag the edge of the clip to it's new location.
+
+	THE AUDIO / VIDEO IS OUT OF SYNC.  WHAT CAN I DO?
+		1) This is usually related to a bug in libopenshot or FFmpeg.  To resolve this, re-encode the video using the 
+		   ffmpeg command line tool.
+		   
+		2) Here is an example command to convert a folder full of Canon MTS files to MP4:
+		   $ find '/home/jonathan/Desktop/Caveman Movie/Videos' -iname "*.MTS" -exec ffmpeg -i {} -acodec libfaac -ab 128k -ac 2 -r 60 -vcodec mpeg4 -f mp4 -y -sameq {}.mp4 \;
+
+		3) Usually the reason the A/V are out of sync is related to the frame rate (i.e. the -r parameter on the ffmpeg command).
+		   Try a variety of frame rates and OpenShot project types to find one that doesn't have A/V sync issues.
+		   Some common rates are:  -r 29.97  -r 25  -r 30  -r 60
+
+
+#################
+    WEBSITES
+#################
+
+http://www.openshot.org/  (PROJECT WEBSITE and BLOG)
+http://launchpad.net/openshot/ (SOURCE CODE, BUG TRACKER, TRANSLATIONS)
+http://freshmeat.net/projects/openshot-video-editor/
+https://sourceforge.net/projects/openshotvideo/
+https://www.ohloh.net/p/openshot-video-editor/
+
+
+
+####################
+    REPORT A BUG
+####################
+
+https://bugs.launchpad.net/openshot
+
+
+
+####################
+    TRANSLATIONS
+####################
+
+https://translations.launchpad.net/openshot
+
+
+
+####################
+   ASK A QUESTION  
+####################
+
+https://answers.launchpad.net/openshot
+
+
+
+

openshot/openshot.py

@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-#	OpenShot Video Editor is a program that creates, modifies, and edits video files.
-#   Copyright (C) 2009  Jonathan Thomas, TJ
-#
-#	This file is part of OpenShot Video Editor (http://launchpad.net/openshot/).
-#
-#	OpenShot Video Editor is free software: you can redistribute it and/or modify
-#	it under the terms of the GNU General Public License as published by
-#	the Free Software Foundation, either version 3 of the License, or
-#	(at your option) any later version.
-#
-#	OpenShot Video Editor is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with OpenShot Video Editor.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys, os
-from classes import info
-from classes.OpenShotApp import OpenShotApp
-from classes.logger import log
-
-# This method starts OpenShot
-def main():
-	""""Initialise settings (not implemented) and create main window/application."""
-	
-	# Display version and exit (if requested)
-	if "--version" in sys.argv:
-		print ("OpenShot version %s" % info.SETUP['version'])
-		exit()
-
-	log.info("--------------------------------")
-	log.info("   OpenShot (version %s)" % info.SETUP['version'])
-	log.info("--------------------------------")
-	
-	# Create application
-	app = OpenShotApp(sys.argv)
-	# Run and return result
-	sys.exit(app.run())
-
-if __name__ == '__main__':
-	main()

setup.py

@@ -0,0 +1,104 @@
+# @file
+# @brief Distutils Setup.py file - Used to install OpenShot 2.0
+# @author Jonathan Thomas <jonathan@openshot.org>
+#
+# @section LICENSE
+#
+# Copyright (c) 2008-2014 OpenShot Studios, LLC
+# (http://www.openshotstudios.com). This file is part of
+# OpenShot Video Editor (http://www.openshot.org), an open-source project
+# dedicated to delivering high quality video editing and animation solutions
+# to the world.
+#
+# OpenShot Video Editor is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# OpenShot Video Editor is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
+
+import glob, os, sys, subprocess
+from distutils.core import setup
+
+print "Execution path: %s" % os.path.abspath(__file__)
+from src.classes import info
+
+# Boolean: running as root?
+ROOT = os.geteuid() == 0
+# For Debian packaging it could be a fakeroot so reset flag to prevent execution of
+# system update services for Mime and Desktop registrations.
+# The debian/openshot.postinst script must do those.
+if not os.getenv("FAKEROOTKEY") == None:
+	print "NOTICE: Detected execution in a FakeRoot so disabling calls to system update services."
+	ROOT = False
+
+os_files = [
+	 # XDG application description
+	 ('share/applications', ['xdg/openshot.desktop']),
+	 # XDG application icon
+	 ('share/pixmaps', ['xdg/openshot.svg']),
+	 # XDG desktop mime types cache
+	 ('share/mime/packages',['xdg/openshot.xml']),
+	 # launcher (mime.types)
+	 ('lib/mime/packages',['xdg/openshot']),
+	 # man-page ("man 1 openshot")
+	 ('share/man/man1',['docs/openshot.1']),
+	 ('share/man/man1',['docs/openshot-render.1']),
+]
+
+# Add all the translations
+locale_files = []
+for filepath in glob.glob("src/locale/*/LC_MESSAGES/*"):
+	filepath = filepath.replace('src/', '')
+	locale_files.append(filepath)
+	
+
+# Call the main Distutils setup command
+# -------------------------------------
+dist = setup(
+	 scripts	= ['bin/openshot','bin/openshot-render'],
+	 packages	 = ['src', 'src.classes', 'src.language', 'src.windows', 'src.uploads', 'src.uploads.vimeo', 'src.uploads.vimeo.httplib2', 'src.uploads.vimeo.httplib2wrap', 'src.uploads.vimeo.oauth2', 'src.uploads.vimeo.oauth2.clients', 'src.uploads.youtube', 'src.uploads.youtube.atom', 'src.uploads.youtube.gdata', 'src.uploads.youtube.gdata.geo', 'src.uploads.youtube.gdata.media', 'src.uploads.youtube.gdata.oauth', 'src.uploads.youtube.gdata.opensearch', 'src.uploads.youtube.gdata.tlslite', 'src.uploads.youtube.gdata.tlslite.integration', 'src.uploads.youtube.gdata.tlslite.utils', 'src.uploads.youtube.gdata.youtube'],
+	 package_data = {
+	 				'src' : ['export_presets/*', 'images/*', 'locale/OpenShot/*', 'locale/README', 'profiles/*', 'themes/*/*.png', 'themes/*/*.xml', 'themes/*/icons/*.png', 'titles/*/*.svg', 'transitions/icons/medium/*.png', 'transitions/icons/small/*.png', 'transitions/*.pgm', 'transitions/*.png', 'transitions/*.svg', 'effects/icons/medium/*.png', 'effects/icons/small/*.png', 'effects/*.xml', 'blender/blend/*.blend', 'blender/icons/*.png', 'blender/earth/*.jpg', 'blender/scripts/*.py', 'blender/*.xml'] + locale_files,
+	 				'src.windows' : ['ui/*.ui', 'ui/icons/*'],
+	 				'src.uploads' : ['logos/*.png'],
+	 				},
+	 data_files = os_files,
+	 **info.SETUP
+)
+# -------------------------------------
+
+
+FAILED = 'Failed to update.\n'
+
+if ROOT and dist != None:
+	#update the XDG Shared MIME-Info database cache
+	try: 
+		sys.stdout.write('Updating the Shared MIME-Info database cache.\n')
+		subprocess.call(["update-mime-database", os.path.join(sys.prefix, "share/mime/")])
+	except:
+		sys.stderr.write(FAILED)
+
+	#update the mime.types database
+	try: 
+		sys.stdout.write('Updating the mime.types database\n')
+		subprocess.call("update-mime")
+	except:
+		sys.stderr.write(FAILED)
+
+	# update the XDG .desktop file database
+	try:
+		sys.stdout.write('Updating the .desktop file database.\n')
+		subprocess.call(["update-desktop-database"])
+	except:
+		sys.stderr.write(FAILED)
+	sys.stdout.write("\n-----------------------------------------------")
+	sys.stdout.write("\nInstallation Finished!")
+	sys.stdout.write("\nRun OpenShot by typing 'openshot' or through the Applications menu.")
+	sys.stdout.write("\n-----------------------------------------------\n")