~thomas-deruyter-3/qreator/qreator

« back to all changes in this revision

Viewing changes to data/ui/QrCodeLocation.ui

  • Committer: David Planella
  • Date: 2012-06-02 09:17:40 UTC
  • mfrom: (81.1.2 qreator_bug1006630)
  • Revision ID: david.planella@ubuntu.com-20120602091740-3rbrviz5mqb1dre6
Merged lp:~stefan-schwarzburg/qreator/qreator:

* Fixes lp:1006630 'Resize QR input widgets'
* Additional changes to merge proposal:
  * Added Stefan Schwarzburg to autors credits
  * Added margins to qr_input box
  * Disabled automatic resizing of QR code

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
    <property name="visible">True</property>
6
6
    <property name="can_focus">False</property>
7
7
    <child>
8
 
      <placeholder/>
9
 
    </child>
10
 
    <child>
11
8
      <object class="GtkExpander" id="expander1">
12
9
        <property name="can_focus">True</property>
13
10
        <property name="margin_top">6</property>
106
103
        <property name="height">1</property>
107
104
      </packing>
108
105
    </child>
 
106
    <child>
 
107
      <placeholder/>
 
108
    </child>
109
109
  </object>
110
110
</interface>