Add translate files

console/gui/CertificateClass.py

@@ -51,7 +51,7 @@ class CertClass (QtGui.QWidget):
         
         self.sendlayout.addWidget(LabelWordWrap(_('Port')), 2,0)
         
-        self.send_port = ClearLineEdit(_('8888'))
+        self.send_port = ClearLineEdit('8888')
         self.send_port.setValidator(QtGui.QIntValidator(self))
         self.sendlayout.addWidget(self.send_port, 2, 1)
         
@@ -69,7 +69,7 @@ class CertClass (QtGui.QWidget):
         
         self.getlayout.addWidget(LabelWordWrap(_('Port')), 2,0)
         
-        self.get_port = ClearLineEdit(_('8888'))
+        self.get_port = ClearLineEdit('8888')
         self.get_port.setValidator(QtGui.QIntValidator(self))
         self.getlayout.addWidget(self.get_port, 2, 1)
         

console/gui/DisplayMethod.py

@@ -77,7 +77,7 @@ class DisplayMethod(QtGui.QWidget):
                     'QWidget { background: transparent;}'\
                     'QGroupBox {'\
 #                     'border: 2px solid gray;'\
-                     'border: 1px solid gray;'\
+                     'border: 1px outset gray;'\
                      'border-radius: 16px;'\
 #                     'font: normal 14px;'\
                      'font: bold 14px;'\
@@ -219,12 +219,12 @@ class DisplayMethod(QtGui.QWidget):
                 group_name = group.split('.')[0].encode('utf-8')
                 sub_group = group.split('.')[1].encode('utf-8')
                 
-                for i in range (20):
-                    self.layout_dict[group_name].addWidget(ButtonMenu \
-                                ('gggggggg',\
-                                'qqqqww wwwww', \
-                                'code-block', \
-                                self))
+#                for i in range (20):
+#                    self.layout_dict[group_name].addWidget(ButtonMenu \
+#                                ('gggggggg',\
+#                                'qqqqww wwwww', \
+#                                'code-block', \
+#                                self))
                 self.layout_dict[group_name].addWidget \
                                 (self.button_list[sub_group]\
                                 [len(self.button_list[sub_group]) - 1])
@@ -318,47 +318,18 @@ class DisplayMethodScroll (QtGui.QScrollArea):
         
         self.horizontalScrollBar().hide()
         
-#        self.set_style(self.MainFrameWgt)
-
-#    def set_style(self, wgt):
-#        print wgt.styleSheet()
-#        self.setStyleSheet("QWidget "\
-#        "{  "\
-#        "background-color: transparent ; "\
-#        "background-image: url(/usr/share/apps/kwin/calculatecubecap.png); "\
-##        "background-position: center center; "\
-##        "background-attachment: fixed; "\
-##        "background-repeat: no-repeat; "\
-##        "alternate-background-color: rgba(255, 255, 255, 15%);"\
-#        " }")
-#    def paintEvent(self, Event):
-#        opt = QtGui.QStyleOption()
-#        opt.initFrom(self)
-#        p = QtGui.QPainter(self)
-#        p.begin(0)
-#        self.style().drawPrimitive(QtGui.QStyle.PE_Widget, opt, p, self)
-
-
-
-
 
 class StartWgt(QtGui.QWidget):
     
-    def __init__(self, parent, ClientObj):
+    def __init__(self, parent):
         super(StartWgt, self).__init__(parent)
         self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
-
-    def refresh(self, ClientObj):
-#        self.setStyleSheet("QWidget { background-color: %s }" \
-#                            %ClientObj.method_background_color)
-        ClientObj.app.processEvents()
         
 class StartWidget (QtGui.QScrollArea):
     def __init__(self, parent, ClientObj):
         QtGui.QScrollArea.__init__(self, parent)
         
-        self.MainFrameWgt = StartWgt(self, ClientObj)
-        self.MainFrameWgt.refresh(ClientObj)
+        self.MainFrameWgt = StartWgt(self)
         self.setWidget(self.MainFrameWgt)
         
         # set resizable widget in ScrollArea

console/gui/LeftMenu.py

@@ -143,7 +143,6 @@ class LeftMenu(QtGui.QScrollArea):
 #        print view
         self.parent.ClientObj.MainWidget.main_frame_view(view, method_name)
 
-
     def create_steps (self, method_name, steps):
         temp = self.parent.ClientObj.MainWidget.windowTitle().split('>')
         if not _(' Step ') in temp[len(temp)-1]:
