[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bkamoso/2=2E0=5D_src=3A_Added_sizeHint_and_set_minim?=
From: Alex Fiestas <afiestas () kde ! org>
Date: 2011-02-09 20:04:35
Message-ID: 20110209200435.84416A609B () git ! kde ! org
[Download RAW message or body]
Git commit 58c8a23b727f85708af95e8a6addc6c1e1358b7d by Alex Fiestas.
Committed on 09/02/2011 at 21:04.
Pushed by afiestas into branch '2.0'.
Added sizeHint and set minimum to 320x240
M +4 -4 src/mainWidget.ui
M +5 -0 src/webcamwidget.cpp
M +1 -1 src/webcamwidget.h
http://commits.kde.org/kamoso/58c8a23b727f85708af95e8a6addc6c1e1358b7d
diff --git a/src/mainWidget.ui b/src/mainWidget.ui
index c1b409a..57343df 100644
--- a/src/mainWidget.ui
+++ b/src/mainWidget.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>623</width>
- <height>540</height>
+ <width>322</width>
+ <height>430</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -78,8 +78,8 @@
</property>
<property name="minimumSize">
<size>
- <width>533</width>
- <height>350</height>
+ <width>320</width>
+ <height>240</height>
</size>
</property>
<property name="maximumSize">
diff --git a/src/webcamwidget.cpp b/src/webcamwidget.cpp
index 4b3034d..8499a2e 100644
--- a/src/webcamwidget.cpp
+++ b/src/webcamwidget.cpp
@@ -242,6 +242,11 @@ void WebcamWidget::photoGstCallback(QGst::BufferPtr buffer, \
QGst::PadPtr)
QGlib::disconnect(d->m_bin->getElementByName("fakesink"), "handoff", this, \
&WebcamWidget::photoGstCallback); }
+QSize WebcamWidget::sizeHint() const
+{
+ return QSize(533, 350);
+}
+
void WebcamWidget::fileSaved(KJob *job)
{
KIO::CopyJob *copy = static_cast<KIO::CopyJob *>(job);
diff --git a/src/webcamwidget.h b/src/webcamwidget.h
index aecc953..4afcc29 100644
--- a/src/webcamwidget.h
+++ b/src/webcamwidget.h
@@ -41,7 +41,7 @@ public:
~WebcamWidget();
void photoGstCallback(QGst::BufferPtr buffer, QGst::PadPtr pad);
-
+ virtual QSize sizeHint() const;
public Q_SLOTS:
void playFile(const Device& device);
bool takePhoto(const KUrl &dest);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic