Merge lp:~stefan-schwarzburg/qreator/qreator_url_shortener into lp:~dpm/qreator/trunk

[Schwarzburg]

This branch implements the option to directly shorten URLs via Goo.gl, Bit.ly or TinyURL.com.

The conversion option is visible all the time, but has to be activated manually.
If the URL was shortened and then the URL is changed, the shortened version is removed and must be activated again.

The visual components are:
 - a conversion button
 - a combobox to select the service
 - a link button for the shortened url which can be used to check that the shortening worked as expected
 - a label that can display errors.

This feature was not meantioned in the next milestone, but since it is complete and working, we might want to include it as well.

David: it would be great if you could simply have a look at the layout and tell me if you like it :-)

[lp:~stefan-schwarzburg/qreator/qreator_url_shortener]

125. By Schwarzburg on 2012-10-18

added label to make the combobox meaning more clear

126. By Schwarzburg on 2012-10-20

Pre-upgrade checkpoint

127. By Schwarzburg on 2012-10-20

Pre-upgrade checkpoint

128. By Schwarzburg on 2012-10-21

Pre-upgrade checkpoint

129. By Schwarzburg on 2012-10-21

Pre-upgrade checkpoint

130. By Schwarzburg on 2012-10-21

updates due to quickly update

131. By Schwarzburg on 2012-10-22

now in sync with possible future trunk :-)

132. By Schwarzburg on 2012-10-28

minor cosnmetical changes; added missing tools.py file

[David Planella (dpm)]

I love the feature, good work (as usual)! :-)

I like the fact that you've reduced the layout to the minimal number of elements, and I'd like to try to see if we can squeeze even more out of simplicity and usability. Here's my suggestion:

http://ubuntuone.com/5yaGY5klw7BqbPCnyV5LPy

In summary:

- Keeping all widgets in a single row
- Collapsing the original URL and the shortened URL into a single entry
- Hiding away the shortener service selector (*)

There is also the question whether we update the QR code with the shortened URL, which I think might make sense for those shorteners (e.g. bit.ly) that keep track of click stats through analytics. I think we should probably update it, but I don't feel strongly about it, either.

What do you think?

(*) I've been reluctant to add a preferences page up until now, as I'm a firm believer of "sane defaults for everyone" and "preferences are maintenance burden", but I think in this case we might want to add a preferences page to select the shortener service. Mainly because of 2 reasons: a) most users won't change shorteners that often, so I believe we should not show it directly to them and b) to work well with shorteners with analytics, we might want to have a text box preference to add their API keys. If we are going to add a preferences page, I'd like to keep it inside the main window as the about page (instead of a pop-up dialog), to keep the self-contained, mobile, feel of the app (even though we're far from becoming a mobile app).

Now if having a preferences page is going to be a non-trivial amount of work, we might just want to pick one shortener service and go with that for the first cut. On a next release we can then feature the preferences page.

review: Needs Information

[David Planella (dpm)]

Now that we've switched the trunk branch from my personal one to the team-owned one, would you mind clicking on the "Resubmit proposal" link at the top of the page, change the "Target branch" to be ~qreator-hackers/qreator/trunk and press Resubmit?

Launchpad will then show the diff against the right branch. Thanks!

[lp:~stefan-schwarzburg/qreator/qreator_url_shortener]

133. By Schwarzburg on 2012-11-11

merged with latest trunk

134. By Schwarzburg on 2012-11-11

simplified interface; implemented all suggested changes

135. By Schwarzburg on 2012-11-11

nicer feedback to the user what is shortened

136. By Schwarzburg on 2012-11-12

implemented user interface suggestion by david

137. By Schwarzburg on 2012-11-12

updated to latest trunk

138. By Schwarzburg on 2012-11-12

added messagedialog to show network connection problems

139. By Schwarzburg on 2012-11-12

removed ramains from older branches. Do not know why 'merge' with trunk did not remove them

140. By Schwarzburg on 2012-11-21

removed my api key from bitly, added isdg (as default), made the error message slightly more useful

Unmerged revisions

140. By Schwarzburg on 2012-11-21

removed my api key from bitly, added isdg (as default), made the error message slightly more useful

139. By Schwarzburg on 2012-11-12

removed ramains from older branches. Do not know why 'merge' with trunk did not remove them

138. By Schwarzburg on 2012-11-12

added messagedialog to show network connection problems

137. By Schwarzburg on 2012-11-12

updated to latest trunk

136. By Schwarzburg on 2012-11-12

implemented user interface suggestion by david

135. By Schwarzburg on 2012-11-11

nicer feedback to the user what is shortened

134. By Schwarzburg on 2012-11-11

simplified interface; implemented all suggested changes

133. By Schwarzburg on 2012-11-11

merged with latest trunk

132. By Schwarzburg on 2012-10-28

minor cosnmetical changes; added missing tools.py file

131. By Schwarzburg on 2012-10-22

now in sync with possible future trunk :-)

=== modified file '.quickly'
--- .quickly	2012-05-28 11:05:50 +0000
+++ .quickly	2012-10-28 16:08:21 +0000
@@ -1,5 +1,5 @@
 project = qreator
-version = 12.04
+version = 12.08.1
 template = ubuntu-application
 lp_id = qreator
 dependencies = software-center
 
=== modified file 'bin/qreator'
--- bin/qreator	2012-05-28 09:38:22 +0000
+++ bin/qreator	2012-10-28 16:08:21 +0000
@@ -15,9 +15,13 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
+### DO NOT EDIT THIS FILE ###
+
 import sys
 import os
 
+import locale
+locale.textdomain('qreator')
 
 # Add project root directory (enable symlink and trunk execution)
 PROJECT_ROOT_DIRECTORY = os.path.abspath(
@@ -25,18 +29,19 @@
 
 python_path = []
 if os.path.abspath(__file__).startswith('/opt'):
-    syspath = sys.path[:]  # copy to avoid infinite loop in pending objects
+    locale.bindtextdomain('qreator', '/opt/extras.ubuntu.com/qreator/share/locale')
+    syspath = sys.path[:] # copy to avoid infinite loop in pending objects
     for path in syspath:
         opt_path = path.replace('/usr', '/opt/extras.ubuntu.com/qreator')
         python_path.insert(0, opt_path)
         sys.path.insert(0, opt_path)
+    os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/qreator/share/", os.getenv("XDG_DATA_DIRS", "/usr/local/share/:/usr/share/")))
 if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'qreator'))
     and PROJECT_ROOT_DIRECTORY not in sys.path):
     python_path.insert(0, PROJECT_ROOT_DIRECTORY)
     sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
 if python_path:
-    os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''),
-        ':'.join(python_path)))  # for subprocesses
+    os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
 
 import qreator
 qreator.main()
 
=== modified file 'data/ui/QrCodeURL.ui'
--- data/ui/QrCodeURL.ui	2012-05-30 08:33:06 +0000
+++ data/ui/QrCodeURL.ui	2012-10-28 16:08:21 +0000
@@ -8,10 +8,15 @@
       <object class="GtkEntry" id="entryURL">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="margin_top">3</property>
+        <property name="margin_bottom">3</property>
+        <property name="hexpand">True</property>
+        <property name="placeholder_text">[URL]</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
         <property name="hexpand">True</property>
         <property name="invisible_char">•</property>
         <property name="invisible_char_set">True</property>
-        <property name="placeholder_text">[URL]</property>
         <signal name="changed" handler="on_entryURL_changed" swapped="no"/>
         <signal name="icon-press" handler="on_entryURL_icon_press" swapped="no"/>
       </object>
@@ -43,5 +48,91 @@
         <property name="height">1</property>
       </packing>
     </child>
+    <child>
+      <object class="GtkToggleButton" id="togglebuttonURLShortener">
+        <property name="label" translatable="yes">Shorten URL</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_action_appearance">False</property>
+        <signal name="toggled" handler="on_togglebuttonURLShortener_toggled" swapped="no"/>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xpad">5</property>
+            <property name="label" translatable="yes">with</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="comboboxtextURLShortener">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="entry_text_column">0</property>
+            <property name="id_column">1</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLinkButton" id="linkbuttonUrlShortener">
+            <property name="label" translatable="yes">[shortened URL]</property>
+            <property name="use_action_appearance">False</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="has_tooltip">True</property>
+            <property name="margin_right">6</property>
+            <property name="hexpand">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="relief">none</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="messagelabelUrlShortener">
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">label</property>
+            <property name="justify">center</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">1</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
   </object>
 </interface>
 
=== modified file 'qreator/QreatorWindow.py'
--- qreator/QreatorWindow.py	2012-06-24 07:59:42 +0000
+++ qreator/QreatorWindow.py	2012-10-28 16:08:21 +0000
@@ -25,7 +25,7 @@
 
 from qreator_lib.i18n import _
 from qreator_lib import Window
-from qreator_lib.helpers import get_media_file
+from qreator.tools import get_media_path
 
 from QRCode import QRCode
 from QRCode import QRCodeOutput
@@ -71,7 +71,7 @@
 
         # Load the background texture in the QR code page
         self.texture = cairo.ImageSurface.create_from_png(
-                                                get_media_file("pattern.png"))
+                                                get_media_path("pattern.png"))
 
         # Time to wait in milliseconds before switching to the next view
         # after having clicked once on an iconview icon
@@ -161,8 +161,7 @@
         self.qr_types_store.clear()
 
         for qr_type in self.qr_types:
-            icon = GdkPixbuf.Pixbuf.new_from_file(get_media_file(
-                            qr_type.icon_path))
+            icon = GdkPixbuf.Pixbuf.new_from_file(qr_type.icon_path)
             self.qr_types_store.append([qr_type.description,
                                         icon,
                                         qr_type.id])
 