@@ -205,17 +204,25 @@ class LeftMenu(QtGui.QScrollArea):
             (self.old_title + _(' > Step ') + '0')
 
 
+    # create helper signals
     collect = QtCore.Signal()
     calling = QtCore.Signal()
     
-
     def collect_object(self):
+        try:
+            self.collect.disconnect()
+        except RuntimeError, e:
+            print e
+            
         self.collect.connect(self.parent.ClientObj.MainWidget.main_frame.\
                         MainFrameWgt.collect_object(False))
         self.collect.emit()
-        
 
     def calling_method(self):
+        try:
+            self.calling.disconnect()
+        except RuntimeError, e:
+            print e
         self.calling.connect(self.parent.ClientObj.MainWidget.main_frame.\
                         MainFrameWgt.calling(True))
         self.calling.emit()
@@ -224,7 +231,7 @@ class LeftMenu(QtGui.QScrollArea):
         def wrapper(): 
 #            print 'set_step = ', set_step
             step = set_step if set_step else 0
-            
+
 #            print 'dddd', step
             
             self.parent.ClientObj.method_name = method_name
@@ -255,11 +262,19 @@ class LeftMenu(QtGui.QScrollArea):
         return wrapper
         
     def changed_step(self, step):
+            
+        temp = self.parent.ClientObj.MainWidget.windowTitle().split('>')
+        if not _(' Step ') in temp[len(temp)-1]:
+            self.old_title = self.parent.ClientObj.MainWidget.windowTitle()
+                
+        self.parent.ClientObj.MainWidget.setWindowTitle \
+                            (self.old_title + _(' > Step ') + str(step))        
+        
             # set bold for current step
-            for i in range(len(self.button_list)):
-                if i == step:
-                    self.button_list[i].setFont \
+        for i in range(len(self.button_list)):
+            if i == step:
+                self.button_list[i].setFont \
                                 (QtGui.QFont('',-1,QtGui.QFont.Bold))
-                else:
-                    self.button_list[i].setFont \
+            else:
+                self.button_list[i].setFont \
                                 (QtGui.QFont('',-1,QtGui.QFont.Normal))

console/gui/MainClass.py

@@ -111,6 +111,9 @@ class ApiClient (QtGui.QWidget):
             self.path_to_cert = path_to_cert.replace("~",self.homePath)
         except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             pass
+        if self.path_to_cert.lower() == 'not':
+            path_to_cert = '~/.calculate/client_cert/'
+            self.path_to_cert = path_to_cert.replace("~",self.homePath)
         ###################### gui ##########################
         # get background color
         try:

console/gui/conf_connection.py

@@ -16,15 +16,16 @@
 #  limitations under the License.
 
 from PySide import QtGui, QtCore
-from client_class import Client_suds, HTTPSClientCertTransport
 from suds import WebFault
 import threading
-from calculate.api.cl_api import DataVarsApi
+import gettext
 
+from calculate.api.cl_api import DataVarsApi
 from calculate.api.client.function import clear
 from session_function import client_post_cert
 from calculate.api.client.cert_verify import VerifyError
 
+from client_class import Client_suds, HTTPSClientCertTransport
 from more import https_server, client_signal, show_msg, uniq, LabelWordWrap
 
 class FrameConnection(QtGui.QWidget):
@@ -36,6 +37,7 @@ class FrameConnection(QtGui.QWidget):
 #        self.initUI()
 #        
 #    def initUI(self):
+        gettext.install('default', './', unicode=True)
         grid = QtGui.QGridLayout(self)
         grid.setSpacing(10)
 
@@ -77,7 +79,7 @@ class FrameConnection(QtGui.QWidget):
         grid.addWidget(self.text_port, 2, 2)
 
 
-        self.cmd_connect = QtGui.QPushButton('Connect')
+        self.cmd_connect = QtGui.QPushButton(_('Connect'))
         self.cmd_connect.setIcon(QtGui.QIcon.fromTheme("network-connect"))
         self.cmd_connect.setDefault(True)
         self.cmd_connect.setAutoDefault(True)

console/gui/default.po

