Author: tgoettlicher Date: Wed Nov 24 15:08:48 2010 New Revision: 62883 URL: http://svn.opensuse.org/viewcvs/yast?rev=62883&view=rev Log: fixed hanging file chooser dialog (bnc #642270) Modified: branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes branches/SuSE-Code-11-SP1-Branch/qt/src/QY2StyleEditor.cc branches/SuSE-Code-11-SP1-Branch/qt/src/YQApplication.cc branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI_builtins.cc Modified: branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake?rev=62883&r1=62882&r2=62883&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/VERSION.cmake Wed Nov 24 15:08:48 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "11") +SET(VERSION_PATCH "12") Modified: branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes?rev=62883&r1=62882&r2=62883&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes Wed Nov 24 15:08:48 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 24 14:25:12 CET 2010 - tgoettlicher@suse.de + +- fixed hanging file chooser dialog (bnc #642270) +- V 2.18.12 + +------------------------------------------------------------------- Tue Apr 20 12:45:13 CEST 2010 - tgoettlicher@suse.de - Fixed untranslated context menu (bnc #580165) Modified: branches/SuSE-Code-11-SP1-Branch/qt/src/QY2StyleEditor.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/src/QY2StyleEditor.cc?rev=62883&r1=62882&r2=62883&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/src/QY2StyleEditor.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/src/QY2StyleEditor.cc Wed Nov 24 15:08:48 2010 @@ -77,7 +77,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: branches/SuSE-Code-11-SP1-Branch/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/src/YQApplication.cc?rev=62883&r1=62882&r2=62883&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/src/YQApplication.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/src/YQApplication.cc Wed Nov 24 15:08:48 2010 @@ -472,7 +472,7 @@ QString dirName = QFileDialog::getExistingDirectory( 0, // parent fromUTF8( headline ) , // caption - fromUTF8( startDir )); // dir + fromUTF8( startDir ), QFileDialog::DontUseNativeDialog); // dir busyCursor(); @@ -491,7 +491,8 @@ QFileDialog::getOpenFileName( 0, // parent fromUTF8( headline ) , // caption fromUTF8( startWith ), // dir - fromUTF8( filter )); // filter + fromUTF8( filter ), // filter + 0, QFileDialog::DontUseNativeDialog); busyCursor(); return toUTF8( fileName ); @@ -543,7 +544,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: branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI_builtins.cc?rev=62883&r1=62882&r2=62883&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI_builtins.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI_builtins.cc Wed Nov 24 15:08:48 2010 @@ -313,7 +313,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 @@ -339,7 +341,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