=== modified file 'qreator/__init__.py'
--- qreator/__init__.py	2012-06-23 08:42:52 +0000
+++ qreator/__init__.py	2012-10-28 16:08:21 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 David Planella <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 
=== modified file 'qreator/qrcodes/GtkHelpers.py'
--- qreator/qrcodes/GtkHelpers.py	2012-05-30 10:19:57 +0000
+++ qreator/qrcodes/GtkHelpers.py	2012-10-28 16:08:21 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 David Planella <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 
=== modified file 'qreator/qrcodes/QRCodeLocation.py'
--- qreator/qrcodes/QRCodeLocation.py	2012-05-30 08:33:06 +0000
+++ qreator/qrcodes/QRCodeLocation.py	2012-10-28 16:08:21 +0000
@@ -14,14 +14,14 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-from qreator_lib.helpers import get_media_file
+from qreator.tools import get_media_path
 #from qreator_lib import QRCodeType as QRCodeType
 from QRCodeLocationGtk import QRCodeLocationGtk
 
 class QRCodeLocation(object):
     def __init__(self, qr_code_update_func, icon_path, description, id):
         self.qr_code_update_func = qr_code_update_func
-        self.icon_path = get_media_file(icon_path)
+        self.icon_path = get_media_path(icon_path)
         self.description = description
         self.id = id
 
 
=== modified file 'qreator/qrcodes/QRCodeLocationGtk.py'
--- qreator/qrcodes/QRCodeLocationGtk.py	2012-06-23 16:49:09 +0000
+++ qreator/qrcodes/QRCodeLocationGtk.py	2012-10-28 16:08:21 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 David Planella <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 
=== modified file 'qreator/qrcodes/QRCodeSoftwareCenterApp.py'
--- qreator/qrcodes/QRCodeSoftwareCenterApp.py	2012-05-30 08:33:06 +0000
+++ qreator/qrcodes/QRCodeSoftwareCenterApp.py	2012-10-28 16:08:21 +0000
@@ -14,7 +14,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-from qreator_lib.helpers import get_media_file
+from qreator.tools import get_media_path
 #from qreator_lib import QRCodeType as QRCodeType
 from QRCodeSoftwareCenterAppGtk import QRCodeSoftwareCenterAppGtk
 
@@ -22,7 +22,7 @@
 class QRCodeSoftwareCenterApp(object):
     def __init__(self, qr_code_update_func, icon_path, description, id):
         self.qr_code_update_func = qr_code_update_func
-        self.icon_path = get_media_file(icon_path)
+        self.icon_path = get_media_path(icon_path)
         self.description = description
         self.id = id
 
 
=== modified file 'qreator/qrcodes/QRCodeSoftwareCenterAppGtk.py'
--- qreator/qrcodes/QRCodeSoftwareCenterAppGtk.py	2012-05-30 10:19:57 +0000
+++ qreator/qrcodes/QRCodeSoftwareCenterAppGtk.py	2012-10-28 16:08:21 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 David Planella <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 
=== modified file 'qreator/qrcodes/QRCodeText.py'
--- qreator/qrcodes/QRCodeText.py	2012-05-30 08:33:06 +0000
+++ qreator/qrcodes/QRCodeText.py	2012-10-28 16:08:21 +0000
@@ -14,14 +14,14 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-from qreator_lib.helpers import get_media_file
+from qreator.tools import get_media_path
 #from qreator_lib import QRCodeType as QRCodeType
 from QRCodeTextGtk import QRCodeTextGtk
 
 class QRCodeText(object):
     def __init__(self, qr_code_update_func, icon_path, description, id):
         self.qr_code_update_func = qr_code_update_func
-        self.icon_path = get_media_file(icon_path)
+        self.icon_path = get_media_path(icon_path)
         self.description = description
         self.id = id
 
 
=== modified file 'qreator/qrcodes/QRCodeTextGtk.py'
--- qreator/qrcodes/QRCodeTextGtk.py	2012-05-30 08:33:06 +0000
+++ qreator/qrcodes/QRCodeTextGtk.py	2012-10-28 16:08:21 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 David Planella <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 
=== modified file 'qreator/qrcodes/QRCodeType.py'
--- qreator/qrcodes/QRCodeType.py	2012-05-30 08:33:06 +0000
+++ qreator/qrcodes/QRCodeType.py	2012-10-28 16:08:21 +0000
@@ -19,7 +19,7 @@
                  id):
         self.parent_widget = parent_widget
         self.drawing_area = drawing_area
-        self.icon_path = get_media_file(icon_path)
+        self.icon_path = get_media_path(icon_path)
         self.description = description
         self.id = id
 
 
=== modified file 'qreator/qrcodes/QRCodeURL.py'
--- qreator/qrcodes/QRCodeURL.py	2012-05-30 08:33:06 +0000
+++ qreator/qrcodes/QRCodeURL.py	2012-10-28 16:08:21 +0000
@@ -14,14 +14,14 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-from qreator_lib.helpers import get_media_file
+from qreator.tools import get_media_path
 #from qreator_lib import QRCodeType as QRCodeType
 from QRCodeURLGtk import QRCodeURLGtk
 
 class QRCodeURL(object):
     def __init__(self, qr_code_update_func, icon_path, description, id):
         self.qr_code_update_func = qr_code_update_func
-        self.icon_path = get_media_file(icon_path)
+        self.icon_path = get_media_path(icon_path)
         self.description = description
         self.id = id
 
 