@@ -0,0 +1,233 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: console_gui_translate\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-15 15:55+0300\n"
+"PO-Revision-Date: 2012-02-15 16:11+0300\n"
+"Last-Translator: dspiridonov <ds@calculate.ru>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-0: /var/calculate/mydir/source/spyder/cl-api-client/console/gui\n"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:53
+msgid "User@Server_HostName"
+msgstr "Пользователь@Имя_сервера"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:63
+msgid "User Name"
+msgstr "Имя пользователя"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:68
+msgid "Organization Name"
+msgstr "Название организации"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:73
+msgid "Network address"
+msgstr "Сетевой адрес"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:78
+msgid "State Name"
+msgstr "Город"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:83
+msgid "Country (2 words)"
+msgstr "Страна (2 символа)"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:93
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:107
+msgid "Create Request"
+msgstr "Создать Запрос на подпись сертификата"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:98
+msgid "Cancel"
+msgstr "Отмена"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:148
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:267
+msgid " Step "
+msgstr " Шаг "
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:204
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:248
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:271
+msgid " > Step "
+msgstr " > Шаг "
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:28
+#, python-format
+msgid ""
+"%s v%s. \n"
+"Composed of Calculate Utilities 3.0\n"
+"Calculate Utilities разрабатываются компанией Калкулэйт. (c) 2007-%d"
+msgstr ""
+"%s v%s. \n"
+"Входит в состав Calculate Utilities 3.0\n"
+"Calculate Utilities разрабатываются компанией Калкулэйт. (c) 2007-%d"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:39
+msgid "Quit"
+msgstr "Выход"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:68
+msgid "Calculate Utilities"
+msgstr "Calculate Utilities"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:52
+#, python-format
+msgid "Your certificate ID = %s"
+msgstr "Номер Вашего сертификата = %s"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:56
+msgid " New Session"
+msgstr "Новая сессия"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:57
+msgid " Old Session"
+msgstr "Старая сессия"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:58
+#, python-format
+msgid " Your session id = %s"
+msgstr "Номер Вашей сессии = %s"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:60
+msgid "Certificate not send!"
+msgstr "Сертификат не отправлен!"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:62
+#, python-format
+msgid " Your certifitate id = %d"
+msgstr "Номер Вашего сертификата = %d"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:65
+msgid "expiry date certificate has passed"
+msgstr "Время жизни сертификата истекло"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:67
+#, python-format
+msgid "shelf life expires after %d days"
+msgstr "Время жизни сертификата истекает через %d дней"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/more.py:195
+msgid "Open"
+msgstr "Открыть"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/more.py:577
+msgid "Yes"
+msgstr "Да"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:48
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:66
+msgid "Host"
+msgstr "Хост"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:49
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:67
+msgid "Enter Host"
+msgstr "Введите Хост"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:52
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:70
+msgid "Port"
+msgstr "Порт"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:54
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:72
+msgid "8888"
+msgstr "8888"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:62
+msgid "Send certificate signing request"
+msgstr "Отправить запрос на подпись сертификата"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:80
+msgid "Get certificate from server"
+msgstr "Забрать сертификат с сервера"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:105
+msgid "Certificates"
+msgstr "Сертификаты"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:114
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:202
+msgid "Enter Hostname or IP adress"
+msgstr "Введите имя хоста или IP адрес"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:114
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:202
+msgid "Field \"Host\" Error!"
+msgstr "Ошибка в поле \"Хост\"!"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:119
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:207
+msgid "Enter Port"
+msgstr "Введите номер порта"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:119
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:207
+msgid "Field \"Port\" Error!"
+msgstr "Ошибка в поле \"Порт\"!"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:146
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:218
+#, python-format
+msgid "Error code: %s"
+msgstr "Код ошибки: %s"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:146
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:218
+msgid "Close. Connecting Error."
+msgstr "Ошибка соединения. Закрываюсь."
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:180
+msgid "This server can not sign certificate!"
+msgstr "Сервер не подписал сертификат!"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:185
+#, python-format
+msgid "Your request id = %s"
+msgstr "Номер Вашего запроса = %s"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:318
+msgid "filename = "
+msgstr "Имя файла ="
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:321
+msgid "file with ca certificates exists"
+msgstr "Файл с сертификатом удостоверяющего центра создан"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/MainFrameResult.py:395
+#, python-format
+msgid "Percent = %s"
+msgstr "Процент = %s"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/MainFrameResult.py:463
+msgid "Send"
+msgstr "Отправить"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/client_class.py:114
+msgid "Add certificate to trusted"
+msgstr "Добавить сертификат в доверенные"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainframe.py:331
+msgid "Press for advanced settings."
+msgstr "Нажмите для дополнительных настроек"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainframe.py:624
+msgid "Previous"
+msgstr "Назад"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainframe.py:636
+msgid "Ok"
+msgstr "Ok"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainframe.py:645
+msgid "Next"
+msgstr "Далее"
+

