Author: dmacvicar Date: Mon Dec 15 09:01:55 2008 New Revision: 54110 URL: http://svn.opensuse.org/viewcvs/yast?rev=54110&view=rev Log: while yesterday it compiled, now it broke, but close again Added: branches/tmp/dmacvicar/control-center-qt4/control-center/CMakeLists.txt branches/tmp/dmacvicar/control-center-qt4/control-center/src/CMakeLists.txt Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.h branches/tmp/dmacvicar/control-center-qt4/control-center/src/main.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.h branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.h branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.h branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.h branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterdoc.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.h branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.h branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.cpp branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.h Added: branches/tmp/dmacvicar/control-center-qt4/control-center/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/CMakeLists.txt?rev=54110&view=auto ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/CMakeLists.txt (added) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/CMakeLists.txt Mon Dec 15 09:01:55 2008 @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 2.6) +PROJECT(YCONTROLCENTER) +FIND_PACKAGE(Qt4 REQUIRED) +ADD_SUBDIRECTORY(src) + Added: branches/tmp/dmacvicar/control-center-qt4/control-center/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/CMakeLists.txt?rev=54110&view=auto ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/CMakeLists.txt (added) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/CMakeLists.txt Mon Dec 15 09:01:55 2008 @@ -0,0 +1,41 @@ + +SET(THEMEDIR "${CMAKE_INSTALL_PREFIX}/share/YaST2/theme") + +INCLUDE_DIRECTORIES(${QT_INCLUDES} ${QT_QT3SUPPORT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + +ADD_DEFINITIONS("-DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/YaST2/locale\"") +ADD_DEFINITIONS("-DICON_DIR=\"${THEMEDIR}/current/icons/32x32/apps\"") +ADD_DEFINITIONS("-DPIXMAP_DIR=\"${THEMEDIR}/current/icons/32x32/apps\"") +ADD_DEFINITIONS("-DDESKTOP_TRANSLATIONS_DIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\"") +ADD_DEFINITIONS("-DMODULES_DESKTOP_DIR=\"${CMAKE_INSTALL_PREFIX}/share/applications/YaST2\"") +ADD_DEFINITIONS("-DGROUPS_DESKTOP_DIR=\"${CMAKE_INSTALL_PREFIX}/share/applications/YaST2/groups\"") + +# -DICON_DIR=\"${themedir}/current/icons/32x32/apps\" \ +# -DPIXMAP_DIR=\"${themedir}/current/control-center\" \ +# -DMODULES_DESKTOP_DIR=\"${desktopdir}\" \ +# -DGROUPS_DESKTOP_DIR=\"${desktopdir}/groups\" \ +# -DLOCALEDIR=\"${localedir}\" \ +# -DDESKTOP_TRANSLATIONS_DIR=\"${datadir}/locale\" + + +SET(YCONTROLCENTER_SRCS + main.cpp + myintl.cpp + process.cpp + searchdialog.cpp +# testmain.cpp + y2cc_config.cpp + y2cc_iconview.cpp + y2controlcenter.cpp + y2controlcenterdoc.cpp + y2controlcenterview.cpp + y2savelogs.cpp + yastmodules.cpp +) + +QT4_AUTOMOC(${YCONTROLCENTER_SRCS}) +#QT_WRAP_CPP(outMoc ${YCONTROLCENTER_SRCS}) + +ADD_EXECUTABLE(y2controlcenter ${YCONTROLCENTER_SRCS} ${outMoc}) +TARGET_LINK_LIBRARIES(y2controlcenter ${QT_QT_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY}) \ No newline at end of file Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.cpp Mon Dec 15 09:01:55 2008 @@ -24,6 +24,8 @@ #include #include +//Added by qt3to4: +#include <Q3TextStream> #include <iostream> @@ -47,7 +49,7 @@ void QY2Settings::initSections() { _defaultSection = new Section( "" ); - CHECK_PTR( _defaultSection ); + //CHECK_PTR( _defaultSection ); _currentSection = _defaultSection; _sections.insert( "", _defaultSection ); @@ -154,7 +156,7 @@ QFile file( _fileName ); - if ( ! file.open( IO_ReadOnly ) ) + if ( ! file.open( QIODevice::ReadOnly ) ) { cerr << "Can't load settings from " << _fileName << ": " << file.errorString() @@ -165,8 +167,8 @@ return false; } - QTextStream str( &file ); - str.setEncoding( QTextStream::UnicodeUTF8 ); + Q3TextStream str( &file ); + str.setEncoding( Q3TextStream::UnicodeUTF8 ); QString line; int lineCount = 0; @@ -230,7 +232,7 @@ QFile file( _fileName ); - if ( ! file.open( IO_WriteOnly ) ) + if ( ! file.open( QIODevice::WriteOnly ) ) { cerr << "Can't save settings to " << _fileName << ": " << file.errorString() @@ -239,8 +241,8 @@ return false; } - QTextStream str( &file ); - str.setEncoding( QTextStream::UnicodeUTF8 ); + Q3TextStream str( &file ); + str.setEncoding( Q3TextStream::UnicodeUTF8 ); // The default section must be saved first since it doesn't have a section // name that could be used for a headline @@ -261,7 +263,7 @@ } -void QY2Settings::saveSection( QTextStream & str, Section * sect ) +void QY2Settings::saveSection( Q3TextStream & str, Section * sect ) { // Section header Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.h?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.h (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/QY2Settings.h Mon Dec 15 09:01:55 2008 @@ -26,9 +26,9 @@ #include #include -#include +#include #include -#include +#include /** * Utility class that handles program settings in .ini file format: @@ -229,7 +229,7 @@ /** * Save one section to a stream **/ - void saveSection( QTextStream & stream, Section * section ); + void saveSection( Q3TextStream & stream, Section * section ); // Data members @@ -243,9 +243,9 @@ bool _dirty; Section * _defaultSection; - QDict<Section> _sections; + Q3Dict<Section> _sections; - typedef QDictIterator<Section> SectionIterator; + typedef Q3DictIterator<Section> SectionIterator; }; #endif // QY2Settings_h Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/main.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/main.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/main.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/main.cpp Mon Dec 15 09:01:55 2008 @@ -10,10 +10,11 @@ Textdomain "control-center" */ -#include -#include -#include -#include +#include <QApplication> +#include <QTimer> +#include <QFont> +#include <QString> +#include <QDesktopWidget> #include @@ -60,7 +61,7 @@ // cerr << time(0) << " main()" << endl; config.textdomain = "control-center"; - set_textdomain (config.textdomain); + set_textdomain (config.textdomain.toLatin1()); QApplication app( argc, argv ); @@ -82,11 +83,11 @@ // cout << (config.isroot.value()==true?"true":"false") << endl; - Qt::WFlags wflags = Qt::WType_TopLevel; - - if ( config.noBorder ) - wflags |= Qt::WStyle_Customize | Qt::WStyle_NoBorder; + Qt::WindowFlags wflags = Qt::Window; + //if ( config.noBorder ) + // wflags |= Qt::WStyle_Customize | Qt::WStyle_NoBorder; + Y2ControlCenter y2cc( wflags ); if ( config.fullscreen ) @@ -98,7 +99,7 @@ else y2cc.resize( 680, 420 ); - app.setMainWidget( &y2cc ); + //app.setMainWidget( &y2cc ); QString title = _("YaST2 Control Center"); @@ -113,7 +114,7 @@ title += hostname; } } - y2cc.setCaption( title ); + y2cc.setWindowTitle( title ); y2cc.show(); QTimer::singleShot( 0, &y2cc, SLOT( configure() ) ); Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.cpp Mon Dec 15 09:01:55 2008 @@ -4,6 +4,8 @@ #include #include #include +//Added by qt3to4: +#include <Q3TextStream> #define QTEXTSTREAM @@ -23,22 +25,22 @@ bool Process::start(const QString& cmdline) { - fp=popen(cmdline,"r"); + fp=popen(cmdline.toLocal8Bit(),"r"); if (!fp) { qDebug("process not started"); return false; } #ifdef QTEXTSTREAM - stream = new QTextStream(fp,IO_ReadOnly); - stream->setEncoding(QTextStream::UnicodeUTF8); + stream = new Q3TextStream(fp,QIODevice::ReadOnly); + stream->setEncoding(Q3TextStream::UnicodeUTF8); #endif clearbuffer(); timer = new QTimer( this ); connect( timer, SIGNAL(timeout()), SLOT(readfromprocess()) ); - timer->start( 0, FALSE ); + timer->start(0); return true; } @@ -138,6 +140,6 @@ return buffer; } -#include "process.moc.cpp" +#include "process.moc" // vim:sw=2 Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.h?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.h (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/process.h Mon Dec 15 09:01:55 2008 @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include class Process : public QObject @@ -34,7 +34,7 @@ void readfromprocess(); private: QString buffer; - QTextStream* stream; + Q3TextStream* stream; FILE* fp; QTimer* timer; int interval; Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.cpp Mon Dec 15 09:01:55 2008 @@ -14,10 +14,15 @@ #include "searchdialog.h" #include "myintl.h" +#include <QHBoxLayout> +#include <QVBoxLayout> +#include <QLabel> +#include <QListWidget> SearchDialog::SearchDialog(QWidget *parent) : - QDialog(parent,0,true) + QDialog(parent,0) { + setModal(true); QPushButton *search,*cancel; QLabel *label; QHBoxLayout *hbox; @@ -42,13 +47,14 @@ vbox->addWidget(txt); vbox->addSpacing(3); vbox->setMargin(10); - hbox=new QHBoxLayout(vbox); + hbox=new QHBoxLayout(this); + vbox->addLayout(hbox); hbox->setSpacing(5); hbox->addStretch(1); hbox->addWidget(search); - lb=new QListBox(this); - connect(lb, SIGNAL(clicked(QListBoxItem *)), this, SLOT(slotbye(QListBoxItem *))); - connect(lb, SIGNAL(returnPressed(QListBoxItem *)), this, SLOT(slotbye(QListBoxItem *))); + lb=new QListWidget(this); + connect(lb, SIGNAL(clicked(Q3ListBoxItem *)), this, SLOT(slotbye(Q3ListBoxItem *))); + connect(lb, SIGNAL(returnPressed(Q3ListBoxItem *)), this, SLOT(slotbye(Q3ListBoxItem *))); vbox->addSpacing(13); vbox->addWidget(lb); hbox->addWidget(cancel); @@ -57,7 +63,7 @@ sb=new QStatusBar(this); sb->setSizeGripEnabled(false); vbox->addWidget(sb); - setCaption(_("YaST2 Control Center - Search")); + setWindowTitle(_("YaST2 Control Center - Search")); } SearchDialog::~SearchDialog() @@ -81,10 +87,10 @@ return txt->text(); } -void SearchDialog::SearchResult ( QListBoxItem * item ) +void SearchDialog::SearchResult( QListWidgetItem * item ) { if (item) - lb->insertItem(item); + lb->addItem(item); } void SearchDialog::ClearResults() @@ -99,17 +105,17 @@ { if (!time) { - sb->message(msg); + sb->showMessage(msg); } else { - sb->message(msg,time); + sb->showMessage(msg,time); } } -void SearchDialog::slotbye(QListBoxItem *item) +void SearchDialog::slotbye(QListWidgetItem *item) { - int num=lb->index(item); + int num=lb->row(item); if (num<0) { return; @@ -125,4 +131,4 @@ emit sigSearch(txt->text()); } -#include +#include "searchdialog.moc" Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.h?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.h (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/searchdialog.h Mon Dec 15 09:01:55 2008 @@ -10,13 +10,14 @@ #define SEARCHDIALOG_H // include files for QT -#include -#include -#include -#include -#include -#include -#include +#include <QDialog> +#include <QPushButton> +#include <QLineEdit> +#include <QLayout> +#include <QLabel> +#include <QListWidget> +#include <QStatusBar> +#include <QVBoxLayout> class SearchDialog : public QDialog @@ -26,7 +27,7 @@ SearchDialog(QWidget *parent); ~SearchDialog(); QString getText() const; - void SearchResult ( QListBoxItem * box ); + void SearchResult( QListWidgetItem * box ); void ClearResults(); void message(const QString & msg,int time=0); int exec(); @@ -36,13 +37,13 @@ protected slots: - void slotbye(QListBoxItem *); + void slotbye(QListWidgetItem *); void slotsearch(); private: QLineEdit *txt; QVBoxLayout *vbox; - QListBox *lb; + QListWidget *lb; QStatusBar *sb; }; Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.cpp Mon Dec 15 09:01:55 2008 @@ -8,6 +8,8 @@ #include "y2cc_iconview.h" +//Added by qt3to4: +#include <QPixmap> #define SBINYAST2 "/sbin/yast2" @@ -17,7 +19,7 @@ // * MyQIconViewItem // * -MyQIconViewItem::MyQIconViewItem ( QIconView * parent, const QString & text, const QPixmap & icon ):QIconViewItem(parent,text,icon) +MyQIconViewItem::MyQIconViewItem ( QListWidget * parent, const QString & text, const QPixmap & icon ):QListWidgetItem(icon,text,parent) { } @@ -74,28 +76,29 @@ // * -MyQIconView::MyQIconView( QWidget * parent, const char * name, WFlags f ) : - QIconView( parent , name , f ) +MyQIconView::MyQIconView( QWidget * parent ) : + QListWidget( parent ) { - setItemsMovable(false); + //FIXME setItemsMovable(false); } MyQIconView::~MyQIconView() { } -QDragObject * MyQIconView::dragObject() +Q3DragObject * MyQIconView::dragObject() { if ( !currentItem() ) return 0; MyQIconViewItem *item = (MyQIconViewItem*)currentItem(); - QTextDrag *drag=0L; + Q3TextDrag *drag=0L; if (item) { +#if 0 if (item->getModule()) { - drag = new QTextDrag( viewport() ); + drag = new Q3TextDrag( viewport() ); drag->setSubtype("plain"); drag->setPixmap( *currentItem()->pixmap(), QPoint( currentItem()->pixmapRect().width() / 2, @@ -112,9 +115,10 @@ desktopentry=desktopentry.arg(item->getModule()->getName()); drag->setText(desktopentry); } +#endif } return drag; } -#include +#include "y2cc_iconview.moc" Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.h?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.h (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2cc_iconview.h Mon Dec 15 09:01:55 2008 @@ -9,8 +9,10 @@ #ifndef Y2CC_ICONVIEW_H #define Y2CC_ICONVIEW_H -#include -#include +#include <QListWidget>> +#include <QPixmap> +#include <Q3DragObject> + #include "yastmodules.h" #undef WITHICONMOVE @@ -36,23 +38,23 @@ /* * needed for DnD */ -class MyQIconView : public QIconView +class MyQIconView : public QListWidget { Q_OBJECT public: - MyQIconView( QWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + MyQIconView( QWidget * parent = 0); ~MyQIconView(); protected: - QDragObject * dragObject(); + Q3DragObject * dragObject(); }; /* * needed for DnD */ -class MyQIconViewItem: public QIconViewItem, public YModData +class MyQIconViewItem: public QListWidgetItem, public YModData { public: - MyQIconViewItem ( QIconView * parent, const QString & text, const QPixmap & icon ); + MyQIconViewItem ( QListWidget * parent, const QString & text, const QPixmap & icon ); ~MyQIconViewItem(); }; Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.cpp Mon Dec 15 09:01:55 2008 @@ -12,11 +12,15 @@ #include "y2controlcenter.h" #include "y2savelogs.h" -#include +#include <QMenu> +#include <QPixmap> +#include <QEvent> +#include <QKeyEvent> +#include <QDebug> -Y2ControlCenter::Y2ControlCenter( WFlags wflags ) - : QMainWindow( 0, 0, wflags ) // parent, name, wflags +Y2ControlCenter::Y2ControlCenter( Qt::WindowFlags wflags ) + : QMainWindow( 0, wflags ) // parent, wflags { setAppIcon(); initStatusBar(); @@ -46,23 +50,23 @@ if ( ! appIcon.isNull() ) { // fprintf( stderr, "y2controlcenter: Using icon %s\n", iconName.ascii() ); - topLevelWidget()->setIcon( appIcon ); + topLevelWidget()->setWindowIcon( appIcon ); } else { - fprintf( stderr, "y2controlcenter: No icon %s\n", iconName.ascii() ); + qWarning() << "y2controlcenter: No icon" << iconName; } } void Y2ControlCenter::configure() { - statusBar()->message(_("Reading module list...")); + statusBar()->showMessage(_("Reading module list...")); if ( !_view->init() ) { QString msg = *_view->getErrorString(); - statusBar()->message(_("*** Reading module list failed ***")); + statusBar()->showMessage(_("*** Reading module list failed ***")); QMessageBox::information(this,_("YaST2 Control Center"),msg,_("Quit")); msg=(char*)0L; qApp->quit(); @@ -76,26 +80,26 @@ // "File" menu // - QPopupMenu * fileMenu = new QPopupMenu( this ); + QMenu * fileMenu = new QMenu( _( "&File" ), this ); // "File" menu - menuBar()->insertItem( _( "&File" ), fileMenu ); + menuBar()->addMenu( fileMenu ); // "File" -> "Quit" menu item - quits the application - fileMenu->insertItem( _( "&Quit" ), qApp, SLOT( quit() ), CTRL + Key_Q ); + fileMenu->addAction( _( "&Quit" ), qApp, SLOT( quit() ), QKeySequence(Qt::Key_Control, Qt::Key_Q) ); // // "Edit" menu // - QPopupMenu * editMenu = new QPopupMenu( this ); + QMenu * editMenu = new QMenu( _( "&Edit" ), this ); // "Edit" menu - menuBar()->insertItem( _( "&Edit" ), editMenu ); + menuBar()->addMenu( editMenu ); // "Edit" -> "Search" menu item - searches for YaST2 modules - editMenu->insertItem( _( "&Search..." ), _view, SLOT( search() ), Key_F3 ); + editMenu->addAction( _( "&Search..." ), _view, SLOT( search() ), Qt::Key_F3 ); @@ -103,13 +107,13 @@ // "Help" menu // - QPopupMenu * helpMenu = new QPopupMenu( this ); + QMenu * helpMenu = new QMenu( _( "&Help" ), this ); // "Help" menu - menuBar()->insertItem( _( "&Help" ), helpMenu ); + menuBar()->addMenu( helpMenu ); // "Help" -> "Help" menu item - searches for YaST2 modules - helpMenu->insertItem( _( "&Help" ), _view, SLOT( help() ), Key_F1 ); + helpMenu->addAction( _( "&Help" ), _view, SLOT( help() ), Qt::Key_F1 ); @@ -117,13 +121,13 @@ void Y2ControlCenter::initStatusBar() { - statusBar ()->message ("", 2000); + statusBar ()->showMessage ("", 2000); } void Y2ControlCenter::slotStatusHelpMsg(const QString &text) { - statusBar()->message(text, 4000); + statusBar()->showMessage(text, 4000); } bool Y2ControlCenter::eventFilter( QObject *obj, QEvent *ev ) @@ -133,7 +137,7 @@ QKeyEvent *k = (QKeyEvent*)ev; if ( k->key() == Qt::Key_F8 && // Shift-F8: save y2logs - k->state() == Qt::ShiftButton ) + k->modifiers().testFlag(Qt::ShiftModifier) ) { y2LogSaver->save(); return true; // don't process this event any further @@ -154,4 +158,4 @@ { } -#include +#include "y2controlcenter.moc" Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.h?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.h (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenter.h Mon Dec 15 09:01:55 2008 @@ -10,24 +10,26 @@ #define Y2CONTROLCENTER_H // include files for QT -#include -#include -#include -#include +#include <QString> +#include <QMenu> +#include <QMainWindow> +#include #include -#include -#include +#include <QToolBar> +#include <QPixmap> #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include +//Added by qt3to4: +#include <QEvent> // #include // application specific includes @@ -47,7 +49,7 @@ public: - Y2ControlCenter( WFlags wflags = WType_TopLevel ); + Y2ControlCenter( Qt::WindowFlags wflags = Qt::Window ); ~Y2ControlCenter(); Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterdoc.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterdoc.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterdoc.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterdoc.cpp Mon Dec 15 09:01:55 2008 @@ -42,4 +42,4 @@ return modified; } -#include +#include "y2controlcenterdoc.moc" Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.cpp Mon Dec 15 09:01:55 2008 @@ -18,14 +18,19 @@ #include <iostream> // #include -#include -#include -#include -#include -#include -#include -#include -#include +#include <QMainWindow> +#include <QApplication> +#include <QDir> +#include <QFile> +#include <QMessageBox> +#include <QRegExp> +#include <QTimer> +//#include +//Added by qt3to4: +#include <QFrame> +#include <QPixmap> +#include <QLabel> + #include #include @@ -49,8 +54,10 @@ #define MAXLEFTLISTBOXHEIGHTDIFF 30 Y2ControlCenterView::Y2ControlCenterView(QWidget *parent) - : QVBox(parent) + : QWidget(parent) { + QVBoxLayout *vbox = new QVBoxLayout(this); + _modules = 0; lastCalledModule = 0; lastCallTime = 0; @@ -58,34 +65,36 @@ _searchDialog = 0; _items = 0; - setMargin( 5 ); + vbox->setMargin( 5 ); // show titlebar only if title-bar-gradient.png exists if ( !QPixmap( PIXMAP_DIR "/title-bar-gradient.png" ).isNull() ) { QWidget * title_bar = layoutTitleBar( this ); - CHECK_PTR( title_bar ); + vbox->addWidget(title_bar); title_bar->setMinimumWidth(640); } #if 0 - QFrame * separator = new QFrame( this ); + Q3Frame * separator = new Q3Frame( this ); CHECK_PTR( separator ); - separator->setFrameStyle( QFrame::HLine | QFrame::Plain ); + separator->setFrameStyle( Q3Frame::HLine | Q3Frame::Plain ); layout->addWidget( separator ); #endif - QHBox * contentHBox = new QHBox( this ); - - + QHBoxLayout * contentHBox = new QHBoxLayout( this ); + vbox->addLayout(contentHBox); + // // Module Categories List // - _listBox = new QListBox( contentHBox ); - _listBox->setBackgroundMode( PaletteDark ); - _listBox->setFixedWidth ( LEFTLISTBOXWIDTH ); - _listBox->setFrameStyle (QFrame::StyledPanel|QFrame::Raised); + _listBox = new QListWidget(this); + contentHBox->addWidget(_listBox); + + // FIXME _listBox->setBackgroundMode( PaletteDark ); + // FIXME _listBox->setFixedWidth ( LEFTLISTBOXWIDTH ); + // FIXME _listBox->setFrameStyle (Q3Frame::StyledPanel|Q3Frame::Raised); connect( _listBox, SIGNAL( highlighted ( int ) ), this, SLOT ( slotButtonClicked( int ) ) ); @@ -109,33 +118,38 @@ // IconView for the Module Icons // - _iconView = new MyQIconView( contentHBox ); - _iconView->setArrangement( QIconView::LeftToRight ); - _iconView->setResizeMode( QIconView::Adjust ); - _iconView->setGridX( 200 ); + _iconView = new MyQIconView( this ); + contentHBox->addWidget(_iconView ); + + //FIXME_iconView->setArrangement( Q3IconView::LeftToRight ); + //FIXME_iconView->setResizeMode( Q3IconView::Adjust ); + // FIXME _iconView->setGridX( 200 ); // _iconView->setGridY( 40 ); - _iconView->setSpacing( 12 ); - _iconView->setItemTextPos( QIconView::Right ); - _iconView->setSorting( false ); + // FIXME _iconView->setSpacing( 12 ); + //FIXME_iconView->setItemTextPos( Q3IconView::Right ); + _iconView->setSortingEnabled( false ); - connect( _iconView, SIGNAL( mouseButtonClicked ( int, QIconViewItem *, const QPoint& ) ), - this, SLOT ( slotIconClicked ( int, QIconViewItem *, const QPoint&) )); +#if 0 - connect( _iconView, SIGNAL( returnPressed ( QIconViewItem * ) ), - this, SLOT ( slotIconClicked ( QIconViewItem * ) )); + connect( _iconView, SIGNAL( mouseButtonClicked ( int, QListWidgetItem *, const QPoint& ) ), + this, SLOT ( slotIconClicked ( int, QListWidgetItem *, const QPoint&) )); - connect( _iconView, SIGNAL( onItem ( QIconViewItem * ) ), - this, SLOT ( slotOnItem ( QIconViewItem * ) ) ); + connect( _iconView, SIGNAL( returnPressed ( QListWidgetItem * ) ), + this, SLOT ( slotIconClicked ( QListWidgetItem * ) )); - connect( _iconView, SIGNAL( selectionChanged ( QIconViewItem *) ), - this, SLOT ( slotOnItem ( QIconViewItem *) ) ); + connect( _iconView, SIGNAL( onItem ( QListWidgetItem * ) ), + this, SLOT ( slotOnItem ( QListWidgetItem * ) ) ); + connect( _iconView, SIGNAL( selectionChanged ( QListWidgetItem *) ), + this, SLOT ( slotOnItem ( QListWidgetItem *) ) ); + +#endif // // Buttons // - QHBox * buttonBox = new QHBox( this ); + QHBoxLayout * buttonBox = new QHBoxLayout( this ); QPushButton * button = 0; @@ -145,7 +159,9 @@ // Help button // - button = new QPushButton( _("&Help"), buttonBox ); + button = new QPushButton( _("&Help"), this); + buttonBox->addWidget(button); + connect( button, SIGNAL( clicked() ), this, SLOT( help() ) ); #endif @@ -154,12 +170,16 @@ // Search button // - button = new QPushButton( _("&Search..."), buttonBox ); + button = new QPushButton( _("&Search..."), this); + buttonBox->addWidget(button); + connect( button, SIGNAL( clicked() ), this, SLOT( search() ) ); // Stretcher - QWidget * stretcher = new QWidget( buttonBox ); + QWidget * stretcher = new QWidget(this); + buttonBox->addWidget(stretcher); + stretcher->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert @@ -186,7 +206,7 @@ connect( _modules, SIGNAL( modError ( QString ) ), this, SLOT ( errorPopup ( QString ) ) ); - QApplication::setOverrideCursor( Qt::waitCursor ); + QApplication::setOverrideCursor( Qt::WaitCursor ); if ( ! _modules->init() ) { @@ -205,17 +225,19 @@ { QPixmap titleBarGradientPixmap = QPixmap( PIXMAP_DIR "/title-bar-gradient.png" ); - QHBox * titleBar = new QHBox( parent ); - CHECK_PTR( titleBar ); - setGradient( titleBar, titleBarGradientPixmap ); - titleBar->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert + QHBoxLayout * titleBar = new QHBoxLayout( parent ); + //CHECK_PTR( titleBar ); + // FIXME setGradient( titleBar, titleBarGradientPixmap ); + // FIXME titleBar->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert // // Left logo // - QLabel * left = new QLabel( titleBar ); - left->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert + QLabel * left = new QLabel(parent); + titleBar->addWidget(left); + + //FIXME left->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert QPixmap leftLogo( PIXMAP_DIR "/title-bar-left.png" ); @@ -223,7 +245,7 @@ { left->setPixmap( leftLogo ); left->setFixedSize( leftLogo.size() ); - left->setBackgroundOrigin( QWidget::ParentOrigin ); + //FIXMEleft->setBackgroundOrigin( QWidget::ParentOrigin ); } @@ -231,8 +253,10 @@ // Center stretch space // - QWidget * spacer = new QWidget( titleBar ); - CHECK_PTR( titleBar ); + QWidget * spacer = new QWidget(parent); + titleBar->addWidget(spacer); + + //CHECK_PTR( titleBar ); spacer->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert @@ -240,8 +264,10 @@ // Right logo // - QLabel * right = new QLabel( titleBar ); - CHECK_PTR( right ); + QLabel * right = new QLabel(parent); + titleBar->addWidget(right); + + //CHECK_PTR( right ); QPixmap rightLogo( PIXMAP_DIR "/title-bar-right.png" ); @@ -249,10 +275,10 @@ { right->setPixmap( rightLogo ); right->setFixedSize( rightLogo.size() ); - right->setBackgroundOrigin( QWidget::ParentOrigin ); + //FIXME right->setBackgroundOrigin( QWidget::ParentOrigin ); } - return titleBar; + return parent; } @@ -263,7 +289,10 @@ if ( widget && ! pixmap.isNull() ) { widget->setFixedHeight( pixmap.height() ); - widget->setPaletteBackgroundPixmap( pixmap ); + + QPalette palette; + palette.setBrush(widget->backgroundRole(), QBrush(pixmap)); + widget->setPalette(palette); } } @@ -271,7 +300,7 @@ void Y2ControlCenterView::errorPopup( QString msg ) { - QApplication::setOverrideCursor( Qt::arrowCursor ); + QApplication::setOverrideCursor( Qt::ArrowCursor ); QMessageBox::warning( this, _("YaST2 Control Center"),msg); QApplication::restoreOverrideCursor(); } @@ -297,7 +326,7 @@ icon = ptr->getIcon(); groupname = ptr->getName(); - QImage img = QPixmap( icondir + icon ).convertToImage(); + QImage img = QPixmap( icondir + icon ).toImage(); // draw border around icon because we want more space between the icons img = img.copy( -1 * GROUP_ICON_HORIZ_BORDER , // x @@ -305,12 +334,12 @@ 2 * GROUP_ICON_HORIZ_BORDER + img.width() , // width 2 * GROUP_ICON_VERT_BORDER + img.height() ); // height - QListBoxPixmap * pixmapItem = new QListBoxPixmap( img, groupname ); - _listBox->insertItem( pixmapItem ); + QListWidgetItem * pixmapItem = new QListWidgetItem( QIcon(QPixmap::fromImage(img)), groupname ); + _listBox->addItem( pixmapItem ); if (ptr->isEmpty()) { - pixmapItem->setSelectable(false); + //FIXMEpixmapItem->setSelectable(false); } else if (firstenabled<0) { @@ -318,7 +347,7 @@ } } - _listBox->setSelected(firstenabled<0?0:firstenabled,true); + _listBox->setCurrentRow(firstenabled<0?0:firstenabled); //we don't want scrollbars if possible QTimer::singleShot( 0, this, SLOT( slotAdjustListbox() ) ); @@ -354,14 +383,14 @@ } } } - configfile.setName(homedir.absFilePath("y2controlcenterrc")); + configfile.setFileName(homedir.absoluteFilePath("y2controlcenterrc")); //only display msg if file does not exist //TODO: write a real config file if (!configfile.exists()) { if (dirok) { - configfile.open(IO_ReadWrite); + configfile.open(QIODevice::ReadWrite); } set_textdomain( "control-center" ); QMessageBox::information( this, _("YaST2 Control Center"), @@ -373,6 +402,7 @@ void Y2ControlCenterView::slotAdjustListbox() { +#if 0 int width = _listBox->contentsWidth() - _listBox->visibleWidth(); if ( width > 0 ) @@ -399,6 +429,7 @@ _listBox->setMinimumHeight( height ); _listBox->updateGeometry(); } +#endif } Y2ControlCenterView::~Y2ControlCenterView() @@ -413,13 +444,13 @@ return error; } -void Y2ControlCenterView::slotIconClicked(QIconViewItem *item) +void Y2ControlCenterView::slotIconClicked(QListWidgetItem *item) { if ( item ) runModule( ( (MyQIconViewItem *) item )->getModule() ); } -void Y2ControlCenterView::slotIconClicked(int button, QIconViewItem *item, const QPoint &pos) +void Y2ControlCenterView::slotIconClicked(int button, QListWidgetItem *item, const QPoint &pos) { if ( item && button == Qt::LeftButton ) runModule( ( (MyQIconViewItem *) item )->getModule() ); @@ -449,7 +480,7 @@ lastCallTime = time( NULL ); lastCalledModule = mod; - QApplication::setOverrideCursor( Qt::waitCursor ); + QApplication::setOverrideCursor( Qt::WaitCursor ); QString msg= _("Starting module %1...").arg( mod->getName()); emit statusMsg( msg); @@ -464,7 +495,7 @@ } } -void Y2ControlCenterView::slotOnItem(QIconViewItem *item) +void Y2ControlCenterView::slotOnItem(QListWidgetItem *item) { if (!item) return; @@ -501,7 +532,7 @@ MyQIconViewItem * icon = new MyQIconViewItem (_iconView, m->getName (), pixmap); icon->setModule (m); - icon->setDragEnabled (TRUE); + //icon->setDragEnabled (TRUE); m = group->next (); } @@ -557,12 +588,13 @@ // item clicked (0="ok", 1="cancel" -> ok-2 = module to run) if ( searchDialogResult > 1 ) { - runModule( _items->at( searchDialogResult - 2 ) ); + runModule( &_items->value( searchDialogResult - 2 ) ); } } void Y2ControlCenterView::slotSearchModule(QString text) { +#if 0 if ( ! _items ) return; @@ -582,16 +614,16 @@ //walk through all modules in group while (m) { - if (m->getName().contains(QRegExp(text,false,false)) || \ - m->getDescription().contains(QRegExp(text,false,false))) + if (m->getName().contains(QRegExp(text, Qt::CaseInsensitive)) || \ + m->getDescription().contains(QRegExp(text, Qt::CaseInsensitive))) { // cout << "Found: " << m->getName() << "(" <SearchResult(new QListBoxPixmap(QPixmap(icondir + m->getIcon()),m->getName())); + _searchDialog->SearchResult(new QListWidgetItem(QPixmap(icondir + m->getIcon()),m->getName())); if (_items->size()<=i) { _items->resize(i+1); } - _items->insert(i,m); + _items->insertk(i,m); i++; } m=ptr->next(); @@ -614,7 +646,7 @@ _searchDialog->ClearResults(); _searchDialog->message(_("No search string specified"),10000); } - +#endif } -#include +#include "y2controlcenterview.moc" Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.h?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.h (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2controlcenterview.h Mon Dec 15 09:01:55 2008 @@ -11,8 +11,9 @@ #define Y2CONTROLCENTERVIEW_H // include files for QT -#include -#include +#include <QWidget> +#include <QPixmap> +#include <QListWidget> #include "yastmodules.h" #include @@ -22,10 +23,10 @@ class SearchDialog; class MyQIconView; -class QIconViewItem; -class QListBox; +class Q3IconViewItem; +class QListWidget; -class Y2ControlCenterView : public QVBox +class Y2ControlCenterView : public QWidget { Q_OBJECT @@ -50,9 +51,9 @@ void slotButtonClicked(int); void slotResetCursor(); void slotSearchModule(QString text); - void slotIconClicked(QIconViewItem *); - void slotIconClicked(int button, QIconViewItem *item, const QPoint &pos); - void slotOnItem(QIconViewItem *); + void slotIconClicked(QListWidgetItem *); + void slotIconClicked(int button, QListWidgetItem *item, const QPoint &pos); + void slotOnItem(QListWidgetItem *); void slotAdjustListbox(); void errorPopup(QString msg); @@ -67,7 +68,7 @@ YModules * _modules; QVector<const YMod> *_items; - QListBox * _listBox; + QListWidget * _listBox; MyQIconView * _iconView; SearchDialog * _searchDialog; Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.cpp Mon Dec 15 09:01:55 2008 @@ -9,8 +9,8 @@ #include "y2savelogs.h" -#include -#include +#include <QFileDialog> +#include <QMessageBox> Y2SaveLogs::Y2SaveLogs() @@ -44,8 +44,7 @@ void Y2SaveLogs::saveProcessExited() { - if ( proc->normalExit() && - proc->exitStatus() == 0 ) + if ( proc->exitStatus() == QProcess::NormalExit ) { emit statusMsg( _("Log files written successfully.") ); } @@ -79,26 +78,29 @@ { QString saveLogsCommand = "/sbin/save_y2logs"; - if ( access( saveLogsCommand.ascii(), X_OK ) == 0 ) + if ( access( saveLogsCommand.toLocal8Bit(), X_OK ) == 0 ) { lock = true; proc = new QProcess( this ); - proc->addArgument( saveLogsCommand ); - proc->addArgument( fileName ); connect (proc, SIGNAL(processExited()), this, SLOT(saveProcessExited())); - bool result = proc->start(); + QStringList args; + args << fileName; + + proc->start( saveLogsCommand, args ); - if ( !result ) + + + if ( ! proc->exitCode() ) { // unable to start command (errors while running command are handled by saveProcessExited) QMessageBox::warning( 0, // parent "Error", // caption QString( "Couldn't save y2logs to %1 - " - "exit code %2" ).arg( fileName ).arg( result ), + "exit code %2" ).arg( fileName ).arg( proc->exitCode() ), QMessageBox::Ok | QMessageBox::Default, // button0 QMessageBox::NoButton, // button1 QMessageBox::NoButton ); // button2 @@ -137,21 +139,21 @@ // Leave the mouse cursor alone - this function might be called from // some other widget, not only from AskForSaveFileName(). - file_name = QFileDialog::getSaveFileName( startWith, - filter, - 0, // parent - "file_selector", // name - headline ); // caption + file_name = QFileDialog::getSaveFileName( 0, //parent + headline, // caption + QString(), + filter ); // filter + if ( file_name.isEmpty() ) // this includes file_name.isNull() return QString::null; - if ( access( (const char *) file_name, F_OK ) == 0 ) // file exists? + if ( access( file_name.toLocal8Bit(), F_OK ) == 0 ) // file exists? { QString msg; - if ( access( (const char *) file_name, W_OK ) == 0 ) + if ( access( (const char *) file_name.toLocal8Bit(), W_OK ) == 0 ) { // Confirm if the user wishes to overwrite an existing file msg = ( _( "%1 exists! Really overwrite?" ) ).arg( file_name ); @@ -176,4 +178,4 @@ return file_name; } -#include +#include "y2savelogs.moc" Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.h?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.h (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/y2savelogs.h Mon Dec 15 09:01:55 2008 @@ -7,8 +7,8 @@ #define Y2SAVELOGS_H // include files for QT -#include -#include +#include <QString> +#include <QProcess> // application specific includes Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.cpp?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.cpp (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.cpp Mon Dec 15 09:01:55 2008 @@ -23,7 +23,7 @@ #include "yastmodules.h" -#include "QY2Settings.h" +#include "QSettings" #include #include @@ -35,11 +35,12 @@ #include #include <iostream> -#include -#include -#include -#include -#include +#include <QApplication> +#include <QDir> +#include <QTextStream> +#include <QTimer> +#include <QRegExp> +#include <QDebug> using std::cout; using std::cerr; @@ -57,9 +58,6 @@ YModules::YModules() { - modList.setAutoDelete( true ); // delete items when they are removed - groupList.setAutoDelete( true ); // delete items when they are removed - bindtextdomain( DESKTOP_TRANSLATIONS, DESKTOP_TRANSLATIONS_DIR ); bind_textdomain_codeset( DESKTOP_TRANSLATIONS, "utf8" ); @@ -81,8 +79,8 @@ if ( initGroups() && initModules() ) { - groupList.sort(); - modList.sort(); + qSort(groupList.begin(), groupList.end()); + qSort(modList.begin(), modList.end()); removeEmptyGroups(); emit modulesReady(); @@ -104,7 +102,7 @@ "if the latter is the case, try to run the Control Center as root. \n" "Also make sure that you do not run out of disk space. "); - cerr << error << endl; + qDebug() << error; return false; } @@ -118,7 +116,7 @@ if ( lang_cstr ) { langWithCountry = lang_cstr; - langWithCountry.replace( QRegExp( "[@\\.].*$" ), "" ); // remove .utf8 / @euro etc. + langWithCountry.replace( QRegExp( "[@\\.).toString().*$" ), "" ); // remove .utf8 / @euro etc. lang = langWithCountry; lang.replace( QRegExp( "_.*$" ), "" ); // remove _DE etc. @@ -132,7 +130,7 @@ if ( ! dir.exists() ) { - emit modError( QString( _("Directory %1 does not exist.") ).arg( dir.absPath() )); + emit modError( QString( _("Directory %1 does not exist.") ).arg( dir.absolutePath() )); return false; } @@ -155,7 +153,7 @@ if ( ! dir.exists() ) { - emit modError( QString( _("Directory %1 does not exist.") ).arg( dir.absPath())); + emit modError( QString( _("Directory %1 does not exist.") ).arg( dir.absolutePath())); return false; } @@ -174,46 +172,46 @@ bool YModules::readModuleDesktopFile( const QString & path, const QString & filename ) { - QY2Settings desktopFile( path + "/" + filename ); + QSettings desktopFile( path + "/" + filename, QSettings::IniFormat ); - if ( desktopFile.readError() ) + if ( desktopFile.status() != QSettings::NoError ) return false; - desktopFile.selectSection( "Desktop Entry" ); + desktopFile.beginGroup( "Desktop Entry" ); - if ( desktopFile[ "Hidden" ] == "true" ) + if ( desktopFile.value("Hidden").toBool() ) return true; YMod * mod = new YMod(); - CHECK_PTR( mod ); + //CHECK_PTR( mod ); // // Name // - QString name = desktopFile[ QString( "Name[%1]" ).arg( langWithCountry ) ]; + QString name = desktopFile.value( QString( "Name.value( %1).toString()" ).arg( langWithCountry ) ).toString(); if ( name.isEmpty() ) - name = desktopFile[ QString( "Name[%1]" ).arg( lang ) ]; + name = desktopFile.value(QString( "Name.value( %1).toString()" ).arg( lang )).toString(); if ( name.isEmpty() ) { QString msgid = QString( "Name(%1)" ).arg( filename ); msgid += ": "; - msgid += desktopFile[ "Name" ]; - name = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.ascii() ) ); + msgid += desktopFile.value("Name").toString(); + name = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.toUtf8() ) ); if ( name == msgid ) // no translation? name = ""; #if VERBOSE_GETTEXT - fprintf( stderr, "Reading key %s -> %s\n", msgid.ascii(), name.ascii() ); + fprintf( stderr, "Reading key %s -> %s\n", msgid.ascii(), name.toUtf8() ); #endif } if ( name.isEmpty() ) - name = desktopFile[ "Name" ]; + name = desktopFile.value("Name").toString(); mod->setName( name ); @@ -222,49 +220,47 @@ // GenericName // - QString description = desktopFile[ QString( "GenericName[%1]" ).arg( langWithCountry ) ]; + QString description = desktopFile.value(QString( "GenericName.value( %1).toString()" ).arg( langWithCountry )).toString(); if ( description.isEmpty() ) - description = desktopFile[ QString( "GenericName[%1]" ).arg( lang ) ]; + description = desktopFile.value(QString( "GenericName.value( %1).toString()" ).arg( lang )).toString(); if ( description.isEmpty() ) { QString msgid = QString( "GenericName(%1)" ).arg( filename ); msgid += ": "; - msgid += desktopFile[ "GenericName" ]; - description = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.ascii() ) ); + msgid += desktopFile.value( "GenericName" ).toString(); + description = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.toUtf8() ) ); if ( description == msgid ) // no translation? description = ""; #if VERBOSE_GETTEXT - fprintf( stderr, "Reading key %s -> %s\n", msgid.ascii(), description.ascii() ); + fprintf( stderr, "Reading key %s -> %s\n", msgid.toUtf8(), description.toUtf8() ); #endif } if ( description.isEmpty() ) - description = desktopFile[ "GenericName" ]; + description = desktopFile.value("GenericName").toString(); mod->setDescription( description ); - QString icon = desktopFile[ "Icon" ]; - QRegExp extension( "\\.(png|jpg)$", false ); // case insensitive + QString icon = desktopFile.value("Icon").toString(); + QRegExp extension( "\\.(png|jpg)$", Qt::CaseInsensitive ); - if ( icon.find( extension ) < 0 ) // no .png or .jpg extension? + if ( icon.indexOf( extension ) < 0 ) // no .png or .jpg extension? icon += ".png"; // assume .png mod->setIcon( icon ); - mod->setYCPName ( desktopFile[ "X-SuSE-YaST-Call" ] ); - mod->setGroup ( desktopFile[ "X-SuSE-YaST-Group" ] ); - mod->setArguments ( desktopFile[ "X-SuSE-YaST-Argument" ] ); - mod->setSortKey ( desktopFile[ "X-SuSE-YaST-SortKey" ] ); - mod->setGeometry ( desktopFile[ "X-SuSE-YaST-Geometry" ] ); - - QString rootOnly = desktopFile[ "X-SuSE-YaST-RootOnly" ]; - QRegExp yes( "^(true|yes|1)$", false ); // case insensitive + mod->setYCPName ( desktopFile.value( "X-SuSE-YaST-Call" ).toString() ); + mod->setGroup ( desktopFile.value( "X-SuSE-YaST-Group" ).toString() ); + mod->setArguments ( desktopFile.value( "X-SuSE-YaST-Argument" ).toString() ); + mod->setSortKey ( desktopFile.value( "X-SuSE-YaST-SortKey" ).toString() ); + mod->setGeometry ( desktopFile.value( "X-SuSE-YaST-Geometry" ).toString() ); - mod->setRootFlag( rootOnly.find( yes ) >= 0 ); + bool rootOnly = desktopFile.value( "X-SuSE-YaST-RootOnly" ).toBool(); + mod->setRootFlag( rootOnly ); #if 0 printf( "new Module: %s\n", (const char *) mod->getName() ); @@ -281,61 +277,61 @@ bool YModules::readGroupDesktopFile( const QString & path, const QString & filename ) { - QY2Settings desktopFile( path + "/" + filename ); + QSettings desktopFile( path + "/" + filename ); - if ( desktopFile.readError() ) + if ( desktopFile.status() != QSettings::NoError ) return false; - desktopFile.selectSection( "Desktop Entry" ); + desktopFile.beginGroup( "Desktop Entry" ); - if ( desktopFile[ "Hidden" ] == "true" ) + if ( desktopFile.value("Hidden").toBool() ) return true; - QString rawName = desktopFile[ "X-SuSE-YaST-Group" ]; - QString sortKey = desktopFile[ "X-SuSE-YaST-SortKey" ]; + QString rawName = desktopFile.value("X-SuSE-YaST-Group").toString(); + QString sortKey = desktopFile.value( "X-SuSE-YaST-SortKey" ).toString(); - QString name = desktopFile[ QString( "Name[%1]" ).arg( langWithCountry ) ]; + QString name = desktopFile.value( QString( "Name[%1]" ).arg( langWithCountry ) ).toString(); if ( name.isEmpty() ) - name = desktopFile[ QString( "Name[%1]" ).arg( lang ) ]; + name = desktopFile.value( QString("Name[%1]").arg( lang ) ).toString(); if ( name.isEmpty() ) { QString msgid = QString( "Name(%1)" ).arg( filename ); msgid += ": "; - msgid += desktopFile[ "Name" ]; - name = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.ascii() ) ); + msgid += desktopFile.value( "Name" ).toString(); + name = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.toUtf8() ) ); if ( name == msgid ) // no translation? { -#if VERBOSE_GROUPS - fprintf( stderr, "No translation for group name %s\n", msgid.ascii() ); -#endif + qWarning() << "No translation for group " << msgid; name = ""; } -#if VERBOSE_GROUPS - fprintf( stderr, "[Groups] Reading key %s -> %s\n", msgid.ascii(), name.ascii() ); -#endif + qDebug() << "[Groups] Reading key " << msgid << " -> " << name; } if ( name.isEmpty() ) - name = desktopFile[ "Name" ]; + { + name = desktopFile.value( "Name" ).toString(); + qDebug() << "Name: '" << name << "'"; + } + - QString icon = desktopFile.get( "Icon", DEFAULT_GROUP_ICON ); - QRegExp extension( "\\.(png|jpg)$", false ); // case insensitive + QString icon = desktopFile.value( "Icon", DEFAULT_GROUP_ICON ).toString(); + QRegExp extension( "\\.(png|jpg)$", Qt::CaseInsensitive ); - if ( icon.find( extension ) < 0 ) // no .png or .jpg extension? + if ( icon.indexOf( extension ) < 0 ) // no .png or .jpg extension? icon += ".png"; // assume .png ModGroup * grp = new ModGroup( rawName ); groupList.first(); // move groupList.current() to the first group - if ( groupList.find( grp ) >= 0 ) + if ( groupList.indexOf( grp ) >= 0 ) { // group already existing - qWarning( "Warning: Duplicate group %s in %s", rawName.ascii(), filename.ascii() ); + qWarning() << "Warning: Duplicate group " << rawName << " in " << filename; } else { @@ -373,11 +369,13 @@ groupList.first(); // move groupList.current() to the first group - if ( groupList.find( tmpGrp ) < 0 ) + GroupListIterator it(groupList); + int index = groupList.indexOf( tmpGrp ); + + if ( groupList.indexOf( tmpGrp ) < 0 ) { // group did not exist - qWarning( "Warning: new Group detected for Module %s, misspelled in .desktop file?", - module->getName().ascii() ); + qWarning() << "Warning: new Group detected for Module " << module->getName() << ", misspelled in .desktop file?"; tmpGrp->setIcon(DEFAULT_GROUP_ICON); tmpGrp->setSortKey( "zzzzz" ); @@ -388,10 +386,12 @@ } else { - // groupList.current() points now to what groupList.find() found - - groupList.current()->addModule( module ); + it += index; + + // iterator points now to the found group + + it.value()->addModule( module ); delete tmpGrp; tmpGrp=0; } @@ -432,17 +432,17 @@ ModuleListIterator it( modList ); printf( "*** Available Modules ***\n\n" ); - while ( *it ) + while ( it.hasNext() ) { + YMod *mod = it.next(); + // Beware: cout << (const char *) 0 doesn't work (overwrites memory), // and QString::null returns such a (const char *) 0 ! - printf( "Module: %s\n", (const char *) (*it)->getName() ); - printf( "\tgroup: %s\n", (const char *) (*it)->getGroup() ); - printf( "\ticon: %s\n", (const char *) (*it)->getIcon() ); - printf( "\tsortKey: %s\n\n", (const char *) (*it)->getSortKey() ); - - ++it; + printf( "Module: %s\n", (const char *) mod->getName().toUtf8() ); + printf( "\tgroup: %s\n", (const char *) mod->getGroup().toUtf8() ); + printf( "\ticon: %s\n", (const char *) mod->getIcon().toUtf8() ); + printf( "\tsortKey: %s\n\n", (const char *) mod->getSortKey().toUtf8() ); } } @@ -451,17 +451,17 @@ GroupListIterator it( groupList ); printf( "*** Available Groups ***\n\n" ); - while ( *it ) + while ( it.hasNext() ) { + ModGroup *grp = it.next(); + // Beware: cout << (const char *) 0 doesn't work (overwrites memory), // and QString::null returns such a (const char *) 0 ! - printf( "Group:\t%s - ", (const char *) (*it)->getRawName() ); - printf( "%s\n", (const char *) (*it)->getName() ); - printf( "\ticon: %s\n", (const char *) (*it)->getIcon() ); - printf( "\tsortKey: %s\n\n", (const char *) (*it)->getSortKey() ); - - ++it; + printf( "Group:\t%s - ", (const char *) grp->getRawName().toUtf8() ); + printf( "%s\n", (const char *) grp->getName().toUtf8() ); + printf( "\ticon: %s\n", (const char *) grp->getIcon().toUtf8() ); + printf( "\tsortKey: %s\n\n", (const char *) grp->getSortKey().toUtf8() ); } } @@ -469,16 +469,15 @@ { GroupListIterator it( groupList ); - while ( *it ) + while ( it.hasNext() ) { - if ((*it)->isEmpty() ) - { - groupList.remove(*it); - (*it)->first(); - } - else - { - ++it; + ModGroup *grp = it.next(); + + if (grp->isEmpty() ) + { + groupList.remove(grp); + delete grp; + //grp->first(); } } } @@ -519,9 +518,9 @@ } cmd += " &"; - qDebug( "Command: %s", cmd.ascii() ); + qDebug() << "Command: " << cmd; - system( cmd ); + system( cmd.toLocal8Bit() ); } @@ -723,7 +722,6 @@ ModGroup::ModGroup() { //class YModules holds the primary pointer to the Data - modules.setAutoDelete(false); sorted=true; icon=DEFAULT_GROUP_ICON; sortkey=""; @@ -733,7 +731,6 @@ ModGroup::ModGroup(const QString& Name) { - modules.setAutoDelete(false); rawname=Name; icon=DEFAULT_GROUP_ICON; sorted=true; @@ -788,32 +785,64 @@ YMod* ModGroup::first() { - if (sorted==false) {modules.sort(); sorted=true;} - return modules.first(); + if (sorted==false) + { + qSort(modules.begin(), modules.end()); + sorted=true; + } + + GroupListIterator it(modules); + return it.value(); } YMod* ModGroup::last() { - if (sorted==false) {modules.sort(); sorted=true;} - return modules.last(); + if (sorted==false) + { + qSort(modules.begin(), modules.end()); + sorted=true; + } + + GroupListIterator it(modules); + it.toBack(); + + return it.value(); } YMod* ModGroup::prev() { - if (sorted==false) {modules.sort(); sorted=true;} - return modules.prev(); + if (sorted==false) + { + qSort(modules.begin(), modules.end()); + sorted=true; + } + + GroupListIterator it(modules); + return it.findPrevious(it.value()); } YMod* ModGroup::next() { - if (sorted==false) {modules.sort(); sorted=true;} - return modules.next(); + if (sorted==false) + { + qSort(modules.begin(), modules.end()); + sorted=true; + } + + GroupListIterator it(modules); + return it.findNext(it.value()); } YMod* ModGroup::current() { - if (sorted==false) {modules.sort(); sorted=true;} - return modules.current(); + if (sorted==false) + { + qSort(modules.begin(), modules.end()); + sorted=true; + } + + GroupListIterator it(modules); + return it.value(); } bool ModGroup::isEmpty() const @@ -951,4 +980,4 @@ return module; } -#include +#include "yastmodules.moc" Modified: branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.h?rev=54110&r1=54109&r2=54110&view=diff ============================================================================== --- branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.h (original) +++ branches/tmp/dmacvicar/control-center-qt4/control-center/src/yastmodules.h Mon Dec 15 09:01:55 2008 @@ -14,24 +14,24 @@ #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include <QFile> +#include <QString> +#include <QList> +#include <QVector> +#include +#include +#include <QRegExp> +#include <QObject> #include "y2cc_globals.h" class YMod; class ModGroup; -typedef QSortedList<YMod> ModuleList; -typedef QPtrListIterator<YMod> ModuleListIterator; +typedef QList ModuleList; +typedef QListIterator ModuleListIterator; -typedef QSortedList<ModGroup> GroupList; -typedef QPtrListIterator<ModGroup> GroupListIterator; +typedef QList GroupList; +typedef QListIterator GroupListIterator; class YModules: public QObject -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org