Author: tgoettlicher
Date: Thu Jan 31 17:15:20 2008
New Revision: 44081
URL: http://svn.opensuse.org/viewcvs/yast?rev=44081&view=rev
Log: (empty)
Removed:
branches/tmp/tgoettlicher/yast2cc_rewrite/src/systemsettings.desktop
branches/tmp/tgoettlicher/yast2cc_rewrite/src/systemsettingsrc
branches/tmp/tgoettlicher/yast2cc_rewrite/src/systemsettingsui.rc
Modified:
branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt
branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedsortfilterproxymodel.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmodulemodel.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/kicongrouppage.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/menuitem.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.cpp
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt?rev=44081&r1=44080&r2=44081&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt Thu Jan 31 17:15:20 2008
@@ -30,6 +30,7 @@
kcategorizedsortfilterproxymodel.h
moduleiconitem.h
kcmoduleinfo.h
+kcategorizedview_p.h
)
#SET(yast2-control-center_RCCS ../files.qrc)
@@ -43,7 +44,7 @@
QT4_ADD_RESOURCES(yast2-control-center_RCC_SRCS ${yast2-control-center_RCCS})
-ADD_DEFINITIONS(-DQT_NO_DEBUG)
+#ADD_DEFINITIONS(-DQT_NO_DEBUG)
ADD_EXECUTABLE(yast2-control-center ${yast2-control-center_SRCS} ${yast2-control-center_MOC} ${yast2-control-center_RCC_SRCS})
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedsortfilterproxymodel.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedsortfilterproxymodel.cpp?rev=44081&r1=44080&r2=44081&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedsortfilterproxymodel.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedsortfilterproxymodel.cpp Thu Jan 31 17:15:20 2008
@@ -25,6 +25,7 @@
#include "kcategorizedsortfilterproxymodel_p.h"
#include
+#include <iostream>
#include <QItemSelection>
#include <QStringList>
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp?rev=44081&r1=44080&r2=44081&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp Thu Jan 31 17:15:20 2008
@@ -27,6 +27,7 @@
#include <QPainter>
#include <QScrollBar>
#include <QPaintEvent>
+#include <iostream>
//#include
@@ -391,6 +392,8 @@
const QStyleOption &option,
QPainter *painter)
{
+ std::cout << "KCategorizedView::Private::drawNewCategory" << std::endl;
+
if (!index.isValid())
{
return;
@@ -730,9 +733,13 @@
void KCategorizedView::paintEvent(QPaintEvent *event)
{
+
+ std::cout << "KCategorizedView::paintEvent" << std::endl;
+
if (!d->proxyModel || !d->categoryDrawer || !d->proxyModel->isCategorizedModel())
{
QListView::paintEvent(event);
+ std::cout << "..return" << std::endl;
return;
}
@@ -801,6 +808,8 @@
bool intersectedInThePast = false;
foreach (const QString &category, d->categories)
{
+
+ std::cout << "..Redraw cat (foreach)" << std::endl;
otherOption = option;
otherOption.rect = d->categoryVisualRect(category);
otherOption.state &= ~QStyle::State_MouseOver;
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.cpp?rev=44081&r1=44080&r2=44081&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorydrawer.cpp Thu Jan 31 17:15:20 2008
@@ -22,6 +22,8 @@
#include <QPainter>
#include <QStyleOption>
+#include <iostream>
+
//#include
#include "kcategorizedsortfilterproxymodel.h"
@@ -41,6 +43,8 @@
{
const QString category = index.model()->data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole).toString();
+ std::cout << "KCategoryDrawer::drawCategory" << std::endl;
+
QColor color;
if (option.state & QStyle::State_Selected)
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp?rev=44081&r1=44080&r2=44081&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp Thu Jan 31 17:15:20 2008
@@ -31,6 +31,8 @@
//#include
//#include
+#include <iostream>
+
class KCModuleInfo::Private
{
public:
@@ -51,29 +53,38 @@
void loadAll();
};
-KCModuleInfo::Private::Private()
-{
-}
+//KCModuleInfo::Private::Private()
+//{
+//}
-/*KCModuleInfo::Private::Private( KService::Ptr s )
+//KCModuleInfo::Private::Private( KService::Ptr s )
+KCModuleInfo::Private::Private( )
: allLoaded( false )
- , service( s )
+// , service( s )
{
- if ( !service )
- {
- kDebug(712) << "Could not find the service.";
- return;
- }
+// if ( !service )
+// {
+// kDebug(712) << "Could not find the service.";
+// return;
+// }
// set the modules simple attributes
- name = service->name();
+/* name = service->name();
comment = service->comment();
icon = service->icon();
fileName = service->entryPath();
lib = service->library();
- keywords = service->keywords();
+ keywords = service->keywords(); */
+
+ name = "name";
+ comment = "comment";
+ icon = "icon";
+ fileName = "fileName";
+ lib = "lib";
+ keywords = QStringList("keywords");
+
+
}
-*/
KCModuleInfo::KCModuleInfo()
{
@@ -83,6 +94,7 @@
KCModuleInfo::KCModuleInfo(const QString& desktopFile)
{
// d = new Private( KService::serviceByStorageId(desktopFile) );
+ d = new Private( );
}
//KCModuleInfo::KCModuleInfo( KService::Ptr moduleInfo )
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmodulemodel.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmodulemodel.cpp?rev=44081&r1=44080&r2=44081&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmodulemodel.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmodulemodel.cpp Thu Jan 31 17:15:20 2008
@@ -22,9 +22,12 @@
#include <QHash>
#include <QList>
+#include <QStringList>
#include "kcategorizedsortfilterproxymodel.h"
#include "menuitem.h"
+#include <iostream>
+
Q_DECLARE_METATYPE(MenuItem *)
@@ -62,7 +65,7 @@
// if ( mItem->children.isEmpty() && mItem->service->serviceTypes().contains("SystemSettingsCategory" ) ) {
// return false;
// } else {
-// return KCategorizedSortFilterProxyModel::filterAcceptsRow( source_row, source_parent );
+ return KCategorizedSortFilterProxyModel::filterAcceptsRow( source_row, source_parent );
// }
}
@@ -152,18 +155,28 @@
QVariant KCModuleModel::data(const QModelIndex &index, int role) const
{
+
+///TG//////////
+
+ return(QString("data"));
+
+///TG//////////
+
+/*
+
+
MenuItem * mi = 0;
QVariant theData;
if ( !index.isValid() ) {
return QVariant();
}
mi = static_cast