iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://git@github.com/CDrummond/cantata.git

Browse Source 
Conflicts:
	dynamic/dynamicpage.cpp
This commit is contained in:
Craig Drummond
2015-10-22 23:07:05 +01:00
parent c92a6dcecb 925fba7443
commit 79aa6c77c2
12 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dynamic/dynamicpage.cpp
View File

@@ -71,13 +71,14 @@ DynamicPage::DynamicPage(QWidget *p)
#ifdef Q_OS_WIN
remoteRunningLabel=new QLabel(this);
remoteRunningLabel->setStyleSheet(QString(".QFrame {"
"background-color: rgba(235, 187, 187, 127);"
remoteRunningLabel->setStyleSheet(QString(".QLabel {"
"background-color: rgba(235, 187, 187, 196);"
"border-radius: 3px;"
"border: 1px solid red;"
"margin: 2px;"
"}"
".QLabel { color: black; }"));
"padding: 4px;"
"margin: 1px;"
"color: black; }"));
remoteRunningLabel->setText(i18n("Remote dynamizer is not running."));
#endif
Dynamic::self()->stopAct()->setEnabled(false);
proxy.setSourceModel(Dynamic::self());