[Uludag-commits] r17611 - in branches/yali4: po yali4/gui yali4/gui/Ui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Wed Apr  9 14:26:14 2008
New Revision: 17611

Modified:
   branches/yali4/po/tr.po
   branches/yali4/yali4/gui/DiskWidgets.py
   branches/yali4/yali4/gui/Ui/partedit.ui
Log:
 * pythonish cosmetic

Modified: branches/yali4/po/tr.po
=================================================================
--- branches/yali4/po/tr.po	(original)
+++ branches/yali4/po/tr.po	Wed Apr  9 14:26:14 2008
@@ -1596,7 +1596,7 @@
 
 #: yali4/partitionrequest.py:182
 msgid "There is a request for the same Partition Type."
-msgstr ""
+msgstr "Bu bölüm tipi için daha önceden bir alan ayrılmış."
 
 #: yali4/partitiontype.py:47
 msgid "Install Root"

Modified: branches/yali4/yali4/gui/DiskWidgets.py
=================================================================
--- branches/yali4/yali4/gui/DiskWidgets.py	(original)
+++ branches/yali4/yali4/gui/DiskWidgets.py	Wed Apr  9 14:26:14 2008
@@ -73,13 +73,21 @@
         self.tabWidget.setAutoFillBackground(False)
         self.tabWidget.setFocusPolicy(Qt.NoFocus)
 
-        self.partEdit = PartEdit()
+        self.useTypesTexts = [_("as Pardus System Files (mandatory)"),
+                              _("as User Files (optional)"),
+                              _("as Swap Space (optional)"),
+                              _("as Storage Area")]
+
+        self.useTypesKeys = ["pardus","home","swap","archive"]
+        self.useTypes = dict(zip(self.useTypesKeys, self.useTypesTexts))
+
+        self.partEdit = PartEdit(self.useTypesTexts)
         self.partEdit.ui.fileSystemBox.setVisible(False)
+
         self.vbox.addWidget(self.tabWidget)
         self.vbox.addWidget(self.partEdit)
-
         self.connect(self.tabWidget,QtCore.SIGNAL("currentChanged(int)"),self.updatePartEdit)
-        self.connect(self.partEdit.ui.formatType,QtCore.SIGNAL("currentIndexChanged(int)"),self.formatTypeChanged)
+        self.connect(self.partEdit.ui.formatType,QtCore.SIGNAL("currentIndexChanged(QString)"),self.formatTypeChanged)
         self.connect(self.partEdit.ui.deletePartition,QtCore.SIGNAL("clicked()"),self.slotDeletePart)
         self.connect(self.partEdit.ui.resizePartition,QtCore.SIGNAL("clicked()"),self.slotResizePart)
         self.connect(self.partEdit.ui.applyTheChanges,QtCore.SIGNAL("clicked()"),self.slotApplyPartitionChanges)
@@ -135,7 +143,7 @@
             self.partEdit.ui.formatCheck.setEnabled(False)
 
         # index 1 is Pardus' root partition..
-        if cur == 1:
+        if cur == self.useTypes["pardus"]:
             if self.partEdit.ui.partitionSize.maximum() < ctx.consts.min_root_size and not self.partEdit.isPartitionUsed:
                 self.partEdit.ui.formatType.setCurrentIndex(0)
                 self.partEdit.ui.information.setText(_("'Install Root' size must be larger than %s MB.") % (ctx.consts.min_root_size))
@@ -149,15 +157,15 @@
             self.partEdit.ui.partitionSlider.setMinimum(10)
             self.partEdit.ui.formatCheck.setEnabled(True)
 
-        if cur == 2:
+        if cur == self.useTypes["home"]:
             # if selected partition has different fs for userspace, forceToFormat
             if not self.partEdit.currentPart.getFSName() in ["ext3","reiserfs","xfs"]:
                 forceToFormat()
 
-        if cur == 3:
+        if cur == self.useTypes["swap"]:
             forceToFormat()
 
-        if cur == 4:
+        if cur == self.useTypes["archive"]:
             forceToFormat()
             self.partEdit.ui.fileSystem.setVisible(False)
             self.partEdit.ui.fileSystemBox.setVisible(True)
@@ -537,11 +545,14 @@
     currentPartNum = 0
     isPartitionUsed = False
 
-    def __init__(self, *args):
+    def __init__(self, useTypes):
         QtGui.QWidget.__init__(self,None)
         self.ui = Ui_PartEdit()
         self.ui.setupUi(self)
 
+        for useType in useTypes:
+            self.ui.formatType.addItem(useType)
+
     def updateContent(self):
         part = self.currentPart
         self.ui.deletePartition.setVisible(True)

Modified: branches/yali4/yali4/gui/Ui/partedit.ui
=================================================================
--- branches/yali4/yali4/gui/Ui/partedit.ui	(original)
+++ branches/yali4/yali4/gui/Ui/partedit.ui	Wed Apr  9 14:26:14 2008
@@ -175,26 +175,6 @@
           <string/>
          </property>
         </item>
-        <item>
-         <property name="text" >
-          <string>as Pardus System Files (mandatory)</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>as User Files (optional)</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>as Swap Space (optional)</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>as Storage Area</string>
-         </property>
-        </item>
        </widget>
       </item>
       <item row="2" column="1" >