Merge pull request #5940 from nirvn/messagebar_link_color

nirvn · web-flow · commit f149730e4324 · 2017-12-23T07:40:04.000+07:00
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -1538,7 +1538,7 @@ void QgsLayoutDesignerDialog::exportToRaster()
     case QgsLayoutExporter::Success:
       mMessageBar->pushMessage( tr( "Export layout" ),
                                 tr( "Successfully exported layout to <a href=\"%1\">%2</a>" ).arg( QUrl::fromLocalFile( fi.path() ).toString(), fileNExt.first ),
-                                QgsMessageBar::INFO, 0 );
+                                QgsMessageBar::SUCCESS, 0 );
       break;
 
     case QgsLayoutExporter::PrintError:
@@ -1644,7 +1644,7 @@ void QgsLayoutDesignerDialog::exportToPdf()
     {
       mMessageBar->pushMessage( tr( "Export layout" ),
                                 tr( "Successfully exported layout to <a href=\"%1\">%2</a>" ).arg( QUrl::fromLocalFile( fi.path() ).toString(), outputFileName ),
-                                QgsMessageBar::INFO, 0 );
+                                QgsMessageBar::SUCCESS, 0 );
       break;
     }
 
@@ -1794,7 +1794,7 @@ void QgsLayoutDesignerDialog::exportToSvg()
     {
       mMessageBar->pushMessage( tr( "Export layout" ),
                                 tr( "Successfully exported layout to <a href=\"%1\">%2</a>" ).arg( QUrl::fromLocalFile( fi.path() ).toString(), outputFileName ),
-                                QgsMessageBar::INFO, 0 );
+                                QgsMessageBar::SUCCESS, 0 );
       break;
     }
 
diff --git a/src/gui/qgsmessagebaritem.cpp b/src/gui/qgsmessagebaritem.cpp
@@ -100,7 +100,7 @@ void QgsMessageBarItem::writeContent()
         msgIcon = QStringLiteral( "/mIconWarning.svg" );
         break;
       case QgsMessageBar::SUCCESS:
-        msgIcon = QStringLiteral( "/mIconSuccess.png" );
+        msgIcon = QStringLiteral( "/mIconSuccess.svg" );
         break;
       default:
         break;
@@ -109,6 +109,35 @@ void QgsMessageBarItem::writeContent()
   }
   mLblIcon->setPixmap( icon.pixmap( 24 ) );
 
+
+  // STYLESHEETS
+  QString contentStyleSheet;
+  if ( mLevel == QgsMessageBar::SUCCESS )
+  {
+    mStyleSheet = "QgsMessageBar { background-color: #dff0d8; border: 1px solid #8e998a; } "
+                  "QLabel,QTextEdit { color: black; } ";
+    contentStyleSheet = "<style> a, a:visited, a:hover { color:#268300; } </style>";
+  }
+  else if ( mLevel == QgsMessageBar::CRITICAL )
+  {
+    mStyleSheet = "QgsMessageBar { background-color: #d65253; border: 1px solid #9b3d3d; } "
+                  "QLabel,QTextEdit { color: white; } ";
+    contentStyleSheet = "<style>a, a:visited, a:hover { color:#4e0001; }</style>";
+  }
+  else if ( mLevel == QgsMessageBar::WARNING )
+  {
+    mStyleSheet = "QgsMessageBar { background-color: #ffc800; border: 1px solid #e0aa00; } "
+                  "QLabel,QTextEdit { color: black; } ";
+    contentStyleSheet = "<style>a, a:visited, a:hover { color:#945a00; }</style>";
+  }
+  else if ( mLevel == QgsMessageBar::INFO )
+  {
+    mStyleSheet = "QgsMessageBar { background-color: #e7f5fe; border: 1px solid #b9cfe4; } "
+                  "QLabel,QTextEdit { color: #2554a1; } ";
+    contentStyleSheet = "<style>a, a:visited, a:hover { color:#3bb2fe; }</style>";
+  }
+  mStyleSheet += QLatin1String( "QLabel#mItemCount { font-style: italic; }" );
+
   // TITLE AND TEXT
   if ( mTitle.isEmpty() && mText.isEmpty() )
   {
@@ -147,6 +176,7 @@ void QgsMessageBarItem::writeContent()
         t += QLatin1String( ": " );
       content.prepend( QStringLiteral( "<b>" ) + t + " </b>" );
     }
