Merge lp:~david4dev/dmedia/fix-672256 into lp:dmedia

[David Green]

Fixes bug #672256.

I have added a placeholder icon for dmedia so that I can use it in the .desktop file. It is intended that someone good at icon design will replace this with a proper icon.

Once installed (using setup.py), `sudo update-desktop-database` needs to be run for Nautilus to see dmedia-import as a media handler.

[Jason Gerard DeRose (jderose)]

Thanks, David, you're a machine! I'm pretty sure update-desktop-database will run automatically when the .deb is installed, but I'll make sure that works.

review: Approve

[Jason Gerard DeRose (jderose)]

Okay, confirmed that update-desktop-database does indeed run automatically when the .deb is installed, so your place holder should be up and running in the next daily build (I just requested a build). Package version will be 0.2.0~bzr116~maverick1 (or ~lucid1).

By the way, are you developing under Lucid, Maverick, or Natty? The Natty dailies currently aren't working (Launchpad issue), but hopefully they will be soon.

Thanks again!

[David Green (david4dev)]

I'm developing on Maverick.

=== added file 'dmedia-import'
--- dmedia-import	1970-01-01 00:00:00 +0000
+++ dmedia-import	2010-11-24 22:55:15 +0000
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+
+# Authors:
+#   David Green <[e-mail]>
+#
+# dmedia: distributed media library
+# Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
+#
+# This file is part of `dmedia`.
+#
+# `dmedia` is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# `dmedia` 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 Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License along
+# with `dmedia`.  If not, see <http://www.gnu.org/licenses/>.
+
+#This is a placeholder file for the dmedia importer.
+
+import gtk
+import gettext
+_ = gettext.gettext
+import sys
+
+
+class ImporterGUI(gtk.Window):
+    def __init__(self):
+        super(ImporterGUI, self).__init__()
+
+        self.set_title(_('dmedia Media Importer'))
+        self.resize(500, 500)
+
+        self.add_content()
+
+        self.connect_signals()
+
+
+    def add_content(self):
+        self.container = gtk.HBox()
+
+        self.label = gtk.Label(_('This will become the dmedia importer.'))
+        self.label.show()
+
+        self.container.add(self.label)
+        self.label.show()
+        self.container.show()
+        self.add(self.container)
+
+
+    def connect_signals(self):
+        self.connect("delete_event", self.delete_event)
+        self.connect("destroy", self.destroy)
+
+
+    def destroy(self, widget, data=None):
+        gtk.main_quit()
+
+
+    def delete_event(self, widget, event, data=None):
+        return False
+
+
+    def go(self, args=[]):
+        self.label.set_text(self.label.get_text() + "\n\n" + ', '.join(args))
+        self.show_all()
+        gtk.main()
+
+
+
+if __name__ == '__main__':
+    app = ImporterGUI()
+    app.go(args=sys.argv)
 
=== added file 'dmedia-import.desktop'
--- dmedia-import.desktop	1970-01-01 00:00:00 +0000
+++ dmedia-import.desktop	2010-11-24 22:55:15 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Dmedia Media Importer
+GenericName=Media Importer
+Comment=Import media files into the dmedia library
+Exec=dmedia-import %U
+Icon=dmedia
+Terminal=false
+Type=Application
+MimeType=x-content/image-dcf;x-content/audio-player;x-content/video-dvd;x-content/image-picturecd
 
=== added file 'dmedia.svg'
--- dmedia.svg	1970-01-01 00:00:00 +0000
+++ dmedia.svg	2010-11-24 22:55:15 +0000
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="75.747768"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="776"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="-24.896765"
+       y="38.196884"
+       id="text3348"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.75159621,-0.65962348,0.65962348,0.75159621,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan3350"
+         x="-24.896765"
+         y="38.196884"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">Dmedia</tspan></text>
+  </g>
+</svg>
 
=== modified file 'setup.py'
--- setup.py	2010-11-24 03:50:51 +0000
+++ setup.py	2010-11-24 22:55:15 +0000
@@ -2,6 +2,7 @@
 
 # Authors:
 #   Jason Gerard DeRose <[e-mail]>
+#   David Green <[e-mail]>
 #
 # dmedia: distributed media library
 # Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
@@ -100,8 +101,14 @@
     package_data=dict(
         dmedialib=['data/*'],
     ),
-    scripts=['dmedia'],
+    scripts=['dmedia', 'dmedia-import'],
     data_files=[
         ('share/man/man1', ['dmedia.1']),
+        ('share/applications', ['dmedia-import.desktop']),
+        #^ this enables Nautilus to use dmedia-import as a handler for
+        #media devices such as cameras. `sudo update-desktop-database`
+        #may need to run for this to show up in the Nautilus
+        #media handling preferences.
+        ('share/pixmaps', ['dmedia.svg']) #installs the icon
     ],
 )