=== modified file 'qreator/qrcodes/QRCodeURLGtk.py'
--- qreator/qrcodes/QRCodeURLGtk.py	2012-08-02 13:15:02 +0000
+++ qreator/qrcodes/QRCodeURLGtk.py	2012-10-28 16:08:21 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 David Planella <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -18,6 +18,53 @@
 from GtkHelpers import clear_text_entry, show_clear_icon
 from qreator_lib.helpers import get_data_file
 from qreator_lib.i18n import _
+import requests
+import json
+from urllib import urlencode
+
+
+class TinyUrlShortener(object):
+    def __init__(self, url=None):
+        self.api_url = "http://tinyurl.com/api-create.php"
+        self.url = url
+
+    def short_url(self):
+        self.r = requests.get("{0}?url={1}".format(self.api_url, self.url))
+        return self.r.content
+
+class BitlyShortener(object):
+    def __init__(self, url=None):
+        self.api_url = 'http://api.bit.ly/v3/shorten'
+        self.url = url
+        self.data = {"login": "xubuntix",
+                     "apiKey": "R_9b35d5ecdee200a89e3ca16b312bf4a1",
+                     "longUrl": self.url}
+
+    def short_url(self):
+        self.r = requests.get(self.api_url, params=self.data)
+        self.results = json.loads(self.r.content)
+        return self.results["data"]["url"]
+
+
+class GoogleShortener(object):
+    def __init__(self, url=None):
+        self.api_key = "AIzaSyCU_pFNpACW4luWEZRgNnfWMEUdlnZyYQI"
+        self.api_url = 'https://www.googleapis.com/urlshortener/v1/url'
+        self.url = url
+        self.params = {"key": self.api_key,
+                       'Content-Type' : 'application/json'}
+        self.data = {"longUrl": self.url}
+
+    def short_url(self):
+        self.r = requests.post(self.api_url, headers=self.params, data=json.dumps(self.data))
+        self.results = json.loads(self.r.content)
+        return self.results["id"]
+
+
+SHORTENER_TYPES = [(_("Google"), GoogleShortener),
+                   (_("Bitly"), BitlyShortener),
+                   (_("TinyUrl"), TinyUrlShortener),
+                   ]
 
 
 class QRCodeURLGtk(object):
@@ -38,9 +85,52 @@
         self.entry.set_placeholder_text(_('[URL]'))
         self.combobox.set_active(0)
 
+        # Currently three shortener options are available: google tinyurl bitly
+        # The selected service is stored in self.Shortener
+        self.shorten_options = self.builder.get_object('comboboxtextURLShortener')
+        for s in SHORTENER_TYPES:
+            self.shorten_options.append_text(s[0])
+        self.shorten_options.set_active(0)
+        self.shorten_options.connect("changed", self.on_shortener_changed)
+        self.Shortener = SHORTENER_TYPES[self.shorten_options.get_active()][1]
+
         self.entry.connect("changed", self.on_entryURL_changed)
         self.combobox.connect("changed", self.on_comboboxtextProtocol_changed)
 
+    def on_shortener_changed(self, widget):
+        self.Shortener = SHORTENER_TYPES[widget.get_active()][1]
+        self.on_togglebuttonURLShortener_toggled(
+            self.builder.get_object('togglebuttonURLShortener'))
+
+
+    def on_togglebuttonURLShortener_toggled(self, widget):
+        if widget.get_active():
+            s = self.Shortener(url=self.adress)
+            try:
+                short_adress = s.short_url()
+            except requests.exceptions.ConnectionError:
+                self.builder.get_object('linkbuttonUrlShortener').set_visible(False)
+                self.builder.get_object('linkbuttonUrlShortener').set_sensitive(False)
+                self.builder.get_object('messagelabelUrlShortener').set_text(
+                    _("A network connection error occured."))
+                self.builder.get_object('messagelabelUrlShortener').set_visible(True)
+                return()
+            except:
+                self.builder.get_object('linkbuttonUrlShortener').set_visible(False)
+                self.builder.get_object('linkbuttonUrlShortener').set_sensitive(False)
+                self.builder.get_object('messagelabelUrlShortener').set_text(
+                    _("An error occured while trying to shorten the url."))
+                self.builder.get_object('messagelabelUrlShortener').set_visible(True)
+                return()
+            self.builder.get_object('linkbuttonUrlShortener').set_uri(short_adress)
+            self.builder.get_object('linkbuttonUrlShortener').set_label(short_adress)
+            self.builder.get_object('linkbuttonUrlShortener').set_sensitive(True)
+            self.builder.get_object('linkbuttonUrlShortener').set_visible(True)
+            self.qr_code_update_func(short_adress)
+        else:
+            self.builder.get_object('linkbuttonUrlShortener').set_visible(False)
+            self.builder.get_object('linkbuttonUrlShortener').set_sensitive(False)
+        self.builder.get_object('messagelabelUrlShortener').set_visible(False)
     def on_activated(self):
         pass
 
@@ -53,7 +143,10 @@
         if not protocol or www == '':
             return
 
-        self.qr_code_update_func(protocol + www)
+        self.adress = protocol + www
+
+        self.qr_code_update_func(self.adress)
+        return False
 
     def on_entryURL_icon_press(self, widget, icon, mouse_button):
         clear_text_entry(widget, icon)
