StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

use Style::get

Browse Source
This commit is contained in:
krepa098 2014-08-11 17:23:41 +02:00
parent 0d748b93d6
commit 1c27b55470
3 changed files with 12 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
widget/emoticonswidget.cpp
View File

@ -16,6 +16,7 @@
#include "emoticonswidget.h" #include "emoticonswidget.h"
#include "smileypack.h" #include "smileypack.h"
#include "style.h"
#include <QPushButton> #include <QPushButton>
#include <QRadioButton> #include <QRadioButton>
@ -26,11 +27,7 @@
EmoticonsWidget::EmoticonsWidget(QWidget *parent) : EmoticonsWidget::EmoticonsWidget(QWidget *parent) :
QMenu(parent) QMenu(parent)
{ {
QFile f(":/ui/emoticonWidget/emoticonWidget.css"); setStyleSheet(Style::get(":/ui/emoticonWidget/emoticonWidget.css"));
f.open(QFile::ReadOnly | QFile::Text);
QString pageButtonCss = f.readAll();
setStyleSheet(pageButtonCss);
setLayout(&layout); setLayout(&layout);
layout.addWidget(&stack); layout.addWidget(&stack);

23
widget/filetransfertwidget.cpp
View File

@ -18,6 +18,7 @@
#include "widget.h" #include "widget.h"
#include "core.h" #include "core.h"
#include "math.h" #include "math.h"
#include "style.h"
#include <QFileDialog> #include <QFileDialog>
#include <QPixmap> #include <QPixmap>
#include <QPainter> #include <QPainter>
@ -36,10 +37,7 @@ FileTransfertWidget::FileTransfertWidget(ToxFile File)
QFont prettysmall; QFont prettysmall;
prettysmall.setPixelSize(10); prettysmall.setPixelSize(10);
this->setObjectName("default"); this->setObjectName("default");
QFile f0(":/ui/fileTransferWidget/fileTransferWidget.css"); this->setStyleSheet(Style::get(":/ui/fileTransferWidget/fileTransferWidget.css"));
f0.open(QFile::ReadOnly | QFile::Text);
QTextStream fileTransfertWidgetStylesheet(&f0);
this->setStyleSheet(fileTransfertWidgetStylesheet.readAll());
QPalette greybg; QPalette greybg;
greybg.setColor(QPalette::Window, QColor(209,209,209)); greybg.setColor(QPalette::Window, QColor(209,209,209));
greybg.setColor(QPalette::Base, QColor(150,150,150)); greybg.setColor(QPalette::Base, QColor(150,150,150));
@ -71,20 +69,9 @@ FileTransfertWidget::FileTransfertWidget(ToxFile File)
buttonWidget->setAutoFillBackground(true); buttonWidget->setAutoFillBackground(true);
buttonWidget->setLayout(buttonLayout); buttonWidget->setLayout(buttonLayout);
QFile f1(":/ui/stopFileButton/style.css"); stopFileButtonStylesheet = Style::get(":/ui/stopFileButton/style.css");
f1.open(QFile::ReadOnly | QFile::Text); pauseFileButtonStylesheet = Style::get(":/ui/pauseFileButton/style.css");
QTextStream stopFileButtonStylesheetStream(&f1); acceptFileButtonStylesheet = Style::get(":/ui/acceptFileButton/style.css");
stopFileButtonStylesheet = stopFileButtonStylesheetStream.readAll();
QFile f2(":/ui/pauseFileButton/style.css");
f2.open(QFile::ReadOnly | QFile::Text);
QTextStream pauseFileButtonStylesheetStream(&f2);
pauseFileButtonStylesheet = pauseFileButtonStylesheetStream.readAll();
QFile f3(":/ui/acceptFileButton/style.css");
f3.open(QFile::ReadOnly | QFile::Text);
QTextStream acceptFileButtonStylesheetStream(&f3);
acceptFileButtonStylesheet = acceptFileButtonStylesheetStream.readAll();
topright->setStyleSheet(stopFileButtonStylesheet); topright->setStyleSheet(stopFileButtonStylesheet);
if (File.direction == ToxFile::SENDING) if (File.direction == ToxFile::SENDING)

37
widget/form/groupchatform.cpp
View File

@ -20,6 +20,7 @@
#include "widget/widget.h" #include "widget/widget.h"
#include "friend.h" #include "friend.h"
#include "friendlist.h" #include "friendlist.h"
#include "style.h"
#include <QFont> #include <QFont>
#include <QTime> #include <QTime>
#include <QScrollBar> #include <QScrollBar>
@ -55,16 +56,8 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
namesList->setFont(small); namesList->setFont(small);
chatAreaWidget->setLayout(mainChatLayout); chatAreaWidget->setLayout(mainChatLayout);
QString chatAreaStylesheet = "";
try chatArea->setStyleSheet(Style::get(":/ui/chatArea/chatArea.css"));
{
QFile f(":/ui/chatArea/chatArea.css");
f.open(QFile::ReadOnly | QFile::Text);
QTextStream chatAreaStylesheetStream(&f);
chatAreaStylesheet = chatAreaStylesheetStream.readAll();
}
catch (int e) {}
chatArea->setStyleSheet(chatAreaStylesheet);
chatArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); chatArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
chatArea->setWidgetResizable(true); chatArea->setWidgetResizable(true);
chatArea->setContextMenuPolicy(Qt::CustomContextMenu); chatArea->setContextMenuPolicy(Qt::CustomContextMenu);
@ -73,35 +66,15 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
mainChatLayout->setColumnStretch(1,1); mainChatLayout->setColumnStretch(1,1);
mainChatLayout->setSpacing(10); mainChatLayout->setSpacing(10);
QString msgEditStylesheet = "";
try
{
QFile f(":/ui/msgEdit/msgEdit.css");
f.open(QFile::ReadOnly | QFile::Text);
QTextStream msgEditStylesheetStream(&f);
msgEditStylesheet = msgEditStylesheetStream.readAll();
}
catch (int e) {}
msgEdit->setObjectName("group"); msgEdit->setObjectName("group");
msgEdit->setStyleSheet(msgEditStylesheet); msgEdit->setStyleSheet(Style::get(":/ui/msgEdit/msgEdit.css"));
msgEdit->setFixedHeight(50); msgEdit->setFixedHeight(50);
msgEdit->setFrameStyle(QFrame::NoFrame); msgEdit->setFrameStyle(QFrame::NoFrame);
mainChatLayout->setColumnStretch(1,1); mainChatLayout->setColumnStretch(1,1);
mainChatLayout->setHorizontalSpacing(10); mainChatLayout->setHorizontalSpacing(10);
QString sendButtonStylesheet = ""; sendButton->setStyleSheet(Style::get(":/ui/sendButton/sendButton.css"));
try
{
QFile f(":/ui/sendButton/sendButton.css");
f.open(QFile::ReadOnly | QFile::Text);
QTextStream sendButtonStylesheetStream(&f);
sendButtonStylesheet = sendButtonStylesheetStream.readAll();
}
catch (int e) {}
sendButton->setStyleSheet(sendButtonStylesheet);
sendButton->setFixedSize(50, 50); sendButton->setFixedSize(50, 50);
main->setLayout(mainLayout); main->setLayout(mainLayout);