From 4ab7d6484a05bf825161ec13a0ae494164bfb873 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 7 Dec 2022 13:38:39 +0100 Subject: [PATCH] Remove unused headerbanner component Signed-off-by: Claudio Cambra --- src/gui/CMakeLists.txt | 2 - src/gui/creds/webflowcredentialsdialog.cpp | 1 - src/gui/creds/webflowcredentialsdialog.h | 2 - src/gui/headerbanner.cpp | 146 --------------------- src/gui/headerbanner.h | 93 ------------- 5 files changed, 244 deletions(-) delete mode 100644 src/gui/headerbanner.cpp delete mode 100644 src/gui/headerbanner.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 8543e41ee3fe1..7588a616956a1 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -169,8 +169,6 @@ set(client_SRCS guiutility.cpp elidedlabel.h elidedlabel.cpp - headerbanner.h - headerbanner.cpp iconutils.h iconutils.cpp remotewipe.h diff --git a/src/gui/creds/webflowcredentialsdialog.cpp b/src/gui/creds/webflowcredentialsdialog.cpp index 8bb1eb90eb4f0..19db3430bedfe 100644 --- a/src/gui/creds/webflowcredentialsdialog.cpp +++ b/src/gui/creds/webflowcredentialsdialog.cpp @@ -6,7 +6,6 @@ #include "theme.h" #include "application.h" #include "owncloudgui.h" -#include "headerbanner.h" #include "wizard/owncloudwizardcommon.h" #ifdef WITH_WEBENGINE #include "wizard/webview.h" diff --git a/src/gui/creds/webflowcredentialsdialog.h b/src/gui/creds/webflowcredentialsdialog.h index a965dcbde8fcd..b684603d76109 100644 --- a/src/gui/creds/webflowcredentialsdialog.h +++ b/src/gui/creds/webflowcredentialsdialog.h @@ -12,7 +12,6 @@ class QVBoxLayout; namespace OCC { -class HeaderBanner; #ifdef WITH_WEBENGINE class WebView; #endif // WITH_WEBENGINE @@ -60,7 +59,6 @@ public slots: QLabel *_infoLabel; QVBoxLayout *_layout; QVBoxLayout *_containerLayout; - HeaderBanner *_headerBanner; }; } // namespace OCC diff --git a/src/gui/headerbanner.cpp b/src/gui/headerbanner.cpp deleted file mode 100644 index 80fecfb93d833..0000000000000 --- a/src/gui/headerbanner.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (C) by Michael Schuster - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - */ - -/**************************************************************************** -** -** Based on Qt sourcecode: -** qt5/qtbase/src/widgets/dialogs/qwizard.cpp -** -** https://code.qt.io/cgit/qt/qtbase.git/tree/src/widgets/dialogs/qwizard.cpp?h=v5.13.0 -** -** Original license: -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "headerbanner.h" - -#include -#include - -#include -#include -#include - -namespace OCC { - -// These fudge terms were needed a few places to obtain pixel-perfect results -const int GapBetweenLogoAndRightEdge = 5; -const int ModernHeaderTopMargin = 2; - -HeaderBanner::HeaderBanner(QWidget *parent) - : QWidget(parent) -{ - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - setBackgroundRole(QPalette::Base); - titleLabel = new QLabel(this); - titleLabel->setBackgroundRole(QPalette::Base); - logoLabel = new QLabel(this); - QFont font = titleLabel->font(); - font.setBold(true); - titleLabel->setFont(font); - layout = new QGridLayout(this); - layout->setContentsMargins(QMargins()); - layout->setSpacing(0); - layout->setRowMinimumHeight(3, 1); - layout->setRowStretch(4, 1); - layout->setColumnStretch(2, 1); - layout->setColumnMinimumWidth(4, 2 * GapBetweenLogoAndRightEdge); - layout->setColumnMinimumWidth(6, GapBetweenLogoAndRightEdge); - layout->addWidget(titleLabel, 1, 1, 5, 1); - layout->addWidget(logoLabel, 1, 5, 5, 1); -} - -void HeaderBanner::setup(const QString &title, const QPixmap &logo, const QPixmap &banner, - const Qt::TextFormat titleFormat, const QString &styleSheet) -{ - QStyle *style = parentWidget()->style(); - //const int layoutHorizontalSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing); - int topLevelMarginLeft = style->pixelMetric(QStyle::PM_LayoutLeftMargin, nullptr, parentWidget()); - int topLevelMarginRight = style->pixelMetric(QStyle::PM_LayoutRightMargin, nullptr, parentWidget()); - int topLevelMarginTop = style->pixelMetric(QStyle::PM_LayoutTopMargin, nullptr, parentWidget()); - //int topLevelMarginBottom = style->pixelMetric(QStyle::PM_LayoutBottomMargin, 0, parentWidget()); - - layout->setRowMinimumHeight(0, ModernHeaderTopMargin); - layout->setRowMinimumHeight(1, topLevelMarginTop - ModernHeaderTopMargin - 1); - layout->setRowMinimumHeight(6, 3); - int minColumnWidth0 = topLevelMarginLeft + topLevelMarginRight; - int minColumnWidth1 = topLevelMarginLeft + topLevelMarginRight + 1; - layout->setColumnMinimumWidth(0, minColumnWidth0); - layout->setColumnMinimumWidth(1, minColumnWidth1); - titleLabel->setTextFormat(titleFormat); - titleLabel->setText(title); - if(!styleSheet.isEmpty()) - titleLabel->setStyleSheet(styleSheet); - logoLabel->setPixmap(logo); - bannerPixmap = banner; - if (bannerPixmap.isNull()) { - QSize size = layout->totalMinimumSize(); - setMinimumSize(size); - setMaximumSize(QWIDGETSIZE_MAX, size.height()); - } else { - setFixedHeight(banner.height() + 2); - } - updateGeometry(); -} - -void HeaderBanner::paintEvent(QPaintEvent * /* event */) -{ - QPainter painter(this); - painter.drawPixmap(0, 0, width(), bannerPixmap.height(), bannerPixmap); - int x = width() - 2; - int y = height() - 2; - const QPalette &pal = QGuiApplication::palette(); - painter.setPen(pal.mid().color()); - painter.drawLine(0, y, x, y); - painter.setPen(pal.base().color()); - painter.drawPoint(x + 1, y); - painter.drawLine(0, y + 1, x + 1, y + 1); -} - -} // namespace OCC diff --git a/src/gui/headerbanner.h b/src/gui/headerbanner.h deleted file mode 100644 index dc1e7a3a7dde1..0000000000000 --- a/src/gui/headerbanner.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) by Michael Schuster - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - */ - -/**************************************************************************** -** -** Based on Qt sourcecode: -** qt5/qtbase/src/widgets/dialogs/qwizard.cpp -** -** https://code.qt.io/cgit/qt/qtbase.git/tree/src/widgets/dialogs/qwizard.cpp?h=v5.13.0 -** -** Original license: -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef HEADERBANNER_H -#define HEADERBANNER_H - -#include - -class QLabel; -class QGridLayout; -class QPixmap; - -namespace OCC { - -class HeaderBanner : public QWidget -{ - Q_OBJECT -public: - HeaderBanner(QWidget *parent = nullptr); - - void setup(const QString &title, const QPixmap &logo, const QPixmap &banner, - const Qt::TextFormat titleFormat, const QString &styleSheet); - -protected: - void paintEvent(QPaintEvent *event) override; - -private: - QLabel *titleLabel; - QLabel *logoLabel; - QGridLayout *layout; - QPixmap bannerPixmap; -}; - -} // namespace OCC - -#endif // HEADERBANNER_H