aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/qt/accordion_frame.cpp15
-rw-r--r--ui/qt/accordion_frame.h1
-rw-r--r--ui/qt/address_editor_frame.cpp2
-rw-r--r--ui/qt/column_editor_frame.cpp4
-rw-r--r--ui/qt/filter_expression_frame.cpp4
-rw-r--r--ui/qt/preference_editor_frame.cpp2
-rw-r--r--ui/qt/search_frame.cpp1
-rw-r--r--ui/qt/widgets/display_filter_edit.cpp10
-rw-r--r--ui/qt/widgets/display_filter_edit.h2
-rw-r--r--ui/qt/wireshark_main_window.cpp2
10 files changed, 41 insertions, 2 deletions
diff --git a/ui/qt/accordion_frame.cpp b/ui/qt/accordion_frame.cpp
index e62209861d..29fa7b69b0 100644
--- a/ui/qt/accordion_frame.cpp
+++ b/ui/qt/accordion_frame.cpp
@@ -13,6 +13,7 @@
#include "accordion_frame.h"
#include "ui/util.h"
+#include <ui/qt/utils/color_utils.h>
#include <QLayout>
#include <QPropertyAnimation>
@@ -93,3 +94,17 @@ void AccordionFrame::animationFinished()
setMaximumHeight(frame_height_);
}
}
+
+QString AccordionFrame::lineEditStyleSheet()
+{
+ return QString(
+ "QLineEdit {"
+#ifdef Q_OS_MAC
+ " border: 1px solid palette(%1);"
+ " border-radius: 3px;"
+#else
+ " border: 1px solid palette(shadow);"
+#endif
+ "}"
+ ).arg(ColorUtils::themeIsDark() ? QString("light") : QString("dark"));
+} \ No newline at end of file
diff --git a/ui/qt/accordion_frame.h b/ui/qt/accordion_frame.h
index 9bdc3368ee..f67d55b342 100644
--- a/ui/qt/accordion_frame.h
+++ b/ui/qt/accordion_frame.h
@@ -21,6 +21,7 @@ public:
explicit AccordionFrame(QWidget *parent = 0);
void animatedShow();
void animatedHide();
+ QString lineEditStyleSheet();
signals:
void visibilityChanged(bool visible);
diff --git a/ui/qt/address_editor_frame.cpp b/ui/qt/address_editor_frame.cpp
index 50180ad92a..ec399de07c 100644
--- a/ui/qt/address_editor_frame.cpp
+++ b/ui/qt/address_editor_frame.cpp
@@ -40,6 +40,8 @@ AddressEditorFrame::AddressEditorFrame(QWidget *parent) :
ui->setupUi(this);
ui->addressComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+ ui->nameLineEdit->setStyleSheet(lineEditStyleSheet());
+
#ifdef Q_OS_MAC
foreach (QWidget *w, findChildren<QWidget *>()) {
w->setAttribute(Qt::WA_MacSmallSize, true);
diff --git a/ui/qt/column_editor_frame.cpp b/ui/qt/column_editor_frame.cpp
index ea527b9a87..45a32a1dd0 100644
--- a/ui/qt/column_editor_frame.cpp
+++ b/ui/qt/column_editor_frame.cpp
@@ -33,6 +33,10 @@ ColumnEditorFrame::ColumnEditorFrame(QWidget *parent) :
{
ui->setupUi(this);
+ ui->titleLineEdit->setStyleSheet(lineEditStyleSheet());
+ ui->fieldsNameLineEdit->setStyleSheet(lineEditStyleSheet());
+ ui->occurrenceLineEdit->setStyleSheet(lineEditStyleSheet());
+
#ifdef Q_OS_MAC
foreach (QWidget *w, findChildren<QWidget *>()) {
w->setAttribute(Qt::WA_MacSmallSize, true);
diff --git a/ui/qt/filter_expression_frame.cpp b/ui/qt/filter_expression_frame.cpp
index 38975977fb..fcb67ece73 100644
--- a/ui/qt/filter_expression_frame.cpp
+++ b/ui/qt/filter_expression_frame.cpp
@@ -29,6 +29,10 @@ FilterExpressionFrame::FilterExpressionFrame(QWidget *parent) :
{
ui->setupUi(this);
+ ui->labelLineEdit->setStyleSheet(lineEditStyleSheet());
+ ui->displayFilterLineEdit->setStyleSheet(lineEditStyleSheet());
+ ui->commentLineEdit->setStyleSheet(lineEditStyleSheet());
+
#ifdef Q_OS_MAC
foreach (QWidget *w, findChildren<QWidget *>()) {
w->setAttribute(Qt::WA_MacSmallSize, true);
diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp
index 9552c48ac3..01b6e9188b 100644
--- a/ui/qt/preference_editor_frame.cpp
+++ b/ui/qt/preference_editor_frame.cpp
@@ -42,6 +42,8 @@ PreferenceEditorFrame::PreferenceEditorFrame(QWidget *parent) :
{
ui->setupUi(this);
+ ui->preferenceLineEdit->setStyleSheet(lineEditStyleSheet());
+
#ifdef Q_OS_MAC
foreach (QWidget *w, findChildren<QWidget *>()) {
w->setAttribute(Qt::WA_MacSmallSize, true);
diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp
index e8b6cd9498..a03c7baace 100644
--- a/ui/qt/search_frame.cpp
+++ b/ui/qt/search_frame.cpp
@@ -49,6 +49,7 @@ SearchFrame::SearchFrame(QWidget *parent) :
regex_(nullptr)
{
sf_ui_->setupUi(this);
+ sf_ui_->searchLineEdit->setStyleSheet(lineEditStyleSheet());
#ifdef Q_OS_MAC
foreach (QWidget *w, findChildren<QWidget *>()) {
diff --git a/ui/qt/widgets/display_filter_edit.cpp b/ui/qt/widgets/display_filter_edit.cpp
index fd3d7f9356..734352438f 100644
--- a/ui/qt/widgets/display_filter_edit.cpp
+++ b/ui/qt/widgets/display_filter_edit.cpp
@@ -213,8 +213,8 @@ void DisplayFilterEdit::alignActionButtons()
rightMargin = 0;
}
- setStyleSheet(QString(
- "DisplayFilterEdit {"
+ SyntaxLineEdit::setStyleSheet(style_sheet_ + QString(
+ "SyntaxLineEdit {"
" padding-left: %1px;"
" margin-left: %2px;"
" margin-right: %3px;"
@@ -603,6 +603,12 @@ void DisplayFilterEdit::buildCompletionList(const QString &field_word, const QSt
completer()->setCompletionPrefix(field_word);
}
+void DisplayFilterEdit::setStyleSheet(const QString &style_sheet)
+{
+ style_sheet_ = style_sheet;
+ SyntaxLineEdit::setStyleSheet(style_sheet_);
+}
+
void DisplayFilterEdit::clearFilter()
{
clear();
diff --git a/ui/qt/widgets/display_filter_edit.h b/ui/qt/widgets/display_filter_edit.h
index 54febb8872..18422c44c2 100644
--- a/ui/qt/widgets/display_filter_edit.h
+++ b/ui/qt/widgets/display_filter_edit.h
@@ -47,6 +47,7 @@ public slots:
void updateBookmarkMenu();
void applyDisplayFilter();
void displayFilterSuccess(bool success);
+ void setStyleSheet(const QString &style_sheet);
private slots:
void checkFilter(const QString &filter_text);
@@ -78,6 +79,7 @@ private:
QString last_applied_;
QString filter_word_preamble_;
bool autocomplete_accepts_field_;
+ QString style_sheet_;
void setDefaultPlaceholderText();
void buildCompletionList(const QString &field_word, const QString &preamble);
diff --git a/ui/qt/wireshark_main_window.cpp b/ui/qt/wireshark_main_window.cpp
index 45561ce163..a269c013a5 100644
--- a/ui/qt/wireshark_main_window.cpp
+++ b/ui/qt/wireshark_main_window.cpp
@@ -486,6 +486,8 @@ WiresharkMainWindow::WiresharkMainWindow(QWidget *parent) :
main_ui_->actionViewFullScreen->setShortcut(QKeySequence(Qt::Key_F11));
#endif
+ main_ui_->goToLineEdit->setStyleSheet(main_ui_->goToFrame->lineEditStyleSheet());
+
#if defined(Q_OS_MAC)
main_ui_->goToPacketLabel->setAttribute(Qt::WA_MacSmallSize, true);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 20:37:57 +0000