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

[Schwarzburg]

This branch implements the three data formats: SMS, MMS and tel (call).

The data format is not standardized (see https://code.google.com/p/zxing/wiki/BarcodeContents), but it seems that the chosen format: SMSTO:<number>:<message> is the most used format.

I'm open to all suggestions (including a different icon or separating the "tel" type from the "SMS" and "MMS".

A minor bug fix is included in this branch: adding QR Code types increases the main window height, but this can be fixed a simple line that hides the individual windows before adding them to the main window. I can of cause separate this little fix in a different branch.

When you have reviewed the branches, you might want to ask me to get the branches up to date with trunk after each merge...

[David Planella (dpm)]

Thanks again for this feature!

I'm planning to do the thorough review that it deserves, but for now, after having tested if from a user point of view (i.e. not having looked at the code yet), here are a few things that I've noticed:

- The Call/SMS/MMS dropdown needs a label on the right, to keep consistency with the other code type layouts (e.g. VCard, Wifi, etc) and not leave an empty space. It could simply be "Type:" for example.
- The extra space for the exclamation sign next to the 'Message:' text box in the 'SMS:' or 'MMS:' types should be taken into account in the 'Call:' type, so that when switching from one type to another we don't have widget sizes moving around. In fact, it should either be put inside the textbox, or next to it on the right, as we do with the VCard code
- The exclamation mark icon should be the same one as we use for the VCard code
- I could not manage to make the exclamation mark go away in the 'SMS:' type, even after having entered a correct phone number and message
- [Optional] we should probably only allow numbers and the '+' sign in the Number text box
- [Optional, discussion] shall we have a multi-line textbox to enter the message in SMS?
- [Optional, discussion] I could not see any noticeable difference between the SMS and MMS types. Do you think we really need MMS?, do people still use them?

review: Needs Fixing

[David Planella (dpm)]

Also, if it's not too much trouble, would you mind, as you're suggesting, separating the window height bug into a dedicated branch?

I don't mind minor unrelated fixes to be put in feature branches, but this particular one, as it's got to do with window sizing, which I remember to be a bit of a nightmare for Qreator in GTK, I'd like to keep track of.

Thanks!

[Schwarzburg (stefan-schwarzburg)]

I'll add the "Type:" label.

The space is good as well.

Explamation mark icon will be changed.

Very good point with the MMS :-) I never used them. So I'll remove them.

the number box should allow all signs that locale phone numbers have. I have looked at a great library https://code.google.com/p/libphonenumber/ which is sadly not available for Ubuntu... But the goal would be: if someone from Germany enters a typical German number: "07473 / 123456", this should be allowed and converted into an international format ([phone]). This could be done by the library I mentioned, but getting it into Ubuntu is a lot of work.
So maybe until this can be done, we should restrict to numbers and +

Multiline message box is fine, do you think a numbers counter would be imporant (e.g. "137 [3 letters left]")?

The exclamation mark: I think it necessary to inform the user that if a message is entered, many QR Code scanners will behave badly. On many, it will not work at all (even the phonenumber will be useless then).
SO my question to you would be: how is this best communicated to the user and if by a message dialog, should the sign disappear after the user has read the warning?

[David Planella (dpm)]

Al 09/11/12 14:18, En/na Schwarzburg ha escrit:
> I'll add the "Type:" label.
>
> The space is good as well.
>
> Explamation mark icon will be changed.
>
> Very good point with the MMS :-) I never used them. So I'll remove them.
>

Ack, thanks.

> the number box should allow all signs that locale phone numbers have. I have looked at a great library https://code.google.com/p/libphonenumber/ which is sadly not available for Ubuntu... But the goal would be: if someone from Germany enters a typical German number: "07473 / 123456", this should be allowed and converted into an international format ([phone]). This could be done by the library I mentioned, but getting it into Ubuntu is a lot of work.
> So maybe until this can be done, we should restrict to numbers and +
>

I agree, let's keep the scope down for now.

> Multiline message box is fine, do you think a numbers counter would be imporant (e.g. "137 [3 letters left]")?
>

