From f7df477b1e8fa4528b6fe4f8b44c403f46e72d85 Mon Sep 17 00:00:00 2001
From: aqua <aqua@iserlohn-fortress.net>
Date: Mon, 22 Aug 2022 10:16:01 +0300
Subject: Add UrlBar and TabBar

- move src/tabwindow/tabbar.* to src/tabbar/
---
 src/rekonqwindow.ui | 55 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 18 deletions(-)

(limited to 'src/rekonqwindow.ui')

diff --git a/src/rekonqwindow.ui b/src/rekonqwindow.ui
index ee76a408..1105f300 100644
--- a/src/rekonqwindow.ui
+++ b/src/rekonqwindow.ui
@@ -11,27 +11,33 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>rekonq</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="spacing">
-     <number>0</number>
-    </property>
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
-     <number>0</number>
-    </property>
     <item>
-     <widget class="QTabWidget" name="tabWidget"/>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="TabBar" name="tabs" native="true"/>
+      </item>
+      <item>
+       <widget class="QToolButton" name="newTab">
+        <property name="text">
+         <string>Add Tab</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="UrlBar" name="urlBar"/>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QStackedWidget" name="views"/>
     </item>
    </layout>
   </widget>
@@ -41,7 +47,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>22</height>
+     <height>30</height>
     </rect>
    </property>
    <widget class="QMenu" name="menurekonq">
@@ -75,6 +81,19 @@
    </property>
   </action>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>UrlBar</class>
+   <extends>QLineEdit</extends>
+   <header>urlbar/urlbar.h</header>
+  </customwidget>
+  <customwidget>
+   <class>TabBar</class>
+   <extends>QWidget</extends>
+   <header>tabbar/tabbar.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>
-- 
cgit v1.2.1