Browse Source

refactor: rename a css file.

reviewable/pr5457/r3
TriKriSta 7 years ago
parent
commit
147cec3312
  1. 2
      res.qrc
  2. 3
      src/main.cpp
  3. 1
      src/widget/widget.cpp
  4. 0
      themes/default/centralWidget/centralWidget.css
  5. 10
      themes/default/loginScreen/loginScreen.css

2
res.qrc

@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
<file>img/taskbar/light/taskbar_event.svg</file>
<file>img/transfer.svg</file>
<file>themes/default/fileTransferWidget/fileDone.svg</file>
<file>themes/default/centralWidget/centralWidget.css</file>
<file>themes/default/chatArea/chatArea.css</file>
<file>themes/default/chatArea/chatHead.css</file>
<file>themes/default/chatArea/innerStyle.css</file>
@ -102,7 +103,6 @@ @@ -102,7 +103,6 @@
<file>themes/default/fileTransferInstance/filetransferWidget.css</file>
<file>themes/default/acceptCall/acceptCall.svg</file>
<file>themes/default/rejectCall/rejectCall.svg</file>
<file>themes/default/global.css</file>
<file>img/login_logo.svg</file>
<file>themes/default/notificationEdge/notificationEdge.css</file>
<file>themes/default/loginScreen/loginScreen.css</file>

3
src/main.cpp

@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@
#include "src/persistence/toxsave.h"
#include "src/video/camerasource.h"
#include "src/widget/loginscreen.h"
#include "src/widget/style.h"
#include "src/widget/translator.h"
#include "widget/widget.h"
#include <QApplication>
@ -372,8 +371,6 @@ int main(int argc, char* argv[]) @@ -372,8 +371,6 @@ int main(int argc, char* argv[])
QObject::connect(a.get(), &QApplication::aboutToQuit, cleanup);
a->setStyleSheet(Style::getStylesheet(QStringLiteral("global.css")));
// Run
int errorcode = a->exec();

1
src/widget/widget.cpp

@ -146,6 +146,7 @@ void Widget::init() @@ -146,6 +146,7 @@ void Widget::init()
connect(actionQuit, &QAction::triggered, qApp, &QApplication::quit);
layout()->setContentsMargins(0, 0, 0, 0);
ui->centralwidget->setStyleSheet(Style::getStylesheet(QStringLiteral("centralWidget/centralWidget.css")));
ui->friendList->setStyleSheet(Style::getStylesheet("friendList/friendList.css"));
profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.svg");

0
themes/default/global.css → themes/default/centralWidget/centralWidget.css

10
themes/default/loginScreen/loginScreen.css

@ -62,16 +62,6 @@ QLabel, QCheckBox, QProgressBar @@ -62,16 +62,6 @@ QLabel, QCheckBox, QProgressBar
color: black;
}
QLineEdit
{
color: #f1f1f1;
}
QListView
{
color: #f1f1f1;
}
QCheckBox:disabled
{
color: gray;

Loading…
Cancel
Save