← Back to branch summary

~ubuntu-branches/ubuntu/raring/hplip/raring

« back to all changes in this revision

Viewing changes to ui4/ui_utils.py

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-10-06 15:03:44 UTC
  • mfrom: (1.6.1) (20.1.16 quantal)
  • Revision ID: package-import@ubuntu.com-20121006150344-2p3xz26br0t3hu2q
Tags: 3.12.10-1
http://bugs.debian.org/683033
http://bugs.debian.org/687129
* New upstream release
  - Fixes "Network scanning fails (Closes: #683033)
* quilt refresh hplip-syslog-fix-debug-messages-to-error.dpatch
* Fix "error in clean build env" updated debian/rules (Closes: #687129)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ui4/ui_utils.py
23
23
import os.path
24
24
import re
25
25
import os
 
26
import time
26
27
 
27
28
# Local
28
29
from base.g import *
122
123
        self.working_dir = '.'
123
124
        self.voice_phone = ''
124
125
        self.email_address = ''
 
126
        self.upgrade_notify=True
 
127
        self.upgrade_last_update_time=0
 
128
        self.upgrade_pending_update_time=0
 
129
        self.latest_available_version=""
125
130
        self.loadDefaults()
126
131
 
127
132
 
136
141
 
137
142
 
138
143
    def loadDefaults(self):
139
 
        self.cmd_scan = self.__setup(['xsane -V %SANE_URI%', 'kooka', 'xscanimage'])
 
144
        self.cmd_scan = self.__setup(['simple-scan %SANE_URI%', 'xsane -V %SANE_URI%', 'kooka', 'xscanimage'])
140
145
        self.cmd_fab = self.__setup(['hp-fab'])
141
146
 
142
147
 
186
191
        self.voice_phone = unicode(self.value("voice_phone").toString())
187
192
        self.email_address = unicode(self.value("email_address").toString())
188
193
        self.endGroup()
 
194
        
 
195
        self.beginGroup("upgrade")
 
196
        self.upgrade_notify= bool(self.value("notify_upgrade").toBool())
 
197
        self.latest_available_version=str(self.value("latest_available_version").toString())
 
198
            
 
199
        i, Ok = self.value("last_upgraded_time").toInt()
 
200
        if Ok and i >0:
 
201
            self.upgrade_last_update_time =i
 
202
        else:
 
203
            self.upgrade_last_update_time = 0
 
204
            
 
205
        i, Ok = self.value("pending_upgrade_time").toInt()
 
206
        if Ok and i >0 :
 
207
            self.upgrade_pending_update_time = i
 
208
        else:
 
209
            self.upgrade_pending_update_time = 0
 
210
            
 
211
        self.endGroup()
189
212
 
190
213
 
191
214
    def save(self):
222
245
        self.setValue("voice_phone", QVariant(self.voice_phone))
223
246
        self.setValue("email_address", QVariant(self.email_address))
224
247
        self.endGroup()
 
248
        
 
249
        self.beginGroup("upgrade")
 
250
        self.setValue("notify_upgrade", QVariant(self.upgrade_notify))
 
251
        if self.upgrade_last_update_time <1:
 
252
            self.upgrade_last_update_time = time.time()         # <---Need to verify code once
 
253
            
 
254
        self.setValue("last_upgraded_time", QVariant(self.upgrade_last_update_time))
 
255
        self.setValue("pending_upgrade_time", QVariant(self.upgrade_pending_update_time))
 
256
        self.endGroup()
 
257
 
225
258
 
226
259
        self.sync()
227
260
 
374
407
    "application/vnd.hp-HPGL" : (__translate("HP Graphics Language File"), '.hgl, .hpg, .plt, .prn'),
375
408
    "application/x-cshell" : (__translate("C Shell Script"), '.csh, .sh'),
376
409
    "application/x-csource" : (__translate("C Source Code"), '.c'),
377
 
    "text/cpp": (__translate("C++ Source Code"), '.cpp, .cxx'),
 
410
    "text/cpp": (__translate("C/C++ Source Code"), '.c, .cpp, .cxx'),
378
411
    "application/x-perl" : (__translate("Perl Script"), '.pl'),
379
412
    "application/x-python" : (__translate("Python Program"), '.py'),
380
413
    "application/x-shell" : (__translate("Shell Script"), '.sh'),