From d796821f8304306dbe088701724243b39e8eb358 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Mon, 16 Apr 2018 17:07:36 +0200 Subject: Multiple subwindows interface Subwindows are similar to tab groups. - Rewrote Browser and MainWindow, so they should be somewhat cleaner now - Moved AboutDialog to lib/about What's broken: - loading bar - search box - address bar bookmark suggestions - plugins --- src/forms/aboutdialog.cpp | 98 ------------------------------------------- src/forms/aboutdialog.h | 31 -------------- src/forms/aboutdialog.ui | 105 ---------------------------------------------- 3 files changed, 234 deletions(-) delete mode 100644 src/forms/aboutdialog.cpp delete mode 100644 src/forms/aboutdialog.h delete mode 100644 src/forms/aboutdialog.ui (limited to 'src/forms') diff --git a/src/forms/aboutdialog.cpp b/src/forms/aboutdialog.cpp deleted file mode 100644 index 058c57d..0000000 --- a/src/forms/aboutdialog.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/* - * This file is part of smolbote. It's copyrighted by the contributors recorded - * in the version control history of the file, available from its original - * location: https://neueland.iserlohn-fortress.net/smolbote.hg - * - * SPDX-License-Identifier: GPL-3.0 - */ - -#include "aboutdialog.h" -#include "browser.h" -#include "ui_aboutdialog.h" -#include "version.h" -#include -#include - -// compiler -// clang also defines __GNUC__, so we need to check for clang first -#if defined(__clang__) -#define compiler "Clang " __clang_version__ -#elif defined(__GNUC__) -#define compiler "GCC " __VERSION__ -#else -#define compiler "unknown compiler"; -#endif - -AboutDialog::AboutDialog(QWidget *parent) - : QDialog(parent) - , ui(new Ui::AboutDialog) -{ - setAttribute(Qt::WA_DeleteOnClose, true); - ui->setupUi(this); - - auto *browser = dynamic_cast(QApplication::instance()); - - ui->icon->setPixmap(dynamic_cast(browser)->windowIcon().pixmap(72, 72)); - - auto *aboutLabel = new QLabel(this); - aboutLabel->setWordWrap(true); - aboutLabel->setText(tr("

smolbote " SMOLBOTE_VERSION "

" - "

yet another no-frills browser

")); - ui->toolBox->addItem(aboutLabel, tr("About")); - - auto *licenseLabel = new QLabel(this); - licenseLabel->setWordWrap(true); - licenseLabel->setText(tr("

Copyright (C) 2017 Xian Nox

" - "

This program is free software, and you are welcome to use it under the conditions set by the GNU GPLv3:" - "

    " - "
  • the freedom to use the software for any purpose,
    • " - "
  • the freedom to change the software to suit your needs,
    • " - "
  • the freedom to share the software with anyone,
    • " - "
  • the freedom to share the changes you make, and
    • " - "
  • the responsibility to grant the same freedoms when sharing the software.
    • " - "
" - "

You can find the full license text in LICENSE.md.

")); - ui->toolBox->addItem(licenseLabel, tr("License")); - - auto *libsLabel = new QLabel(this); - libsLabel->setWordWrap(true); - libsLabel->setText(tr("

Version " SMOLBOTE_DESCRIBE "

" - "

Branch: " SMOLBOTE_BRANCH "
" - "Compiled with " compiler "

" - "

    " - "
  • Qt " QT_VERSION_STR "
    • " - "
  • QtWebEngine " QTWEBENGINE_VERSION_STR "
    • " - "
  • Boost " BOOST_LIB_VERSION "
    • " - "

")); - ui->toolBox->addItem(libsLabel, tr("Details")); - - // list profiles - if(!browser->profiles().isEmpty()) { - QString profilesText = tr("

Profile list:

" - "

    "); - for(const QString &name : browser->profiles()) { - if(name.isEmpty()) - profilesText += tr("
  • Off-the-record
    • "); - else - profilesText += tr("
  • %1
    • ").arg(name); - } - profilesText += tr("

"); - libsLabel->setText(libsLabel->text() + profilesText); - } - - // list plugins - if(!browser->plugins().isEmpty()) { - QString pluginText = tr("

Plugin list:

" - "

    "); - for(const Browser::Plugin &plugin : browser->plugins()) { - pluginText += tr("
  • %1 (%2)
    • ").arg(plugin.meta["name"].toString(), plugin.meta["author"].toString()); - } - pluginText += tr("

"); - libsLabel->setText(libsLabel->text() + pluginText); - } -} - -AboutDialog::~AboutDialog() -{ - delete ui; -} diff --git a/src/forms/aboutdialog.h b/src/forms/aboutdialog.h deleted file mode 100644 index 265f3c9..0000000 --- a/src/forms/aboutdialog.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of smolbote. It's copyrighted by the contributors recorded - * in the version control history of the file, available from its original - * location: https://neueland.iserlohn-fortress.net/smolbote.hg - * - * SPDX-License-Identifier: GPL-3.0 - */ - -#ifndef SMOLBOTE_ABOUTDIALOG_H -#define SMOLBOTE_ABOUTDIALOG_H - -#include - -namespace Ui -{ -class AboutDialog; -} - -class AboutDialog : public QDialog -{ - Q_OBJECT - -public: - explicit AboutDialog(QWidget *parent = nullptr); - ~AboutDialog() override; - -private: - Ui::AboutDialog *ui; -}; - -#endif // SMOLBOTE_ABOUTDIALOG_H diff --git a/src/forms/aboutdialog.ui b/src/forms/aboutdialog.ui deleted file mode 100644 index f7fe21e..0000000 --- a/src/forms/aboutdialog.ui +++ /dev/null @@ -1,105 +0,0 @@ - - - AboutDialog - - - - 0 - 0 - 500 - 600 - - - - About - - - - - - - - - 72 - 72 - - - - TextLabel - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - -1 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Close - - - - - - - - - - - buttonBox - accepted() - AboutDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - AboutDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - -- cgit v1.2.1