Ah, yeah, good idea, this might be a nice feature.

> The exclamation mark: I think it necessary to inform the user that if a message is entered, many QR Code scanners will behave badly. On many, it will not work at all (even the phonenumber will be useless then).
> SO my question to you would be: how is this best communicated to the user and if by a message dialog, should the sign disappear after the user has read the warning?
>

Ah, gotcha, I understand it now. A quick question first: assuming we're
restricting the target QR scanners to the most popular ones (e.g.
QrDroid and whichever popular app they use on the iPhone) - if we find
out that they support the non-standard SMS code, do you still think that
we should show a message?

If you still think so, then my suggestion would be to show the message
in a manner that it's visible but does not get in the way. For example:

1. Inside the text box: [Message. WARNING not all code readers might
support it]
2. Additionally, an exclamation mark icon inside the textbox that goes
away as soon as you type. I know single-line text boxes support it, not
sure about the multi-line ones, though.

I'd be up for keeping it lightweight, as users tend to freak out when
they see warning signs and exclamation marks :)

Let me know what you think.

[Schwarzburg (stefan-schwarzburg)]

As for the message:
- I have a N900 (with Debian based Maemo OS)
- I have access to an iPhone, where I installed 12 free QR scanners for testing purposes

If you have access to an android phone, we might be able to determine how often the format

SMSTO:<number>:<message>

fails.

- I have also tested 20 freely available online QR Code creaters, which allow the message type. All of them use this format. But I forgot to count the number of creators I found which only support sms:<number>. Probably about 5.

What do you think?

[David Planella (dpm)]

Sounds good, I'll add the results of my experiments with Android too.

In the meantime, and as with the other MP, would you mind resubmitting it against the qreator-hackers branch? Thanks!

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

134. By Schwarzburg on 2012-11-11

try to import libphonenumbers

135. By Schwarzburg on 2012-11-11

merged with lates trunk

136. By Schwarzburg on 2012-11-11

updated the new phone type to the refactored qrcode type system

137. By Schwarzburg on 2012-11-11

updated glade file

138. By Schwarzburg on 2012-11-11

removed the tools file; added phone option to the desktop file

139. By Schwarzburg on 2012-11-11

changed the entry to a multiline textview

140. By Schwarzburg on 2012-11-11

working placeholder text for textview; still wrong color though

141. By Schwarzburg on 2012-11-11

blocked handlers when placeholders text is reinserted or message type is changed without message or number

142. By Schwarzburg on 2012-11-11

restrict phonenumber to + and digits

143. By Schwarzburg on 2012-11-11

cleanup of unused code

144. By Schwarzburg on 2012-11-11

fixed another update bug

145. By Schwarzburg on 2012-11-12

added the clear entry icon to the number field

146. By Schwarzburg on 2012-11-12

merged with latest trunk

147. By Schwarzburg on 2012-11-22

merged davids changes

148. By Schwarzburg on 2012-11-22

replaced the last occurence of SMS with 'Text Message'

149. By Schwarzburg on 2012-11-22

made qrcode/QRCodeSMS*.py pep8 complient and removed pylint errors and warnings

150. By Schwarzburg on 2012-11-22

merged with latest trunk

151. By Schwarzburg on 2012-11-22

added short translator guides

Unmerged revisions

151. By Schwarzburg on 2012-11-22

added short translator guides

150. By Schwarzburg on 2012-11-22

merged with latest trunk

149. By Schwarzburg on 2012-11-22

made qrcode/QRCodeSMS*.py pep8 complient and removed pylint errors and warnings

148. By Schwarzburg on 2012-11-22

replaced the last occurence of SMS with 'Text Message'

147. By Schwarzburg on 2012-11-22

merged davids changes

146. By Schwarzburg on 2012-11-12

merged with latest trunk

145. By Schwarzburg on 2012-11-12

added the clear entry icon to the number field

144. By Schwarzburg on 2012-11-11

fixed another update bug

143. By Schwarzburg on 2012-11-11

cleanup of unused code