@@ -73,7 +166,12 @@
     def on_entryURL_changed(self, widget, data=None):
         show_clear_icon(widget)
         self.check_and_remove_protocol(widget)
-        self.update_url_qr_code(www=widget.get_text())
+        self.clear_shortener()
+        self.update_url_qr_code()
 
     def on_comboboxtextProtocol_changed(self, widget, data=None):
         self.update_url_qr_code(protocol=widget.get_active_text())
+
+    def clear_shortener(self):
+        self.builder.get_object('linkbuttonUrlShortener').set_visible(False)
+        self.builder.get_object('togglebuttonURLShortener').set_active(False)
 
=== modified file 'qreator/qrcodes/QRCodeVCard.py'
--- qreator/qrcodes/QRCodeVCard.py	2012-06-02 08:59:55 +0000
+++ qreator/qrcodes/QRCodeVCard.py	2012-10-28 16:08:21 +0000
@@ -14,7 +14,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-from qreator_lib.helpers import get_media_file
+from qreator.tools import get_media_path
 #from qreator_lib import QRCodeType as QRCodeType
 from QRCodeVCardGtk import QRCodeVCardGtk
 import vobject
@@ -22,7 +22,7 @@
 class QRCodeVCard(object):
     def __init__(self, qr_code_update_func, icon_path, description, id):
         self.qr_code_update_func = qr_code_update_func
-        self.icon_path = get_media_file(icon_path)
+        self.icon_path = get_media_path(icon_path)
         self.description = description
         self.id = id
 
 
=== modified file 'qreator/qrcodes/QRCodeVCardGtk.py'
--- qreator/qrcodes/QRCodeVCardGtk.py	2012-06-09 00:06:51 +0000
+++ qreator/qrcodes/QRCodeVCardGtk.py	2012-10-28 16:08:21 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
-# Copyright (C) 2012 Stefan Schwarzburg <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# Copyright (C) 2012 David Planella <[e-mail]>
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 
=== modified file 'qreator/qrcodes/QRCodeWifi.py'
--- qreator/qrcodes/QRCodeWifi.py	2012-05-30 08:33:06 +0000
+++ qreator/qrcodes/QRCodeWifi.py	2012-10-28 16:08:21 +0000
@@ -14,14 +14,14 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-from qreator_lib.helpers import get_media_file
+from qreator.tools import get_media_path
 #from qreator_lib import QRCodeType as QRCodeType
 from QRCodeWifiGtk import QRCodeWifiGtk
 
 class QRCodeWifi(object):
     def __init__(self, qr_code_update_func, icon_path, description, id):
         self.qr_code_update_func = qr_code_update_func
-        self.icon_path = get_media_file(icon_path)
+        self.icon_path = get_media_path(icon_path)
         self.description = description
         self.id = id
 
 
=== modified file 'qreator/qrcodes/QRCodeWifiGtk.py'
--- qreator/qrcodes/QRCodeWifiGtk.py	2012-05-30 10:19:57 +0000
+++ qreator/qrcodes/QRCodeWifiGtk.py	2012-10-28 16:08:21 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 David Planella <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
 # by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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
+# 
+# You should have received a copy of the GNU General Public License along 
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 
=== added file 'qreator/tools.py'
--- qreator/tools.py	1970-01-01 00:00:00 +0000
+++ qreator/tools.py	2012-10-28 16:08:21 +0000
@@ -0,0 +1,9 @@
+import os
+from qreator_lib.qreatorconfig import get_data_file
+
+def get_media_path(media_file_name):
+    media_filename = get_data_file('media', '%s' % (media_file_name,))
+    if not os.path.exists(media_filename):
+        media_filename = None
+
+    return media_filename
 
=== added file 'qreator_lib/AboutDialog.py'
--- qreator_lib/AboutDialog.py	1970-01-01 00:00:00 +0000
+++ qreator_lib/AboutDialog.py	2012-10-28 16:08:21 +0000
@@ -0,0 +1,50 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+### BEGIN LICENSE
+# Copyright (C) 2012 David Planella <[e-mail]>
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+### END LICENSE
+
+### DO NOT EDIT THIS FILE ###
+
+from gi.repository import Gtk # pylint: disable=E0611
+
+from . helpers import get_builder
+
+class AboutDialog(Gtk.AboutDialog):
+    __gtype_name__ = "AboutDialog"
+
+    def __new__(cls):
+        """Special static method that's automatically called by Python when 
+        constructing a new instance of this class.
+        
+        Returns a fully instantiated AboutDialog object.
+        """
+        builder = get_builder('AboutQreatorDialog')
+        new_object = builder.get_object("about_qreator_dialog")
+        new_object.finish_initializing(builder)
+        return new_object
+
+    def finish_initializing(self, builder):
+        """Called while initializing this instance in __new__
+
+        finish_initalizing should be called after parsing the ui definition
+        and creating a AboutDialog object with it in order
+        to finish initializing the start of the new AboutQreatorDialog
+        instance.
+        
+        Put your initialization code in here and leave __init__ undefined.
+        """
+        # Get a reference to the builder and set up the signals.
+        self.builder = builder
+        self.ui = builder.get_ui(self)
+
 
=== modified file 'qreator_lib/Builder.py'
--- qreator_lib/Builder.py	2012-05-19 14:45:57 +0000
+++ qreator_lib/Builder.py	2012-10-28 16:08:21 +0000
@@ -14,6 +14,8 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
+### DO NOT EDIT THIS FILE ###
+
 '''Enhances builder connections, provides object to access glade objects'''
 
 from gi.repository import GObject, Gtk # pylint: disable=E0611
@@ -273,14 +275,14 @@
         # Now, automatically find any the user didn't specify in glade
         for sig in signal_names:
             # using convention suggested by glade
-            sigpy = sig.replace("-", "_")
-            handler_names = ["on_%s_%s" % (widget_name, sigpy)]
+            sig = sig.replace("-", "_")
+            handler_names = ["on_%s_%s" % (widget_name, sig)]
 
             # Using the convention that the top level window is not
             # specified in the handler name. That is use
             # on_destroy() instead of on_windowname_destroy()
             if widget is callback_obj:
-                handler_names.append("on_%s" % sigpy)
+                handler_names.append("on_%s" % sig)
 
             do_connect(item, sig, handler_names,
              callback_handler_dict, builder.connections)
 
=== added file 'qreator_lib/PreferencesDialog.py'
--- qreator_lib/PreferencesDialog.py	1970-01-01 00:00:00 +0000
+++ qreator_lib/PreferencesDialog.py	2012-10-28 16:08:21 +0000
@@ -0,0 +1,64 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+### BEGIN LICENSE
+# Copyright (C) 2012 David Planella <[e-mail]>
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+### END LICENSE
+
+### DO NOT EDIT THIS FILE ###
+
+"""this dialog adjusts values in gsettings
+"""
+
+from gi.repository import Gtk # pylint: disable=E0611
+import logging
+logger = logging.getLogger('qreator_lib')
+
+from . helpers import get_builder, show_uri, get_help_uri
+
+class PreferencesDialog(Gtk.Dialog):
+    __gtype_name__ = "PreferencesDialog"
+
+    def __new__(cls):
+        """Special static method that's automatically called by Python when 
+        constructing a new instance of this class.
+        
+        Returns a fully instantiated PreferencesDialog object.
+        """
+        builder = get_builder('PreferencesQreatorDialog')
+        new_object = builder.get_object("preferences_qreator_dialog")
+        new_object.finish_initializing(builder)
+        return new_object
+
+    def finish_initializing(self, builder):
+        """Called while initializing this instance in __new__
+
+        finish_initalizing should be called after parsing the ui definition
+        and creating a PreferencesDialog object with it in order to
+        finish initializing the start of the new PerferencesQreatorDialog
+        instance.
+        
+        Put your initialization code in here and leave __init__ undefined.
+        """
+
+        # Get a reference to the builder and set up the signals.
+        self.builder = builder
+        self.ui = builder.get_ui(self, True)
+
+        # code for other initialization actions should be added here
+
+    def on_btn_close_clicked(self, widget, data=None):
+        self.destroy()
+
+    def on_btn_help_clicked(self, widget, data=None):
+        show_uri(self, "ghelp:%s" % get_help_uri('preferences'))
+
 
=== modified file 'qreator_lib/Window.py'
--- qreator_lib/Window.py	2012-05-19 14:45:57 +0000
+++ qreator_lib/Window.py	2012-10-28 16:08:21 +0000
@@ -14,11 +14,13 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-from gi.repository import Gtk  # pylint: disable=E0611
+### DO NOT EDIT THIS FILE ###
+
+from gi.repository import Gio, Gtk # pylint: disable=E0611
 import logging
 logger = logging.getLogger('qreator_lib')
 
-from . helpers import get_builder
+from . helpers import get_builder, show_uri, get_help_uri
 
 # This class is meant to be subclassed by QreatorWindow.  It provides
 # common functions and some boilerplate.
@@ -60,8 +62,8 @@
         self.preferences_dialog = None # instance
         self.AboutDialog = None # class
 
-        ##self.settings = Gio.Settings("net.launchpad.qreator")
-        ##self.settings.connect('changed', self.on_preferences_changed)
+        self.settings = Gio.Settings("net.launchpad.qreator")
+        self.settings.connect('changed', self.on_preferences_changed)
 
         # Optional application indicator support
         # Run 'quickly add indicator' to get started.
@@ -76,6 +78,34 @@
         except ImportError:
             pass
 
