[Uludag-commits] r15587 - in trunk/staj-projeleri/Pakito: . pakito/gui

[uludag-commits at pardus.org.tr]

Author: gokcen.eraslan
Date: Tue Oct  2 11:56:59 2007
New Revision: 15587

Modified:
   trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py
   trunk/staj-projeleri/Pakito/pakito/gui/multitabwidget.py
   trunk/staj-projeleri/Pakito/pakitoui.rc
Log:
minor fixes

Modified: trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py
=================================================================
--- trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py	(original)
+++ trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py	Tue Oct  2 11:56:59 2007
@@ -22,7 +22,7 @@
 
 # PiSi imports
 import pisi.api
-from pisi.config import Options
+from pisi.config import Options 
 import pisi.ui
 
 from pakito.gui.pspecWidget.pspecWidget import PspecWidget
@@ -83,7 +83,6 @@
         
         self.connect(qApp, SIGNAL("shutDown()"), self.exit)
         
-#        self.createGUI(self.pspecTab.editor.part)
         self.setXMLFile(os.getcwd() + "/pakitoui.rc")
         self.createShellGUI()
 
@@ -207,9 +206,9 @@
         try:
             self.pspecTab = PspecWidget(self.twTabs, os.path.join(self.tempDir, "pspec.xml"))
         except Exception, err:
+            qApp.restoreOverrideCursor()
             KMessageBox.sorry(self, i18n("pspec.xml cannot be parsed: %s" % str(err)), i18n("Invalid File"))
             self.closePacket()
-            qApp.restoreOverrideCursor()
             return          
         
         self.actionsTab = ActionsWidget(self.twTabs, os.path.join(self.tempDir, "actions.py"))
@@ -492,6 +491,10 @@
         dia = OptionsDialog(self)
         dia.exec_loop()
     
+    def slotConfigureKeys(self):
+        KKeyDialog.configure(self.actionCollection())
+
+    
     def doActions(self):                
         # actions
         
@@ -506,7 +509,8 @@
         self.actionExit = KStdAction.quit(self.exit, self.actionCollection(), "actionExit")
 
         #settings actions
-        self.actionSettings = KStdAction.preferences(self.slotSettings, self.actionCollection(), "actionSettings")
+        KStdAction.keyBindings(self.slotConfigureKeys, self.actionCollection())
+        self.actionSettings = KStdAction.preferences(self.slotSettings, self.actionCollection())
         
         # build actions        
         self.actionFetch = KAction(i18n("Fetch"), "khtml_kget", KShortcut(), self.fetchSlot, self.actionCollection(), "actionFetch")

Modified: trunk/staj-projeleri/Pakito/pakito/gui/multitabwidget.py
=================================================================
--- trunk/staj-projeleri/Pakito/pakito/gui/multitabwidget.py	(original)
+++ trunk/staj-projeleri/Pakito/pakito/gui/multitabwidget.py	Tue Oct  2 11:56:59 2007
@@ -3,7 +3,10 @@
 from qt import *
 from kutils import *
 
-class MultiTabWidget(QWidget):    
+SIZEOPENED = 110
+SIZECLOSED = 30
+
+class MultiTabWidget(QWidget):
     def __init__(self, parent = None, orient = KMultiTabBar.Horizontal, pos = KMultiTabBar.Top, name = None):
         QWidget.__init__(self, parent, name)
         if orient == KMultiTabBar.Horizontal:
@@ -25,7 +28,7 @@
         self.activeTabID = -1      
         self.bigSize = -1
         self.orientation = orient
-        self.setMinimumHeight(50)
+        self.setFixedHeight(SIZECLOSED)
         
     def addTab(self, widget, pix = None, id = -1, string = ""):
         if not pix:
@@ -33,12 +36,6 @@
         self.tabWidget.appendTab(pix, id, string)
         self.stack.addWidget(widget, id)
         tab = self.tabWidget.tab(id)
-        
-        if self.orientation == KMultiTabBar.Horizontal:
-            self.setFixedHeight(tab.height()+6)
-        else:
-            self.setFixedWidth(tab.width()+6)
-        
         self.connect(tab, SIGNAL("clicked(int)"), self.tabClicked)
         
     def removeTab(self, id):
@@ -71,12 +68,14 @@
         if self.bigSize == -1:
                 self.bigSize = 100
         if self.orientation == KMultiTabBar.Horizontal:
-            self.setMaximumHeight(700)
-            self.setMinimumHeight(120)
+            self.setMaximumHeight(500)
+            self.setMinimumHeight(110)
             self.resize(self.width(), self.bigSize)
         else:
-            self.setMaximumWidth(700)
+            self.setMaximumWidth(500)
+            self.setMinimumWidth(110)
             self.resize(self.bigSize, self.height())
+        self.updateGeometry()
             
     def shrinkTab(self):
         self.stack.hide()
@@ -84,8 +83,9 @@
             self.tabWidget.setTab(self.activeTabID, False)
         if self.orientation == KMultiTabBar.Horizontal:
             self.bigSize = self.height()
-            self.setFixedHeight(self.tabWidget.tab(self.activeTabID).height() + 10)
+            self.setFixedHeight(SIZECLOSED)
         else:
             self.bigSize = self.width()
-            self.setFixedWidth(self.tabWidget.tab(self.activeTabID).width() + 10)
+            self.setFixedWidth(SIZECLOSED)
         self.activeTabID = -1
+        self.updateGeometry()

Modified: trunk/staj-projeleri/Pakito/pakitoui.rc
=================================================================
--- trunk/staj-projeleri/Pakito/pakitoui.rc	(original)
+++ trunk/staj-projeleri/Pakito/pakitoui.rc	Tue Oct  2 11:56:59 2007
@@ -28,10 +28,6 @@
     <Action name="actionComputeSHA1" />
     <Action name="actionDetectType" />
   </Menu>
-  <Menu name="settings">
-      <text>&amp;Settings</text>
-      <Action name="actionSettings" />
-  </Menu>
 </MenuBar>
 
 <ToolBar name="file">