142. By Schwarzburg on 2012-11-11

restrict phonenumber to + and digits

=== modified file '.quickly'
--- .quickly	2012-05-28 11:05:50 +0000
+++ .quickly	2012-10-30 18:41:18 +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-30 18:41:18 +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()

=== added file 'data/media/sms.png'
Binary files data/media/sms.png	1970-01-01 00:00:00 +0000 and data/media/sms.png	2012-10-30 18:41:18 +0000 differ
=== added file 'data/media/sms.svg'
--- data/media/sms.svg	1970-01-01 00:00:00 +0000
+++ data/media/sms.svg	2012-10-30 18:41:18 +0000
@@ -0,0 +1,119 @@
+<?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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   width="64"
+   height="64"
+   sodipodi:docname="sms.svg"
+   inkscape:export-filename="/home/schwarz/Projects/Qreator/qreator_sms/data/media/sms.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata8">
+    <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>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="2.6074563"
+     inkscape:cx="-58.933414"
+     inkscape:cy="17.187981"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.99249995000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="path3926"
+     sodipodi:cx="-152.44742"
+     sodipodi:cy="7.8149738"
+     sodipodi:rx="20.518082"
+     sodipodi:ry="17.066441"
+     d="m -131.92934,7.8149738 a 20.518082,17.066441 0 1 1 -41.03616,0 20.518082,17.066441 0 1 1 41.03616,0 z"
+     transform="matrix(1.4807658,0,0,1.7802466,257.73892,18.08742)" />
+  <path
+     style="fill:#dd4814;fill-opacity:1;stroke:none"
+     d="M 32,4e-8 C 20.68115,4e-8 10.75154,5.8813601 5.0624999,14.75 l 21.9687501,0 c 0.90143,0 1.625,0.623814 1.625,1.375 l 0,42.03125 c 0,0.751186 -0.72357,1.34375 -1.625,1.34375 L 15.625,59.5 C 20.41587,62.359411 26.01528,64 32,64 49.673109,64 64,49.67311 64,32 64,14.326887 49.673109,4e-8 32,4e-8 z M 1.8124998,21.375 C 0.64061985,24.702084 -1.5e-7,28.272078 -1.5e-7,32 c 0,3.725289 0.6422,7.29991 1.81249995,10.625 l 0,-21.25 z"
+     id="path2987"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#dd4814;fill-opacity:1;stroke:none"
+     d="m 5.66702,18.440675 18.98305,0 c 0.90143,0 1.62712,0.78743 1.62712,1.765537 l 0,30.367235 c 0,0.978107 -0.72569,1.765536 -1.62712,1.765536 l -18.98305,0 c -0.90142,0 -1.62712,-0.787429 -1.62712,-1.765536 l 0,-30.367235 c 0,-0.978107 0.7257,-1.765537 1.62712,-1.765537 z"
+     id="rect3759" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#dd4814;fill-opacity:1;stroke:none"
+     d="m 21.53142,16.677966 c 0,0.299544 -2.85324,0.542373 -6.37288,0.542373 -3.51965,0 -6.37288,-0.242829 -6.37288,-0.542373 0,-0.299544 2.85323,-0.542373 6.37288,-0.542373 3.51964,0 6.37288,0.242829 6.37288,0.542373 z"
+     id="path3761-2" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#dd4814;fill-opacity:1;stroke:none"
+     d="m 13.80261,53.152542 2.71187,0 c 0.90142,0 1.62712,0.787429 1.62712,1.765536 l 0,1.62147 c 0,0.978107 -0.7257,1.765536 -1.62712,1.765536 l -2.71187,0 c -0.90142,0 -1.62712,-0.787429 -1.62712,-1.765536 l 0,-1.62147 c 0,-0.978107 0.7257,-1.765536 1.62712,-1.765536 z"
+     id="rect3781" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 20.677967,21.864405 32.271187,0 0,20.338983 -32.271187,0 z"
+     id="rect3795"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#dd4814;stroke-width:1.99249995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 20.737831,21.924265 16.71,11.066721 15.37367,-11.003611"
+     id="path3797"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#dd4814;stroke-width:1.99249995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="M 20.671149,42.142414 33.430555,31.077924"
+     id="path3799"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#dd4814;stroke-width:1.99249995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="M 52.606159,41.860391 40.953172,30.817574"
+     id="path3801"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 28.077497,9.009053 c 0,0 2.368569,-0.579447 5.033641,1.965518 2.665072,2.544964 1.965517,5.417157 1.965517,5.417157"
+     id="path3803"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="czc" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1.65370095px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 29.561382,3.508059 c 0,0 3.785323,-0.9915414 8.044504,3.3633638 4.259179,4.3549052 3.141186,9.2697582 3.141186,9.2697582"
+     id="path3803-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="czc" />
+</svg>

=== added file 'data/ui/QrCodeSMS.ui'
--- data/ui/QrCodeSMS.ui	1970-01-01 00:00:00 +0000
+++ data/ui/QrCodeSMS.ui	2012-10-30 18:41:18 +0000
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkGrid" id="qr_code_sms">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkEntry" id="entryText">
+        <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="invisible_char">•</property>
+        <property name="invisible_char_set">True</property>
+        <property name="placeholder_text">[prefilled message text]</property>
+        <signal name="changed" handler="on_entryText_changed" swapped="no"/>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">2</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="boxMessage">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkLabel" id="labelMessage">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Message: </property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEventBox" id="eventboxmessage">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <signal name="button-press-event" handler="on_eventboxmessage_press_event" swapped="no"/>
+            <child>
+              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="yalign">0.50999999046325684</property>
+                <property name="xpad">4</property>
+                <property name="stock">gtk-dialog-warning</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">2</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">Number: </property>
+      </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="GtkEntry" id="entryNumber">
+        <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="invisible_char">•</property>
+        <property name="invisible_char_set">True</property>
+        <property name="placeholder_text">[phone number (international format)]</property>
+        <signal name="changed" handler="on_entryNumber_changed" swapped="no"/>
+      </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>
+    <child>
+      <object class="GtkComboBoxText" id="comboboxType">
+        <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="left_attach">1</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+</interface>

=== modified file 'qreator/QreatorWindow.py'
--- qreator/QreatorWindow.py	2012-06-24 07:59:42 +0000
+++ qreator/QreatorWindow.py	2012-10-30 18:41:18 +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
@@ -119,6 +119,7 @@
         from qrcodes.QRCodeLocation import QRCodeLocation
         from qrcodes.QRCodeWifi import QRCodeWifi
         from qrcodes.QRCodeVCard import QRCodeVCard
+        from qrcodes.QRCodeSMS import QRCodeSMS
         try:
             from qrcodes.QRCodeSoftwareCenterApp import \
                 QRCodeSoftwareCenterApp
@@ -139,10 +140,12 @@
         self.qr_types.append(
             QRCodeVCard(self.update_qr_code, 'vcard.png',
                 _('Business card'), 4))
+        self.qr_types.append(
+            QRCodeSMS(self.update_qr_code, 'sms.png', _('Call & SMS'), 5))
         if use_usc_qr_type:
             self.qr_types.append(
                 QRCodeSoftwareCenterApp(self.update_qr_code,
-                    'softwarecentre.png', _('Ubuntu Software Center app'), 5))
+                    'softwarecentre.png', _('Ubuntu Software Center app'), 6))
 
         self.qr_types_store = Gtk.ListStore(str, GdkPixbuf.Pixbuf, int)
         # ^ desc, icon, id ^
@@ -155,14 +158,14 @@
         self.curr_width = 0
 
         for qr_type in self.qr_types:
+            qr_type.widget.grid.hide() # otherwise the main window gets too large!
             self.ui.qr_input_box.add(qr_type.widget.grid)
 
     def fill_qr_types_store(self):
         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-30 18:41:18 +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
 
@@ -50,6 +50,9 @@
     parser.add_option(
         "-b", "--businesscard", dest="view", action="store_const", const="vcard",
         help=UTF8_("Create a QR code for a business card"))
