January 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r44089 - /trunk/gtk/src/YGDialog.cc
by michael_meeks＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: michael_meeks Date: Thu Jan 31 21:49:59 2008 New Revision: 44089 URL: http://svn.opensuse.org/viewcvs/yast?rev=44089&view=rev Log: suggested code. Modified: trunk/gtk/src/YGDialog.cc Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=44089&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Thu Jan 31 21:49:59 2008 @@ -424,6 +424,12 @@ void YGDialog::openInternal() { +#if TESTED + // Ensure only one default button ? + gtk_widget_show (m_widget); + gtk_window_present (GTK_WINDOW (m_widget)); + gtk_widget_queue_draw (m_widget); +#endif #if 0 ensureOnlyOneDefaultButton(); QWidget::show(); @@ -436,6 +442,10 @@ void YGDialog::activate() { +#if TESTED + gtk_window_present (GTK_WINDOW (m_widget)); + gtk_widget_queue_draw (m_widget); +#endif #if 0 QWidget::raise(); QWidget::update(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44088 - /tags/stable-2_16_2/gtk/
by coolo＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: coolo Date: Thu Jan 31 20:12:54 2008 New Revision: 44088 URL: http://svn.opensuse.org/viewcvs/yast?rev=44088&view=rev Log: Created tag stable-2_16_2 for gtk Added: tags/stable-2_16_2/gtk/ - copied from r44087, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44087 - in /trunk/gtk: VERSION yast2-gtk.spec.in
by coolo＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: coolo Date: Thu Jan 31 20:12:48 2008 New Revision: 44087 URL: http://svn.opensuse.org/viewcvs/yast?rev=44087&view=rev Log: versions Modified: trunk/gtk/VERSION trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=44087&r1=44086&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Thu Jan 31 20:12:48 2008 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=44087&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Thu Jan 31 20:12:48 2008 @@ -3,8 +3,8 @@ @HEADER@ Source2: yast2-gtk-rpmlintrc BuildRequires: blocxx-devel gcc-c++ libxcrypt-devel libzypp-devel yast2-devtools gtk2-devel -BuildRequires: yast2-core-devel >= 2.16.21 -Requires: yast2-core >= 2.16.21 +BuildRequires: yast2-core-devel >= 2.16.25 +Requires: yast2-core >= 2.16.25 Summary: YaST2 - Gtk Graphical User Interface Provides: yast2_ui -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44086 - /trunk/gtk/package/yast2-gtk.changes
by coolo＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: coolo Date: Thu Jan 31 20:12:02 2008 New Revision: 44086 URL: http://svn.opensuse.org/viewcvs/yast?rev=44086&view=rev Log: changelog Modified: trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Thu Jan 31 20:12:02 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 31 20:11:40 CET 2008 - coolo(a)suse.de + +- make it compile against latest yast2-core + +------------------------------------------------------------------- Sun Jan 27 21:03:57 CET 2008 - coolo(a)suse.de - fix changelog -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44085 - in /trunk/gtk/src: YGDialog.cc YGDialog.h YGMultiLineEdit.cc YGPackageSelector.cc YGUI.cc YGUI.h
by coolo＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: coolo Date: Thu Jan 31 20:10:39 2008 New Revision: 44085 URL: http://svn.opensuse.org/viewcvs/yast?rev=44085&view=rev Log: make it compile at least Modified: trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGDialog.h trunk/gtk/src/YGMultiLineEdit.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUI.h Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=44085&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Thu Jan 31 20:10:39 2008 @@ -421,3 +421,24 @@ return new YGDialog (dialogType, colorMode); } +void +YGDialog::openInternal() +{ +#if 0 + ensureOnlyOneDefaultButton(); + QWidget::show(); + QWidget::raise(); // FIXME: is this really necessary? + QWidget::update(); +#endif +} + + +void +YGDialog::activate() +{ +#if 0 + QWidget::raise(); + QWidget::update(); +#endif +} + Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=44085&r1=… ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Thu Jan 31 20:10:39 2008 @@ -33,6 +33,9 @@ virtual int preferredWidth() { return 0; } virtual int preferredHeight() { return 0; } + virtual void activate(); + virtual void openInternal(); + YGWIDGET_IMPL_CHILD_ADDED (m_containee) YGWIDGET_IMPL_CHILD_REMOVED (m_containee) }; Modified: trunk/gtk/src/YGMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGMultiLineEdit.cc?rev=4… ============================================================================== --- trunk/gtk/src/YGMultiLineEdit.cc (original) +++ trunk/gtk/src/YGMultiLineEdit.cc Thu Jan 31 20:10:39 2008 @@ -216,7 +216,7 @@ static void link_clicked_cb (GtkWidget *widget, const char *url, YGRichText *pThis) { - YGUI::ui()->sendEvent (new YMenuEvent (YCPString (url))); + YGUI::ui()->sendEvent (new YMenuEvent (url)); } YGWIDGET_IMPL_COMMON Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Thu Jan 31 20:10:39 2008 @@ -1651,7 +1651,7 @@ if (!strcmp (action, "accept")) { y2milestone ("Closing PackageSelector with 'accept'"); - YGUI::ui()->sendEvent (new YMenuEvent (YCPSymbol ("accept"))); + YGUI::ui()->sendEvent (new YMenuEvent ("accept")); } else if (!strcmp (action, "cancel")) { y2milestone ("Closing PackageSelector with 'cancel'"); Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=44085&r1=440… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Thu Jan 31 20:10:39 2008 @@ -297,13 +297,16 @@ dialog->normalCursor(); } -YCPValue YGUI::runPkgSelection (YWidget *packageSelector) +YEvent* YGUI::runPkgSelection (YWidget *packageSelector) { y2milestone( "Running package selection..." ); - YCPValue input = YCPVoid(); + YEvent *event = 0; try { - input = evaluateUserInput(); + do + { + event = filterInvalidEvents( userInput(0) ); + } while ( ! event ); } catch (const std::exception &e) { y2error ("UI::RunPkgSelection() error: %s", e.what()); y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); @@ -312,8 +315,8 @@ y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); } - y2milestone ("Package selection done - returning %s", input->toString().c_str()); - return input; + // y2milestone ("Package selection done - returning %s", input->toString().c_str()); + return event; } void YGUI::makeScreenShot (string filename) Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=44085&r1=4408… ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Thu Jan 31 20:10:39 2008 @@ -85,7 +85,7 @@ virtual void makeScreenShot (string filename); virtual void beep(); - virtual YCPValue runPkgSelection (YWidget *packageSelector); + virtual YEvent * runPkgSelection (YWidget *packageSelector); void toggleRecordMacro(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44084 - /tags/stable-2_16_15/installation/
by aschnell＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: aschnell Date: Thu Jan 31 19:08:25 2008 New Revision: 44084 URL: http://svn.opensuse.org/viewcvs/yast?rev=44084&view=rev Log: Created tag stable-2_16_15 for installation Added: tags/stable-2_16_15/installation/ - copied from r44083, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44083 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call
by aschnell＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: aschnell Date: Thu Jan 31 19:07:41 2008 New Revision: 44083 URL: http://svn.opensuse.org/viewcvs/yast?rev=44083&view=rev Log: - reflect init-script rename from suse-blinux to sbl Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=44083&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Jan 31 19:07:41 2008 @@ -1 +1 @@ -2.16.14 +2.16.15 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jan 31 19:07:41 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 31 19:05:49 CET 2008 - aschnell(a)suse.de + +- reflect init-script rename from suse-blinux to sbl +- 2.16.15 + +------------------------------------------------------------------- Thu Jan 31 15:02:56 CET 2008 - jsuchome(a)suse.cz - call users_finish.ycp from inst_finish.ycp (FATE #302980) Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Thu Jan 31 19:07:41 2008 @@ -315,7 +315,7 @@ >/tmp/suse-blinux.conf mv -f /tmp/suse-blinux.conf /etc /etc/init.d/brld start - /etc/init.d/suse-blinux start + /etc/init.d/sbl start fi fi #============================================= -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44082 - /tags/branch-SLE-10-SP2-2_13_97/storage/
by fehr＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: fehr Date: Thu Jan 31 18:10:51 2008 New Revision: 44082 URL: http://svn.opensuse.org/viewcvs/yast?rev=44082&view=rev Log: Created tag branch-SLE-10-SP2-2_13_97 for storage Added: tags/branch-SLE-10-SP2-2_13_97/storage/ - copied from r44081, branches/SuSE-SLE-10-SP2-Branch/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44081 - /branches/tmp/tgoettlicher/yast2cc_rewrite/src/
by tgoettlicher＠svn.opensuse.org 31 Jan '08

