[Uludag-commits] r16922 - in branches/yali4-md/yali4: . gui
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
1 Şub 2008 Cum 23:41:00 EET
Author: gokmen.goksel
Date: Fri Feb 1 23:41:00 2008
New Revision: 16922
Modified:
branches/yali4-md/yali4/gui/ScrPartitionAuto.py
branches/yali4-md/yali4/gui/ScreenWidget.py
branches/yali4-md/yali4/gui/YaliDialog.py
branches/yali4-md/yali4/gui/YaliWindow.py
branches/yali4-md/yali4/gui/context.py
branches/yali4-md/yali4/gui/installdata.py
branches/yali4-md/yali4/partitionrequest.py
Log:
sync..
Modified: branches/yali4-md/yali4/gui/ScrPartitionAuto.py
=================================================================
--- branches/yali4-md/yali4/gui/ScrPartitionAuto.py (original)
+++ branches/yali4-md/yali4/gui/ScrPartitionAuto.py Fri Feb 1 23:41:00 2008
@@ -30,6 +30,9 @@
from yali4.gui.GUIException import *
import yali4.gui.context as ctx
+# Auto Partition Methods
+methodUseAvail, methodEraseAll = range(2)
+
##
# Partition Choice Widget
class Widget(QtGui.QWidget, ScreenWidget):
@@ -80,12 +83,10 @@
if not self.ui.device_list.count():
raise YaliExceptionInfo, _("It seems that you don't have the required disk space (min. %s) for Pardus installation." % ctx.consts.min_root_size)
- self.connect(self.ui.accept_auto, SIGNAL("clicked()"),
- self.slotSelectAuto)
- self.connect(self.ui.manual, SIGNAL("clicked()"),
- self.slotSelectManual)
- self.connect(self.ui.device_list, SIGNAL("itemChanged(QListWidgetItem*)"),
- self.slotDeviceChanged)
+ self.connect(self.ui.accept_auto_1, SIGNAL("clicked()"),self.slotSelectAuto)
+ self.connect(self.ui.accept_auto_2, SIGNAL("clicked()"),self.slotSelectAuto)
+ self.connect(self.ui.manual, SIGNAL("clicked()"),self.slotSelectManual)
+ self.connect(self.ui.device_list, SIGNAL("itemChanged(QListWidgetItem*)"),self.slotDeviceChanged)
def shown(self):
ctx.mainScreen.disableNext()
@@ -94,14 +95,14 @@
def execute(self):
ctx.installData.autoPartDev = None
- if self.ui.accept_auto.isChecked():
+ if self.ui.accept_auto_1.isChecked() or self.ui.accept_auto_2.isChecked():
ctx.installData.autoPartDev = self.device
ctx.debugger.log("Automatic Partition selected..")
-
+ if self.ui.accept_auto_2.isChecked():
+ ctx.installData.autoPartMethod = methodEraseAll
# skip next screen()
# We pass the Manual Partitioning screen
- num = ctx.mainScreen.getCurrentIndex() + 1
- ctx.mainScreen.goToScreen(num)
+ ctx.mainScreen.moveInc = 2
return True
Modified: branches/yali4-md/yali4/gui/ScreenWidget.py
=================================================================
--- branches/yali4-md/yali4/gui/ScreenWidget.py (original)
+++ branches/yali4-md/yali4/gui/ScreenWidget.py Fri Feb 1 23:41:00 2008
@@ -25,7 +25,7 @@
return True
def backCheck(self):
- return True
+ return False
def update(self):
pass
Modified: branches/yali4-md/yali4/gui/YaliDialog.py
=================================================================
--- branches/yali4-md/yali4/gui/YaliDialog.py (original)
+++ branches/yali4-md/yali4/gui/YaliDialog.py Fri Feb 1 23:41:00 2008
@@ -87,7 +87,7 @@
QObject.connect(self.windowTitle.pushButton,SIGNAL("clicked()"),self.reject)
QMetaObject.connectSlotsByName(self)
- self.setStyleSheet("QFrame#windowTitle {background-color:white;border:1px solid #CCC;border-radius:4px;}")
+ self.setStyleSheet("QFrame#windowTitle {background-color:#70A73C;color:#FFF;border:1px solid #CCC;border-radius:4px;}")
class WarningDialog(Dialog):
@@ -153,3 +153,9 @@
self.emit(SIGNAL("signalCancel"), ())
+class InformationWindow(QtGui.QWidget):
+
+ def __init__(self, *args):
+ pass
+
+
Modified: branches/yali4-md/yali4/gui/YaliWindow.py
=================================================================
--- branches/yali4-md/yali4/gui/YaliWindow.py (original)
+++ branches/yali4-md/yali4/gui/YaliWindow.py Fri Feb 1 23:41:00 2008
@@ -35,6 +35,8 @@
self.screenData = None
self.debugShortCut = QtGui.QShortcut(QtGui.QKeySequence(Qt.Key_F2),self.ui)
+ self.moveInc = 1
+
# Dont need help as default
self.slotToggleHelp()
@@ -70,10 +72,14 @@
def slotNext(self):
_w = self.mainStack.currentWidget()
_w.execute()
- self.stackMove(self.getCur(+1))
+ self.stackMove(self.getCur(self.moveInc))
+ self.moveInc = 1
def slotBack(self):
- self.stackMove(self.getCur(-1))
+ _w = self.mainStack.currentWidget()
+ _w.backCheck()
+ self.stackMove(self.getCur(self.moveInc * -1))
+ self.moveInc = 1
def stackMove(self,new):
self.mainStack.setCurrentIndex(new)
Modified: branches/yali4-md/yali4/gui/context.py
=================================================================
--- branches/yali4-md/yali4/gui/context.py (original)
+++ branches/yali4-md/yali4/gui/context.py Fri Feb 1 23:41:00 2008
@@ -18,6 +18,8 @@
from yali4.options import options
from yali4.partitionrequest import partrequests
+# lock for format request
+requestsCompleted = False
# bind some constant values
# There are more values defined in yali/constants.py!
Modified: branches/yali4-md/yali4/gui/installdata.py
=================================================================
--- branches/yali4-md/yali4/gui/installdata.py (original)
+++ branches/yali4-md/yali4/gui/installdata.py Fri Feb 1 23:41:00 2008
@@ -10,6 +10,9 @@
# Please read the COPYING file.
#
+# Auto Partition Methods
+methodUseAvail, methodEraseAll = range(2)
+
class InstallData:
keyData = None
rootPassword = None
@@ -17,6 +20,8 @@
users = []
autoLoginUser = None
autoPartDev = None
+ autoPartMethod = methodUseAvail
bootLoaderDev = None
repoAddr = None
useYaliFirstBoot = False
+
Modified: branches/yali4-md/yali4/partitionrequest.py
=================================================================
--- branches/yali4-md/yali4/partitionrequest.py (original)
+++ branches/yali4-md/yali4/partitionrequest.py Fri Feb 1 23:41:00 2008
@@ -385,3 +385,4 @@
# partition requests singleton.
partrequests = RequestList()
+
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi