Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

NavigationBar: Remove exit fullscreen button

Browse Source
This commit is contained in:
David Rosca 2018-01-04 18:29:04 +01:00
parent 54282af88f
commit 2e7a77a6b4
9 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/app/browserwindow.cpp
View File

@ -1229,7 +1229,6 @@ bool BrowserWindow::event(QEvent* event)
statusBar()->hide(); statusBar()->hide();
m_navigationContainer->hide(); m_navigationContainer->hide();
m_navigationToolbar->buttonExitFullscreen()->show();
} }
else if (m_oldWindowState & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) { else if (m_oldWindowState & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) {
// Leave fullscreen // Leave fullscreen
@ -1240,7 +1239,6 @@ bool BrowserWindow::event(QEvent* event)
m_navigationContainer->show(); m_navigationContainer->show();
m_navigationToolbar->setSuperMenuVisible(!m_menuBarVisible); m_navigationToolbar->setSuperMenuVisible(!m_menuBarVisible);
m_navigationToolbar->buttonExitFullscreen()->hide();
m_isHtmlFullScreen = false; m_isHtmlFullScreen = false;
} }

13
src/lib/navigation/navigationbar.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* Falkon - Qt web browser * Falkon - Qt web browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2018 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
@ -119,21 +119,11 @@ NavigationBar::NavigationBar(BrowserWindow* window)
m_navigationSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); m_navigationSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
m_navigationSplitter->setCollapsible(0, false); m_navigationSplitter->setCollapsible(0, false);
m_exitFullscreen = new ToolButton(this);
m_exitFullscreen->setObjectName("navigation-button-exitfullscreen");
m_exitFullscreen->setToolTip(tr("Exit Fullscreen"));
m_exitFullscreen->setToolButtonStyle(Qt::ToolButtonIconOnly);
m_exitFullscreen->setToolbarButtonLook(true);
m_exitFullscreen->setFocusPolicy(Qt::NoFocus);
m_exitFullscreen->setAutoRaise(true);
m_exitFullscreen->setVisible(false);
m_layout->addLayout(backNextLayout); m_layout->addLayout(backNextLayout);
m_layout->addWidget(m_reloadStop); m_layout->addWidget(m_reloadStop);
m_layout->addWidget(m_buttonHome); m_layout->addWidget(m_buttonHome);
m_layout->addWidget(m_buttonAddTab); m_layout->addWidget(m_buttonAddTab);
m_layout->addWidget(m_navigationSplitter); m_layout->addWidget(m_navigationSplitter);
m_layout->addWidget(m_exitFullscreen);
m_layout->addWidget(m_supMenu); m_layout->addWidget(m_supMenu);
setContextMenuPolicy(Qt::CustomContextMenu); setContextMenuPolicy(Qt::CustomContextMenu);
@ -153,7 +143,6 @@ NavigationBar::NavigationBar(BrowserWindow* window)
connect(m_buttonHome, SIGNAL(controlClicked()), m_window, SLOT(goHomeInNewTab())); connect(m_buttonHome, SIGNAL(controlClicked()), m_window, SLOT(goHomeInNewTab()));
connect(m_buttonAddTab, SIGNAL(clicked()), m_window, SLOT(addTab())); connect(m_buttonAddTab, SIGNAL(clicked()), m_window, SLOT(addTab()));
connect(m_buttonAddTab, SIGNAL(middleMouseClicked()), m_window->tabWidget(), SLOT(addTabFromClipboard())); connect(m_buttonAddTab, SIGNAL(middleMouseClicked()), m_window->tabWidget(), SLOT(addTabFromClipboard()));
connect(m_exitFullscreen, SIGNAL(clicked(bool)), m_window, SLOT(toggleFullScreen()));
} }
void NavigationBar::setSplitterSizes(int locationBar, int websearchBar) void NavigationBar::setSplitterSizes(int locationBar, int websearchBar)

4
src/lib/navigation/navigationbar.h
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* Falkon - Qt web browser * Falkon - Qt web browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2018 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
@ -51,7 +51,6 @@ public:
ToolButton* buttonForward() { return m_buttonForward; } ToolButton* buttonForward() { return m_buttonForward; }
ToolButton* buttonHome() { return m_buttonHome; } ToolButton* buttonHome() { return m_buttonHome; }
ToolButton* buttonAddTab() { return m_buttonAddTab; } ToolButton* buttonAddTab() { return m_buttonAddTab; }
ToolButton* buttonExitFullscreen() { return m_exitFullscreen; }
ReloadStopButton* buttonReloadStop() { return m_reloadStop; } ReloadStopButton* buttonReloadStop() { return m_reloadStop; }
WebSearchBar* webSearchBar() { return m_searchLine; } WebSearchBar* webSearchBar() { return m_searchLine; }
QSplitter* splitter() { return m_navigationSplitter; } QSplitter* splitter() { return m_navigationSplitter; }
@ -102,7 +101,6 @@ private:
ToolButton* m_buttonHome; ToolButton* m_buttonHome;
ToolButton* m_buttonAddTab; ToolButton* m_buttonAddTab;
ToolButton* m_supMenu; ToolButton* m_supMenu;
ToolButton* m_exitFullscreen;
ReloadStopButton* m_reloadStop; ReloadStopButton* m_reloadStop;
Menu* m_menuBack; Menu* m_menuBack;

BIN
themes/breathe/images/restore.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 433 B

5
themes/breathe/main.css
View File

@ -52,11 +52,6 @@
qproperty-icon: url(images/menu.png); qproperty-icon: url(images/menu.png);
} }
#navigation-button-exitfullscreen
{
qproperty-icon: url(images/restore);
}
/*TabWidget*/ /*TabWidget*/
#tabbar::tab #tabbar::tab
{ {

5
themes/chrome/main.css
View File

@ -96,11 +96,6 @@
qproperty-multiIcon: url(images/navigation-supermenu.png); qproperty-multiIcon: url(images/navigation-supermenu.png);
} }
#navigation-button-exitfullscreen
{
qproperty-themeIcon: "view-restore";
}
ToolButton[toolbar-look="true"] ToolButton[toolbar-look="true"]
{ {
qproperty-iconSize: 16px 16px; qproperty-iconSize: 16px 16px;

5
themes/linux/main.css
View File

@ -53,11 +53,6 @@
qproperty-fallbackIcon: url(images/menu.svg); qproperty-fallbackIcon: url(images/menu.svg);
} }
#navigation-button-exitfullscreen
{
qproperty-themeIcon: "view-restore";
}
/*TabWidget*/ /*TabWidget*/
#tabbar-button-right #tabbar-button-right
{ {

5
themes/mac/main.css
View File

@ -97,11 +97,6 @@
qproperty-multiIcon: url(images/navigation-supermenu.png); qproperty-multiIcon: url(images/navigation-supermenu.png);
} }
#navigation-button-exitfullscreen
{
qproperty-themeIcon: "view-restore";
}
/*TabWidget*/ /*TabWidget*/
#tabbar-button-right #tabbar-button-right
{ {

5
themes/windows/main.css
View File

@ -107,11 +107,6 @@
qproperty-iconSize: 23px 22px; qproperty-iconSize: 23px 22px;
} }
#navigation-button-exitfullscreen
{
qproperty-themeIcon: "view-restore";
}
/*TabWidget*/ /*TabWidget*/
#tabbar-button-right #tabbar-button-right
{ {