1 files changed, 35 insertions, 108 deletions
diff --git a/src/rekonqwindow.ui b/src/rekonqwindow.ui
index 7879f848..a00f33f6 100644
--- a/src/rekonqwindow.ui
+++ b/src/rekonqwindow.ui
@@ -16,100 +16,6 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <layout class="QHBoxLayout" name="tabBarLayout">
-      <item>
-       <widget class="TabBar" name="tabs" native="true"/>
-      </item>
-      <item>
-       <widget class="QToolButton" name="newTab">
-        <property name="styleSheet">
-         <string notr="true">border: none;</string>
-        </property>
-        <property name="text">
-         <string>Add Tab</string>
-        </property>
-        <property name="icon">
-         <iconset theme="document-new">
-          <normaloff>.</normaloff>.</iconset>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" name="urlBarLayout">
-      <item>
-       <widget class="QToolButton" name="back">
-        <property name="text">
-         <string>Back</string>
-        </property>
-        <property name="icon">
-         <iconset theme="go-previous">
-          <normaloff>.</normaloff>.</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="forward">
-        <property name="text">
-         <string>Forward</string>
-        </property>
-        <property name="icon">
-         <iconset theme="go-next">
-          <normaloff>.</normaloff>.</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="refresh">
-        <property name="text">
-         <string>Reload</string>
-        </property>
-        <property name="icon">
-         <iconset theme="view-refresh">
-          <normaloff>.</normaloff>.</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="home">
-        <property name="text">
-         <string>Home</string>
-        </property>
-        <property name="icon">
-         <iconset theme="go-home">
-          <normaloff>.</normaloff>.</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="UrlBar" name="urlBar"/>
-      </item>
-      <item>
-       <widget class="QToolButton" name="load">
-        <property name="text">
-         <string>Load</string>
-        </property>
-        <property name="icon">
-         <iconset theme="bookmarks">
-          <normaloff>.</normaloff>.</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="menu">
-        <property name="text">
-         <string>Menu</string>
-        </property>
-        <property name="icon">
-         <iconset theme="preferences">
-          <normaloff>.</normaloff>.</iconset>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
      <widget class="QSplitter" name="splitter">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -209,7 +115,7 @@
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
-  <widget class="BookmarkToolBar" name="bookmarksToolBar">
+  <widget class="TabToolBar" name="tabToolBar">
    <property name="windowTitle">
     <string>toolBar</string>
    </property>
@@ -220,6 +126,28 @@
     <bool>false</bool>
    </attribute>
   </widget>
+  <widget class="NavigationToolBar" name="navigationToolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>true</bool>
+   </attribute>
+  </widget>
+  <widget class="BookmarkToolBar" name="bookmarksToolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>true</bool>
+   </attribute>
+  </widget>
   <action name="actionTaskManager">
    <property name="text">
     <string>Task Manager</string>
@@ -269,17 +197,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>UrlBar</class>
-   <extends>QLineEdit</extends>
-   <header>urlbar/urlbar.hpp</header>
-  </customwidget>
-  <customwidget>
-   <class>TabBar</class>
-   <extends>QWidget</extends>
-   <header>tabbar/tabbar.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>BookmarksPanel</class>
    <extends>QTreeView</extends>
    <header>panels/bookmarkspanel.hpp</header>
@@ -287,12 +204,22 @@
   <customwidget>
    <class>BookmarksMenu</class>
    <extends>QMenu</extends>
-   <header>bookmarks/bookmarksmenu.hpp</header>
+   <header>panels/bookmarksmenu.hpp</header>
   </customwidget>
   <customwidget>
    <class>BookmarkToolBar</class>
    <extends>QToolBar</extends>
-   <header>bookmarks/bookmarkstoolbar.hpp</header>
+   <header>panels/bookmarkstoolbar.hpp</header>
+  </customwidget>
+  <customwidget>
+   <class>NavigationToolBar</class>
+   <extends>QToolBar</extends>
+   <header>panels/navigationtoolbar.hpp</header>
+  </customwidget>
+  <customwidget>
+   <class>TabToolBar</class>
+   <extends>QToolBar</extends>
+   <header>panels/tabtoolbar.hpp</header>
   </customwidget>
  </customwidgets>
  <resources/>