mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
Merge branch 'v2.1'
This commit is contained in:
commit
3434052690
|
@ -1,6 +1,6 @@
|
|||
/* ============================================================
|
||||
* StatusBarIcons - Extra icons in statusbar for QupZilla
|
||||
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
|
||||
* Copyright (C) 2013-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* 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
|
||||
|
@ -28,6 +28,7 @@
|
|||
SBI_ImagesIcon::SBI_ImagesIcon(BrowserWindow* window, const QString &settingsPath)
|
||||
: SBI_Icon(window, settingsPath)
|
||||
{
|
||||
setObjectName(QSL("sbi_imagesicon"));
|
||||
setCursor(Qt::PointingHandCursor);
|
||||
setToolTip(tr("Modify images loading settings per-site and globally"));
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* ============================================================
|
||||
* StatusBarIcons - Extra icons in statusbar for QupZilla
|
||||
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
|
||||
* Copyright (C) 2013-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* 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
|
||||
|
@ -29,6 +29,7 @@
|
|||
SBI_JavaScriptIcon::SBI_JavaScriptIcon(BrowserWindow* window)
|
||||
: SBI_Icon(window)
|
||||
{
|
||||
setObjectName(QSL("sbi_javascripticon"));
|
||||
setCursor(Qt::PointingHandCursor);
|
||||
setToolTip(tr("Modify JavaScript settings per-site and globally"));
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* ============================================================
|
||||
* StatusBarIcons - Extra icons in statusbar for QupZilla
|
||||
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
|
||||
* Copyright (C) 2013-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* 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
|
||||
|
@ -29,6 +29,7 @@ SBI_NetworkIcon::SBI_NetworkIcon(BrowserWindow* window)
|
|||
: SBI_Icon(window)
|
||||
, m_networkConfiguration(new QNetworkConfigurationManager(this))
|
||||
{
|
||||
setObjectName(QSL("sbi_networkicon"));
|
||||
setCursor(Qt::PointingHandCursor);
|
||||
|
||||
onlineStateChanged(m_networkConfiguration->isOnline());
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* ============================================================
|
||||
* StatusBarIcons - Extra icons in statusbar for QupZilla
|
||||
* Copyright (C) 2014 David Rosca <nowrep@gmail.com>
|
||||
* Copyright (C) 2014-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* 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
|
||||
|
@ -24,6 +24,7 @@ SBI_ZoomWidget::SBI_ZoomWidget(BrowserWindow* parent)
|
|||
: QSlider(parent)
|
||||
, m_window(parent)
|
||||
{
|
||||
setObjectName(QSL("sbi_zoomwidget"));
|
||||
setOrientation(Qt::Horizontal);
|
||||
setFixedWidth(100);
|
||||
setMaximumHeight(20);
|
||||
|
|
Loading…
Reference in New Issue
Block a user