diff options
author | Christian Dywan <christian@twotoasts.de> | 2018-08-22 00:25:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-22 00:25:36 +0200 |
commit | b363061ac6406e6b7f99cec1809531719d015aa5 (patch) | |
tree | 92258e3f1ed453a7552d7f76b3f1927f4291746a /ui | |
parent | 8d4981ad39c710333d658f52ad1daabcb9eba3ea (diff) | |
download | midori-git-b363061ac6406e6b7f99cec1809531719d015aa5.tar.gz |
Implement panel in the browser window (#13)
![screenshot from 2018-08-21 23-51-20](https://user-images.githubusercontent.com/1204189/44431228-7f5c3d00-a59d-11e8-8872-9bddc1e7adc4.png)
A Gtk.Paned splits the browser window into what's considered the panel and the web view. Compared to the old code, the navigationbar is inside the paned and a Gtk.StackSwitcher (in a second headerbar)/ Gtk.Stack takes the role of the toolbar/ notebook.
Nothing implements a panel right now, although it's exposed via peas.
Diffstat (limited to 'ui')
-rw-r--r-- | ui/browser.ui | 346 |
1 files changed, 201 insertions, 145 deletions
diff --git a/ui/browser.ui b/ui/browser.ui index d564b258..0d105d8c 100644 --- a/ui/browser.ui +++ b/ui/browser.ui @@ -18,212 +18,268 @@ <property name="default-width">800</property> <property name="default-height">600</property> <child type="titlebar"> - <object class="GtkHeaderBar"> - <property name="show-close-button">yes</property> + <object class="GtkPaned"> <property name="visible">yes</property> - <child type="title"> - <object class="GtkScrolledWindow" id="scrolled"> - <property name="hscrollbar-policy">external</property> - <property name="vscrollbar-policy">never</property> - <property name="visible">yes</property> - <child> - <object class="MidoriSwitcher"> - <property name="orientation">horizontal</property> - <property name="stack">tabs</property> - <property name="visible">yes</property> - </object> - </child> - </object> - </child> - <child> - <object class="MidoriDownloadButton" id="downloads"> - <property name="valign">center</property> - </object> - <packing> - <property name="pack-type">end</property> - </packing> - </child> + <property name="position" bind-source="paned" bind-property="position" bind-flags="bidirectional|sync-create"/> <child> - <object class="GtkMenuButton" id="app_menu"> - <property name="focus-on-click">no</property> - <property name="valign">center</property> - <child> - <object class="GtkImage"> - <property name="icon-name">view-more-symbolic</property> - <property name="use-fallback">yes</property> + <object class="GtkHeaderBar" id="panelbar"> + <property name="show-close-button">yes</property> + <property name="visible" bind-source="panel" bind-property="visible" bind-flags="sync-create"/> + <child type="title"> + <object class="GtkStackSwitcher"> + <property name="stack">panel</property> <property name="visible">yes</property> </object> </child> </object> <packing> - <property name="pack-type">end</property> + <property name="shrink">no</property> </packing> </child> - <child> - <object class="GtkMenuButton" id="profile"> - <property name="focus-on-click">no</property> - <property name="valign">center</property> + <child> + <object class="GtkHeaderBar" id="tabbar"> + <property name="show-close-button">yes</property> <property name="visible">yes</property> - <child> - <object class="GtkImage" id="profile_icon"> - <property name="icon-name">user-info-symbolic</property> - <property name="use-fallback">yes</property> + <child type="title"> + <object class="GtkScrolledWindow" id="scrolled"> + <property name="hscrollbar-policy">external</property> + <property name="vscrollbar-policy">never</property> <property name="visible">yes</property> + <child> + <object class="MidoriSwitcher"> + <property name="orientation">horizontal</property> + <property name="stack">tabs</property> + <property name="visible">yes</property> + </object> + </child> </object> </child> - </object> - <packing> - <property name="pack-type">end</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="focus-on-click">no</property> - <property name="valign">center</property> - <property name="action-name">win.tab-new</property> - <property name="visible">yes</property> <child> - <object class="GtkImage"> - <property name="icon-name">tab-new-symbolic</property> - <property name="visible">yes</property> + <object class="MidoriDownloadButton" id="downloads"> + <property name="valign">center</property> </object> + <packing> + <property name="pack-type">end</property> + </packing> </child> - </object> - <packing> - <property name="pack-type">end</property> - </packing> - </child> - </object> - </child> - <child> - <object class="GtkBox"> - <property name="orientation">vertical</property> - <property name="visible">yes</property> - <child> - <object class="GtkActionBar" id="navigationbar"> - <property name="visible">yes</property> <child> - <object class="GtkBox"> - <property name="orientation">horizontal</property> + <object class="GtkMenuButton" id="profile"> + <property name="focus-on-click">no</property> + <property name="valign">center</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> + <object class="GtkImage" id="profile_icon"> + <property name="icon-name">user-info-symbolic</property> + <property name="use-fallback">yes</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> + <packing> + <property name="pack-type">end</property> + </packing> </child> <child> - <object class="GtkButton" id="reload"> + <object class="GtkMenuButton" id="app_menu"> <property name="focus-on-click">no</property> - <property name="action-name">win.tab-reload</property> - <property name="visible">yes</property> + <property name="valign">center</property> <child> <object class="GtkImage"> - <property name="icon-name">view-refresh-symbolic</property> + <property name="icon-name">view-more-symbolic</property> + <property name="use-fallback">yes</property> <property name="visible">yes</property> </object> </child> </object> + <packing> + <property name="pack-type">end</property> + </packing> </child> <child> - <object class="GtkButton" id="stop_loading"> + <object class="GtkToggleButton" id="panel_toggle"> <property name="focus-on-click">no</property> - <property name="action-name">win.tab-stop-loading</property> - <property name="visible">yes</property> + <property name="valign">center</property> + <property name="action-name">win.panel</property> <child> <object class="GtkImage"> - <property name="icon-name">process-stop-symbolic</property> + <property name="icon-name">view-grid-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> + <packing> + <property name="pack-type">start</property> + </packing> </child> <child> - <object class="GtkMenuButton" id="menubutton"> + <object class="GtkButton"> + <property name="focus-on-click">no</property> <property name="valign">center</property> - <property name="direction">none</property> + <property name="action-name">win.tab-new</property> <property name="visible">yes</property> + <child> + <object class="GtkImage"> + <property name="icon-name">tab-new-symbolic</property> + <property name="visible">yes</property> + </object> + </child> </object> <packing> <property name="pack-type">end</property> </packing> </child> </object> + <packing> + <property name="shrink">no</property> + </packing> </child> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="orientation">vertical</property> + <property name="visible">yes</property> <child> - <object class="MidoriNetworkCheck"> - </object> - </child> - <child> - <object class="GtkOverlay" id="overlay"> - <property name="hexpand">yes</property> - <property name="vexpand">yes</property> + <object class="GtkPaned" id="paned"> <property name="visible">yes</property> <child> - <object class="GtkStack" id="tabs"> - <property name="transition-type">over-left-right</property> - <property name="visible">yes</property> - <property name="hexpand">yes</property> - <property name="vexpand">yes</property> + <object class="GtkStack" id="panel"> + <property name="transition-type">slide-left-right</property> </object> </child> - <child type="overlay"> - <object class="GtkSearchBar" id="search"> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="margin">0</property> - <style> - <class name="background"/> - </style> + <child> + <object class="GtkBox"> + <property name="orientation">vertical</property> + <property name="visible">yes</property> <child> - <object class="GtkSearchEntry" id="search_entry"> + <object class="GtkActionBar" 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> + <object class="MidoriNetworkCheck"> + </object> + </child> + <child> + <object class="GtkOverlay" id="overlay"> + <property name="hexpand">yes</property> + <property name="vexpand">yes</property> + <property name="visible">yes</property> + <child> + <object class="GtkStack" id="tabs"> + <property name="transition-type">over-left-right</property> + <property name="visible">yes</property> + <property name="hexpand">yes</property> + <property name="vexpand">yes</property> + </object> + </child> + <child type="overlay"> + <object class="GtkSearchBar" id="search"> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="margin">0</property> + <style> + <class name="background"/> + </style> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="visible">yes</property> + </object> + </child> + </object> + </child> + <child type="overlay"> + <object class="MidoriStatusbar" id="statusbar"> + <property name="halign">start</property> + <property name="valign">end</property> + <property name="margin">0</property> + <style> + <class name="background"/> + </style> + </object> + </child> </object> </child> - </object> - </child> - <child type="overlay"> - <object class="MidoriStatusbar" id="statusbar"> - <property name="halign">start</property> - <property name="valign">end</property> - <property name="margin">0</property> - <style> - <class name="background"/> - </style> </object> </child> </object> |