+    def on_mnu_contents_activate(self, widget, data=None):
+        show_uri(self, "ghelp:%s" % get_help_uri())
+
+    def on_mnu_about_activate(self, widget, data=None):
+        """Display the about box for qreator."""
+        if self.AboutDialog is not None:
+            about = self.AboutDialog() # pylint: disable=E1102
+            response = about.run()
+            about.destroy()
+
+    def on_mnu_preferences_activate(self, widget, data=None):
+        """Display the preferences window for qreator."""
+
+        """ From the PyGTK Reference manual
+           Say for example the preferences dialog is currently open,
+           and the user chooses Preferences from the menu a second time;
+           use the present() method to move the already-open dialog
+           where the user can see it."""
+        if self.preferences_dialog is not None:
+            logger.debug('show existing preferences_dialog')
+            self.preferences_dialog.present()
+        elif self.PreferencesDialog is not None:
+            logger.debug('create new preferences_dialog')
+            self.preferences_dialog = self.PreferencesDialog() # pylint: disable=E1102
+            self.preferences_dialog.connect('destroy', self.on_preferences_dialog_destroyed)
+            self.preferences_dialog.show()
+        # destroy command moved into dialog to allow for a help button
+
     def on_mnu_close_activate(self, widget, data=None):
         """Signal handler for closing the QreatorWindow."""
         self.destroy()
@@ -85,3 +115,15 @@
         # Clean up code for saving application state should be added here.
         Gtk.main_quit()
 
+    def on_preferences_changed(self, settings, key, data=None):
+        logger.debug('preference changed: %s = %s' % (key, str(settings.get_value(key))))
+
+    def on_preferences_dialog_destroyed(self, widget, data=None):
+        '''only affects gui
+        
+        logically there is no difference between the user closing,
+        minimising or ignoring the preferences dialog'''
+        logger.debug('on_preferences_dialog_destroyed')
+        # to determine whether to create or present preferences_dialog
+        self.preferences_dialog = None
+
 
=== modified file 'qreator_lib/__init__.py'
--- qreator_lib/__init__.py	2012-05-19 14:45:57 +0000
+++ qreator_lib/__init__.py	2012-10-28 16:08:21 +0000
@@ -14,6 +14,8 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
+### DO NOT EDIT THIS FILE ###
+
 '''facade - makes qreator_lib package easy to refactor
 
 while keeping its api constant'''
 
=== modified file 'qreator_lib/helpers.py'
--- qreator_lib/helpers.py	2012-05-28 09:38:22 +0000
+++ qreator_lib/helpers.py	2012-10-28 16:08:21 +0000
@@ -14,6 +14,8 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
+### DO NOT EDIT THIS FILE ###
+
 """Helpers for an Ubuntu application."""
 import logging
 import os
@@ -21,11 +23,12 @@
 from . qreatorconfig import get_data_file
 from . Builder import Builder
 
+from locale import gettext as _
 
 def get_builder(builder_file_name):
     """Return a fully-instantiated Gtk.Builder instance from specified ui 
     file
-
+    
     :param builder_file_name: The name of the builder file, without extension.
         Assumed to be in the 'ui' directory under the data path.
     """
@@ -46,22 +49,19 @@
     if not os.path.exists(media_filename):
         media_filename = None
 
-    return media_filename
-
+    return "file:///"+media_filename
 
 class NullHandler(logging.Handler):
     def emit(self, record):
         pass
 
-
 def set_up_logging(opts):
     # add a handler to prevent basicConfig
     root = logging.getLogger()
     null_handler = NullHandler()
     root.addHandler(null_handler)
 
-    formatter = logging.Formatter(
-        "%(levelname)s:%(name)s: %(funcName)s() '%(message)s'")
+    formatter = logging.Formatter("%(levelname)s:%(name)s: %(funcName)s() '%(message)s'")
 
     logger = logging.getLogger('qreator')
     logger_sh = logging.StreamHandler()
@@ -80,7 +80,6 @@
     if opts.verbose > 1:
         lib_logger.setLevel(logging.DEBUG)
 
-
 def get_help_uri(page=None):
     # help_uri from source tree - default language
     here = os.path.dirname(__file__)
@@ -96,13 +95,11 @@
 
     return help_uri
 
-
 def show_uri(parent, link):
-    from gi.repository import Gtk  # pylint: disable=E0611
+    from gi.repository import Gtk # pylint: disable=E0611
     screen = parent.get_screen()
     Gtk.show_uri(screen, link, Gtk.get_current_event_time())
 
-
 def alias(alternative_function_name):
     '''see http://www.drdobbs.com/web-development/184406073#l9'''
     def decorator(function):
 
=== modified file 'qreator_lib/qreatorconfig.py'
--- qreator_lib/qreatorconfig.py	2012-05-28 09:38:22 +0000
+++ qreator_lib/qreatorconfig.py	2012-10-28 16:08:21 +0000
@@ -14,10 +14,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-# THIS IS Qreator CONFIGURATION FILE
-# YOU CAN PUT THERE SOME GLOBAL VALUE
-# Do not touch unless you know what you're doing.
-# you're warned :)
+### DO NOT EDIT THIS FILE ###
 
 __all__ = [
     'project_path_not_found',
@@ -33,6 +30,7 @@
 
 import os
 
+from locale import gettext as _
 
 class project_path_not_found(Exception):
     """Raised when we can't find the project directory."""
 
=== modified file 'setup.py'
--- setup.py	2012-05-28 11:15:51 +0000
+++ setup.py	2012-10-28 16:08:21 +0000
@@ -15,7 +15,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ###########
+###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ######################
 
 import os
 import sys
@@ -27,16 +27,16 @@
     sys.exit(1)
 assert DistUtilsExtra.auto.__version__ >= '2.18', 'needs DistUtilsExtra.auto >= 2.18'
 
-
-def update_config(values = {}):
-
+def update_config(libdir, values = {}):
+
+    filename = os.path.join(libdir, 'qreator_lib/qreatorconfig.py')
     oldvalues = {}
     try:
-        fin = file('qreator_lib/qreatorconfig.py', 'r')
-        fout = file(fin.name + '.new', 'w')
+        fin = file(filename, 'r')
+        fout = file(filename + '.new', 'w')
 
         for line in fin:
-            fields = line.split(' = ')  # Separate variable from value
+            fields = line.split(' = ') # Separate variable from value
             if fields[0] in values:
                 oldvalues[fields[0]] = fields[1].strip()
                 line = "%s = %s\n" % (fields[0], values[fields[0]])
@@ -47,42 +47,92 @@
         fin.close()
         os.rename(fout.name, fin.name)
     except (OSError, IOError), e:
-        print ("ERROR: Can't find qreator_lib/qreatorconfig.py")
+        print ("ERROR: Can't find %s" % filename)
         sys.exit(1)
     return oldvalues
 
 
-def update_desktop_file(datadir):
+def move_desktop_file(root, target_data, prefix):
+    # The desktop file is rightly installed into install_data.  But it should
+    # always really be installed into prefix, because while we can install
+    # normal data files anywhere we want, the desktop file needs to exist in
+    # the main system to be found.  Only actually useful for /opt installs.
+
+    old_desktop_path = os.path.normpath(root + target_data +
+                                        '/share/applications')
+    old_desktop_file = old_desktop_path + '/qreator.desktop'
+    desktop_path = os.path.normpath(root + prefix + '/share/applications')
+    desktop_file = desktop_path + '/qreator.desktop'
+
+    if not os.path.exists(old_desktop_file):
+        print ("ERROR: Can't find", old_desktop_file)
+        sys.exit(1)
+    elif target_data != prefix + '/':
+        # This is an /opt install, so rename desktop file to use extras-
+        desktop_file = desktop_path + '/extras-qreator.desktop'
+        try:
+            os.makedirs(desktop_path)
+            os.rename(old_desktop_file, desktop_file)
+            os.rmdir(old_desktop_path)
+        except OSError as e:
+            print ("ERROR: Can't rename", old_desktop_file, ":", e)
+            sys.exit(1)
+
+    return desktop_file
+
+def update_desktop_file(filename, target_pkgdata, target_scripts):
 
     try:
-        fin = file('qreator.desktop.in', 'r')
-        fout = file(fin.name + '.new', 'w')
+        fin = file(filename, 'r')
+        fout = file(filename + '.new', 'w')
 
         for line in fin:
             if 'Icon=' in line:
-                line = "Icon=%s\n" % (datadir + 'media/qreator.svg')
+                line = "Icon=%s\n" % (target_pkgdata + 'media/qreator.svg')
+            elif 'Exec=' in line:
+                cmd = line.split("=")[1].split(None, 1)
+                line = "Exec=%s" % (target_scripts + 'qreator')
+                if len(cmd) > 1:
+                    line += " %s" % cmd[1].strip()  # Add script arguments back
+                line += "\n"
             fout.write(line)
         fout.flush()
         fout.close()
         fin.close()
         os.rename(fout.name, fin.name)
     except (OSError, IOError), e:
-        print ("ERROR: Can't find qreator.desktop.in")
+        print ("ERROR: Can't find %s" % filename)
         sys.exit(1)
 
+def compile_schemas(root, target_data):
+    if target_data == '/usr/':
+        return  # /usr paths don't need this, they will be handled by dpkg
+    schemadir = os.path.normpath(root + target_data + 'share/glib-2.0/schemas')
+    if (os.path.isdir(schemadir) and
+            os.path.isfile('/usr/bin/glib-compile-schemas')):
+        os.system('/usr/bin/glib-compile-schemas "%s"' % schemadir)
+
 
 class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
     def run(self):
-        values = {'__qreator_data_directory__': "'%s'" % (self.prefix + '/share/qreator/'),
+        DistUtilsExtra.auto.install_auto.run(self)
+
+        target_data = '/' + os.path.relpath(self.install_data, self.root) + '/'
+        target_pkgdata = target_data + 'share/qreator/'
+        target_scripts = '/' + os.path.relpath(self.install_scripts, self.root) + '/'
+
+        values = {'__qreator_data_directory__': "'%s'" % (target_pkgdata),
                   '__version__': "'%s'" % self.distribution.get_version()}
-        previous_values = update_config(values)
-        update_desktop_file(self.prefix + '/share/qreator/')
-        DistUtilsExtra.auto.install_auto.run(self)
-        update_config(previous_values)
-
-##############################################################################
-###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ##################
-##############################################################################
+        update_config(self.install_lib, values)
+
+        desktop_file = move_desktop_file(self.root, target_data, self.prefix)
+        update_desktop_file(desktop_file, target_pkgdata, target_scripts)
+        compile_schemas(self.root, target_data)
+
+        
+#########################################################################################
+###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW #############################
+#########################################################################################
 
 DistUtilsExtra.auto.setup(
     name='qreator',