[Uludag-commits] r24277 - in trunk/kde4/package-manager/manager: src ui
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
1 Tem 2009 Çar 11:04:41 EEST
Author: faik
Date: Wed Jul 1 11:04:41 2009
New Revision: 24277
Modified:
trunk/kde4/package-manager/manager/src/config.py
trunk/kde4/package-manager/manager/src/settingsdialog.py
trunk/kde4/package-manager/manager/src/tray.py
trunk/kde4/package-manager/manager/ui/settingsdialog.ui
Log:
Instal updates automatically
Modified: trunk/kde4/package-manager/manager/src/config.py
=================================================================
--- trunk/kde4/package-manager/manager/src/config.py (original)
+++ trunk/kde4/package-manager/manager/src/config.py Wed Jul 1 11:04:41 2009
@@ -16,6 +16,7 @@
defaults = {"SystemTray":False,
"UpdateCheck":False,
+ "InstallUpdatesAutomatically":False,
"UpdateCheckInterval":60,
}
@@ -55,6 +56,9 @@
def updateCheck(self):
return self.getBoolValue(general, "UpdateCheck")
+ def installUpdatesAutomatically(self):
+ return self.getBoolValue(general, "InstallUpdatesAutomatically")
+
def updateCheckInterval(self):
return self.getNumValue(general, "UpdateCheckInterval")
@@ -67,6 +71,9 @@
def setUpdateCheck(self, enabled):
self.setValue(general, "UpdateCheck", enabled)
+ def setInstallUpdatesAutomatically(self, enabled):
+ self.setValue(general, "InstallUpdatesAutomatically", enabled)
+
def setUpdateCheckInterval(self, value):
self.setValue(general, "UpdateCheckInterval", value)
Modified: trunk/kde4/package-manager/manager/src/settingsdialog.py
=================================================================
--- trunk/kde4/package-manager/manager/src/settingsdialog.py (original)
+++ trunk/kde4/package-manager/manager/src/settingsdialog.py Wed Jul 1 11:04:41 2009
@@ -53,6 +53,7 @@
self.settings.onlyGuiApp.setChecked(self.config.showOnlyGuiApp())
self.settings.intervalCheck.setChecked(self.config.updateCheck())
+ self.settings.installUpdates.setChecked(self.config.installUpdatesAutomatically())
self.settings.intervalSpin.setValue(self.config.updateCheckInterval())
self.settings.systemTray.setChecked(self.config.systemTray())
self.settings.updateCheckGroupBox.setEnabled(self.config.systemTray())
@@ -71,6 +72,7 @@
def connectSignals(self):
self.connect(self.settings.onlyGuiApp, SIGNAL("toggled(bool)"), self.markChanged)
self.connect(self.settings.intervalCheck, SIGNAL("toggled(bool)"), self.markChanged)
+ self.connect(self.settings.installUpdates, SIGNAL("toggled(bool)"), self.markChanged)
self.connect(self.settings.useBandwidthLimit, SIGNAL("toggled(bool)"), self.markChanged)
self.connect(self.settings.intervalSpin, SIGNAL("valueChanged(int)"), self.markChanged)
self.connect(self.settings.systemTray, SIGNAL("toggled(bool)"), self.markChanged)
@@ -85,6 +87,7 @@
self.config.setSystemTray(self.settings.systemTray.isChecked())
self.settings.emit(SIGNAL("traySettingChanged()"))
+ self.config.setInstallUpdatesAutomatically(self.settings.installUpdates.isChecked())
self.config.setUpdateCheck(self.settings.intervalCheck.isChecked())
self.config.setUpdateCheckInterval(self.settings.intervalSpin.value())
Modified: trunk/kde4/package-manager/manager/src/tray.py
=================================================================
--- trunk/kde4/package-manager/manager/src/tray.py (original)
+++ trunk/kde4/package-manager/manager/src/tray.py Wed Jul 1 11:04:41 2009
@@ -66,6 +66,11 @@
def showPopup(self):
upgrades = self.iface.getUpdates()
+ if config.PMConfig().installUpdatesAutomatically():
+ if not self.appWindow.isVisible() and not self.iface.operationInProgress():
+ self.iface.upgradePackages(upgrades)
+ return
+
newUpgrades = set(upgrades) - set(self.lastUpgrades)
self.lastUpgrades = upgrades
if not len(upgrades) or not newUpgrades:
Modified: trunk/kde4/package-manager/manager/ui/settingsdialog.ui
=================================================================
--- trunk/kde4/package-manager/manager/ui/settingsdialog.ui (original)
+++ trunk/kde4/package-manager/manager/ui/settingsdialog.ui Wed Jul 1 11:04:41 2009
@@ -21,6 +21,44 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_4">
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="buttonHelp">
+ <property name="text">
+ <string>&Help</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonOk">
+ <property name="text">
+ <string>&OK</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonCancel">
+ <property name="text">
+ <string>&Cancel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
@@ -124,7 +162,7 @@
</property>
</spacer>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -137,6 +175,16 @@
</property>
</spacer>
</item>
+ <item row="2" column="0" colspan="3">
+ <widget class="QCheckBox" name="installUpdates">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Install updates automatically</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -673,44 +721,6 @@
</widget>
</widget>
</item>
- <item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QPushButton" name="buttonHelp">
- <property name="text">
- <string>&Help</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="buttonOk">
- <property name="text">
- <string>&OK</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="buttonCancel">
- <property name="text">
- <string>&Cancel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
</layout>
</widget>
<tabstops>
@@ -765,12 +775,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>74</x>
- <y>251</y>
+ <x>91</x>
+ <y>280</y>
</hint>
<hint type="destinationlabel">
- <x>71</x>
- <y>277</y>
+ <x>88</x>
+ <y>310</y>
</hint>
</hints>
</connection>
@@ -781,12 +791,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>179</x>
- <y>251</y>
+ <x>196</x>
+ <y>280</y>
</hint>
<hint type="destinationlabel">
- <x>170</x>
- <y>283</y>
+ <x>212</x>
+ <y>310</y>
</hint>
</hints>
</connection>
@@ -902,5 +912,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>intervalCheck</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>installUpdates</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>218</x>
+ <y>136</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>238</x>
+ <y>185</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi