← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/conf/dlgvideobase.ui

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/conf/dlgvideobase.ui
105
105
        </item>
106
106
       </layout>
107
107
      </item>
108
 
      <item row="0" column="1">
109
 
       <widget class="VideoWidget" name="m_pPreviewGV" native="true">
110
 
        <property name="minimumSize">
111
 
         <size>
112
 
          <width>40</width>
113
 
          <height>40</height>
114
 
         </size>
115
 
        </property>
116
 
       </widget>
117
 
      </item>
118
 
      <item row="1" column="1">
119
 
       <widget class="QPushButton" name="m_pPreviewPB">
120
 
        <property name="text">
121
 
         <string>Start preview</string>
122
 
        </property>
123
 
       </widget>
124
 
      </item>
125
108
     </layout>
126
109
    </widget>
127
110
   </item>
128
111
   <item>
 
112
    <widget class="VideoWidget2" name="m_pPreviewGV" native="true">
 
113
     <property name="minimumSize">
 
114
      <size>
 
115
       <width>40</width>
 
116
       <height>40</height>
 
117
      </size>
 
118
     </property>
 
119
    </widget>
 
120
   </item>
 
121
   <item>
 
122
    <widget class="QPushButton" name="m_pPreviewPB">
 
123
     <property name="text">
 
124
      <string>Start preview</string>
 
125
     </property>
 
126
    </widget>
 
127
   </item>
 
128
   <item>
129
129
    <spacer name="verticalSpacer">
130
130
     <property name="orientation">
131
131
      <enum>Qt::Vertical</enum>
142
142
 </widget>
143
143
 <customwidgets>
144
144
  <customwidget>
145
 
   <class>VideoWidget</class>
 
145
   <class>KComboBox</class>
 
146
   <extends>QComboBox</extends>
 
147
   <header>kcombobox.h</header>
 
148
  </customwidget>
 
149
  <customwidget>
 
150
   <class>VideoWidget2</class>
146
151
   <extends>QWidget</extends>
147
 
   <header>widgets/videowidget.h</header>
 
152
   <header>widgets/videowidget2.h</header>
148
153
   <container>1</container>
149
154
  </customwidget>
150
155
 </customwidgets>