From bee3e158963c3685211f54b08d8b59d6c5113757 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Tue, 22 Apr 2008 05:21:24 -0700
Subject: [PATCH] views: add a bookmarks view

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 ugit/views/__init__.py |   9 ++++-
 ui/bookmark.ui         | 101 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 ui/bookmark.ui

diff --git a/ugit/views/__init__.py b/ugit/views/__init__.py
index d784695d..3d8082de 100644
--- a/ugit/views/__init__.py
+++ b/ugit/views/__init__.py
@@ -19,6 +19,7 @@ from search import Ui_search
 from options import Ui_options
 from createbranch import Ui_createbranch
 from merge import Ui_merge
+from bookmark import Ui_bookmark
 
 class View(Ui_main, QMainWindow):
 	'''The main ugit interface.'''
@@ -181,6 +182,12 @@ class SearchView(Ui_search, QDialog):
 class MergeView(Ui_merge, QDialog):
 	def __init__(self, parent=None):
 		QDialog.__init__(self, parent)
-		Ui_search.__init__(self)
+		Ui_merge.__init__(self)
 		self.setupUi(self)
 		self.revision.setFocus()
+
+class BookmarkView(Ui_bookmark, QDialog):
+	def __init__(self, parent=None):
+		QDialog.__init__(self, parent)
+		Ui_bookmark.__init__(self)
+		self.setupUi(self)
diff --git a/ui/bookmark.ui b/ui/bookmark.ui
new file mode 100644
index 00000000..7afb12e0
--- /dev/null
+++ b/ui/bookmark.ui
@@ -0,0 +1,101 @@
+<ui version="4.0" >
+ <class>bookmark</class>
+ <widget class="QDialog" name="bookmark" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>531</width>
+    <height>513</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Bookmarks</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QListWidget" name="bookmarks" />
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="button_open" >
+       <property name="text" >
+        <string>Open</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="button_delete" >
+       <property name="text" >
+        <string>Delete</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>91</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="button_save" >
+       <property name="text" >
+        <string>Save</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="button_cancel" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>button_save</sender>
+   <signal>clicked()</signal>
+   <receiver>bookmark</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>398</x>
+     <y>490</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>265</x>
+     <y>256</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>button_cancel</sender>
+   <signal>clicked()</signal>
+   <receiver>bookmark</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>483</x>
+     <y>490</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>265</x>
+     <y>256</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
-- 
2.11.4.GIT