[Uludag-commits] r15623 - trunk/comar/ahenk/lider/src

[uludag-commits at pardus.org.tr]

Author: bahadir.kandemir
Date: Thu Oct  4 11:27:26 2007
New Revision: 15623

Modified:
   trunk/comar/ahenk/lider/src/browser.py
   trunk/comar/ahenk/lider/src/mainwindow.py
Log:
- Tooltip for directory root
- Moved "new domain" menu to browser item
- Removed toolbar and menu


Modified: trunk/comar/ahenk/lider/src/browser.py
=================================================================
--- trunk/comar/ahenk/lider/src/browser.py	(original)
+++ trunk/comar/ahenk/lider/src/browser.py	Thu Oct  4 11:27:26 2007
@@ -30,6 +30,9 @@
         self.setRootIsDecorated(True)
         self.window = window
         
+        self.menu_blank = QPopupMenu(self)
+        self.menu_blank.insertItem(getIconSet("filenew", KIcon.Small), i18n("&New Domain"), self.slotNewDomain)
+        
         self.menu_domain = QPopupMenu(self)
         self.menu_domain.insertItem(getIconSet("folder", KIcon.Small), i18n("&New Directory"), self.slotNewDirectory)
         self.menu_domain.insertSeparator()
@@ -51,6 +54,9 @@
         self.connect(self, SIGNAL("collapsed(QListViewItem*)"), self.slotCollapse)
         self.connect(self, SIGNAL("selectionChanged()"), self.slotNodeChanged)
         
+        self.tipper = BrowserItemTip(self.viewport())
+        self.tipper.list = self
+        
         self.initDomains()
     
     def initDomains(self):
@@ -66,6 +72,8 @@
                 self.menu_directory.exec_loop(point)
             else:
                 self.menu_domain.exec_loop(point)
+        else:
+            self.menu_blank.exec_loop(point)
     
     def slotConfigure(self):
         item = self.selectedItem()
@@ -96,6 +104,14 @@
                 item.parent().collapseNodes()
                 item.parent().expandNodes()
     
+    def slotNewDomain(self):
+        dd = DomainDialog(self)
+        if dd.exec_loop():
+            dn = dd.connection.base_dn
+            label = dd.connection.label
+            self.window.dc.addConnection(dd.connection)
+            BrowserItem(self, self.window, dn, label, dd.connection)
+    
     def slotNewDirectory(self):
         item = self.selectedItem()
         connection = item.connection
@@ -190,6 +206,18 @@
         self.window.tab.showPage(show_tab)
 
 
+class BrowserItemTip(QToolTip):
+    def maybeTip(self, point):
+        item = self.list.itemAt(point)
+        if item and not isinstance(item.parent(), BrowserItem):
+            rect = self.list.itemRect(item)
+            args = [
+                item.connection.label,
+                item.connection.host,
+            ]
+            self.tip(self.list.itemRect(item), i18n("<strong>%1</strong><br>Host: %2").arg(*args))
+
+
 class BrowserItem(QListViewItem):
     """Domain tree element.
        Requires a parent node object, window object and DN for the node.

Modified: trunk/comar/ahenk/lider/src/mainwindow.py
=================================================================
--- trunk/comar/ahenk/lider/src/mainwindow.py	(original)
+++ trunk/comar/ahenk/lider/src/mainwindow.py	Thu Oct  4 11:27:26 2007
@@ -26,19 +26,11 @@
         self.setMinimumSize(560, 440)
         self.application = app
         
-        self.act_new_domain = QAction(getIconSet("filenew"), i18n("New Domain"), Qt.CTRL + Qt.Key_N, self)
-        self.connect(self.act_new_domain, SIGNAL("activated()"), self.slotNewDomain)
-        
         mbar = self.menuBar()
         menu = QPopupMenu(self)
-        mbar.insertItem(i18n("&Domain"), menu)
-        self.act_new_domain.addTo(menu)
-        menu.insertSeparator()
+        mbar.insertItem("&Lider", menu)
         menu.insertItem(i18n("&Quit"), self.slotQuit, Qt.CTRL + Qt.Key_Q)
         
-        self.toolbar = QToolBar(self)
-        self.act_new_domain.addTo(self.toolbar)
-        
         self.status = QStatusBar(self)
         
         splitter = QSplitter(self)
@@ -105,14 +97,6 @@
         except domain.DomainXMLParseError, e:
             self.showCriticalError(e.args[0])
     
-    def slotNewDomain(self):
-        dd = browser.DomainDialog(self)
-        if dd.exec_loop():
-            dn = dd.connection.base_dn
-            label = dd.connection.label
-            self.dc.addConnection(dd.connection)
-            browser.BrowserItem(self.browser, self, dn, label, dd.connection)
-    
     def closeEvent(self, e):
         self.slotQuit()
         e.accept()