Commit aba32b04 authored by Edward Hervey's avatar Edward Hervey

* pitivi/configure.py.in:

Added get_global_pixmap_dir() for being able to use local/global installed
pixmap directory.
* pitivi/ui/mainwindow.py:
Fix window icon behaviour for cvs and installed
* pitivi/ui/projectsettings.py:
icon not needed here


git-svn-id: svn+ssh://svn.gnome.org/svn/pitivi/trunk@722 d3729300-e425-0410-8a4c-d956edccc248
parent 17fbddbf
2006-03-23 Edward Hervey <edward@fluendo.com>
* pitivi/configure.py.in:
Added get_global_pixmap_dir() for being able to use local/global installed
pixmap directory.
* pitivi/ui/mainwindow.py:
Fix window icon behaviour for cvs and installed
* pitivi/ui/projectsettings.py:
icon not needed here
2006-03-23 Edward Hervey <edward@fluendo.com>
* pitivi/discoverer.py:
......
......@@ -20,9 +20,11 @@
# Boston, MA 02111-1307, USA.
import os.path
import string
LIBDIR = '@LIBDIR@'
PKGDATADIR = '@DATADIR@/@PACKAGE@'
PIXMAPDIR = '@DATADIR@/pixmaps'
pitivi_version = '@VERSION@'
def get_pixmap_dir():
......@@ -32,3 +34,11 @@ def get_pixmap_dir():
else:
root = PKGDATADIR
return os.path.join(root, 'pixmaps')
def get_global_pixmap_dir():
dir = os.path.dirname(os.path.abspath(__file__))
if os.path.exists(os.path.join(dir, 'CVS')):
root = string.join(dir.split('/')[:-1], '/')
else:
root = PIXMAPDIR
return root
......@@ -29,6 +29,7 @@ import gtk
import gst
import pitivi.instance as instance
import pitivi.configure as configure
from timeline import TimelineWidget
from sourcefactories import SourceFactoriesWidget
......@@ -127,7 +128,7 @@ class PitiviMainWindow(gtk.Window):
hpaned.pack2(viewerframe, resize=False, shrink=False)
#application icon
self.set_icon_from_file("application-pitivi.png")
self.set_icon_from_file(configure.get_global_pixmap_dir() + "/application-pitivi.png")
## UI Callbacks
......@@ -164,7 +165,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("application-pitivi.png")
abt.set_icon_from_file(configure.get_global_pixmap_dir() + "/application-pitivi.png")
abt.show()
......
......@@ -35,7 +35,6 @@ class ProjectSettingsDialog(GladeWindow):
self.project = project
self.widgets["exportwidget"].setSettings(self.project.settings)
self._fillSettings()
self.set_icon_from_file("application-pitivi.png")
def _fillSettings(self):
w = self.widgets
......
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