31 Jan '08

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_rewr… ============================================================================== --- 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_rewr… ============================================================================== --- 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 <limits.h> +#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_rewr… ============================================================================== --- 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 <kstyle.h> @@ -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_rewr… ============================================================================== --- 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 <kiconloader.h> #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_rewr… ============================================================================== --- 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 <kstandarddirs.h> //#include <klocale.h> +#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_rewr… ============================================================================== --- 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<MenuItem *>( index.internalPointer() ); -// QStringList searchKeyWords; + QStringList searchKeyWords; switch ( role ) { case Qt::DisplayRole: switch ( index.column() ) { case 0: -// theData.setValue( mi->service->name()); + theData.setValue( mi->service->name()); break; case 1: @@ -201,7 +214,14 @@ default: break; } + + theData.setValue(QString("Test")); + return theData; + +*/ + + } Qt::ItemFlags KCModuleModel::flags(const QModelIndex &index) const Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kicongrouppage.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kicongrouppage.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kicongrouppage.cpp Thu Jan 31 17:15:20 2008 @@ -22,6 +22,8 @@ #include <QtAlgorithms> #include <QStyle> +#include <iostream> + #include "kicongrouppage.h" Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp Thu Jan 31 17:15:20 2008 @@ -10,23 +10,33 @@ #include "kcmodulemodel.h" #include "kcategorydrawer.h" #include "moduleiconitem.h" +#include <iostream> MainWindow::MainWindow() : QMainWindow() { + std::cout << "MainWindow::MainWindow()" << std::endl; QWidget *centralWidget = new QWidget; setCentralWidget(centralWidget); + QHBoxLayout *layout = new QHBoxLayout; + centralWidget->setLayout(layout); MenuItem *rootItem = new MenuItem(true, 0); - MenuItem *first = new MenuItem(false, rootItem); - first->name="hi"; - first->caption="hallo"; + MenuItem * kat = new MenuItem(true, rootItem); + kat->name = "Kat"; + + MenuItem *mod = new MenuItem(false, kat); + mod->name="hi"; + mod->caption="hallo"; + + KCModuleModel *model; -// foreach ( MenuItem* item, rootItem->children ) { - KCModuleModel *model = new KCModuleModel( first, this ); + + foreach ( MenuItem* item, rootItem->children ) { + model = new KCModuleModel( item, this ); KCategoryDrawer * drawer = new KCategoryDrawer; KCategorizedView * tv = new KCategorizedView( this ); tv->setSelectionMode(QAbstractItemView::SingleSelection); @@ -44,11 +54,14 @@ kcsfpm->sort( 0 ); tv->setModel( kcsfpm ); + layout->addWidget(tv); +} - QHBoxLayout *layout = new QHBoxLayout; - centralWidget->setLayout(layout); - layout->addWidget(tv); + + + +// layout->addWidget(tv); } Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/menuitem.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/menuitem.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/menuitem.cpp Thu Jan 31 17:15:20 2008 @@ -19,6 +19,8 @@ */ #include "menuitem.h" +#include <iostream> + MenuItem::MenuItem( bool isMenu, MenuItem * itsParent ) : parent( itsParent ), Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp Thu Jan 31 17:15:20 2008 @@ -28,6 +28,8 @@ #include <qapplication.h> #include <qpainter.h> +#include <iostream> + #define IMAGE_SIZE 32 #define ICON_WIDTH 100 Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/modulesview.cpp Thu Jan 31 17:15:20 2008 @@ -32,6 +32,8 @@ #include "kcmsearch.h" #include "moduleiconitem.h" #include "kcmodulemenu.h" +#include <iostream> + ModulesView::ModulesView( KCModuleMenu *rootMenu, const QString &menuPath, QWidget *parent ) : QWidget( parent ), rootMenu( NULL ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44080 - /trunk/yast2/library/cwm/doc/dialog_tree.xml
by aschnell＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: aschnell Date: Thu Jan 31 17:01:33 2008 New Revision: 44080 URL: http://svn.opensuse.org/viewcvs/yast?rev=44080&view=rev Log: - fixed quotes Modified: trunk/yast2/library/cwm/doc/dialog_tree.xml Modified: trunk/yast2/library/cwm/doc/dialog_tree.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/doc/dialog_tre… ============================================================================== --- trunk/yast2/library/cwm/doc/dialog_tree.xml (original) +++ trunk/yast2/library/cwm/doc/dialog_tree.xml Thu Jan 31 17:01:33 2008 @@ -44,7 +44,7 @@ "widget_descr" : $[...], (4) "back_button" : "", "next_button" : "NextButton", - "abort_button" : AbortButton", + "abort_button" : "AbortButton", "functions" : $[...] ]); </screen> @@ -58,7 +58,7 @@ </para> <para> It takes one map as parameter. It contains all the needed information for -for creating and running the dialog. Return value is a symbol for the wizard +creating and running the dialog. Return value is a symbol for the wizard sequencer. </para> <para> @@ -91,7 +91,7 @@ <listitem><para> <computeroutput>"caption" : string</computeroutput> is the dialog caption. Will be used as the caption of the dialog when the screen -is shown, and also as caption for the label to the tree widget the +is shown, and also as caption for the label to the tree widget the <computeroutput>"tree_item_label"</computeroutput> key is missing. </para></listitem> <listitem><para> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0