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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/quicklaunch
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2009-03-18 14:03:16
Message-ID: 1237384996.323701.30829.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 940930 by lappelhans:

Split out QuicklaunchLayout-files to make the code look nicer


 M  +1 -0      CMakeLists.txt  
 A             QuicklaunchLayout.cpp   [License: GPL (v2+)]
 A             QuicklaunchLayout.h   [License: GPL (v2+)]
 M  +2 -2      quicklaunchApplet.cpp  
 M  +1 -40     quicklaunchApplet.h  


--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/CMakeLists.txt \
#940929:940930 @@ -13,6 +13,7 @@
 set(plasma_applet_quicklaunch_SRCS
   quicklaunchApplet.cpp
   quicklaunchIcon.cpp
+  QuicklaunchLayout.cpp
 )
 
 kde4_add_ui_files(plasma_applet_quicklaunch_SRCS quicklaunchConfig.ui)
--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchApplet.cpp \
#940929:940930 @@ -101,7 +101,7 @@
     setLayout(m_layout);
 
     // Initialize inner layout
-    m_innerLayout = new QuicklaunchLayout(0, m_rowCount);
+    m_innerLayout = new QuicklaunchLayout(m_rowCount, this, 0);
     m_innerLayout->setContentsMargins(0, 0, 0, 0);
     m_innerLayout->setSpacing(0);
     m_layout->addItem(m_innerLayout);
@@ -241,7 +241,7 @@
         m_dialog->setAcceptDrops(true);
         //m_dialog->installEventFilter(this);
         m_dialog->setContextMenuPolicy(Qt::ActionsContextMenu);
-        m_dialogLayout = new QuicklaunchLayout(m_dialogWidget, m_dialogRowCount);
+        m_dialogLayout = new QuicklaunchLayout(m_dialogRowCount, m_dialogWidget, \
m_dialogWidget);  m_dialogWidget->setLayout(m_dialogLayout);
         refactorUi();
         m_dialog->setGraphicsWidget(m_dialogWidget);
--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchApplet.h \
#940929:940930 @@ -23,7 +23,6 @@
 #include <plasma/applet.h>
 #include <plasma/widgets/iconwidget.h>
 #include <QGraphicsLinearLayout>
-#include <QGraphicsGridLayout>
 #include <QGraphicsLayoutItem>
 #include <QList>
 #include <KIcon>
@@ -33,51 +32,13 @@
 #include "ui_quicklaunchAdd.h"
 
 #include "quicklaunchIcon.h"
+#include "QuicklaunchLayout.h"
 
 namespace Plasma
 {
     class Dialog;
 }
 
-class QuicklaunchLayout : public QGraphicsGridLayout
-{
-    public:
-        QuicklaunchLayout(QGraphicsLayoutItem *parent, int rowCount)
-         : QGraphicsGridLayout(parent), m_rowCount(rowCount)
-        {}
-        void setRowCount(int rowCount) { m_rowCount = rowCount; }
-        void addItem(Plasma::IconWidget *icon) {
-            //kDebug() << "Row count is" << rowCount() << "Wanted row count is" << \
                m_rowCount;
-            //int row = m_rowCount == rowCount() || rowCount() == -1 ? 0 : \
                rowCount();
-            //int column = m_rowCount == rowCount()  || columnCount() == 0 ? \
                columnCount() : columnCount() - 1;
-            //kDebug() << "Adding icon to row = " << row << ", column = " << column;
-            int row = 0;
-            int column = 0;
-            while (itemAt(row, column))
-            {
-                kDebug() << "Row is" << row << "column is" << column;
-                if (row < m_rowCount - 1) {
-                    row++;
-                }
-                else {
-                    kDebug() << "column++";
-                    row = 0;
-                    column++;
-                }
-            }
-            QGraphicsGridLayout::addItem(icon, row, column);
-        }
-        QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF()) \
                const
-        {
-            if (which == Qt::PreferredSize) {
-                return QSizeF(columnCount() * geometry().height() / m_rowCount, \
                QGraphicsGridLayout::sizeHint(which, constraint).height());
-            }
-            return QGraphicsGridLayout::sizeHint(which, constraint);
-        }
-    private:
-        int m_rowCount;
-};
-
 class QuicklaunchApplet : public Plasma::Applet
 {
     Q_OBJECT


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