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

Merge branch 'colors'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-15 21:30:41 +01:00
commit 49a1d9ec07
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
17 changed files with 221 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mainwindow.ui
View File

@ -1053,16 +1053,7 @@ QSplitter:handle{
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">QPushButton{
background-color:#1c1c1c;
border:none;
}
QPushButton:hover{
background-color:#292929;
border:none;
}
</string>
<string notr="true"/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">

12
src/misc/settings.cpp
View File

@ -154,6 +154,7 @@ void Settings::load()
useNativeStyle = s.value("nativeStyle", false).toBool();
useEmoticons = s.value("useEmoticons", true).toBool();
statusChangeNotificationEnabled = s.value("statusChangeNotificationEnabled", false).toBool();
themeColor = s.value("themeColor", 0).toInt();
style = s.value("style", "").toString();
if (style == "") // Default to Fusion if available, otherwise no style
{
@ -297,6 +298,7 @@ void Settings::save(QString path)
s.setValue("minimizeToTray", minimizeToTray);
s.setValue("nativeStyle", useNativeStyle);
s.setValue("useEmoticons", useEmoticons);
s.setValue("themeColor", themeColor);
s.setValue("style", style);
s.setValue("statusChangeNotificationEnabled", statusChangeNotificationEnabled);
s.endGroup();
@ -909,3 +911,13 @@ void Settings::setFauxOfflineMessaging(bool value)
{
fauxOfflineMessaging = value;
}
int Settings::getThemeColor() const
{
return themeColor;
}
void Settings::setThemeColor(const int &value)
{
themeColor = value;
}

4
src/misc/settings.h
View File

@ -152,6 +152,9 @@ public:
QString getSmileyPack() const;
void setSmileyPack(const QString &value);
int getThemeColor() const;
void setThemeColor(const int& value);
bool isCurstomEmojiFont() const;
void setCurstomEmojiFont(bool value);
@ -296,6 +299,7 @@ private:
QHash<QString, friendProp> friendLst;
int themeColor;
signals:
//void dataChanged();

134
src/misc/style.cpp
View File

@ -17,6 +17,10 @@
#include "style.h"
#include "settings.h"
#include "src/widget/widget.h"
#include "ui_mainwindow.h"
#include "src/widget/genericchatroomwidget.h"
#include <QFile>
#include <QDebug>
#include <QMap>
@ -42,6 +46,33 @@ QString qssifyFont(QFont font)
.arg(font.family());
}
// colors as defined in
// https://github.com/ItsDuke/Tox-UI/blob/master/UI%20GUIDELINES.md
static QColor palette[] = {
QColor("#6bc260"),
QColor("#cebf44"),
QColor("#c84e4e"),
QColor("#000000"),
QColor("#1c1c1c"),
QColor("#414141"),
QColor("#414141").lighter(120),
QColor("#d1d1d1"),
QColor("#ffffff"),
QColor("#ff7700"),
// Theme colors
QColor("#1c1c1c"),
QColor("#2a2a2a"),
QColor("#414141"),
QColor("#4e4e4e"),
};
static QMap<QString, QString> dict;
QStringList Style::themeColorNames = {QObject::tr("Default"), QObject::tr("Blue"), QObject::tr("Olive"), QObject::tr("Red"), QObject::tr("Violet")};
QList<QColor> Style::themeColorColors = {QColor(), QColor("#004aa4"), QColor("#97ba00"), QColor("#c23716"), QColor("#4617b5")};
QString Style::getStylesheet(const QString &filename)
{
if (!Settings::getInstance().getUseNativeStyle())
@ -58,21 +89,6 @@ QString Style::getStylesheet(const QString &filename)
QColor Style::getColor(Style::ColorPalette entry)
{
// colors as defined in
// https://github.com/ItsDuke/Tox-UI/blob/master/UI%20GUIDELINES.md
static QColor palette[] = {
QColor("#6bc260"),
QColor("#cebf44"),
QColor("#c84e4e"),
QColor("#000000"),
QColor("#1c1c1c"),
QColor("#414141"),
QColor("#414141").lighter(120),
QColor("#d1d1d1"),
QColor("#ffffff"),
QColor("#ff7700"),
};
return palette[entry];
}
@ -98,28 +114,35 @@ QFont Style::getFont(Style::Font font)
QString Style::resolve(QString qss)
{
static QMap<QString, QString> dict = {
// colors
{"@green", getColor(Green).name()},
{"@yellow", getColor(Yellow).name()},
{"@red", getColor(Red).name()},
{"@black", getColor(Black).name()},
{"@darkGrey", getColor(DarkGrey).name()},
{"@mediumGrey", getColor(MediumGrey).name()},
{"@mediumGreyLight", getColor(MediumGreyLight).name()},
{"@lightGrey", getColor(LightGrey).name()},
{"@white", getColor(White).name()},
{"@orange", getColor(Orange).name()},
if (dict.isEmpty())
{
dict = {
// colors
{"@green", Style::getColor(Style::Green).name()},
{"@yellow", Style::getColor(Style::Yellow).name()},
{"@red", Style::getColor(Style::Red).name()},
{"@black", Style::getColor(Style::Black).name()},
{"@darkGrey", Style::getColor(Style::DarkGrey).name()},
{"@mediumGrey", Style::getColor(Style::MediumGrey).name()},
{"@mediumGreyLight", Style::getColor(Style::MediumGreyLight).name()},
{"@lightGrey", Style::getColor(Style::LightGrey).name()},
{"@white", Style::getColor(Style::White).name()},
{"@orange", Style::getColor(Style::Orange).name()},
{"@themeDark", Style::getColor(Style::ThemeDark).name()},
{"@themeMediumDark", Style::getColor(Style::ThemeMediumDark).name()},
{"@themeMedium", Style::getColor(Style::ThemeMedium).name()},
{"@themeLight", Style::getColor(Style::ThemeLight).name()},
// fonts
{"@extraBig", qssifyFont(getFont(ExtraBig))},
{"@big", qssifyFont(getFont(Big))},
{"@bigBold", qssifyFont(getFont(BigBold))},
{"@medium", qssifyFont(getFont(Medium))},
{"@mediumBold", qssifyFont(getFont(MediumBold))},
{"@small", qssifyFont(getFont(Small))},
{"@smallLight", qssifyFont(getFont(SmallLight))},
};
// fonts
{"@extraBig", qssifyFont(Style::getFont(Style::ExtraBig))},
{"@big", qssifyFont(Style::getFont(Style::Big))},
{"@bigBold", qssifyFont(Style::getFont(Style::BigBold))},
{"@medium", qssifyFont(Style::getFont(Style::Medium))},
{"@mediumBold", qssifyFont(Style::getFont(Style::MediumBold))},
{"@small", qssifyFont(Style::getFont(Style::Small))},
{"@smallLight", qssifyFont(Style::getFont(Style::SmallLight))},
};
}
for (const QString& key : dict.keys())
{
@ -144,3 +167,42 @@ void Style::repolish(QWidget *w)
}
}
}
void Style::setThemeColor(int color)
{
if (color < 0 || color >= themeColorColors.size())
setThemeColor(QColor());
else
setThemeColor(themeColorColors[color]);
}
void Style::setThemeColor(QColor color)
{
if (!color.isValid())
{
// Reset to default
palette[ThemeDark] = QColor("#1c1c1c");
palette[ThemeMediumDark] = QColor("#2a2a2a");
palette[ThemeMedium] = QColor("#414141");
palette[ThemeLight] = QColor("#4e4e4e");
}
else
{
palette[ThemeDark] = color.darker(155);
palette[ThemeMediumDark] = color.darker(135);
palette[ThemeMedium] = color.darker(120);
palette[ThemeLight] = color.lighter(110);
}
dict["@themeDark"] = getColor(ThemeDark).name();
dict["@themeMediumDark"] = getColor(ThemeMediumDark).name();
dict["@themeMedium"] = getColor(ThemeMedium).name();
dict["@themeLight"] = getColor(ThemeLight).name();
applyTheme();
}
void Style::applyTheme()
{
Widget::getInstance()->reloadTheme();
}

