diff --git a/img/contact list icons/contact_dark.png b/img/contact list icons/contact_dark.png index 584a4669e..be08811bc 100644 Binary files a/img/contact list icons/contact_dark.png and b/img/contact list icons/contact_dark.png differ diff --git a/ui/chatArea/chatArea.css b/ui/chatArea/chatArea.css deleted file mode 100644 index 8725f4868..000000000 --- a/ui/chatArea/chatArea.css +++ /dev/null @@ -1,74 +0,0 @@ -QScrollArea { - background: transparent; - border: 0 0 0 0; -} - -QScrollArea > QWidget > QWidget { - background: transparent; -} - -QScrollBar:vertical { - background: white; - width: 10px; - margin: 12px 0 12px 0; -} - -QScrollBar::handle:vertical { - background: #d1d1d1; - min-height: 20px; -} - -QScrollBar::handle:vertical:hover { - background: #e3e3e3; -} - -QScrollBar::handle:vertical:pressed { - background: #b1b1b1; -} - -QScrollBar::add-line:vertical { - background: url("ui/chatArea/scrollBarDownArrow.png") center; - height: 10px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} - -QScrollBar::add-line:vertical:hover { - background: url("ui/chatArea/scrollBarDownArrowHover.png") center; -} - -QScrollBar::add-line:vertical:pressed { - background: url("ui/chatArea/scrollBarDownArrowPressed.png") center; -} - -QScrollBar::sub-line:vertical { - background: url("ui/chatArea/scrollBarUpArrow.png") center; - height: 10px; - subcontrol-position: top; - subcontrol-origin: margin; -} - -QScrollBar::sub-line:vertical:hover { - background: url("ui/chatArea/scrollBarUpArrowHover.png") center; -} - -QScrollBar::sub-line:vertical:pressed { - background: url("ui/chatArea/scrollBarUpArrowPressed.png") center; - -} - -QScrollBar:QScrollBar::down-arrow:vertical { - width: 10; - height: 10px; - background: white; -} - -QScrollBar:QScrollBar::up-arrow:vertical { - width: 10px; - height: 10px; - background: white; -} - -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; -} \ No newline at end of file diff --git a/ui/chatArea/scrollBarArrows.xcf b/ui/chatArea/scrollBarArrows.xcf deleted file mode 100644 index 0e3279dee..000000000 Binary files a/ui/chatArea/scrollBarArrows.xcf and /dev/null differ diff --git a/ui/chatArea/scrollBarDownArrow.png b/ui/chatArea/scrollBarDownArrow.png deleted file mode 100644 index 0650e7944..000000000 Binary files a/ui/chatArea/scrollBarDownArrow.png and /dev/null differ diff --git a/ui/chatArea/scrollBarDownArrowHover.png b/ui/chatArea/scrollBarDownArrowHover.png deleted file mode 100644 index 54ae2cf6a..000000000 Binary files a/ui/chatArea/scrollBarDownArrowHover.png and /dev/null differ diff --git a/ui/chatArea/scrollBarDownArrowPressed.png b/ui/chatArea/scrollBarDownArrowPressed.png deleted file mode 100644 index 986e4ab70..000000000 Binary files a/ui/chatArea/scrollBarDownArrowPressed.png and /dev/null differ diff --git a/ui/chatArea/scrollBarHandle.png b/ui/chatArea/scrollBarHandle.png deleted file mode 100644 index fe755bb00..000000000 Binary files a/ui/chatArea/scrollBarHandle.png and /dev/null differ diff --git a/ui/chatArea/scrollBarUpArrow.png b/ui/chatArea/scrollBarUpArrow.png deleted file mode 100644 index fcf1b9fad..000000000 Binary files a/ui/chatArea/scrollBarUpArrow.png and /dev/null differ diff --git a/ui/chatArea/scrollBarUpArrowHover.png b/ui/chatArea/scrollBarUpArrowHover.png deleted file mode 100644 index b6f9ce109..000000000 Binary files a/ui/chatArea/scrollBarUpArrowHover.png and /dev/null differ diff --git a/ui/chatArea/scrollBarUpArrowPressed.png b/ui/chatArea/scrollBarUpArrowPressed.png deleted file mode 100644 index 401f903ce..000000000 Binary files a/ui/chatArea/scrollBarUpArrowPressed.png and /dev/null differ diff --git a/widget/form/chatform.cpp b/widget/form/chatform.cpp index 4ed5f7efb..fe9b904ec 100644 --- a/widget/form/chatform.cpp +++ b/widget/form/chatform.cpp @@ -29,38 +29,15 @@ ChatForm::ChatForm(Friend* chatFriend) avatar->setPixmap(*chatFriend->widget->avatar.pixmap()); chatAreaWidget->setLayout(mainChatLayout); - QString chatAreaStylesheet = ""; - try - { - 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->setWidgetResizable(true); chatArea->setContextMenuPolicy(Qt::CustomContextMenu); - chatArea->setFrameStyle(QFrame::NoFrame); - mainChatLayout->setColumnStretch(1,1); mainChatLayout->setSpacing(10); footButtonsSmall->setSpacing(2); - 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->setStyleSheet(msgEditStylesheet); msgEdit->setFixedHeight(50); - msgEdit->setFrameStyle(QFrame::NoFrame); QString sendButtonStylesheet = ""; try @@ -73,6 +50,10 @@ ChatForm::ChatForm(Friend* chatFriend) catch (int e) {} sendButton->setStyleSheet(sendButtonStylesheet); + QPalette toxgreen; + toxgreen.setColor(QPalette::Button, QColor(107,194,96)); // Tox Green + + QString fileButtonStylesheet = ""; try { diff --git a/widget/form/groupchatform.cpp b/widget/form/groupchatform.cpp index 27d7aa99c..236c9fce6 100644 --- a/widget/form/groupchatform.cpp +++ b/widget/form/groupchatform.cpp @@ -39,39 +39,9 @@ GroupChatForm::GroupChatForm(Group* chatGroup) namesList->setFont(small); chatAreaWidget->setLayout(mainChatLayout); - QString chatAreaStylesheet = ""; - try - { - 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->setWidgetResizable(true); chatArea->setContextMenuPolicy(Qt::CustomContextMenu); - chatArea->setFrameStyle(QFrame::NoFrame); - - mainChatLayout->setColumnStretch(1,1); - 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->setStyleSheet(msgEditStylesheet); - msgEdit->setFixedHeight(50); - msgEdit->setFrameStyle(QFrame::NoFrame); - mainChatLayout->setColumnStretch(1,1); mainChatLayout->setHorizontalSpacing(10); @@ -86,6 +56,7 @@ GroupChatForm::GroupChatForm(Group* chatGroup) catch (int e) {} sendButton->setStyleSheet(sendButtonStylesheet); + msgEdit->setFixedHeight(50); sendButton->setFixedSize(50, 50); main->setLayout(mainLayout);