Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

Merge branch 'v2.1'

Browse Source
This commit is contained in:
David Rosca 2017-03-15 11:00:14 +01:00
commit 3434052690
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/StatusBarIcons/sbi_imagesicon.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* StatusBarIcons - Extra icons in statusbar for QupZilla * 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 * 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 * 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_ImagesIcon::SBI_ImagesIcon(BrowserWindow* window, const QString &settingsPath)
: SBI_Icon(window, settingsPath) : SBI_Icon(window, settingsPath)
{ {
setObjectName(QSL("sbi_imagesicon"));
setCursor(Qt::PointingHandCursor); setCursor(Qt::PointingHandCursor);
setToolTip(tr("Modify images loading settings per-site and globally")); setToolTip(tr("Modify images loading settings per-site and globally"));

3
src/plugins/StatusBarIcons/sbi_javascripticon.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* StatusBarIcons - Extra icons in statusbar for QupZilla * 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 * 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 * it under the terms of the GNU General Public License as published by
@ -29,6 +29,7 @@
SBI_JavaScriptIcon::SBI_JavaScriptIcon(BrowserWindow* window) SBI_JavaScriptIcon::SBI_JavaScriptIcon(BrowserWindow* window)
: SBI_Icon(window) : SBI_Icon(window)
{ {
setObjectName(QSL("sbi_javascripticon"));
setCursor(Qt::PointingHandCursor); setCursor(Qt::PointingHandCursor);
setToolTip(tr("Modify JavaScript settings per-site and globally")); setToolTip(tr("Modify JavaScript settings per-site and globally"));

3
src/plugins/StatusBarIcons/sbi_networkicon.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* StatusBarIcons - Extra icons in statusbar for QupZilla * 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 * 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 * 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) : SBI_Icon(window)
, m_networkConfiguration(new QNetworkConfigurationManager(this)) , m_networkConfiguration(new QNetworkConfigurationManager(this))
{ {
setObjectName(QSL("sbi_networkicon"));
setCursor(Qt::PointingHandCursor); setCursor(Qt::PointingHandCursor);
onlineStateChanged(m_networkConfiguration->isOnline()); onlineStateChanged(m_networkConfiguration->isOnline());

3
src/plugins/StatusBarIcons/sbi_zoomwidget.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* StatusBarIcons - Extra icons in statusbar for QupZilla * 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 * 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 * 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) : QSlider(parent)
, m_window(parent) , m_window(parent)
{ {
setObjectName(QSL("sbi_zoomwidget"));
setOrientation(Qt::Horizontal); setOrientation(Qt::Horizontal);
setFixedWidth(100); setFixedWidth(100);
setMaximumHeight(20); setMaximumHeight(20);