13
src/misc/style.h
View File

@ -38,6 +38,10 @@ public:
LightGrey,
White,
Orange,
ThemeDark,
ThemeMediumDark,
ThemeMedium,
ThemeLight,
};
enum Font
@ -56,6 +60,15 @@ public:
static QFont getFont(Font font);
static QString resolve(QString qss);
static void repolish(QWidget* w);
static void setThemeColor(int color);
static void setThemeColor(QColor color); ///< Pass an invalid QColor to reset to defaults
static void applyTheme(); ///< Reloads some CCS
static QStringList themeColorNames;
static QList<QColor> themeColorColors;
signals:
void themeChanged();
private:
Style();

13
src/widget/form/settings/generalform.cpp
View File

@ -21,6 +21,7 @@
#include "src/misc/settings.h"
#include "src/misc/smileypack.h"
#include "src/core.h"
#include "src/misc/style.h"
#include <QMessageBox>
#include <QStyleFactory>
#include <QTime>
@ -77,6 +78,10 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
else
bodyUI->styleBrowser->setCurrentText(tr("None"));
for (QString color : Style::themeColorNames)
bodyUI->themeColorCBox->addItem(color);
bodyUI->themeColorCBox->setCurrentIndex(Settings::getInstance().getThemeColor());
bodyUI->emoticonSize->setValue(Settings::getInstance().getEmojiFontPointSize());
QStringList timestamps;
@ -119,6 +124,7 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
connect(bodyUI->useEmoticons, &QCheckBox::stateChanged, this, &GeneralForm::onUseEmoticonsChange);
connect(bodyUI->smileyPackBrowser, SIGNAL(currentIndexChanged(int)), this, SLOT(onSmileyBrowserIndexChanged(int)));
connect(bodyUI->styleBrowser, SIGNAL(currentTextChanged(QString)), this, SLOT(onStyleSelected(QString)));
connect(bodyUI->themeColorCBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onThemeColorChanged(int)));
connect(bodyUI->emoticonSize, SIGNAL(editingFinished()), this, SLOT(onEmoticonSizeChanged()));
connect(bodyUI->timestamp, SIGNAL(currentIndexChanged(int)), this, SLOT(onTimestampSelected(int)));
//connection
@ -314,3 +320,10 @@ void GeneralForm::onFauxOfflineMessaging()
{
Settings::getInstance().setFauxOfflineMessaging(bodyUI->cbFauxOfflineMessaging->isChecked());
}
void GeneralForm::onThemeColorChanged(int)
{
int index = bodyUI->themeColorCBox->currentIndex();
Settings::getInstance().setThemeColor(index);
Style::setThemeColor(index);
}

