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

List:       kde-commits
Subject:    playground/base/plasma/applets/groupphoto
From:       Stephan Binner <binner () kde ! org>
Date:       2007-07-04 14:36:38
Message-ID: 1183559798.113006.32001.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 683285 by binner:

hidden support for aKademy 2006 group photo


 M  +1 -1      CMakeLists.txt  
 A             group-photo-2006.html  
 AM            group-photo-2006.jpg  
 M  +4 -2      groupphoto.cpp  
 M  +2 -0      groupphoto.h  


--- trunk/playground/base/plasma/applets/groupphoto/CMakeLists.txt #683284:683285
@@ -15,6 +15,6 @@
 install(FILES plasma-groupphoto-default.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
 install(FILES
-    group-photo.jpg group-photo.html
+    group-photo.jpg group-photo-2006.jpg group-photo.html group-photo-2006.html
     DESTINATION ${DATA_INSTALL_DIR}/groupphoto/)
 
** trunk/playground/base/plasma/applets/groupphoto/group-photo-2006.jpg #property \
svn:mime-type  + application/octet-stream
--- trunk/playground/base/plasma/applets/groupphoto/groupphoto.cpp #683284:683285
@@ -99,7 +99,8 @@
     m_roundCorners = cg.readEntry("roundCorners", false);
     m_pixelSize = cg.readEntry("size", 1000);
     m_rotation = cg.readEntry("rotation",0);
-    m_currentUrl = KGlobal::dirs()->findAllResources("data", "groupphoto/*.jpg")[0];
+    m_year = cg.readEntry("year", 2007);
+    m_currentUrl = KGlobal::dirs()->findAllResources("data", (m_year==2007) ? \
"groupphoto/group-photo.jp*" : "groupphoto/group-photo-2006.jp*" )[0];  m_layout = \
new Plasma::VBoxLayout(0);  m_layout->setGeometry(QRectF(0, 0, 400, 800));
     m_layout->setMargin(12);
@@ -130,7 +131,8 @@
 
 void Groupphoto::readNames()
 {
-    QFile file(KGlobal::dirs()->findAllResources("data", "groupphoto/*.html")[0]);
+    QFile file(KGlobal::dirs()->findAllResources("data", (m_year==2007) ? \
"groupphoto/group-photo.html" : "groupphoto/group-photo-2006.html")[0]); +
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
        return;
 
--- trunk/playground/base/plasma/applets/groupphoto/groupphoto.h #683284:683285
@@ -130,6 +130,8 @@
    
         QPointF m_oldPos;
         QTimer* m_timer;
+
+        int m_year;
 };
 
 K_EXPORT_PLASMA_APPLET(groupphoto, Groupphoto)


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