[yast-commit] r62870 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/QY2StyleEditor.cc src/YQApplication.cc src/YQUI_builtins.cc
Author: tgoettlicher Date: Mon Nov 22 09:46:27 2010 New Revision: 62870 URL: http://svn.opensuse.org/viewcvs/yast?rev=62870&view=rev Log: disables native dialogs (bnc #642270) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/QY2StyleEditor.cc trunk/qt/src/YQApplication.cc trunk/qt/src/YQUI_builtins.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=62870&r1=62869&r2=62870&view=diff ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Mon Nov 22 09:46:27 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "4") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=62870&r1=62869&r2=62870&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Mon Nov 22 09:46:27 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 22 09:40:58 CET 2010 - tgoettlicher@suse.de + +- disables native dialogs (bnc #642270) +- V 2.19.4 + +------------------------------------------------------------------- Mon Oct 11 10:23:07 CEST 2010 - tgoettlicher@suse.de - Fixed font dependency (bnc #629892) Modified: trunk/qt/src/QY2StyleEditor.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2StyleEditor.cc?rev=62870&r1=62869&r2=62870&view=diff ============================================================================== --- trunk/qt/src/QY2StyleEditor.cc (original) +++ trunk/qt/src/QY2StyleEditor.cc Mon Nov 22 09:46:27 2010 @@ -98,7 +98,8 @@ QString fileName = QFileDialog::getOpenFileName( this, // parent QString( "Load stylesheet ..." ), // caption QY2Styler::styler()->themeDir(), // dir - QString( "*.qss") ); // filter + QString( "*.qss"), 0, // filter + QFileDialog::DontUseNativeDialog ); if ( fileName.isEmpty() ) return; // user clicked cancel Modified: trunk/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.cc?rev=62870&r1=62869&r2=62870&view=diff ============================================================================== --- trunk/qt/src/YQApplication.cc (original) +++ trunk/qt/src/YQApplication.cc Mon Nov 22 09:46:27 2010 @@ -501,7 +501,7 @@ QString dirName = QFileDialog::getExistingDirectory( 0, // parent fromUTF8( headline ) , // caption - fromUTF8( startDir )); // dir + fromUTF8( startDir ), QFileDialog::DontUseNativeDialog); // dir busyCursor(); @@ -520,7 +520,8 @@ QFileDialog::getOpenFileName( 0, // parent fromUTF8( headline ) , // caption fromUTF8( startWith ), // dir - fromUTF8( filter )); // filter + fromUTF8( filter ), // filter + 0, QFileDialog::DontUseNativeDialog); busyCursor(); return toUTF8( fileName ); @@ -572,7 +573,7 @@ fileName = QFileDialog::getSaveFileName( parent, // parent headline, // caption startWith, // dir - filter ); // filter + filter, 0, QFileDialog::DontUseNativeDialog ); // filter if ( fileName.isEmpty() ) // this includes fileName.isNull() return QString::null; Modified: trunk/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_builtins.cc?rev=62870&r1=62869&r2=62870&view=diff ============================================================================== --- trunk/qt/src/YQUI_builtins.cc (original) +++ trunk/qt/src/YQUI_builtins.cc Mon Nov 22 09:46:27 2010 @@ -334,7 +334,9 @@ QFileDialog::getSaveFileName( parent, "Select Macro File to Record to", DEFAULT_MACRO_FILE_NAME, // startWith - "*.ycp" // filter + "*.ycp", // filter + 0, // selectedFilter + QFileDialog::DontUseNativeDialog ); if ( ! filename.isEmpty() ) // file selection dialog has been cancelled @@ -360,7 +362,7 @@ QFileDialog::getOpenFileName( parent, "Select Macro File to Play", DEFAULT_MACRO_FILE_NAME, // startWith - "*.ycp" ); + "*.ycp", 0, QFileDialog::DontUseNativeDialog ); busyCursor(); if ( ! filename.isEmpty() ) // file selection dialog has been cancelled -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
tgoettlicher@svn2.opensuse.org