1
src/widget/form/settings/generalform.h
View File

@ -55,6 +55,7 @@ private slots:
void onCheckUpdateChanged();
void onSetShowInFront();
void onFauxOfflineMessaging();
void onThemeColorChanged(int);
private:
Ui::GeneralSettings *bodyUI;

39
src/widget/form/settings/generalsettings.ui
View File

@ -39,8 +39,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>583</width>
<height>748</height>
<width>524</width>
<height>726</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,1">
@ -197,6 +197,9 @@
<property name="toolTip">
<string>Set to 0 to disable</string>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>true</bool>
</property>
<property name="suffix">
<string> minutes</string>
</property>
@ -206,9 +209,6 @@
<property name="maximum">
<number>2147483647</number>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
@ -251,8 +251,14 @@
</layout>
</widget>
</item>
<item alignment="Qt::AlignTop">
<item>
<widget class="QGroupBox" name="themeGroup">
<property name="minimumSize">
<size>
<width>0</width>
<height>232</height>
</size>
</property>
<property name="title">
<string>Theme</string>
</property>
@ -363,6 +369,27 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="themeColorLayour">
<item>
<widget class="QLabel" name="themeColorLabel">
<property name="text">
<string>Theme color</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="themeColorCBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="emoiticonHLayout">
<item>

5
src/widget/genericchatroomwidget.cpp
View File

@ -97,3 +97,8 @@ void GenericChatroomWidget::mouseReleaseEvent(QMouseEvent*)
{
emit chatroomWidgetClicked(this);
}
void GenericChatroomWidget::reloadTheme()
{
setStyleSheet(Style::getStylesheet(":/ui/chatroomWidgets/genericChatroomWidget.css"));
}

4
src/widget/genericchatroomwidget.h
View File

@ -51,6 +51,8 @@ public:
QString getName() const;
QString getStatusMsg() const;
void reloadTheme();
signals:
void chatroomWidgetClicked(GenericChatroomWidget* widget);
@ -63,6 +65,8 @@ protected:
MaskablePixmapWidget* avatar;
QLabel statusPic;
CroppingLabel *nameLabel, *statusMessageLabel;
friend class Style; ///< To update our stylesheets
};
#endif // GENERICCHATROOMWIDGET_H

22
src/widget/widget.cpp
View File

