summaryrefslogtreecommitdiff
path: root/ui/browser.ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui/browser.ui')
-rw-r--r--ui/browser.ui112
1 files changed, 30 insertions, 82 deletions
diff --git a/ui/browser.ui b/ui/browser.ui
index 0d105d8c..4bf7c3dc 100644
--- a/ui/browser.ui
+++ b/ui/browser.ui
@@ -11,7 +11,7 @@
<property name="mode">horizontal</property>
<widgets>
<widget name="scrolled"/>
- <widget name="urlbar"/>
+ <widget name="navigationbar"/>
</widgets>
</object>
<template class="MidoriBrowser" parent="GtkApplicationWindow">
@@ -55,6 +55,23 @@
</object>
</child>
<child>
+ <object class="GtkButton">
+ <property name="focus-on-click">no</property>
+ <property name="valign">center</property>
+ <property name="action-name">win.fullscreen</property>
+ <property name="visible">yes</property>
+ <child>
+ <object class="GtkImage">
+ <property name="icon-name">view-fullscreen-symbolic</property>
+ <property name="visible">yes</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="pack-type">end</property>
+ </packing>
+ </child>
+ <child>
<object class="MidoriDownloadButton" id="downloads">
<property name="valign">center</property>
</object>
@@ -152,88 +169,8 @@
<property name="orientation">vertical</property>
<property name="visible">yes</property>
<child>
- <object class="GtkActionBar" id="navigationbar">
+ <object class="MidoriNavigationbar" id="navigationbar">
<property name="visible">yes</property>
- <child>
- <object class="GtkBox">
- <property name="orientation">horizontal</property>
- <property name="visible">yes</property>
- <style>
- <class name="linked"/>
- </style>
- <child>
- <object class="GtkButton" id="go_back">
- <property name="focus-on-click">no</property>
- <property name="action-name">win.go-back</property>
- <property name="visible">yes</property>
- <child>
- <object class="GtkImage">
- <property name="icon-name">go-previous-symbolic</property>
- <property name="visible">yes</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="go_forward">
- <property name="focus-on-click">no</property>
- <property name="action-name">win.go-forward</property>
- <property name="visible">yes</property>
- <child>
- <object class="GtkImage">
- <property name="icon-name">go-next-symbolic</property>
- <property name="visible">yes</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="reload">
- <property name="focus-on-click">no</property>
- <property name="action-name">win.tab-reload</property>
- <property name="visible">yes</property>
- <child>
- <object class="GtkImage">
- <property name="icon-name">view-refresh-symbolic</property>
- <property name="visible">yes</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="stop_loading">
- <property name="focus-on-click">no</property>
- <property name="action-name">win.tab-stop-loading</property>
- <property name="visible">yes</property>
- <child>
- <object class="GtkImage">
- <property name="icon-name">process-stop-symbolic</property>
- <property name="visible">yes</property>
- </object>
- </child>
- </object>
- </child>
- <child type="center">
- <object class="MidoriUrlbar" id="urlbar">
- <!-- expand has no effect, int.MAX doesn't work -->
- <property name="max-width-chars">300</property>
- <property name="margin-left">16</property>
- <property name="margin-right">16</property>
- <property name="visible">yes</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuButton" id="menubutton">
- <property name="valign">center</property>
- <property name="direction">none</property>
- <property name="visible">yes</property>
- </object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
- </child>
</object>
</child>
<child>
@@ -245,6 +182,17 @@
<property name="hexpand">yes</property>
<property name="vexpand">yes</property>
<property name="visible">yes</property>
+ <!-- Invisible bar at the top to detect motion to reveal the navigationbar -->
+ <child type="overlay">
+ <object class="GtkEventBox">
+ <property name="halign">start</property>
+ <property name="valign">start</property>
+ <property name="hexpand">yes</property>
+ <property name="vexpand">no</property>
+ <property name="halign">fill</property>
+ <property name="visible">yes</property>
+ </object>
+ </child>
<child>
<object class="GtkStack" id="tabs">
<property name="transition-type">over-left-right</property>