console/gui/mainframe.py

@@ -597,8 +597,15 @@ class MFWgt(QtGui.QWidget):
 
                 view = self.ClientObj.client.service[0][self.method_name+'_view']\
                                                 (int(self.ClientObj.sid),  num)
-                                                
-                self.ClientObj.MainWidget.left_frame.changed_step(step)
+
+                # change step in left frame                
+                try:
+                    self.ClientObj.MainWidget.left_frame.changed_step(num)
+                except KeyError:
+                    pass
+                except Exception, e:
+                    show_msg (e, 'Change Step Error')
+                    
                 # display view in main frame
 #                print '===========>>>>>>', view
                 self.ClientObj.MainWidget.main_frame_view(view, self.method_name)
@@ -691,7 +698,6 @@ class MFWgt(QtGui.QWidget):
     def collect_object(self, expert = False):
         def wrapper():
             '''add variable values from widget in param_object'''
-            print '##########################3'
             # store params name if list for each step
             step_num = self.ClientObj.param_objects[self.method_name]['step']
             self.ClientObj.param_objects[self.method_name]['fields'][step_num] = []
@@ -798,13 +804,12 @@ class MFWgt(QtGui.QWidget):
                             
                         self.param_object[field.name] = listToArrayArray(self.ClientObj.client, table_result)
         
-            print 'self.param_object', self.param_object
+#            print 'self.param_object', self.param_object
         return wrapper
 
     def calling(self, CheckOnly = False):
     # call method on server
         def wrapper():
-            print 'HHHHHHHHHHHHHHHHHHHHHHHHH'
             if hasattr (self.param_object, 'CheckOnly'):
                 self.param_object['CheckOnly'] = CheckOnly
                 

console/gui/mainmenu.py

@@ -28,6 +28,7 @@ class MainMenu(QtGui.QWidget):
 ######### Display all methods
         self.Methods = TopMenu('Methods','go-previous', self)
         self.Methods.setStatusTip('Display Methods')
+        self.Methods.setToolTip('')
         self.Methods.clicked.connect(parent.display_methods)
         self.Methods.setVisible(False)
         
@@ -36,6 +37,7 @@ class MainMenu(QtGui.QWidget):
 ######### View information about running processes
         self.Processes = TopMenu('Processes','system-run', self)
         self.Processes.setStatusTip('View information about running processes')
+        self.Processes.setToolTip('')
         self.Processes.clicked.connect(parent.view_processes)
         self.Processes.setVisible(False)
         
@@ -44,6 +46,7 @@ class MainMenu(QtGui.QWidget):
 ######### View information about current session
         self.Session = TopMenu('Session','document-edit-verify', self)
         self.Session.setStatusTip('View information about current session')
+        self.Session.setToolTip('')
         self.Session.clicked.connect(parent.view_session_info)
         self.Session.setVisible(False)
         
@@ -52,6 +55,7 @@ class MainMenu(QtGui.QWidget):
 ######### Exit this session
         self.Disconnect = TopMenu('Disconnect','network-disconnect', self)
         self.Disconnect.setStatusTip('Disconnect')
+        self.Disconnect.setToolTip('')
         self.Disconnect.clicked.connect(parent.disconnect)
         self.Disconnect.setVisible(False)
         
@@ -61,6 +65,7 @@ class MainMenu(QtGui.QWidget):
 ######### Connection
         self.Connect = TopMenu('Connect','network-connect', self)
         self.Connect.setStatusTip('Connect')
+        self.Connect.setToolTip('')
         self.Connect.clicked.connect(parent.connecting)
         
         self.hlayout.addWidget(self.Connect)
@@ -69,6 +74,7 @@ class MainMenu(QtGui.QWidget):
 
         self.Certificates = TopMenu('Certificates','view-certificate', self)
         self.Certificates.setStatusTip('Window work with certificates')
+        self.Certificates.setToolTip('')
         self.Certificates.clicked.connect(parent.work_with_certificates)
         
         self.hlayout.addWidget(self.Certificates)
@@ -76,6 +82,7 @@ class MainMenu(QtGui.QWidget):
 ######### Tools dialog
         self.Tool = TopMenu('Tool','preferences-other', self)
         self.Tool.setStatusTip('Tool application')