@ -118,7 +118,7 @@ void Widget::init()
ui->mainSplitter->restoreState(Settings::getInstance().getSplitterState());
layout()->setContentsMargins(0, 0, 0, 0);
ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css"));
ui->friendList->setStyleSheet(Style::resolve(Style::getStylesheet(":ui/friendList/friendList.css")));
profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.png");
profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
@ -130,8 +130,9 @@ void Widget::init()
ui->mainHead->setLayout(new QVBoxLayout());
ui->mainHead->layout()->setMargin(0);
ui->mainHead->layout()->setSpacing(0);
ui->tooliconsZone->setStyleSheet(Style::resolve("QPushButton{background-color:@themeDark;border:none;}QPushButton:hover{background-color:@themeMediumDark;border:none;}"));
if(QStyleFactory::keys().contains(Settings::getInstance().getStyle())
&& Settings::getInstance().getStyle() != "None")
{
@ -172,6 +173,9 @@ void Widget::init()
// Disable some widgets until we're connected to the DHT
ui->statusButton->setEnabled(false);
Style::setThemeColor(Settings::getInstance().getThemeColor());
Style::applyTheme();
idleTimer = new QTimer();
idleTimer->setSingleShot(true);
int mins = Settings::getInstance().getAutoAwayTime();
@ -1185,3 +1189,17 @@ void Widget::clearAllReceipts()
f->getChatForm()->clearReciepts();
}
}
void Widget::reloadTheme()
{
ui->tooliconsZone->setStyleSheet(Style::resolve("QPushButton{background-color:@themeDark;border:none;}QPushButton:hover{background-color:@themeMediumDark;border:none;}"));
ui->statusPanel->setStyleSheet(Style::getStylesheet(":/ui/window/statusPanel.css"));
ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css"));
ui->statusButton->setStyleSheet(Style::getStylesheet(":ui/statusButton/statusButton.css"));
for (Friend* f : FriendList::getAllFriends())
f->getFriendWidget()->reloadTheme();
for (Group* g : GroupList::groupList)
g->widget->reloadTheme();
}

2
src/widget/widget.h
View File

@ -75,6 +75,8 @@ public:
void clearAllReceipts();
void reloadTheme();
public slots:
void onSettingsClicked();

4
ui/chatroomWidgets/genericChatroomWidget.css
View File

@ -1,6 +1,6 @@
GenericChatroomWidget
{
background-color: @mediumGrey;
background-color: @themeMedium;
}
GenericChatroomWidget[active="true"]
@ -10,7 +10,7 @@ GenericChatroomWidget[active="true"]
GenericChatroomWidget[active="false"]:hover
{
background-color: @mediumGreyLight;
background-color: @themeLight;
}
GenericChatroomWidget[active="true"] > QLabel#status

12
ui/friendList/friendList.css
View File

@ -1,26 +1,22 @@
QScrollArea {
background: #414141;
}
QScrollBar:vertical {
background: rgb(65,65,65);
background: @themeMedium;
width: 16px;
padding: 0px 3px 0px 3px;
}
QScrollBar:handle:vertical {
background: rgba(18, 18, 18, 204);
background: @themeDark;
min-height: 20px;
border-radius: 5px;
margin: 3px 0px 3px 0px;
}
QScrollBar:handle:vertical:hover {
background: rgba(35, 35, 35, 204);
background: @themeMediumDark;
}
QScrollBar:handle:vertical:pressed {
background: rgba(13, 13, 13, 204);
background: @themeDark;
}
QScrollBar:add-line:vertical {height: 0px;subcontrol-position: bottom;subcontrol-origin: margin;}

BIN
ui/statusButton/menu_indicator.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 268 B

8
ui/statusButton/statusButton.css
View File

@ -1,7 +1,7 @@
QPushButton
{
background: none;
background-color: rgb(65,65,65);
background-color: @themeMediumDark;
border: none;
border-radius: 6px;
width: 20px;
@ -30,18 +30,18 @@ QPushButton#offline
QPushButton:default
{
background-color: rgb(65,65,65);
background-color: @themeMediumDark;
}
/*Bugged in Qt, but it's probably better to leave enabled so that users can tell it's clickable*/
QPushButton:hover
{
background-color: rgb(75,75,75);
background-color: @themeMedium;
}
QPushButton:pressed
{
background-color: rgb(55,55,55);
background-color: @themeMediumDark;
}
QPushButton:focus {

10
ui/window/statusPanel.css
View File

@ -1,7 +1,7 @@
QLineEdit
{
background: none;
background-color: @mediumGrey;
background-color: @themeMedium;
color: white;
border: 0px;
border-radius: 6px;
@ -9,7 +9,7 @@ QLineEdit
#statusPanel
{
background-color: @darkGrey;
background-color: @themeDark;
}
#statusPanel > #statusHead > #nameLabel {
@ -25,7 +25,7 @@ QLineEdit
#statusPanel > #statusHead > #statusButton
{
background: none;
background-color: @mediumGrey;
background-color: @themeMedium;
border: none;
border-radius: 6px;
width: 20px;
@ -55,12 +55,12 @@ QLineEdit
/*Bugged in Qt, but it's probably better to leave enabled so that users can tell it's clickable*/
#statusPanel > #statusHead > #statusButton:hover
{
background-color: @mediumGreyLight;
background-color: @themeLight;
}
#statusPanel > #statusHead > #statusButton:pressed
{
background-color: @mediumGrey;
background-color: @themeMedium;
}
#statusPanel > #statusHead > #statusButton:focus {