+    content.prepend( contentStyleSheet );
     mTextBrowser->setText( content );
   }
 
@@ -159,29 +189,6 @@ void QgsMessageBarItem::writeContent()
       mLayout->addWidget( mWidget );
     }
   }
-
-  // STYLESHEET
-  if ( mLevel == QgsMessageBar::SUCCESS )
-  {
-    mStyleSheet = "QgsMessageBar { background-color: #dff0d8; border: 1px solid #8e998a; } "
-                  "QLabel,QTextEdit { color: black; } ";
-  }
-  else if ( mLevel == QgsMessageBar::CRITICAL )
-  {
-    mStyleSheet = "QgsMessageBar { background-color: #d65253; border: 1px solid #9b3d3d; } "
-                  "QLabel,QTextEdit { color: white; } ";
-  }
-  else if ( mLevel == QgsMessageBar::WARNING )
-  {
-    mStyleSheet = "QgsMessageBar { background-color: #ffc800; border: 1px solid #e0aa00; } "
-                  "QLabel,QTextEdit { color: black; } ";
-  }
-  else if ( mLevel == QgsMessageBar::INFO )
-  {
-    mStyleSheet = "QgsMessageBar { background-color: #e7f5fe; border: 1px solid #b9cfe4; } "
-                  "QLabel,QTextEdit { color: #2554a1; } ";
-  }
-  mStyleSheet += QLatin1String( "QLabel#mItemCount { font-style: italic; }" );
 }
 
 QgsMessageBarItem *QgsMessageBarItem::setText( const QString &text )

Original file line number	Diff line number	Diff line change
`@@ -1538,7 +1538,7 @@ void QgsLayoutDesignerDialog::exportToRaster()`
`1538`	`1538`	`case QgsLayoutExporter::Success:`
`1539`	`1539`	`mMessageBar->pushMessage( tr( "Export layout" ),`
`1540`	`1540`	`tr( "Successfully exported layout to <a href=\"%1\">%2</a>" ).arg( QUrl::fromLocalFile( fi.path() ).toString(), fileNExt.first ),`
`1541`		`- QgsMessageBar::INFO, 0 );`
	`1541`	`+ QgsMessageBar::SUCCESS, 0 );`
`1542`	`1542`	`break;`
`1543`	`1543`
`1544`	`1544`	`case QgsLayoutExporter::PrintError:`
`@@ -1644,7 +1644,7 @@ void QgsLayoutDesignerDialog::exportToPdf()`
`1644`	`1644`	`{`
`1645`	`1645`	`mMessageBar->pushMessage( tr( "Export layout" ),`
`1646`	`1646`	`tr( "Successfully exported layout to <a href=\"%1\">%2</a>" ).arg( QUrl::fromLocalFile( fi.path() ).toString(), outputFileName ),`
`1647`		`- QgsMessageBar::INFO, 0 );`
	`1647`	`+ QgsMessageBar::SUCCESS, 0 );`
`1648`	`1648`	`break;`
`1649`	`1649`	`}`
`1650`	`1650`
`@@ -1794,7 +1794,7 @@ void QgsLayoutDesignerDialog::exportToSvg()`
`1794`	`1794`	`{`
`1795`	`1795`	`mMessageBar->pushMessage( tr( "Export layout" ),`
`1796`	`1796`	`tr( "Successfully exported layout to <a href=\"%1\">%2</a>" ).arg( QUrl::fromLocalFile( fi.path() ).toString(), outputFileName ),`
`1797`		`- QgsMessageBar::INFO, 0 );`
	`1797`	`+ QgsMessageBar::SUCCESS, 0 );`
`1798`	`1798`	`break;`
`1799`	`1799`	`}`
`1800`	`1800`