[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/plasma/applets/presence
From:       Abner Silva <abner.silva () kdemail ! net>
Date:       2009-07-22 23:16:25
Message-ID: 1248304585.259695.10353.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1001342 by abnerf:

Merge branch 'new-presence'

Conflicts:
	accountwidget.cpp
	presence.cpp

 M  +3 -3      accountwidget.cpp  
 M  +4 -2      presence.cpp  


--- trunk/playground/base/plasma/applets/presence/accountwidget.cpp #1001341:1001342
@@ -50,9 +50,9 @@
       m_presenceStatus(0)
 {
     init();
-    setMinimumHeight(40);
-    setMinimumWidth(120);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+    setMinimumHeight(75);
+    setMinimumWidth(250);
+    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 }
 
 AccountWidget::~AccountWidget()
--- trunk/playground/base/plasma/applets/presence/presence.cpp #1001341:1001342
@@ -49,7 +49,7 @@
     setBackgroundHints(StandardBackground);
     setAspectRatioMode(IgnoreAspectRatio);
     //setHasConfigurationInterface(true);
-    setPassivePopup(false);
+    setPassivePopup(true);
 
     setPopupIcon("user-offline");
 
@@ -90,6 +90,8 @@
     if (!m_widget) {
         m_widget = new QGraphicsWidget(this);
         m_layout = new QGraphicsLinearLayout(Qt::Vertical, m_widget);
+        m_layout->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        m_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
         m_widget->setLayout (m_layout);
     }
 
@@ -105,9 +107,9 @@
         account->setId(source);
         connect(account, SIGNAL(presenceChanged(const QString&, const QString&)),
                 this, SLOT(onPresenceChanged(const QString&, const QString&)));
-        m_layout->addItem(account);
         m_accounts[source] = account;
         m_engine->connectSource(source, this);
+        m_layout->addItem(account);
     }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]