Skip to content
Snippets Groups Projects
Commit 71f4af60 authored by Nick Draper's avatar Nick Draper
Browse files

Merge branch 'feature/10767_improve_linux_command_link_buttons' of...

Merge branch 'feature/10767_improve_linux_command_link_buttons' of github.com:mantidproject/mantid into feature/10772_OptOut_usage_stats
parents dbc21b46 a78a6905
No related branches found
No related tags found
No related merge requests found
...@@ -60,6 +60,22 @@ void FirstTimeSetup::initLayout() ...@@ -60,6 +60,22 @@ void FirstTimeSetup::initLayout()
m_uiForm.cbInstrument->setCurrentIndex(m_uiForm.cbInstrument->findText( m_uiForm.cbInstrument->setCurrentIndex(m_uiForm.cbInstrument->findText(
QString::fromStdString(instrument))); QString::fromStdString(instrument)));
connect(m_uiForm.cbFacility, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(facilitySelected(const QString &))); connect(m_uiForm.cbFacility, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(facilitySelected(const QString &)));
QString stlyeName = QApplication::style()->metaObject()->className();
if(stlyeName!="QWindowsVistaStyle")
{
//add stylesheet formatting for other environemnts
QString ss = this->styleSheet();
ss += "\n"
"QDialog#FirstTimeSetup QCommandLinkButton {"
" background-color: rgba(255, 255, 255, 0);"
"}"
"\n"
"QDialog#FirstTimeSetup QCommandLinkButton:hover {"
" background-color: rgba(255, 255, 255, 128);"
"}";
this->setStyleSheet(ss);
}
} }
void FirstTimeSetup::confirm() void FirstTimeSetup::confirm()
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QDialog#FirstTimeSetup{background-image: url(:/First_use_Background.png);} <string notr="true">QDialog#FirstTimeSetup{background-image: url(:/First_use_Background.png);}
color: rgb(255, 255, 255);</string> </string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing"> <property name="spacing">
...@@ -208,7 +208,7 @@ color: rgb(0, 0, 0);</string> ...@@ -208,7 +208,7 @@ color: rgb(0, 0, 0);</string>
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">color: rgb(0, 0, 0);</string> <string notr="true"/>
</property> </property>
<property name="text"> <property name="text">
<string>Sample Datasets</string> <string>Sample Datasets</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment