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

[Schwarzburg]

The Notebook that was used to place the different QRCode widgets in did not resize itself, even with a solution that used hide/show on the not-used widgets.

A alternative to the Notebook is a Box with ALL QRCode widgets in them, but only the currently active is shown (all others are hidden).

[David Planella (dpm)]

Thanks a lot!

I like the approach, which is quite similar to what I did in rev 74 already before switching to a notebook widget, and much cleaner. I'd be happy to merge. However, after trying it, it seems to either have brought a regression or trigger a couple of issues that were already present in the code:

* When launching the application:
  - The main window doe not longer have a maximize button
  - The main window height is quite big and cannot be changed (see below). It's off-screen on my laptop.
  - The main window can only be resized horizontally, but not vertically

Oddly enough, these issues resolve when clicking on one of the QR type buttons and going back to the "New" screen.

Here is a short video that illustrates the issues [1]. Any ideas as to what could be causing it?

[1]: http://ubuntuone.com/4tNSAhnTU8EPoEirzTzGrZ

review: Needs Information

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

83. By Schwarzburg on 2012-06-02

Remove the height request from the qrcode widget and make the qrcode size adaptable.

This solves the height problem and the not-maximazable window problem.

[David Planella (dpm)]

Thanks a lot for the new revision, you rock!

I've merged it with some minor changes:

- Added margins to the qr_input box
- Added you to the authors credits
- Disabled automatic resizing of QR codes for now (*)

I also have a couple of questions:

- Looking at the diffs for 'data/ui/QrCodeLocation.ui', and 'data/ui/QrCodeSoftwareCentreApp.ui', what is the function of the placeholders?
- Why was the placeholder added in one case and removed in the other?

(*) While I like the 'organic' feel of the automatic QR code resizing you are proposing, for now I'd prefer to have the user always expect a fixed size, and not have to rely on resizing the window to resize the QR code.

Eventually I want to add '+' and '-' buttons and keyboard shortcuts to increase or decrease the QR code at the user's request (and increase the size of the drawing area when the QR code is too big), but until that is implemented, I prefer to stay on fixed sizes.

review: Approve

[Schwarzburg (stefan-schwarzburg)]

As for the placeholders, I have no idea. They were not put there on purpose by me, but maybe they have been automatically added/removed by glade during the changes.

=== modified file 'data/ui/QrCodeLocation.ui'
--- data/ui/QrCodeLocation.ui	2012-05-30 08:33:06 +0000
+++ data/ui/QrCodeLocation.ui	2012-06-02 07:25:21 +0000
@@ -5,9 +5,6 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <placeholder/>
-    </child>
-    <child>
       <object class="GtkExpander" id="expander1">
         <property name="can_focus">True</property>
         <property name="margin_top">6</property>
@@ -106,5 +103,8 @@
         <property name="height">1</property>
       </packing>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>

=== modified file 'data/ui/QrCodeSoftwareCentreApp.ui'
--- data/ui/QrCodeSoftwareCentreApp.ui	2012-05-30 09:21:02 +0000
+++ data/ui/QrCodeSoftwareCentreApp.ui	2012-06-02 07:25:21 +0000
@@ -20,8 +20,5 @@
         <property name="height">1</property>
       </packing>
     </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>

=== modified file 'data/ui/QreatorWindow.ui'
--- data/ui/QreatorWindow.ui	2012-05-30 08:33:06 +0000
+++ data/ui/QreatorWindow.ui	2012-06-02 07:25:21 +0000
@@ -457,7 +457,6 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkDrawingArea" id="qr_drawingarea">
-                    <property name="height_request">350</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_left">12</property>
@@ -543,15 +542,13 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkNotebook" id="qr_input_notebook">
+                  <object class="GtkBox" id="qr_input_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin_left">12</property>
-                    <property name="margin_right">12</property>
-                    <property name="margin_top">6</property>
-                    <property name="margin_bottom">6</property>
-                    <property name="show_tabs">False</property>
-                    <property name="show_border">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>

=== modified file 'qreator/QreatorWindow.py'
--- qreator/QreatorWindow.py	2012-05-31 19:01:53 +0000
+++ qreator/QreatorWindow.py	2012-06-02 07:25:21 +0000
@@ -105,26 +105,7 @@
         self.curr_width = 0
 
         for qr_type in self.qr_types:
-            self.ui.qr_input_notebook.append_page(qr_type.widget.grid, None)
-
-        self.ui.qr_input_notebook.connect("switch-page",
-            self.on_qr_input_notebook_switch_page)
-
-    def on_qr_input_notebook_switch_page(self, widget, label, page):
-        for p in range(widget.get_n_pages()):
-            container = widget.get_nth_page(p)
-            if not p == page:
-                for c in container.get_children():
-                    try:
-                        c.hide_all()
-                    except AttributeError:
-                        c.hide()
-            else:
-                for c in container.get_children():
-                    try:
-                        c.show_all()
-                    except AttributeError:
-                        c.show()
+            self.ui.qr_input_box.add(qr_type.widget.grid)
 
     def fill_qr_types_store(self):
         self.qr_types_store.clear()
@@ -204,7 +185,11 @@
         self.qr_types[qr_id].widget.on_activated()
 
         self.ui.notebook1.set_current_page(PAGE_QR)
-        self.ui.qr_input_notebook.set_current_page(qr_id)
+
+        for child in self.ui.qr_input_box.get_children():
+            child.hide()
+        self.ui.qr_input_box.get_children()[qr_id].show()
+
 
 ##########################################
 
@@ -316,7 +301,7 @@
 
         if not text == '':
             ## Create the QR code
-            qr_code = QRCode()
+            qr_code = QRCode(output_size = int(min(width, height)*0.9))
             self.surface = qr_code.encode(text, QRCodeOutput.CAIRO_SURFACE)
 
             # Center the image in the drawing area