+    parser.add_option(
+        "-m", "--sms", dest="view", action="store_const", const="sms",
+        help=UTF8_("Create a QR code for a SMS"))
     (options, args) = parser.parse_args()
 
     set_up_logging(options)
@@ -74,8 +77,10 @@
             qr_id = 3
         elif options.view == 'vcard':
             qr_id = 4
+        elif options.view == 'sms':
+            qr_id = 5
         elif options.view == 'software':
-            qr_id = 5
+            qr_id = 6
         window.switch_qrcode_view(qr_id)
         window.ui.notebook1.set_current_page(QreatorWindow.PAGE_QR)
     Gtk.main()

=== modified file 'qreator/qrcodes/GtkHelpers.py'
--- qreator/qrcodes/GtkHelpers.py	2012-05-30 10:19:57 +0000
+++ qreator/qrcodes/GtkHelpers.py	2012-10-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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/qrcodes/QRCodeSMS.py'
--- qreator/qrcodes/QRCodeSMS.py	1970-01-01 00:00:00 +0000
+++ qreator/qrcodes/QRCodeSMS.py	2012-10-30 18:41:18 +0000
@@ -0,0 +1,32 @@
+# -*- 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
+
+from qreator.tools import get_media_path
+#from qreator_lib import QRCodeType as QRCodeType
+from QRCodeSMSGtk import QRCodeSMSGtk
+
+class QRCodeSMS(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_path(icon_path)
+        self.description = description
+        self.id = id
+
+        self.data = {'text': ''}
+        self.textdata = ''
+
+        # Create widget instance
+        self.widget = QRCodeSMSGtk(self.qr_code_update_func)

=== added file 'qreator/qrcodes/QRCodeSMSGtk.py'
--- qreator/qrcodes/QRCodeSMSGtk.py	1970-01-01 00:00:00 +0000
+++ qreator/qrcodes/QRCodeSMSGtk.py	2012-10-30 18:41:18 +0000
@@ -0,0 +1,171 @@
+# -*- 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
+
+from gi.repository import Gtk
+from qreator_lib.i18n import _
+from qreator_lib.helpers import get_data_file
+
+
+MESSAGE_TYPES = [
+    (_("Call"), "tel"),
+    (_("SMS"), "SMS"),
+    (_("MMS"), "MMS"),
+    ]
+
+
+class QRCodeSMSGtk(object):
+    def __init__(self, qr_code_update_func):
+        self.qr_code_update_func = qr_code_update_func
+        self.builder = Gtk.Builder()
+
+        self.builder.add_from_file(
+            get_data_file('ui', '%s.ui' % ('QrCodeSMS',)))
+        self.grid = self.builder.get_object('qr_code_sms')
+
+        self.messagecombo = self.builder.get_object('comboboxType')
+        for t in MESSAGE_TYPES:
+            self.messagecombo.append_text(t[0])
+        self.messagecombo.set_active(0)
+        self.messagecombo.connect("changed", self.on_comboboxType_changed, None)
+
+        self.text = self.builder.get_object('entryText')
+        self.text.connect("changed", self.on_entryText_changed, None)
+
+        # tel is the default message type
+        self.text.hide()
+        self.builder.get_object('boxMessage').hide()
+
+        self.number = self.builder.get_object('entryNumber')
+        self.number.connect("changed", self.on_entryNumber_changed, None)
+
+        self.builder.get_object('eventboxmessage').connect("button-press-event", self.on_eventboxmessage_press_event, None)
+
+    def on_activated(self):
+        pass
+
+    def on_comboboxType_changed(self, widget, data=None):
+        if not MESSAGE_TYPES[widget.get_active()][1] == "tel":
+            self.text.show()
+            self.builder.get_object('boxMessage').show()
+        else:
+            self.text.hide()
+            self.builder.get_object('boxMessage').hide()
+        self.on_entryText_changed(self.text)
+
+    def on_entryNumber_changed(self, widget, data=None):
+        self.on_entryText_changed(self.text)
+
+    def on_entryText_changed(self, widget, data=None):
+        # The SMS data format is not standardized.
+        # Possible formats are:
+        # sms:number
+        # smsto:number
+        # sms:number:message
+        # smsto:number:message
+        # sms:number?body=message
+
+        # the same with capital SMS or SMSTO
+
+        # Comparison of data formats used by other QR Code creators
+
+        # http://qrcode.notixtech.com/
+        # smsto:<number>:<message>
+
+        # http://www.i-nigma.com/CreateBarcodes.html
+        # SMSTO:<number>:<message>
+
+        # http://www.azonmedia.com/en/qrcode-generator
+        # SMSTO:<number>:<message>
+
+        # http://www.mqr.kr/generate/sms/
+        # smsto:<number>:<message>
+
+        # http://www.unitaglive.com/qrcode
+        # SMSTO:<number>:<message>
+
+        # http://www.sparqcode.com/static/maestro
+        # SMSTO:<number>:<message>
+
+        # http://www.qrzilla.com/
+        # smsto:<number>:<message>
+
+        # https://zxing.appspot.com/generator/
+        # smsto:<number>:<message>
+
+        # http://delivr.com/qr-code-generator
+        # smsto:<number>:<message>
+
+        # http://www.snapmaze.com/
+        # SMSTO:<number>:<message>
+
+        # http://app.qreateandtrack.com/#/create/phonesms
+        # sms:<number>:<message>
+
+        # http://www.esponce.com/
+        # SMSTO:<number>:<message>
+
+        # http://www.onlineqrlab.com/
+        # sms:<number>:<message>
+
+        # http://goqr.me/
+        # SMSTO:<number>:<message>
+
+        # http://blog.qr4.nl/QR-Code-SMS.aspx
+        # SMSTO:<number>:<message>
+
+        # http://beqrious.com/qr-code-generator/
+        # smsto:<number>:<message>
+
+        # http://demo.j-plant.com/qrcode-plant.html#type_sms
+        # smsto:<number>:<message>
+
+        # http://qrcode.kaywa.com/
+        # SMSTO:<number>:<message>
+
+        # http://yourfreeqrcode.com/sms.php
+        # smsto:<number>:<message>
+
+        # http://keremerkan.net/qr-code-and-2d-code-generator/
+        # SMSTO:<number>:<message>
+
+        # => we should probably go with SMSTO:number:message
+
+        ty = MESSAGE_TYPES[self.builder.get_object('comboboxType').get_active()][1]
+        n = self.builder.get_object('entryNumber').get_text()
+        te = widget.get_text()
+        if ty == "tel" or te == "":
+            self.qr_code_update_func("{0}:{1}".format(ty, n))
+        else:
+            self.qr_code_update_func("{0}:{1}:{2}".format(ty, n, te))
+
+    def on_eventboxmessage_press_event(self, widget, event, data=None):
+        print widget, event, data
+        dialog = Gtk.MessageDialog(
+            message_type=Gtk.MessageType.INFO,
+            buttons=Gtk.ButtonsType.OK,
+            message_format="Not all QR Code readers can handle SMS codes with message!")
+        dialog.format_secondary_text(
+        """Some QR Code readers accept SMS with predefined message, while others might either ignore the text or get the whole data wrong.
+
+The format Qreator uses is:
+
+SMSTO:<phone number>:<message>
+
+or
+
+SMSTO:<phone number>.""")
+        dialog.run()
+        dialog.destroy()

=== modified file 'qreator/qrcodes/QRCodeSoftwareCenterApp.py'
--- qreator/qrcodes/QRCodeSoftwareCenterApp.py	2012-05-30 08:33:06 +0000
+++ qreator/qrcodes/QRCodeSoftwareCenterApp.py	2012-10-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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/QRCodeVCard.py'
--- qreator/qrcodes/QRCodeVCard.py	2012-06-02 08:59:55 +0000
+++ qreator/qrcodes/QRCodeVCard.py	2012-10-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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-30 18:41:18 +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',