From 2e7a77a6b46d31672ae6839fcc0eb2868bee8049 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 4 Jan 2018 18:29:04 +0100 Subject: [PATCH] NavigationBar: Remove exit fullscreen button --- src/lib/app/browserwindow.cpp | 2 -- src/lib/navigation/navigationbar.cpp | 13 +------------ src/lib/navigation/navigationbar.h | 4 +--- themes/breathe/images/restore.png | Bin 433 -> 0 bytes themes/breathe/main.css | 5 ----- themes/chrome/main.css | 5 ----- themes/linux/main.css | 5 ----- themes/mac/main.css | 5 ----- themes/windows/main.css | 5 ----- 9 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 themes/breathe/images/restore.png diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index 7ea8e5f35..595869ee4 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -1229,7 +1229,6 @@ bool BrowserWindow::event(QEvent* event) statusBar()->hide(); m_navigationContainer->hide(); - m_navigationToolbar->buttonExitFullscreen()->show(); } else if (m_oldWindowState & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) { // Leave fullscreen @@ -1240,7 +1239,6 @@ bool BrowserWindow::event(QEvent* event) m_navigationContainer->show(); m_navigationToolbar->setSuperMenuVisible(!m_menuBarVisible); - m_navigationToolbar->buttonExitFullscreen()->hide(); m_isHtmlFullScreen = false; } diff --git a/src/lib/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp index 2357ff1f9..c321e9410 100644 --- a/src/lib/navigation/navigationbar.cpp +++ b/src/lib/navigation/navigationbar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * Falkon - Qt web browser -* Copyright (C) 2010-2016 David Rosca +* Copyright (C) 2010-2018 David Rosca * * 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 @@ -119,21 +119,11 @@ NavigationBar::NavigationBar(BrowserWindow* window) m_navigationSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); 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->addWidget(m_reloadStop); m_layout->addWidget(m_buttonHome); m_layout->addWidget(m_buttonAddTab); m_layout->addWidget(m_navigationSplitter); - m_layout->addWidget(m_exitFullscreen); m_layout->addWidget(m_supMenu); setContextMenuPolicy(Qt::CustomContextMenu); @@ -153,7 +143,6 @@ NavigationBar::NavigationBar(BrowserWindow* window) connect(m_buttonHome, SIGNAL(controlClicked()), m_window, SLOT(goHomeInNewTab())); connect(m_buttonAddTab, SIGNAL(clicked()), m_window, SLOT(addTab())); 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) diff --git a/src/lib/navigation/navigationbar.h b/src/lib/navigation/navigationbar.h index 031da23d5..21f413e7d 100644 --- a/src/lib/navigation/navigationbar.h +++ b/src/lib/navigation/navigationbar.h @@ -1,6 +1,6 @@ /* ============================================================ * Falkon - Qt web browser -* Copyright (C) 2010-2014 David Rosca +* Copyright (C) 2010-2018 David Rosca * * 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 @@ -51,7 +51,6 @@ public: ToolButton* buttonForward() { return m_buttonForward; } ToolButton* buttonHome() { return m_buttonHome; } ToolButton* buttonAddTab() { return m_buttonAddTab; } - ToolButton* buttonExitFullscreen() { return m_exitFullscreen; } ReloadStopButton* buttonReloadStop() { return m_reloadStop; } WebSearchBar* webSearchBar() { return m_searchLine; } QSplitter* splitter() { return m_navigationSplitter; } @@ -102,7 +101,6 @@ private: ToolButton* m_buttonHome; ToolButton* m_buttonAddTab; ToolButton* m_supMenu; - ToolButton* m_exitFullscreen; ReloadStopButton* m_reloadStop; Menu* m_menuBack; diff --git a/themes/breathe/images/restore.png b/themes/breathe/images/restore.png deleted file mode 100644 index d5cfa95d39603cfb5c111ddc862892a05cb80467..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6%*9TgAsieWw;%dH0CG7CJR*yM zqGce=SbMeU3{X(A#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWIb20G|-o z|Ns93nQ-v!+jsLNIvKkXvUVqB?@7+xo0`8jz5ZxLf+WgD27G0gY zh;^V?>>0&@WF#ek3Kzk^5of*&yQZb zc=_t<%a0#Feg5_N%a^ZTe|-VkJ7=23RiMReB|(0{3``ulhQE1BTf2cG(>z@qLn?07 zPQ1<6WWeK~E&H`;g+kYh0Ea1m|BK)9HIlQkh`jV|N#-t*1W^VBC)EQS2LHH{SgwBk zTijy&-HLV9N-f(%Gpl)D|598L`Fgj*W;4crzb4H-I8~xKK;Genex*&y=R};JH4(`jp3ZEZp|ZkP9Z(X TCFc#Mg96Lb)z4*}Q$iB}$(_l! diff --git a/themes/breathe/main.css b/themes/breathe/main.css index efec834de..35dd1d265 100644 --- a/themes/breathe/main.css +++ b/themes/breathe/main.css @@ -52,11 +52,6 @@ qproperty-icon: url(images/menu.png); } -#navigation-button-exitfullscreen -{ - qproperty-icon: url(images/restore); -} - /*TabWidget*/ #tabbar::tab { diff --git a/themes/chrome/main.css b/themes/chrome/main.css index 135de1cb8..1c825ec25 100644 --- a/themes/chrome/main.css +++ b/themes/chrome/main.css @@ -96,11 +96,6 @@ qproperty-multiIcon: url(images/navigation-supermenu.png); } -#navigation-button-exitfullscreen -{ - qproperty-themeIcon: "view-restore"; -} - ToolButton[toolbar-look="true"] { qproperty-iconSize: 16px 16px; diff --git a/themes/linux/main.css b/themes/linux/main.css index 0a2a5f0b7..72381320c 100644 --- a/themes/linux/main.css +++ b/themes/linux/main.css @@ -53,11 +53,6 @@ qproperty-fallbackIcon: url(images/menu.svg); } -#navigation-button-exitfullscreen -{ - qproperty-themeIcon: "view-restore"; -} - /*TabWidget*/ #tabbar-button-right { diff --git a/themes/mac/main.css b/themes/mac/main.css index 75320346d..7ffe8b813 100644 --- a/themes/mac/main.css +++ b/themes/mac/main.css @@ -97,11 +97,6 @@ qproperty-multiIcon: url(images/navigation-supermenu.png); } -#navigation-button-exitfullscreen -{ - qproperty-themeIcon: "view-restore"; -} - /*TabWidget*/ #tabbar-button-right { diff --git a/themes/windows/main.css b/themes/windows/main.css index 0e280b24a..003bc8f0b 100644 --- a/themes/windows/main.css +++ b/themes/windows/main.css @@ -107,11 +107,6 @@ qproperty-iconSize: 23px 22px; } -#navigation-button-exitfullscreen -{ - qproperty-themeIcon: "view-restore"; -} - /*TabWidget*/ #tabbar-button-right {