python/console/console_editor.py

@@ -581,7 +581,8 @@ def runScriptCode(self):
                 tmpFile = self.createTempFile()
                 filename = tmpFile
 
-            self.parent.pc.shell.runCommand(u"execfile(r'{0}')".format(filename))
+            self.parent.pc.shell.runCommand(u"execfile(u'{0}'.encode('{1}'))"
+                                            .format(filename.replace("\\", "/"), sys.getfilesystemencoding()))
 
     def runSelectedCode(self):
         cmd = self.selectedText()

python/console/console_output.py

@@ -56,7 +56,9 @@ def write(self, m):
             self.out.write(m)
 
         self.move_cursor_to_end()
-        QCoreApplication.processEvents()
+
+        if self.style != "_traceback":
+            QCoreApplication.processEvents()
 
     def move_cursor_to_end(self):
         """Move cursor to end of text"""

python/plugins/fTools/tools/doRandom.py

@@ -60,6 +60,7 @@ def accept(self):
         self.buttonOk.setEnabled( False )
         if self.inShape.currentText() == "":
             QMessageBox.information(self, self.tr("Random Selection Tool"), self.tr("No input shapefile specified"))
+            return
         else:
             self.progressBar.setValue(10)
             inName = self.inShape.currentText()

src/gui/qgsmessagebar.cpp

@@ -76,8 +76,8 @@ QgsMessageBar::QgsMessageBar( QWidget *parent )
   mCloseBtn->setToolTip( tr( "Close" ) );
   mCloseBtn->setMinimumWidth( 40 );
   mCloseBtn->setStyleSheet(
-    "QToolButton { background-color: rgba(0, 0, 0, 0); } "
-    "QToolButton::menu-button { background-color: rgba(0, 0, 0, 0); " );
+    "QToolButton { background-color: rgba(0, 0, 0, 0); }"
+    "QToolButton::menu-button { background-color: rgba(0, 0, 0, 0); }" );
   mCloseBtn->setCursor( Qt::PointingHandCursor );
   mCloseBtn->setIcon( QgsApplication::getThemeIcon( "/mIconClose.png" ) );
   mCloseBtn->setIconSize( QSize( 18, 18 ) );

src/plugins/spatialquery/qgsspatialqueryplugin.cpp

@@ -24,6 +24,7 @@
 #include "qgisinterface.h"
 #include "qgsapplication.h"
 #include "qgsmaplayerregistry.h"
+#include "qgsmessagebar.h"
 
 //
 // Required plugin includes
@@ -111,7 +112,7 @@ void QgsSpatialQueryPlugin::run()
     QString msg;
     if ( ! QgsSpatialQueryDialog::hasPossibleQuery( msg ) )
     {
-      QMessageBox::warning( mIface->mainWindow(), tr( "Query not executed" ), msg, QMessageBox::Ok );
+      mIface->messageBar()->pushMessage( tr( "Query not executed" ), msg, QgsMessageBar::INFO, mIface->messageTimeout() );
       return;
     }
     mDialog = new QgsSpatialQueryDialog( mIface->mainWindow(), mIface );