Author: coolo Date: Tue Dec 4 11:02:48 2007 New Revision: 42646 URL: http://svn.opensuse.org/viewcvs/yast?rev=42646&view=rev Log: get rid of the last pngs to load Added: branches/tmp/coolo/qt4-port/theme/CMakeLists.txt branches/tmp/coolo/qt4-port/theme/background.svg Removed: branches/tmp/coolo/qt4-port/theme/bottom-gradient.png Modified: branches/tmp/coolo/qt4-port/CMakeLists.txt branches/tmp/coolo/qt4-port/src/CMakeLists.txt branches/tmp/coolo/qt4-port/src/YQUI_core.cc branches/tmp/coolo/qt4-port/src/YQWizard.cc branches/tmp/coolo/qt4-port/theme/style.qss Modified: branches/tmp/coolo/qt4-port/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/CMakeLists.txt?rev=42646&r1=42645&r2=42646&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/CMakeLists.txt Tue Dec 4 11:02:48 2007 @@ -15,4 +15,5 @@ SET(Y2QT_THEMEDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme) ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(theme) Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeLists.txt?rev=42646&r1=42645&r2=42646&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Tue Dec 4 11:02:48 2007 @@ -49,7 +49,7 @@ INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) -ADD_SUBDIRECTORY(pkg) +#ADD_SUBDIRECTORY(pkg) #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" ) Modified: branches/tmp/coolo/qt4-port/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_core.cc?rev=42646&r1=42645&r2=42646&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_core.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_core.cc Tue Dec 4 11:02:48 2007 @@ -46,7 +46,7 @@ #include "YQDialog.h" #include "QY2Settings.h" - +#define PIXMAP_DIR THEMEDIR "/openSUSE/wizard/" #define BUSY_CURSOR_TIMEOUT 200 // milliseconds YQUI * YQUI::_ui = 0; @@ -119,6 +119,8 @@ processCommandLineArgs( _ui_argc, _ui_argv ); calcDefaultSize(); + qApp->setStyleSheet( "file:///" PIXMAP_DIR "/style.qss" ); + // Event loop object. Required since a YaST2 UI needs to react to commands // from the YCP command stream as well as to X11 / Qt events. _eventLoop = new QEventLoop( qApp ); Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWizard.cc?rev=42646&r1=42645&r2=42646&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.cc Tue Dec 4 11:02:48 2007 @@ -65,9 +65,6 @@ using std::string; - -#define PIXMAP_DIR THEMEDIR "/wizard/" - #ifdef TEXTDOMAIN # undef TEXTDOMAIN #endif @@ -158,15 +155,7 @@ QLabel * left = new QLabel( titleBar ); layout->addWidget( left ); left->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert - - QPixmap leftLogo( PIXMAP_DIR "title-bar-left.png" ); - - if ( ! leftLogo.isNull() ) - { - left->setPixmap( leftLogo ); - left->setFixedSize( leftLogo.size() ); - } - + left->setObjectName( "titleBar-left" ); // // Center stretch space @@ -183,14 +172,7 @@ YUI_CHECK_NEW( right ); layout->addWidget( right ); - - QPixmap rightLogo( PIXMAP_DIR "title-bar-right.png" ); - - if ( ! rightLogo.isNull() ) - { - right->setPixmap( rightLogo ); - right->setFixedSize( rightLogo.size() ); - } + right->setObjectName( "titleBar-right" ); } @@ -446,7 +428,6 @@ YUI_CHECK_NEW( buttonBox ); QPushButton * button; - QPixmap pixmap; if ( _treeEnabled ) { @@ -454,8 +435,7 @@ button = new QPushButton( _( "Tree" ), buttonBox ); YUI_CHECK_NEW( button ); _treeButton = button; - - pixmap = QPixmap( PIXMAP_DIR "tree-button.png" ); + button->setObjectName( "treeButton" ); } else if ( _stepsEnabled ) @@ -465,8 +445,7 @@ YUI_CHECK_NEW( button ); _stepsButton = button; _stepsButton->hide(); - - pixmap = QPixmap( PIXMAP_DIR "steps-button.png" ); + _stepsButton->setObjectName( "stepsButton" ); } else { @@ -475,12 +454,6 @@ YUI_CHECK_NEW( button ); } - -#if USE_ICON_ON_HELP_BUTTON - if ( ! pixmap.isNull() ) - button->setPixmap( pixmap ); -#endif - layoutSideBarButtonBox( buttonBox, button ); if ( _treeEnabled ) @@ -759,12 +732,6 @@ connect( _helpButton, SIGNAL( clicked() ), this, SLOT ( showHelp() ) ); -#if USE_ICON_ON_HELP_BUTTON - QPixmap pixmap = QPixmap( PIXMAP_DIR "help-button.png" ); - - if ( ! pixmap.isNull() ) - _helpButton->setPixmap( pixmap ); -#endif hbox->addWidget( _helpButton ); hbox->addStretch( 10 ); Added: branches/tmp/coolo/qt4-port/theme/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/theme/CMakeLists.txt?rev=42646&view=auto ============================================================================== --- branches/tmp/coolo/qt4-port/theme/CMakeLists.txt (added) +++ branches/tmp/coolo/qt4-port/theme/CMakeLists.txt Tue Dec 4 11:02:48 2007 @@ -0,0 +1,5 @@ +SET(_files background.svg g22503.png rect2174.png step-current.png step-done.png steps-button.png step-todo.png style.qss background-1024x768.png) + +install( FILES ${_files} DESTINATION ${Y2QT_THEMEDIR}/openSUSE/wizard/ ) + + Added: branches/tmp/coolo/qt4-port/theme/background.svg URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/theme/background.svg?rev=42646&view=auto ============================================================================== --- branches/tmp/coolo/qt4-port/theme/background.svg (added) +++ branches/tmp/coolo/qt4-port/theme/background.svg Tue Dec 4 11:02:48 2007 @@ -0,0 +1,854 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +
