diff --git a/res.qrc b/res.qrc index c22fa6ca6a..e44e6638f6 100644 --- a/res.qrc +++ b/res.qrc @@ -48,25 +48,25 @@ img/taskbar/light/taskbar_online.svg img/transfer.svg themes/dark/acceptCall/acceptCall.svg - themes/dark/addFriendForm/toxId.css - themes/dark/chatArea/chatArea.css - themes/dark/chatArea/chatHead.css + themes/dark/addFriendForm/toxId.qss + themes/dark/chatArea/chatArea.qss + themes/dark/chatArea/chatHead.qss themes/dark/chatArea/error.svg themes/dark/chatArea/info.svg - themes/dark/chatArea/innerStyle.css + themes/dark/chatArea/innerStyle.qss themes/dark/chatArea/scrollBarDownArrow.svg themes/dark/chatArea/scrollBarLeftArrow.svg themes/dark/chatArea/scrollBarRightArrow.svg themes/dark/chatArea/scrollBarUpArrow.svg themes/dark/chatArea/spinner.svg themes/dark/chatArea/typing.svg - themes/dark/chatForm/buttons.css + themes/dark/chatForm/buttons.qss themes/dark/chatForm/callButton.svg themes/dark/chatForm/emoteButton.svg themes/dark/chatForm/exitFullScreenButton.svg themes/dark/chatForm/fileButton.svg - themes/dark/chatForm/fullScreenButtons.css - themes/dark/chatForm/labels.css + themes/dark/chatForm/fullScreenButtons.qss + themes/dark/chatForm/labels.qss themes/dark/chatForm/micButton.svg themes/dark/chatForm/micButtonRed.svg themes/dark/chatForm/screenshotButton.svg @@ -82,60 +82,60 @@ themes/dark/chatForm/videoPreviewRed.svg themes/dark/chatForm/volButton.svg themes/dark/chatForm/volButtonRed.svg - themes/dark/contentDialog/contentDialog.css + themes/dark/contentDialog/contentDialog.qss themes/dark/emoticonWidget/dot_page_current.svg themes/dark/emoticonWidget/dot_page_hover.svg themes/dark/emoticonWidget/dot_page.svg - themes/dark/emoticonWidget/emoticonWidget.css + themes/dark/emoticonWidget/emoticonWidget.qss themes/dark/fileTransferInstance/arrow_black.svg themes/dark/fileTransferInstance/arrow_white.svg themes/dark/fileTransferInstance/browse.svg themes/dark/fileTransferInstance/dir.svg - themes/dark/fileTransferInstance/filetransferWidget.css + themes/dark/fileTransferInstance/filetransferWidget.qss themes/dark/fileTransferInstance/no_dark.svg themes/dark/fileTransferInstance/no.svg themes/dark/fileTransferInstance/pause_dark.svg themes/dark/fileTransferInstance/pause.svg themes/dark/fileTransferInstance/yes.svg themes/dark/fileTransferWidget/fileDone.svg - themes/dark/friendList/friendList.css - themes/dark/genericChatForm/genericChatForm.css - themes/dark/genericChatRoomWidget/genericChatRoomWidget.css - themes/dark/loginScreen/loginScreen.css - themes/dark/msgEdit/msgEdit.css - themes/dark/notificationEdge/notificationEdge.css + themes/dark/friendList/friendList.qss + themes/dark/genericChatForm/genericChatForm.qss + themes/dark/genericChatRoomWidget/genericChatRoomWidget.qss + themes/dark/loginScreen/loginScreen.qss + themes/dark/msgEdit/msgEdit.qss + themes/dark/notificationEdge/notificationEdge.qss themes/dark/palette.ini themes/dark/rejectCall/rejectCall.svg themes/dark/settings/checkboxChecked.svg themes/dark/settings/checkboxCheckedDisabled.svg - themes/dark/settings/mainHead.css + themes/dark/settings/mainHead.qss themes/dark/statusButton/menu_indicator.svg - themes/dark/statusButton/statusButton.css - themes/dark/tooliconsZone/tooliconsZone.css - themes/dark/window/general.css - themes/dark/window/profile.css - themes/dark/window/statusPanel.css - themes/dark/window/window.css + themes/dark/statusButton/statusButton.qss + themes/dark/tooliconsZone/tooliconsZone.qss + themes/dark/window/general.qss + themes/dark/window/profile.qss + themes/dark/window/statusPanel.qss + themes/dark/window/window.qss themes/default/acceptCall/acceptCall.svg - themes/default/addFriendForm/toxId.css - themes/default/chatArea/chatArea.css - themes/default/chatArea/chatHead.css + themes/default/addFriendForm/toxId.qss + themes/default/chatArea/chatArea.qss + themes/default/chatArea/chatHead.qss themes/default/chatArea/error.svg themes/default/chatArea/info.svg - themes/default/chatArea/innerStyle.css + themes/default/chatArea/innerStyle.qss themes/default/chatArea/scrollBarDownArrow.svg themes/default/chatArea/scrollBarLeftArrow.svg themes/default/chatArea/scrollBarRightArrow.svg themes/default/chatArea/scrollBarUpArrow.svg themes/default/chatArea/spinner.svg themes/default/chatArea/typing.svg - themes/default/chatForm/buttons.css + themes/default/chatForm/buttons.qss themes/default/chatForm/callButton.svg themes/default/chatForm/emoteButton.svg themes/default/chatForm/exitFullScreenButton.svg themes/default/chatForm/fileButton.svg - themes/default/chatForm/fullScreenButtons.css - themes/default/chatForm/labels.css + themes/default/chatForm/fullScreenButtons.qss + themes/default/chatForm/labels.qss themes/default/chatForm/micButton.svg themes/default/chatForm/micButtonRed.svg themes/default/chatForm/screenshotButton.svg @@ -151,37 +151,37 @@ themes/default/chatForm/videoPreviewRed.svg themes/default/chatForm/volButton.svg themes/default/chatForm/volButtonRed.svg - themes/default/contentDialog/contentDialog.css + themes/default/contentDialog/contentDialog.qss themes/default/emoticonWidget/dot_page_current.svg themes/default/emoticonWidget/dot_page_hover.svg themes/default/emoticonWidget/dot_page.svg - themes/default/emoticonWidget/emoticonWidget.css + themes/default/emoticonWidget/emoticonWidget.qss themes/default/fileTransferInstance/arrow_black.svg themes/default/fileTransferInstance/arrow_white.svg themes/default/fileTransferInstance/browse.svg themes/default/fileTransferInstance/dir.svg - themes/default/fileTransferInstance/filetransferWidget.css + themes/default/fileTransferInstance/filetransferWidget.qss themes/default/fileTransferInstance/no_dark.svg themes/default/fileTransferInstance/no.svg themes/default/fileTransferInstance/pause_dark.svg themes/default/fileTransferInstance/pause.svg themes/default/fileTransferInstance/yes.svg themes/default/fileTransferWidget/fileDone.svg - themes/default/friendList/friendList.css - themes/default/genericChatForm/genericChatForm.css - themes/default/genericChatRoomWidget/genericChatRoomWidget.css - themes/default/loginScreen/loginScreen.css - themes/default/msgEdit/msgEdit.css - themes/default/notificationEdge/notificationEdge.css + themes/default/friendList/friendList.qss + themes/default/genericChatForm/genericChatForm.qss + themes/default/genericChatRoomWidget/genericChatRoomWidget.qss + themes/default/loginScreen/loginScreen.qss + themes/default/msgEdit/msgEdit.qss + themes/default/notificationEdge/notificationEdge.qss themes/default/palette.ini themes/default/rejectCall/rejectCall.svg - themes/default/settings/mainHead.css + themes/default/settings/mainHead.qss themes/default/statusButton/menu_indicator.svg - themes/default/statusButton/statusButton.css - themes/default/tooliconsZone/tooliconsZone.css - themes/default/window/general.css - themes/default/window/profile.css - themes/default/window/statusPanel.css - themes/default/window/window.css + themes/default/statusButton/statusButton.qss + themes/default/tooliconsZone/tooliconsZone.qss + themes/default/window/general.qss + themes/default/window/profile.qss + themes/default/window/statusPanel.qss + themes/default/window/window.qss diff --git a/src/chatlog/chatwidget.cpp b/src/chatlog/chatwidget.cpp index 499a32f26c..873a3ed261 100644 --- a/src/chatlog/chatwidget.cpp +++ b/src/chatlog/chatwidget.cpp @@ -782,7 +782,7 @@ void ChatWidget::fontChanged(const QFont& font) void ChatWidget::reloadTheme() { - setStyleSheet(style.getStylesheet("chatArea/chatArea.css", settings)); + setStyleSheet(style.getStylesheet("chatArea/chatArea.qss", settings)); setBackgroundBrush(QBrush(style.getColor(Style::ColorPalette::GroundBase), Qt::SolidPattern)); selectionRectColor = style.getColor(Style::ColorPalette::SelectText); selGraphItem->setBrush(QBrush(selectionRectColor)); diff --git a/src/chatlog/content/filetransferwidget.cpp b/src/chatlog/content/filetransferwidget.cpp index 1ff44cab41..35404be174 100644 --- a/src/chatlog/content/filetransferwidget.cpp +++ b/src/chatlog/content/filetransferwidget.cpp @@ -149,7 +149,7 @@ void FileTransferWidget::setBackgroundColor(const QColor& c, bool whiteFont) setProperty("fontColor", whiteFont ? "white" : "black"); - setStyleSheet(style.getStylesheet("fileTransferInstance/filetransferWidget.css", settings)); + setStyleSheet(style.getStylesheet("fileTransferInstance/filetransferWidget.qss", settings)); Style::repolish(this); update(); diff --git a/src/chatlog/content/text.cpp b/src/chatlog/content/text.cpp index b7c7859353..d8f6f032d4 100644 --- a/src/chatlog/content/text.cpp +++ b/src/chatlog/content/text.cpp @@ -27,7 +27,7 @@ Text::Text(DocumentCache& documentCache_, Settings& settings_, Style& style_, co , customColor(custom) , documentCache(documentCache_) , settings{settings_} - , defStyleSheet(style_.getStylesheet(QStringLiteral("chatArea/innerStyle.css"), settings_, font)) + , defStyleSheet(style_.getStylesheet(QStringLiteral("chatArea/innerStyle.qss"), settings_, font)) , style{style_} { color = textColor(); @@ -246,7 +246,7 @@ void Text::visibilityChanged(bool visible) void Text::reloadTheme() { - defStyleSheet = style.getStylesheet(QStringLiteral("chatArea/innerStyle.css"), settings, defFont); + defStyleSheet = style.getStylesheet(QStringLiteral("chatArea/innerStyle.qss"), settings, defFont); color = textColor(); dirty = true; regenerate(); diff --git a/src/video/netcamview.cpp b/src/video/netcamview.cpp index f32ad09325..95c93c2016 100644 --- a/src/video/netcamview.cpp +++ b/src/video/netcamview.cpp @@ -28,7 +28,7 @@ const auto BTN_STATE_NONE = QVariant("none"); const auto BTN_STATE_RED = QVariant("red"); const int BTN_PANEL_HEIGHT = 55; const int BTN_PANEL_WIDTH = 250; -const auto BTN_STYLE_SHEET_PATH = QStringLiteral("chatForm/fullScreenButtons.css"); +const auto BTN_STYLE_SHEET_PATH = QStringLiteral("chatForm/fullScreenButtons.qss"); } // namespace NetCamView::NetCamView(ToxPk friendPk_, CameraSource& cameraSource_, Settings& settings_, diff --git a/src/widget/about/aboutfriendform.cpp b/src/widget/about/aboutfriendform.cpp index d93645b416..dd34510bbf 100644 --- a/src/widget/about/aboutfriendform.cpp +++ b/src/widget/about/aboutfriendform.cpp @@ -90,7 +90,7 @@ void AboutFriendForm::onAutoAcceptDirClicked() void AboutFriendForm::reloadTheme() { - setStyleSheet(style.getStylesheet("window/general.css", settings)); + setStyleSheet(style.getStylesheet("window/general.qss", settings)); } void AboutFriendForm::onAutoAcceptDirChanged(const QString& path) diff --git a/src/widget/chatformheader.cpp b/src/widget/chatformheader.cpp index 9c11fa2580..1fd9d0febf 100644 --- a/src/widget/chatformheader.cpp +++ b/src/widget/chatformheader.cpp @@ -26,7 +26,7 @@ const short HEAD_LAYOUT_SPACING = 5; const short MIC_BUTTONS_LAYOUT_SPACING = 4; const short BUTTONS_LAYOUT_HOR_SPACING = 4; -const QString STYLE_PATH = QStringLiteral("chatForm/buttons.css"); +const QString STYLE_PATH = QStringLiteral("chatForm/buttons.qss"); const QString STATE_NAME[] = { QString{}, // @@ -281,7 +281,7 @@ QSize ChatFormHeader::getAvatarSize() const void ChatFormHeader::reloadTheme() { - setStyleSheet(style.getStylesheet("chatArea/chatHead.css", settings)); + setStyleSheet(style.getStylesheet("chatArea/chatHead.qss", settings)); callButton->setStyleSheet(style.getStylesheet(STYLE_PATH, settings)); videoButton->setStyleSheet(style.getStylesheet(STYLE_PATH, settings)); volButton->setStyleSheet(style.getStylesheet(STYLE_PATH, settings)); diff --git a/src/widget/contentdialog.cpp b/src/widget/contentdialog.cpp index 7f77e7efad..be81f33417 100644 --- a/src/widget/contentdialog.cpp +++ b/src/widget/contentdialog.cpp @@ -428,8 +428,8 @@ void ContentDialog::setUsername(const QString& newName) void ContentDialog::reloadTheme() { - setStyleSheet(style.getStylesheet("contentDialog/contentDialog.css", settings)); - friendScroll->setStyleSheet(style.getStylesheet("friendList/friendList.css", settings)); + setStyleSheet(style.getStylesheet("contentDialog/contentDialog.qss", settings)); + friendScroll->setStyleSheet(style.getStylesheet("friendList/friendList.qss", settings)); } bool ContentDialog::event(QEvent* event) diff --git a/src/widget/contentlayout.cpp b/src/widget/contentlayout.cpp index eeb27f3b09..eff9b64cb7 100644 --- a/src/widget/contentlayout.cpp +++ b/src/widget/contentlayout.cpp @@ -60,8 +60,8 @@ ContentLayout::~ContentLayout() void ContentLayout::reloadTheme() { #ifndef Q_OS_MAC - mainHead->setStyleSheet(style.getStylesheet("settings/mainHead.css", settings)); - mainContent->setStyleSheet(style.getStylesheet("window/general.css", settings)); + mainHead->setStyleSheet(style.getStylesheet("settings/mainHead.qss", settings)); + mainContent->setStyleSheet(style.getStylesheet("window/general.qss", settings)); #endif } diff --git a/src/widget/emoticonswidget.cpp b/src/widget/emoticonswidget.cpp index f3cb042702..8661233d1a 100644 --- a/src/widget/emoticonswidget.cpp +++ b/src/widget/emoticonswidget.cpp @@ -21,7 +21,7 @@ EmoticonsWidget::EmoticonsWidget(SmileyPack& smileyPack, Settings& settings, Sty QWidget* parent) : QMenu(parent) { - setStyleSheet(style.getStylesheet("emoticonWidget/emoticonWidget.css", settings)); + setStyleSheet(style.getStylesheet("emoticonWidget/emoticonWidget.qss", settings)); setLayout(&layout); layout.addWidget(&stack); diff --git a/src/widget/form/addfriendform.cpp b/src/widget/form/addfriendform.cpp index 6d198c2bb0..7c2cce7fb3 100644 --- a/src/widget/form/addfriendform.cpp +++ b/src/widget/form/addfriendform.cpp @@ -281,7 +281,7 @@ void AddFriendForm::onIdChanged(const QString& id) isValidId ? QStringLiteral("%1 (%2)") : QStringLiteral("%1 (%2)"); toxIdLabel.setText(labelText.arg(toxIdText, toxIdComment)); toxId.setStyleSheet(isValidOrEmpty ? QStringLiteral("") - : style.getStylesheet("addFriendForm/toxId.css", settings)); + : style.getStylesheet("addFriendForm/toxId.qss", settings)); toxId.setToolTip(isValidOrEmpty ? QStringLiteral("") : tr("Invalid Tox ID format")); sendButton.setEnabled(isValidId); diff --git a/src/widget/form/conferenceform.cpp b/src/widget/form/conferenceform.cpp index 373534be33..5f415f9d8f 100644 --- a/src/widget/form/conferenceform.cpp +++ b/src/widget/form/conferenceform.cpp @@ -37,7 +37,7 @@ const auto LABEL_PEER_TYPE_OUR = QVariant(QStringLiteral("our")); const auto LABEL_PEER_TYPE_MUTED = QVariant(QStringLiteral("muted")); const auto LABEL_PEER_PLAYING_AUDIO = QVariant(QStringLiteral("true")); const auto LABEL_PEER_NOT_PLAYING_AUDIO = QVariant(QStringLiteral("false")); -const auto PEER_LABEL_STYLE_SHEET_PATH = QStringLiteral("chatArea/chatHead.css"); +const auto PEER_LABEL_STYLE_SHEET_PATH = QStringLiteral("chatArea/chatHead.qss"); /** * @brief Edit name for correct representation if it is needed diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index 17531c76b3..31ae8f2964 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -98,7 +98,7 @@ QString GenericChatForm::resolveToxPk(const ToxPk& pk) } namespace { -const QString STYLE_PATH = QStringLiteral("chatForm/buttons.css"); +const QString STYLE_PATH = QStringLiteral("chatForm/buttons.qss"); } namespace { @@ -367,8 +367,8 @@ QDateTime GenericChatForm::getLatestTime() const void GenericChatForm::reloadTheme() { - setStyleSheet(style.getStylesheet("genericChatForm/genericChatForm.css", settings)); - msgEdit->setStyleSheet(style.getStylesheet("msgEdit/msgEdit.css", settings) + setStyleSheet(style.getStylesheet("genericChatForm/genericChatForm.qss", settings)); + msgEdit->setStyleSheet(style.getStylesheet("msgEdit/msgEdit.qss", settings) + fontToCss(settings.getChatMessageFont(), "QTextEdit")); emoteButton->setStyleSheet(style.getStylesheet(STYLE_PATH, settings)); @@ -502,7 +502,7 @@ void GenericChatForm::onChatMessageFontChanged(const QFont& font) chatWidget->fontChanged(font); chatWidget->forceRelayout(); // message editor - msgEdit->setStyleSheet(style.getStylesheet("msgEdit/msgEdit.css", settings) + msgEdit->setStyleSheet(style.getStylesheet("msgEdit/msgEdit.qss", settings) + fontToCss(font, "QTextEdit")); } diff --git a/src/widget/form/profileform.cpp b/src/widget/form/profileform.cpp index fae27c23c7..78f99d06e6 100644 --- a/src/widget/form/profileform.cpp +++ b/src/widget/form/profileform.cpp @@ -111,7 +111,7 @@ ProfileForm::ProfileForm(IProfileInfo* profileInfo_, Settings& settings_, Style& profilePicture->installEventFilter(this); profilePicture->setAccessibleName("Profile avatar"); profilePicture->setAccessibleDescription("Set a profile avatar shown to all contacts"); - profilePicture->setStyleSheet(style.getStylesheet("window/profile.css", settings)); + profilePicture->setStyleSheet(style.getStylesheet("window/profile.qss", settings)); connect(profilePicture, &MaskablePixmapWidget::clicked, this, &ProfileForm::onAvatarClicked); connect(profilePicture, &MaskablePixmapWidget::customContextMenuRequested, this, &ProfileForm::showProfilePictureContextMenu); diff --git a/src/widget/form/searchsettingsform.cpp b/src/widget/form/searchsettingsform.cpp index 0036d4de50..a469520353 100644 --- a/src/widget/form/searchsettingsform.cpp +++ b/src/widget/form/searchsettingsform.cpp @@ -85,9 +85,9 @@ ParameterSearch SearchSettingsForm::getParameterSearch() void SearchSettingsForm::reloadTheme() { ui->choiceDateButton->setStyleSheet( - style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); + style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); ui->startDateLabel->setStyleSheet( - style.getStylesheet(QStringLiteral("chatForm/labels.css"), settings)); + style.getStylesheet(QStringLiteral("chatForm/labels.qss"), settings)); } void SearchSettingsForm::updateStartDateLabel() @@ -109,7 +109,7 @@ void SearchSettingsForm::onStartSearchSelected(const int index) ui->choiceDateButton->setProperty("state", QStringLiteral("green")); ui->choiceDateButton->setStyleSheet( - style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); + style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); if (startDate.isNull()) { startDate = QDate::currentDate(); @@ -122,7 +122,7 @@ void SearchSettingsForm::onStartSearchSelected(const int index) ui->choiceDateButton->setProperty("state", QString()); ui->choiceDateButton->setStyleSheet( - style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); + style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); } setUpdate(true); diff --git a/src/widget/genericchatroomwidget.cpp b/src/widget/genericchatroomwidget.cpp index a1a4138a8c..fe10a5aef9 100644 --- a/src/widget/genericchatroomwidget.cpp +++ b/src/widget/genericchatroomwidget.cpp @@ -148,7 +148,7 @@ QString GenericChatroomWidget::getTitle() const void GenericChatroomWidget::reloadTheme() { - setStyleSheet(style.getStylesheet("genericChatRoomWidget/genericChatRoomWidget.css", settings)); + setStyleSheet(style.getStylesheet("genericChatRoomWidget/genericChatRoomWidget.qss", settings)); } void GenericChatroomWidget::activate() diff --git a/src/widget/loginscreen.cpp b/src/widget/loginscreen.cpp index 9659ae5adc..ec5e8ee32f 100644 --- a/src/widget/loginscreen.cpp +++ b/src/widget/loginscreen.cpp @@ -53,7 +53,7 @@ LoginScreen::LoginScreen(Paths& paths_, Style& style, int themeColor, connect(ui->importButton, &QPushButton::clicked, this, &LoginScreen::onImportProfile); reset(initialProfileName); - setStyleSheet(style.getStylesheet("loginScreen/loginScreen.css", themeColor)); + setStyleSheet(style.getStylesheet("loginScreen/loginScreen.qss", themeColor)); retranslateUi(); Translator::registerHandler(std::bind(&LoginScreen::retranslateUi, this), this); diff --git a/src/widget/notificationedgewidget.cpp b/src/widget/notificationedgewidget.cpp index f325575815..46edcb3b38 100644 --- a/src/widget/notificationedgewidget.cpp +++ b/src/widget/notificationedgewidget.cpp @@ -16,7 +16,7 @@ NotificationEdgeWidget::NotificationEdgeWidget(Position position, Settings& sett : QWidget(parent) { setAttribute(Qt::WA_StyledBackground); // Show background. - setStyleSheet(style.getStylesheet("notificationEdge/notificationEdge.css", settings)); + setStyleSheet(style.getStylesheet("notificationEdge/notificationEdge.qss", settings)); QHBoxLayout* layout = new QHBoxLayout(this); layout->addStretch(); diff --git a/src/widget/searchform.cpp b/src/widget/searchform.cpp index 3186f0fa11..a73e179653 100644 --- a/src/widget/searchform.cpp +++ b/src/widget/searchform.cpp @@ -37,7 +37,7 @@ SearchForm::SearchForm(Settings& settings_, Style& style_, QWidget* parent) searchSettingsForm->setVisible(false); messageLabel->setProperty("state", QStringLiteral("red")); - messageLabel->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/labels.css"), settings)); + messageLabel->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/labels.qss"), settings)); messageLabel->setText(tr("The text could not be found.")); messageLabel->setVisible(false); @@ -111,11 +111,11 @@ void SearchForm::insertEditor(const QString& text) void SearchForm::reloadTheme() { - settingsButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); - upButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); - downButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); - hideButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); - startButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); + settingsButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); + upButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); + downButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); + hideButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); + startButton->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); searchSettingsForm->reloadTheme(); } @@ -132,7 +132,7 @@ QPushButton* SearchForm::createButton(const QString& name, const QString& state) btn->setAttribute(Qt::WA_LayoutUsesWidgetRect); btn->setObjectName(name); btn->setProperty("state", state); - btn->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); + btn->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); return btn; } @@ -158,7 +158,7 @@ void SearchForm::setStateName(QPushButton* btn, ToolButtonState state) { const auto index = static_cast(state); btn->setProperty("state", STATE_NAME[index]); - btn->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.css"), settings)); + btn->setStyleSheet(style.getStylesheet(QStringLiteral("chatForm/buttons.qss"), settings)); btn->setEnabled(index != 0); } diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index fd0bcf56e4..618b4b389c 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -1874,7 +1874,7 @@ ContentLayout* Widget::createContentDialog(DialogType type) const void reloadTheme() final { - setStyleSheet(style.getStylesheet("window/general.css", settings)); + setStyleSheet(style.getStylesheet("window/general.qss", settings)); } protected: @@ -2451,15 +2451,15 @@ void Widget::reloadTheme() x->setStyleSheet(""); } - setStyleSheet(style.getStylesheet("window/general.css", settings)); - QString statusPanelStyle = style.getStylesheet("window/statusPanel.css", settings); - ui->tooliconsZone->setStyleSheet(style.getStylesheet("tooliconsZone/tooliconsZone.css", settings)); + setStyleSheet(style.getStylesheet("window/general.qss", settings)); + QString statusPanelStyle = style.getStylesheet("window/statusPanel.qss", settings); + ui->tooliconsZone->setStyleSheet(style.getStylesheet("tooliconsZone/tooliconsZone.qss", settings)); ui->statusPanel->setStyleSheet(statusPanelStyle); ui->statusHead->setStyleSheet(statusPanelStyle); - ui->friendList->setStyleSheet(style.getStylesheet("friendList/friendList.css", settings)); - ui->statusButton->setStyleSheet(style.getStylesheet("statusButton/statusButton.css", settings)); + ui->friendList->setStyleSheet(style.getStylesheet("friendList/friendList.qss", settings)); + ui->statusButton->setStyleSheet(style.getStylesheet("statusButton/statusButton.qss", settings)); - profilePicture->setStyleSheet(style.getStylesheet("window/profile.css", settings)); + profilePicture->setStyleSheet(style.getStylesheet("window/profile.qss", settings)); } void Widget::nextChat() diff --git a/themes/dark/addFriendForm/toxId.css b/themes/dark/addFriendForm/toxId.qss similarity index 65% rename from themes/dark/addFriendForm/toxId.css rename to themes/dark/addFriendForm/toxId.qss index 073a2ca382..b7e2e53afd 100644 --- a/themes/dark/addFriendForm/toxId.css +++ b/themes/dark/addFriendForm/toxId.qss @@ -1,3 +1,3 @@ -QLineEdit { +QLineEdit { background-color: #8a3f3a; -} +} diff --git a/themes/dark/chatArea/chatArea.css b/themes/dark/chatArea/chatArea.qss similarity index 100% rename from themes/dark/chatArea/chatArea.css rename to themes/dark/chatArea/chatArea.qss diff --git a/themes/dark/chatArea/chatHead.css b/themes/dark/chatArea/chatHead.qss similarity index 100% rename from themes/dark/chatArea/chatHead.css rename to themes/dark/chatArea/chatHead.qss diff --git a/themes/dark/chatArea/innerStyle.css b/themes/dark/chatArea/innerStyle.qss similarity index 100% rename from themes/dark/chatArea/innerStyle.css rename to themes/dark/chatArea/innerStyle.qss diff --git a/themes/dark/chatForm/buttons.css b/themes/dark/chatForm/buttons.qss similarity index 100% rename from themes/dark/chatForm/buttons.css rename to themes/dark/chatForm/buttons.qss diff --git a/themes/dark/chatForm/fullScreenButtons.css b/themes/dark/chatForm/fullScreenButtons.qss similarity index 100% rename from themes/dark/chatForm/fullScreenButtons.css rename to themes/dark/chatForm/fullScreenButtons.qss diff --git a/themes/dark/chatForm/labels.css b/themes/dark/chatForm/labels.qss similarity index 100% rename from themes/dark/chatForm/labels.css rename to themes/dark/chatForm/labels.qss diff --git a/themes/dark/contentDialog/contentDialog.css b/themes/dark/contentDialog/contentDialog.qss similarity index 100% rename from themes/dark/contentDialog/contentDialog.css rename to themes/dark/contentDialog/contentDialog.qss diff --git a/themes/dark/emoteButton/emoteButton.css b/themes/dark/emoteButton/emoteButton.qss similarity index 100% rename from themes/dark/emoteButton/emoteButton.css rename to themes/dark/emoteButton/emoteButton.qss diff --git a/themes/dark/emoticonWidget/emoticonWidget.css b/themes/dark/emoticonWidget/emoticonWidget.qss similarity index 100% rename from themes/dark/emoticonWidget/emoticonWidget.css rename to themes/dark/emoticonWidget/emoticonWidget.qss diff --git a/themes/dark/fileButton/fileButton.css b/themes/dark/fileButton/fileButton.qss similarity index 100% rename from themes/dark/fileButton/fileButton.css rename to themes/dark/fileButton/fileButton.qss diff --git a/themes/dark/fileTransferInstance/filetransferWidget.css b/themes/dark/fileTransferInstance/filetransferWidget.qss similarity index 100% rename from themes/dark/fileTransferInstance/filetransferWidget.css rename to themes/dark/fileTransferInstance/filetransferWidget.qss diff --git a/themes/dark/friendList/friendList.css b/themes/dark/friendList/friendList.qss similarity index 100% rename from themes/dark/friendList/friendList.css rename to themes/dark/friendList/friendList.qss diff --git a/themes/dark/genericChatForm/genericChatForm.css b/themes/dark/genericChatForm/genericChatForm.qss similarity index 100% rename from themes/dark/genericChatForm/genericChatForm.css rename to themes/dark/genericChatForm/genericChatForm.qss diff --git a/themes/dark/genericChatRoomWidget/genericChatRoomWidget.css b/themes/dark/genericChatRoomWidget/genericChatRoomWidget.qss similarity index 100% rename from themes/dark/genericChatRoomWidget/genericChatRoomWidget.css rename to themes/dark/genericChatRoomWidget/genericChatRoomWidget.qss diff --git a/themes/dark/loginScreen/loginScreen.css b/themes/dark/loginScreen/loginScreen.qss similarity index 100% rename from themes/dark/loginScreen/loginScreen.css rename to themes/dark/loginScreen/loginScreen.qss diff --git a/themes/dark/msgEdit/msgEdit.css b/themes/dark/msgEdit/msgEdit.qss similarity index 100% rename from themes/dark/msgEdit/msgEdit.css rename to themes/dark/msgEdit/msgEdit.qss diff --git a/themes/dark/notificationEdge/notificationEdge.css b/themes/dark/notificationEdge/notificationEdge.qss similarity index 100% rename from themes/dark/notificationEdge/notificationEdge.css rename to themes/dark/notificationEdge/notificationEdge.qss diff --git a/themes/dark/screenshotButton/screenshotButton.css b/themes/dark/screenshotButton/screenshotButton.qss similarity index 100% rename from themes/dark/screenshotButton/screenshotButton.css rename to themes/dark/screenshotButton/screenshotButton.qss diff --git a/themes/dark/sendButton/sendButton.css b/themes/dark/sendButton/sendButton.qss similarity index 100% rename from themes/dark/sendButton/sendButton.css rename to themes/dark/sendButton/sendButton.qss diff --git a/themes/dark/settings/mainHead.css b/themes/dark/settings/mainHead.qss similarity index 100% rename from themes/dark/settings/mainHead.css rename to themes/dark/settings/mainHead.qss diff --git a/themes/dark/statusButton/statusButton.css b/themes/dark/statusButton/statusButton.qss similarity index 100% rename from themes/dark/statusButton/statusButton.css rename to themes/dark/statusButton/statusButton.qss diff --git a/themes/dark/tooliconsZone/tooliconsZone.css b/themes/dark/tooliconsZone/tooliconsZone.qss similarity index 100% rename from themes/dark/tooliconsZone/tooliconsZone.css rename to themes/dark/tooliconsZone/tooliconsZone.qss diff --git a/themes/dark/window/general.css b/themes/dark/window/general.qss similarity index 100% rename from themes/dark/window/general.css rename to themes/dark/window/general.qss diff --git a/themes/dark/window/profile.css b/themes/dark/window/profile.qss similarity index 100% rename from themes/dark/window/profile.css rename to themes/dark/window/profile.qss diff --git a/themes/dark/window/statusPanel.css b/themes/dark/window/statusPanel.qss similarity index 100% rename from themes/dark/window/statusPanel.css rename to themes/dark/window/statusPanel.qss diff --git a/themes/dark/window/window.css b/themes/dark/window/window.qss similarity index 100% rename from themes/dark/window/window.css rename to themes/dark/window/window.qss diff --git a/themes/default/addFriendForm/toxId.css b/themes/default/addFriendForm/toxId.qss similarity index 65% rename from themes/default/addFriendForm/toxId.css rename to themes/default/addFriendForm/toxId.qss index b1e4fd772c..2e250b7ac5 100644 --- a/themes/default/addFriendForm/toxId.css +++ b/themes/default/addFriendForm/toxId.qss @@ -1,3 +1,3 @@ -QLineEdit { +QLineEdit { background-color: #FFC1C1; -} +} diff --git a/themes/default/chatArea/chatArea.css b/themes/default/chatArea/chatArea.qss similarity index 100% rename from themes/default/chatArea/chatArea.css rename to themes/default/chatArea/chatArea.qss diff --git a/themes/default/chatArea/chatHead.css b/themes/default/chatArea/chatHead.qss similarity index 100% rename from themes/default/chatArea/chatHead.css rename to themes/default/chatArea/chatHead.qss diff --git a/themes/default/chatArea/innerStyle.css b/themes/default/chatArea/innerStyle.qss similarity index 100% rename from themes/default/chatArea/innerStyle.css rename to themes/default/chatArea/innerStyle.qss diff --git a/themes/default/chatForm/buttons.css b/themes/default/chatForm/buttons.qss similarity index 100% rename from themes/default/chatForm/buttons.css rename to themes/default/chatForm/buttons.qss diff --git a/themes/default/chatForm/fullScreenButtons.css b/themes/default/chatForm/fullScreenButtons.qss similarity index 100% rename from themes/default/chatForm/fullScreenButtons.css rename to themes/default/chatForm/fullScreenButtons.qss diff --git a/themes/default/chatForm/labels.css b/themes/default/chatForm/labels.qss similarity index 100% rename from themes/default/chatForm/labels.css rename to themes/default/chatForm/labels.qss diff --git a/themes/default/contentDialog/contentDialog.css b/themes/default/contentDialog/contentDialog.qss similarity index 100% rename from themes/default/contentDialog/contentDialog.css rename to themes/default/contentDialog/contentDialog.qss diff --git a/themes/default/emoteButton/emoteButton.css b/themes/default/emoteButton/emoteButton.qss similarity index 100% rename from themes/default/emoteButton/emoteButton.css rename to themes/default/emoteButton/emoteButton.qss diff --git a/themes/default/emoticonWidget/emoticonWidget.css b/themes/default/emoticonWidget/emoticonWidget.qss similarity index 100% rename from themes/default/emoticonWidget/emoticonWidget.css rename to themes/default/emoticonWidget/emoticonWidget.qss diff --git a/themes/default/fileButton/fileButton.css b/themes/default/fileButton/fileButton.qss similarity index 100% rename from themes/default/fileButton/fileButton.css rename to themes/default/fileButton/fileButton.qss diff --git a/themes/default/fileTransferInstance/filetransferWidget.css b/themes/default/fileTransferInstance/filetransferWidget.qss similarity index 100% rename from themes/default/fileTransferInstance/filetransferWidget.css rename to themes/default/fileTransferInstance/filetransferWidget.qss diff --git a/themes/default/friendList/friendList.css b/themes/default/friendList/friendList.qss similarity index 100% rename from themes/default/friendList/friendList.css rename to themes/default/friendList/friendList.qss diff --git a/themes/default/genericChatForm/genericChatForm.css b/themes/default/genericChatForm/genericChatForm.qss similarity index 100% rename from themes/default/genericChatForm/genericChatForm.css rename to themes/default/genericChatForm/genericChatForm.qss diff --git a/themes/default/genericChatRoomWidget/genericChatRoomWidget.css b/themes/default/genericChatRoomWidget/genericChatRoomWidget.qss similarity index 85% rename from themes/default/genericChatRoomWidget/genericChatRoomWidget.css rename to themes/default/genericChatRoomWidget/genericChatRoomWidget.qss index 1ff6d982a2..5520d17a01 100644 --- a/themes/default/genericChatRoomWidget/genericChatRoomWidget.css +++ b/themes/default/genericChatRoomWidget/genericChatRoomWidget.qss @@ -7,10 +7,10 @@ GenericChatroomWidget:hover { GenericChatroomWidget[active="true"] { background-color: @groundBase; /* When active */ } -CroppingLabel#statusMessageLabelObj { +CroppingLabel#statusMessageLabelObj { color: @groundExtra; /* Base color */ } -CroppingLabel#statusMessageLabelObj[active="true"] { +CroppingLabel#statusMessageLabelObj[active="true"] { color: @statusActive; /* Color when active */ } CroppingLabel#nameLabelObj { diff --git a/themes/default/loginScreen/loginScreen.css b/themes/default/loginScreen/loginScreen.qss similarity index 100% rename from themes/default/loginScreen/loginScreen.css rename to themes/default/loginScreen/loginScreen.qss diff --git a/themes/default/msgEdit/msgEdit.css b/themes/default/msgEdit/msgEdit.qss similarity index 100% rename from themes/default/msgEdit/msgEdit.css rename to themes/default/msgEdit/msgEdit.qss diff --git a/themes/default/notificationEdge/notificationEdge.css b/themes/default/notificationEdge/notificationEdge.qss similarity index 100% rename from themes/default/notificationEdge/notificationEdge.css rename to themes/default/notificationEdge/notificationEdge.qss diff --git a/themes/default/screenshotButton/screenshotButton.css b/themes/default/screenshotButton/screenshotButton.qss similarity index 100% rename from themes/default/screenshotButton/screenshotButton.css rename to themes/default/screenshotButton/screenshotButton.qss diff --git a/themes/default/sendButton/sendButton.css b/themes/default/sendButton/sendButton.qss similarity index 100% rename from themes/default/sendButton/sendButton.css rename to themes/default/sendButton/sendButton.qss diff --git a/themes/default/settings/mainHead.css b/themes/default/settings/mainHead.qss similarity index 100% rename from themes/default/settings/mainHead.css rename to themes/default/settings/mainHead.qss diff --git a/themes/default/statusButton/statusButton.css b/themes/default/statusButton/statusButton.qss similarity index 100% rename from themes/default/statusButton/statusButton.css rename to themes/default/statusButton/statusButton.qss diff --git a/themes/default/tooliconsZone/tooliconsZone.css b/themes/default/tooliconsZone/tooliconsZone.qss similarity index 100% rename from themes/default/tooliconsZone/tooliconsZone.css rename to themes/default/tooliconsZone/tooliconsZone.qss diff --git a/themes/default/window/general.css b/themes/default/window/general.qss similarity index 100% rename from themes/default/window/general.css rename to themes/default/window/general.qss diff --git a/themes/default/window/profile.css b/themes/default/window/profile.qss similarity index 100% rename from themes/default/window/profile.css rename to themes/default/window/profile.qss diff --git a/themes/default/window/statusPanel.css b/themes/default/window/statusPanel.qss similarity index 100% rename from themes/default/window/statusPanel.css rename to themes/default/window/statusPanel.qss diff --git a/themes/default/window/window.css b/themes/default/window/window.qss similarity index 100% rename from themes/default/window/window.css rename to themes/default/window/window.qss