rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Initial work on stylesheet support (broken)

Browse Source
This commit is contained in:
Max Sandholm 2017-10-24 21:17:10 +03:00
parent 4fc663db7c
commit 9521e692c0
10 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/res.qrc
View File

@ -42,7 +42,6 @@
<file>icons/emoji-categories/flags.png</file>
<file>icons/emoji-categories/flags@2x.png</file>
</qresource>
<qresource prefix="/logos">
<file>nheko.png</file>
@ -62,13 +61,14 @@
<file>nheko-32.png</file>
<file>nheko-16.png</file>
</qresource>
<qresource prefix="/fonts">
<file>fonts/OpenSans/OpenSans-Regular.ttf</file>
<file>fonts/OpenSans/OpenSans-Italic.ttf</file>
<file>fonts/OpenSans/OpenSans-Bold.ttf</file>
<file>fonts/OpenSans/OpenSans-Semibold.ttf</file>
<file>fonts/EmojiOne/emojione-android.ttf</file>
</qresource>
<qresource prefix="/styles">
<file>styles/system.qss</file>
</qresource>
</RCC>

2
resources/styles/system.qss Normal file
View File

@ -0,0 +1,2 @@
TimelineView { background-color: red; }
TimelineItem { background-color: rgba(255,0,0,255); }

1
src/ChatPage.cc
View File

@ -55,7 +55,6 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
auto splitter = new Splitter(this);
splitter->setHandleWidth(1);
splitter->setStyleSheet("QSplitter::handle { background-color: palette(base); }");
topLayout_->addWidget(splitter);

1
src/MainWindow.cc
View File

@ -43,7 +43,6 @@ MainWindow::MainWindow(QWidget *parent)
{
setWindowTitle("nheko");
setObjectName("MainWindow");
// setStyleSheet("QWidget#MainWindow {background-color: #fff}");
restoreWindowSize();

3
src/TextInputWidget.cc
View File

@ -182,7 +182,6 @@ TextInputWidget::TextInputWidget(QWidget *parent)
send_file_icon.addFile(":/icons/icons/ui/paper-clip-outline.png");
sendFileBtn_ = new FlatButton(this);
sendFileBtn_->setForegroundColor(palette().color(QPalette::Text));
sendFileBtn_->setIcon(send_file_icon);
sendFileBtn_->setIconSize(QSize(24, 24));
@ -203,7 +202,6 @@ TextInputWidget::TextInputWidget(QWidget *parent)
input_->setStyleSheet("border: none; padding-top: 5px; background-color: rgba(0,0,0,0);");
sendMessageBtn_ = new FlatButton(this);
sendMessageBtn_->setForegroundColor(palette().color(QPalette::Text));
QIcon send_message_icon;
send_message_icon.addFile(":/icons/icons/ui/cursor.png");
@ -211,7 +209,6 @@ TextInputWidget::TextInputWidget(QWidget *parent)
sendMessageBtn_->setIconSize(QSize(24, 24));
emojiBtn_ = new EmojiPickButton(this);
emojiBtn_->setForegroundColor(palette().color(QPalette::Text));
QIcon emoji_icon;
emoji_icon.addFile(":/icons/icons/ui/smile.png");

1
src/TimelineItem.cc
View File

@ -67,7 +67,6 @@ TimelineItem::init()
headerLayout_->setMargin(0);
headerLayout_->setSpacing(conf::timeline::headerSpacing);
setStyleSheet("background-color: rgba(0,0,0,0);");
}
/*

4
src/TimelineView.cc
View File

@ -399,9 +399,6 @@ TimelineView::init()
const int max = scroll_area_->verticalScrollBar()->maximum();
scroll_area_->verticalScrollBar()->setValue(max);
});
setBackgroundRole(QPalette::Base);
top_layout_ = new QVBoxLayout(this);
top_layout_->setSpacing(0);
top_layout_->setMargin(0);
@ -418,6 +415,7 @@ TimelineView::init()
scroll_layout_ = new QVBoxLayout(scroll_widget_);
scroll_layout_->addStretch(1);
scroll_layout_->setSpacing(0);
scroll_layout_->setObjectName("timelinescrollarea");
scroll_area_->setWidget(scroll_widget_);

1
src/TopRoomBar.cc
View File

@ -70,7 +70,6 @@ TopRoomBar::TopRoomBar(QWidget *parent)
textLayout_->addWidget(topicLabel_);
settingsBtn_ = new FlatButton(this);
settingsBtn_->setForegroundColor(palette().color(QPalette::ToolTipText));
settingsBtn_->setFixedSize(buttonSize_, buttonSize_);
settingsBtn_->setCornerRadius(buttonSize_ / 2);

1
src/UserInfoWidget.cc
View File

@ -77,7 +77,6 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
buttonLayout_->setMargin(0);
logoutButton_ = new FlatButton(this);
logoutButton_->setForegroundColor(palette().color(QPalette::Text));
logoutButton_->setCornerRadius(logoutButtonSize_ / 2);
QIcon icon;

6
src/main.cc
View File

@ -70,6 +70,12 @@ main(int argc, char *argv[])
app.setWindowIcon(QIcon(":/logos/nheko.png"));
qSetMessagePattern("%{time process}: [%{type}] - %{message}");
QFile stylefile(":/styles/styles/system.qss");
stylefile.open(QFile::ReadOnly);
QString stylesheet = QString(stylefile.readAll());
app.setStyleSheet(stylesheet);
QSettings settings;
// Set the default if a value has not been set.