Author: tgoettlicher
Date: Mon Feb 4 14:49:29 2008
New Revision: 44123
URL: http://svn.opensuse.org/viewcvs/yast?rev=44123&view=rev
Log:
added debugging to console
Modified:
branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmodulemodel.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.h
branches/tmp/tgoettlicher/yast2cc_rewrite/src/menuitem.cpp
branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp
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=44123&r1=44122&r2=44123&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcategorizedview.cpp Mon Feb 4 14:49:29 2008
@@ -58,6 +58,8 @@
const QModelIndexList &KCategorizedView::Private::intersectionSet(const QRect &rect)
{
+ std::cout << "&KCategorizedView::Private::intersectionSet" << std::endl;
+
QModelIndex index;
QRect indexVisualRect;
@@ -80,6 +82,7 @@
int middle = (top + bottom) / 2;
while (bottom <= top)
{
+ std::cout << "bottom <= top" << std::endl;
middle = (top + bottom) / 2;
index = proxyModel->index(middle, 0);
@@ -548,6 +551,9 @@
void KCategorizedView::setModel(QAbstractItemModel *model)
{
+
+ std::cout << "KCategorizedView::setModel" << std::endl;
+
d->lastSelection = QItemSelection();
d->forcedSelectionPosition = 0;
d->elementsInfo.clear();
@@ -563,6 +569,8 @@
if (d->proxyModel)
{
+ std::cout << "d->proxyModel1" << std::endl;
+
QObject::disconnect(d->proxyModel,
SIGNAL(layoutChanged()),
this, SLOT(slotLayoutChanged()));
@@ -582,6 +590,8 @@
if (d->proxyModel)
{
+ std::cout << "d->proxyModel2" << std::endl;
+
d->modelSortRole = d->proxyModel->sortRole();
d->modelSortColumn = d->proxyModel->sortColumn();
d->modelSortOrder = d->proxyModel->sortOrder();
@@ -602,6 +612,8 @@
if (d->proxyModel->rowCount())
{
+ std::cout << "rowCount()" << std::endl;
+
d->layoutChanged(true);
}
}
@@ -750,6 +762,8 @@
option.features |= QStyleOptionViewItemV2::WrapText;
}
+ std::cout << ".";
+
QPainter painter(viewport());
QRect area = event->rect();
const bool focus = (hasFocus() || viewport()->hasFocus()) &&
@@ -758,10 +772,12 @@
const bool enabled = (state & QStyle::State_Enabled) != 0;
painter.save();
+ std::cout << ",";
QModelIndexList dirtyIndexes = d->intersectionSet(area);
foreach (const QModelIndex &index, dirtyIndexes)
{
+ std::cout << "foreach QModelIndex..." << std::endl;
option.state = state;
option.rect = visualRect(index);
@@ -803,6 +819,8 @@
itemDelegate(index)->paint(&painter, option, index);
}
+ std::cout << "-";
+
// Redraw categories
QStyleOptionViewItem otherOption;
bool intersectedInThePast = false;
@@ -829,6 +847,7 @@
// this is doable because we know that categories are correctly ordered on the list
}
}
+ std::cout << "+";
if ((selectionMode() != SingleSelection) && (selectionMode() != NoSelection))
{
@@ -871,6 +890,8 @@
}
painter.restore();
+
+ std::cout << "!" << std::endl;
}
void KCategorizedView::resizeEvent(QResizeEvent *event)
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=44123&r1=44122&r2=44123&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp Mon Feb 4 14:49:29 2008
@@ -133,6 +133,8 @@
{
allLoaded = true;
+ std::cout << "KCModuleInfo::Private::loadAll" << std::endl;
+
// if( !service ) /* We have a bogus service. All get functions will return empty/zero values */
return;
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=44123&r1=44122&r2=44123&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmodulemodel.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmodulemodel.cpp Mon Feb 4 14:49:29 2008
@@ -59,6 +59,9 @@
bool SystemSettingsProxyModel::filterAcceptsRow( int source_row, const QModelIndex & source_parent ) const
{
+
+std::cout << "SystemSettingsProxyModel::filterAcceptsRow" << std::endl;
+
QModelIndex index = sourceModel()->index( source_row, 0, source_parent );
MenuItem * mItem = index.data( Qt::UserRole ).value();
// accept only systemsettings categories that have children
@@ -156,6 +159,8 @@
QVariant KCModuleModel::data(const QModelIndex &index, int role) const
{
+ std::cout << "KCModuleModel::data" << std::endl;
+
///TG//////////
return(QString("data"));
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp?rev=44123&r1=44122&r2=44123&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp Mon Feb 4 14:49:29 2008
@@ -22,14 +22,15 @@
QHBoxLayout *layout = new QHBoxLayout;
centralWidget->setLayout(layout);
+
MenuItem *rootItem = new MenuItem(true, 0);
- MenuItem * kat = new MenuItem(true, rootItem);
- kat->name = "Kat";
+ readMenu( rootItem );
+
+
+
+
- MenuItem *mod = new MenuItem(false, kat);
- mod->name="hi";
- mod->caption="hallo";
KCModuleModel *model;
@@ -52,7 +53,10 @@
kcsfpm->setFilterRole( KCModuleModel::UserFilterRole );
kcsfpm->setFilterCaseSensitivity( Qt::CaseInsensitive );
kcsfpm->sort( 0 );
- tv->setModel( kcsfpm );
+ tv->setModel( kcsfpm );
+// tv->setModel( model );
+
+
layout->addWidget(tv);
}
@@ -61,7 +65,6 @@
-// layout->addWidget(tv);
}
@@ -72,4 +75,73 @@
+void MainWindow::readMenu( MenuItem * parent )
+{
+
+ int depth=0;
+ MenuItem * current = parent;
+
+// for cats
+
+ MenuItem * menuItem = new MenuItem(true, parent);
+ menuItem->name = "Kat1";
+
+// readMenu
+ MenuItem* infoItem = new MenuItem(false,menuItem);
+ infoItem->name="Kat1";
+
+/*
+
+
+
+
+ // look for any categories inside this level, and recurse into them
+ int depth = 0;
+ MenuItem * current = parent;
+ while ( current && current->parent ) {
+ depth++;
+ current = current->parent;
+ }
+
+ QString space;
+ space.fill( ' ', depth * 2 );
+ std::cout << space.data() << "Looking for children in '" << parent->name.data() << "'";
+ for (int i = 0; i < categories.size(); ++i) {
+ KService::Ptr entry = categories.at(i);
+ QString parentCategory = entry->property("X-KDE-System-Settings-Parent-Category").toString();
+ QString category = entry->property("X-KDE-System-Settings-Category").toString();
+ std::cout << "Examining category " << parentCategory.data() << "/" << category.data();
+ if ( parentCategory == parent->name ) {
+ KCModuleInfo module( entry->entryPath() );
+
+ MenuItem * menuItem = new MenuItem(true, parent);
+ menuItem->name = category;
+ menuItem->service = entry;
+ menuItem->item = module;
+ readMenu( menuItem );
+ }
+ }
+
+ // scan for any modules at this level and add them
+ for (int i = 0; i < modules.size(); ++i) {
+ KService::Ptr entry = modules.at(i);
+ QString category = entry->property("X-KDE-System-Settings-Parent-Category").toString();
+ //kDebug() << "Examining module " << category;
+ if(!parent->name.isEmpty() && category == parent->name ) {
+ kDebug() << space << "found module '" << entry->name() << "' " << entry->desktopEntryPath();
+ // Add the module info to the menu
+ KCModuleInfo module(entry->entryPath());
+ kDebug() << space << "filename is " << module.fileName();
+ //append(module);
+ MenuItem * infoItem = new MenuItem(false, parent);
+ infoItem->name = category;
+ infoItem->service = entry;
+ infoItem->item = module;
+ }
+ }
+
+*/
+}
+
+
#include "main_window.moc"
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.h?rev=44123&r1=44122&r2=44123&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.h (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.h Mon Feb 4 14:49:29 2008
@@ -1,6 +1,13 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
+#include "kcategorizedview.h"
+#include "menuitem.h"
+#include "kcmodulemodel.h"
+#include "kcategorydrawer.h"
+#include "moduleiconitem.h"
+
+
#include <QMainWindow>
class MainWindow : public QMainWindow
@@ -14,6 +21,7 @@
public slots:
private:
+ void readMenu( MenuItem * parent );
};
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/menuitem.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/menuitem.cpp?rev=44123&r1=44122&r2=44123&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/menuitem.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/menuitem.cpp Mon Feb 4 14:49:29 2008
@@ -30,6 +30,7 @@
{
if ( parent ) {
+ std::cout << "parent->children.append" << std::endl;
parent->children.append( this );
}
}
Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp?rev=44123&r1=44122&r2=44123&view=diff
==============================================================================
--- branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp (original)
+++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp Mon Feb 4 14:49:29 2008
@@ -102,6 +102,8 @@
:// QListWidgetItem(SmallIcon( module.icon(), IMAGE_SIZE ), module.moduleName(), parent),
imageName(module.icon())
{
+
+ std::cout << "ModuleIconItem::ModuleIconItem" << std::endl;
// setData( Qt::UserRole, KIconLoader::DefaultState );
modules.append(module);
setSize();
@@ -112,12 +114,14 @@
: //QListWidgetItem( SmallIcon( _imageName, IMAGE_SIZE ), text, parent ),
imageName(_imageName)
{
+ std::cout << "ModuleIconItem::ModuleIconItem" << std::endl;
// setData( Qt::UserRole, KIconLoader::DefaultState );
setSize();
}
void ModuleIconItem::loadIcon( bool enabled )
{
+ std::cout << "ModuleIconItem::loadIcon" << std::endl;
// int newState = enabled ? KIconLoader::DefaultState : KIconLoader::DisabledState;
// if( newState == data( Qt::UserRole ).toInt() )
return;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