+        self.Tool.setToolTip('Application Tools')
         self.Tool.clicked.connect(parent.tools)
         
         self.hlayout.addWidget(self.Tool)
@@ -83,6 +90,7 @@ class MainMenu(QtGui.QWidget):
 ######### View help information
         self.Help = TopMenu('Help','help-about', self)
         self.Help.setStatusTip('Help')
+        self.Help.setToolTip('About Application')
         self.Help.clicked.connect(parent.help)
         
         self.hlayout.addWidget(self.Help)
@@ -90,6 +98,7 @@ class MainMenu(QtGui.QWidget):
 ######### Exit program
         self.Exit = TopMenu('Exit','application-exit', self)
         self.Exit.setStatusTip('Exit application')
+        self.Exit.setToolTip('Exit application')
         self.Exit.clicked.connect(parent.close)
         
         self.hlayout.addWidget(self.Exit)

console/gui/more.py

@@ -97,7 +97,8 @@ class ButtonMenu(QtGui.QPushButton):
         self.layout.addWidget(self.image_lbl)
         self.setFlat(True)
         
-        
+        if not label:
+            label = name
         self.lbl = LabelWordWrap(label, self)
         self.lbl.setAlignment(QtCore.Qt.AlignCenter)
         

console/gui/tools.py

@@ -309,8 +309,9 @@ class ToolGui(QtGui.QWidget):
                     new_config.append('bg_color = %s\n' %self.bg_color)
                 elif line.startswith('bg_image '):
                     bg_image_flag = True
-                    if self.fd_bg_image.data:
-                        new_config.append('bg_image = %s\n' %self.fd_bg_image.data)
+                    if self.fd_bg_image.text().lower() == 'not' \
+                                or os.path.isfile(self.fd_bg_image.text()):
+                        new_config.append('bg_image = %s\n' %self.fd_bg_image.text())
                     else:
                         new_config.append(line)
                 elif line.startswith('bg_repeat '):
@@ -327,9 +328,10 @@ class ToolGui(QtGui.QWidget):
             new_config = self.check_cfg (bg_color_flag, new_config, \
                                 '[gui]', 'bg_color', self.bg_color)
             
-            if self.fd_bg_image.data:
+            if self.fd_bg_image.text().lower() == 'not' \
+                                or os.path.isfile(self.fd_bg_image.text()):
                 new_config = self.check_cfg (bg_image_flag, new_config, \
-                                '[gui]', 'bg_image', self.fd_bg_image.data)
+                                '[gui]', 'bg_image', self.fd_bg_image.text())
             
             new_config = self.check_cfg (repeat_bg_flag, new_config, \
                           '[gui]', 'bg_repeat', self.repeat_ComboBox.itemData \
@@ -347,8 +349,9 @@ class ToolGui(QtGui.QWidget):
             ClientObj.method_background_color = self.bg_color
             ClientObj.bg_opacity = self.opacity.value()
             
-            if self.fd_bg_image.data:
-                ClientObj.background_image = self.fd_bg_image.data
+            if self.fd_bg_image.text().lower() == 'not' \
+                                or os.path.isfile(self.fd_bg_image.text()):
+                ClientObj.background_image = self.fd_bg_image.text()
         return wrapper
 
 
@@ -465,8 +468,9 @@ class ToolOther(QtGui.QWidget):
                                 (self.lang_ComboBox.currentIndex()))
                 elif line.startswith('path_to_cert '):
                     cert_flag = True
-                    if self.fd_cert.data:
-                        new_config.append('path_to_cert = %s\n' %self.fd_cert.data)
+                    if self.fd_cert.text().lower() == 'not' or \
+                        os.path.isdir(self.fd_cert.text()):
+                        new_config.append('path_to_cert = %s\n' %self.fd_cert.text())
                     else:
                         new_config.append(line)
                 elif line.startswith('title_color '):
@@ -479,9 +483,10 @@ class ToolOther(QtGui.QWidget):
                                 '[other]', 'lang', self.lang_ComboBox.itemData \
                                 (self.lang_ComboBox.currentIndex()))            
             
-            if self.fd_cert.data:
+            if self.fd_cert.text().lower() == 'not' or \
+                        os.path.isdir(self.fd_cert.text()):
                 new_config = self.check_cfg (cert_flag, new_config, \
-                                '[other]', 'path_to_cert', self.fd_cert.data)
+                                '[other]', 'path_to_cert', self.fd_cert.text())
 
             fnc = open(self.user_config, 'w')
             for line in new_config: