diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/browser.ui | 30 | ||||
| -rw-r--r-- | ui/menus.ui | 22 | ||||
| -rw-r--r-- | ui/navigationbar.ui | 8 |
3 files changed, 22 insertions, 38 deletions
diff --git a/ui/browser.ui b/ui/browser.ui index a9c9ddb9..669b918b 100644 --- a/ui/browser.ui +++ b/ui/browser.ui @@ -4,7 +4,7 @@ <property name="mode">vertical</property> <widgets> <widget name="scrolled"/> - <widget name="profile"/> + <widget name="app_menu"/> </widgets> </object> <object class="GtkSizeGroup"> @@ -73,41 +73,19 @@ </packing> </child> <child> - <object class="MidoriDownloadButton" id="downloads"> - <property name="valign">center</property> - </object> - <packing> - <property name="pack-type">end</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="profile"> + <object class="GtkMenuButton" id="app_menu"> <property name="focus-on-click">no</property> <property name="valign">center</property> + <property name="direction">none</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> - <property name="visible">yes</property> - </object> - </child> </object> <packing> <property name="pack-type">end</property> </packing> </child> <child> - <object class="GtkMenuButton" id="app_menu"> - <property name="focus-on-click">no</property> + <object class="MidoriDownloadButton" id="downloads"> <property name="valign">center</property> - <child> - <object class="GtkImage"> - <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> diff --git a/ui/menus.ui b/ui/menus.ui index f96b0431..e395cdba 100644 --- a/ui/menus.ui +++ b/ui/menus.ui @@ -12,6 +12,16 @@ <attribute name="label" translatable="yes">New P_rivate Browsing Window</attribute> <attribute name="accel"><Primary><Shift>p</attribute> </item> + </section> + <section> + <item> + <attribute name="action">win.clear-private-data</attribute> + <attribute name="hidden-when">action-disabled</attribute> + <attribute name="label" translatable="yes">_Clear private data</attribute> + <attribute name="accel"><Primary><Shift>Delete</attribute> + </item> + </section> + <section> <item> <attribute name="action">win.show-help-overlay</attribute> <attribute name="hidden-when">action-disabled</attribute> @@ -29,17 +39,7 @@ </item> </section> </menu> - <menu id="profile-menu"> - <section> - <item> - <attribute name="action">win.clear-private-data</attribute> - <attribute name="hidden-when">action-disabled</attribute> - <attribute name="label" translatable="yes">_Clear private data</attribute> - <attribute name="accel"><Primary><Shift>Delete</attribute> - </item> - </section> - </menu> - <menu id="browser-menu"> + <menu id="page-menu"> <section> <item> <attribute name="action">win.find</attribute> diff --git a/ui/navigationbar.ui b/ui/navigationbar.ui index 9f69987c..1331e0c1 100644 --- a/ui/navigationbar.ui +++ b/ui/navigationbar.ui @@ -94,8 +94,14 @@ <child> <object class="GtkMenuButton" id="menubutton"> <property name="valign">center</property> - <property name="direction">none</property> <property name="visible">yes</property> + <child> + <object class="GtkImage"> + <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> |