Commit 7ae26b38 authored by Edward Hervey's avatar Edward Hervey

* application-pitivi.png:

* pitivi.png:
* Makefile.am:
* pitivi.desktop.in:
* pitivi.spec.in:
* pitivi/ui/mainwindow.py:
Changing pitivi-application.png to pitivi.png
Closes #337726
* pitivi/objectfactory.py:
slight bugfixes and debug


git-svn-id: svn+ssh://svn.gnome.org/svn/pitivi/trunk@745 d3729300-e425-0410-8a4c-d956edccc248
parent a12c313f
2006-04-10 Edward Hervey <edward@fluendo.com>
* application-pitivi.png:
* pitivi.png:
* Makefile.am:
* pitivi.desktop.in:
* pitivi.spec.in:
* pitivi/ui/mainwindow.py:
Changing pitivi-application.png to pitivi.png
Closes #337726
* pitivi/objectfactory.py:
slight bugfixes and debug
2006-04-10 Edward Hervey <edward@fluendo.com>
* pitivi/ui/sourcefactories.py:
......
......@@ -6,7 +6,7 @@ desktopdir = $(datadir)/applications
desktop_DATA = pitivi.desktop
icondir = $(datadir)/pixmaps
icon_DATA = application-pitivi.png
icon_DATA = pitivi.png
EXTRA_DIST = \
pitivi.spec \
......@@ -16,4 +16,4 @@ EXTRA_DIST = \
NEWS \
AUTHORS \
RELEASE \
application-pitivi.png
pitivi.png
......@@ -6,6 +6,6 @@ Comment[fr]=Editeur Vidéo Non-Linéaire
Exec=pitivi
Terminal=false
Type=Application
Icon=application-pitivi.png
Icon=pitivi.png
Categories=GNOME;GTK;Application;AudioVideo;X-Ximian-Main;X-Red-Hat-Base;
StartupNotify=true
......@@ -41,10 +41,12 @@ PiTiVi non-linear video editor
%{_bindir}/pitivi
%{_libdir}/pitivi
%{_datadir}/pitivi/pixmaps/*
%{_datadir}/pixmaps/application-pitivi.png
%{_datadir}/pixmaps/pitivi.png
%{_datadir}/applications/pitivi.desktop
%changelog
* Mon Apr 10 2006 Edward Hervey <edward at fluendo dot com>
- Changing application-pitivi.png to pitivi.png
* Mon Feb 20 2006 Edward Hervey <edward at fluendo dot com>
- Update for pycairo requirement
* Thu Jun 23 2005 Christian Schaller <christian at fluendo dot com>
......
......@@ -310,6 +310,7 @@ class SMPTETransitionFactory(TransitionFactory):
class MultimediaStream:
def __init__(self, caps):
gst.log("new with caps %s" % caps.to_string())
self.caps = caps
self.raw = False
self.fixed = True
......@@ -440,6 +441,6 @@ def get_stream_for_caps(caps):
if val.startswith("audio/"):
return AudioStream(caps)
if val.startswith("text/"):
return TextStream
return TextStream(caps)
return None
......@@ -136,7 +136,7 @@ class PitiviMainWindow(gtk.Window):
hpaned.pack2(viewerframe, resize=False, shrink=False)
#application icon
self.set_icon_from_file(configure.get_global_pixmap_dir() + "/application-pitivi.png")
self.set_icon_from_file(configure.get_global_pixmap_dir() + "/pitivi.png")
def toggleFullScreen(self):
""" Toggle the fullscreen mode of the application """
......@@ -189,7 +189,7 @@ class PitiviMainWindow(gtk.Window):
authors = ["Edward Hervey <edward@fluendo.com>" ]
abt.set_authors(authors)
abt.set_license("GNU Lesser Public License\nSee http://www.gnu.org/copyleft/lesser.html for more details")
abt.set_icon_from_file(configure.get_global_pixmap_dir() + "/application-pitivi.png")
abt.set_icon_from_file(configure.get_global_pixmap_dir() + "/pitivi.png")
abt.show()
def _importSourcesCb(self, unused_action):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment