Merge lp:~alexwolf/stellarium/qfiledialog-workaround into lp:stellarium

[Alexander Wolf]

I'm write work-around patch for temporary fixes of report #812008

Description of the bug in Qt - http://bugreports.qt.nokia.com/browse/QTBUG-16722

[lp:~alexwolf/stellarium/qfiledialog-workaround]

4918. By Alexander Wolf on 2011-09-19

Add comments and use ifdef

4919. By Alexander Wolf on 2011-09-25

fix mistakes

[treaves (treaves)]

How do we insure this is reverted once the Qt bug is fixed?

[treaves (treaves)]

Looks good.

review: Approve

[Alexander Wolf (alexwolf)]

Only via check Qt bug status

=== modified file 'src/gui/AddRemoveLandscapesDialog.cpp'
--- src/gui/AddRemoveLandscapesDialog.cpp	2011-01-30 15:56:36 +0000
+++ src/gui/AddRemoveLandscapesDialog.cpp	2011-09-25 12:42:20 +0000
@@ -113,7 +113,12 @@
 	// TRANSLATORS: This string is displayed in the "Files of type:" drop-down list in the standard file selection dialog.
 	QString filter = q_("ZIP archives");
 	filter += " (*.zip)";
-	QString sourceArchivePath = QFileDialog::getOpenFileName(NULL, caption, lastUsedDirectoryPath, filter);
+    #ifdef Q_OS_MAC
+    //work-around for Qt bug - http://bugreports.qt.nokia.com/browse/QTBUG-16722
+	QString sourceArchivePath = QFileDialog::getOpenFileName(NULL, caption, lastUsedDirectoryPath, filter, 0, QFileDialog::DontUseNativeDialog);
+    #else
+    QString sourceArchivePath = QFileDialog::getOpenFileName(NULL, caption, lastUsedDirectoryPath, filter);
+    #endif
 	bool useLandscape = ui->checkBoxUseLandscape->isChecked();
 	if (!sourceArchivePath.isEmpty() && QFile::exists(sourceArchivePath))
 	{

=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2011-07-17 17:26:01 +0000
+++ src/gui/ConfigurationDialog.cpp	2011-09-25 12:42:20 +0000
@@ -292,7 +292,12 @@
 void ConfigurationDialog::browseForScreenshotDir()
 {
 	QString oldScreenshorDir = StelFileMgr::getScreenshotDir();
-	QString newScreenshotDir = QFileDialog::getExistingDirectory(NULL, q_("Select screenshot directory"), oldScreenshorDir, QFileDialog::ShowDirsOnly);
+    #ifdef Q_OS_MAC
+    //work-around for Qt bug -  http://bugreports.qt.nokia.com/browse/QTBUG-16722
+	QString newScreenshotDir = QFileDialog::getExistingDirectory(NULL, q_("Select screenshot directory"), oldScreenshorDir, QFileDialog::DontUseNativeDialog);
+    #else
+    QString newScreenshotDir = QFileDialog::getExistingDirectory(NULL, q_("Select screenshot directory"), oldScreenshorDir, QFileDialog::ShowDirsOnly);
+    #endif
 
 	if (!newScreenshotDir.isEmpty()) {
 		// remove trailing slash