[Uludag-commits] r13397 - in trunk/yali/yali/gui: . Ui
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
13 Nis 2007 Cum 12:23:36 EEST
Author: gokmen.goksel
Date: Fri Apr 13 12:23:36 2007
New Revision: 13397
Modified:
trunk/yali/yali/gui/ScrUsers.py
trunk/yali/yali/gui/Ui/setupuserswidget.ui
Log:
* Delete Button Fixed
* Update Fixed
* New view for AutoLogin
Modified: trunk/yali/yali/gui/ScrUsers.py
=================================================================
--- trunk/yali/yali/gui/ScrUsers.py (original)
+++ trunk/yali/yali/gui/ScrUsers.py Fri Apr 13 12:23:36 2007
@@ -56,7 +56,8 @@
# KDE AutoLogin
self.autoLoginUser = ""
-
+ self.edititemindex = ""
+
# Give Admin Privileges default
self.admin.setChecked(True)
@@ -80,7 +81,8 @@
self.connect(self.pass2, SIGNAL("returnPressed()"),
self.slotReturnPressed)
-
+ self.checkUsers()
+
def shown(self):
self.checkUsers()
self.checkCapsLock()
@@ -134,13 +136,9 @@
if self.admin.isOn():
u.groups.append("wheel")
- # Set KDE Auto-Login
- if self.autoLogin.isOn():
- u.setAutoLogin(u.username)
- self.autoLoginUser = u.username
-
existsInList = [i for i in range(self.userList.count())
if self.userList.item(i).getUser().username == u.username]
+
# check user validity
if u.exists() or existsInList:
self.pass_error.setText(
@@ -154,30 +152,39 @@
self.pass_error.setText(
_('<font color="#FF6D19">Realname contains invalid characters!</font>'))
return
-
+
+ updateItem = None
+
try:
self.userList.removeItem(self.edititemindex)
- del self.edititemindex
+ self.autoLogin.removeItem(self.edititemindex + 1)
except:
+ updateItem = self.edititemindex
# nothing wrong. just adding a new user...
pass
+
+ self.edititemindex = ''
+
i = UserItem(self.userList, user = u)
-
- # clear all
- self.username.clear()
- self.realname.clear()
- self.pass1.clear()
- self.pass2.clear()
- self.autoLogin.setChecked(False)
- self.admin.setChecked(True)
+
+ # add user to auto-login list.
+ self.autoLogin.insertItem(u.username)
+
+ if updateItem:
+ self.autoLogin.setCurrentItem(self.autoLogin.count())
+
+ # clear form
+ self.resetWidgets()
# give focus to username widget for a new user. #3280
self.username.setFocus()
-
self.checkUsers()
-
def slotDeleteUser(self):
+ if self.userList.currentItem()==self.edititemindex:
+ self.resetWidgets()
+ self.autoLogin.setCurrentItem(0)
+ self.autoLogin.removeItem(self.userList.currentItem() + 1)
self.userList.removeItem(self.userList.currentItem())
self.checkUsers()
@@ -188,17 +195,31 @@
self.realname.setText(u.realname)
self.pass1.setText(u.passwd)
self.pass2.setText(u.passwd)
- if u.username == self.autoLoginUser:
- autoLogin.setChecked()
+
+ if "wheel" in u.groups:
+ self.admin.setChecked(True)
+ else:
+ self.admin.setChecked(False)
self.edititemindex = self.userList.currentItem()
def checkUsers(self):
if self.userList.count():
+ self.deleteButton.setEnabled(True)
ctx.screens.enableNext()
else:
+ # there is no user in list, there is nobody to delete
+ self.deleteButton.setEnabled(False)
ctx.screens.disableNext()
+ def resetWidgets(self):
+ # clear all
+ self.username.clear()
+ self.realname.clear()
+ self.pass1.clear()
+ self.pass2.clear()
+ self.admin.setChecked(False)
+
def slotReturnPressed(self):
self.slotCreateUser()
Modified: trunk/yali/yali/gui/Ui/setupuserswidget.ui
=================================================================
--- trunk/yali/yali/gui/Ui/setupuserswidget.ui (original)
+++ trunk/yali/yali/gui/Ui/setupuserswidget.ui Fri Apr 13 12:23:36 2007
@@ -84,55 +84,7 @@
<set>WordBreak|AlignCenter</set>
</property>
</widget>
- <widget class="QLayoutWidget" row="4" column="1">
- <property name="name">
- <cstring>layout5</cstring>
- </property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer row="2" column="1">
- <property name="name">
- <cstring>spacer7</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>56</height>
- </size>
- </property>
- </spacer>
- <widget class="QPushButton" row="1" column="1">
- <property name="name">
- <cstring>deleteButton</cstring>
- </property>
- <property name="text">
- <string>Delete Selected User</string>
- </property>
- </widget>
- <widget class="QListBox" row="1" column="0" rowspan="2" colspan="1">
- <property name="name">
- <cstring>userList</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>textLabel2</cstring>
- </property>
- <property name="text">
- <string>Users:</string>
- </property>
- </widget>
- </grid>
- </widget>
- <spacer row="5" column="1">
+ <spacer row="6" column="1">
<property name="name">
<cstring>spacer11</cstring>
</property>
@@ -149,7 +101,7 @@
</size>
</property>
</spacer>
- <spacer row="4" column="2">
+ <spacer row="5" column="2">
<property name="name">
<cstring>spacer14</cstring>
</property>
@@ -180,7 +132,7 @@
<set>WordBreak|AlignCenter</set>
</property>
</widget>
- <spacer row="4" column="0">
+ <spacer row="5" column="0">
<property name="name">
<cstring>spacer14_2</cstring>
</property>
@@ -293,13 +245,81 @@
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3">
+ </grid>
+ </widget>
+ <widget class="QLabel" row="4" column="1">
+ <property name="name">
+ <cstring>textLabel2</cstring>
+ </property>
+ <property name="text">
+ <string>Users:</string>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget" row="5" column="1">
+ <property name="name">
+ <cstring>layout3</cstring>
+ </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QListBox" row="0" column="0" rowspan="2" colspan="1">
+ <property name="name">
+ <cstring>userList</cstring>
+ </property>
+ </widget>
+ <spacer row="1" column="1">
<property name="name">
- <cstring>autoLogin</cstring>
+ <cstring>spacer8</cstring>
</property>
- <property name="text">
- <string>Auto Login with this user</string>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLayoutWidget" row="0" column="1">
+ <property name="name">
+ <cstring>layout2</cstring>
</property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>deleteButton</cstring>
+ </property>
+ <property name="text">
+ <string>Delete Selected User</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel1_5</cstring>
+ </property>
+ <property name="text">
+ <string>Auto Login User :</string>
+ </property>
+ </widget>
+ <widget class="QComboBox">
+ <item>
+ <property name="text">
+ <string>Auto Login Disabled</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>autoLogin</cstring>
+ </property>
+ </widget>
+ </vbox>
</widget>
</grid>
</widget>
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi