Build files now don't include .svn in deb, fixed spelling in ussd-common and added...

git-svn-id: file:///svnroot/ussd-widget/trunk@29 d197f4d6-dc93-42ad-8354-0da1f58e353f

diff --git a/ussd-common/build_ussd-common.py b/ussd-common/build_ussd-common.py
index 6c5424e..ecd8b67 100644 (file)
--- a/ussd-common/build_ussd-common.py
+++ b/ussd-common/build_ussd-common.py
@@ -38,9 +38,9 @@ if __name__ == "__main__":
 chmod +s /usr/bin/pnatd
 """ #Set here your post install script
 
-    version = "0.0.10"
+    version = "0.0.11"
     build = "0" 
-    changeloginformation = "Added support for SMS PDU decoding." 
+    changeloginformation = "Fixed orphographic mistake, added flush when printing to stdout." 
    
     dir_name = "src"     
 
@@ -49,12 +49,13 @@ chmod +s /usr/bin/pnatd
         real_dir = root[len(dir_name):]
         fake_file = []
         for f in files:
-            fake_file.append(root + os.sep + f + "|" + f);
+            if f.find(".svn") < 0 and root.find(".svn") < 0:
+               fake_file.append(root + os.sep + f + "|" + f);
         if len(fake_file) > 0:
             p[real_dir] = fake_file
 
     print p
     r = p.generate(version,build,changelog=changeloginformation,tar=True,dsc=True,changes=True,build=False,src=True)
     fake_file.append(root + os.sep + f + "|" + f)
-    if len(fake_file) > 0:
-        p[real_dir] = fake_file
+#    if len(fake_file) > 0:
+#        p[real_dir] = fake_file

diff --git a/ussd-common/src/usr/bin/ussdquery.py b/ussd-common/src/usr/bin/ussdquery.py
index 9c42633..db88dd3 100755 (executable)
--- a/ussd-common/src/usr/bin/ussdquery.py
+++ b/ussd-common/src/usr/bin/ussdquery.py
@@ -118,7 +118,7 @@ else:
        number = sys.argv[1].split(" ")
        for n in number: 
                if not check_number(n):
-                       print >> sys.stderr, "Sintax error in USSD number."
+                       print >> sys.stderr, "Syntax error in USSD number."
                        sys.exit(-7)
 
 # Parsing command line options
@@ -226,6 +226,7 @@ modem = None
 stage = 0
 if number == "interactive":
        sys.stdout.write(delimiter)
+       sys.stdout.flush()
 while number == "interactive" or stage < len(number):
        if modem == None:
                modem = init_modem(modem)
@@ -236,7 +237,8 @@ while number == "interactive" or stage < len(number):
                        close_modem (modem)
                        sys.exit (0)
                if not check_number (cnumber):
-                       sys.stdout.write ("Sintax error in USSD number"+delimiter)
+                       sys.stdout.write ("Syntax error in USSD number"+delimiter)
+                       sys.stdout.flush()
                        continue
        else:
                cnumber = number[stage]
@@ -302,6 +304,7 @@ while number == "interactive" or stage < len(number):
        if number == "interactive":
                # prints line feed
                sys.stdout.write(reply+delimiter)
+               sys.stdout.flush()
        else:
                if stage == len(number)-1:
                        print reply

diff --git a/ussd-widget/build_ussd-widget.py b/ussd-widget/build_ussd-widget.py
index a74c843..a0cc864 100644 (file)
--- a/ussd-widget/build_ussd-widget.py
+++ b/ussd-widget/build_ussd-widget.py
@@ -23,7 +23,7 @@ if __name__ == "__main__":
     p.description="Widget, that executes USSD query and displays response text\nThe main purpose is viewing your balance. In Russia all operators provide balace information via USSD queries and most part of contracts are prepaid. Ability to see your balance on desktop can be useful in such case.\nAnyway, you can configure widget to any other USSD query."
     p.author="Alexey Guseynov"
     p.mail="kibergus@gmail.com"
-    p.depends = "python2.5, ussd-common (>=0.0.10), python-hildondesktop (>=0.1.0-1maemo2), hildon-desktop-python-loader (>=0.1.0-1maemo2), python-gtk2, python-gobject, python-hildon, python-cairo"
+    p.depends = "python2.5, ussd-common (>=0.0.11), python-hildondesktop (>=0.1.0-1maemo2), hildon-desktop-python-loader (>=0.1.0-1maemo2), python-gtk2, python-gobject, python-hildon, python-cairo, python-dbus"
     p.section="user/desktop"
     p.icon = "./ussd-widget.png"
     p.arch="all"                #should be all for python, any for all arch
@@ -34,9 +34,9 @@ if __name__ == "__main__":
 #    p.postinstall="""#!/bin/sh
 #""" #Set here your post install script
 
-    version = "0.1.7"
+    version = "0.1.8"
     build = "0" 
-    changeloginformation = "Bug fix release." 
+    changeloginformation = "Now partially can be configured via DBus." 
    
     dir_name = "src"   
 
@@ -45,12 +45,13 @@ if __name__ == "__main__":
         real_dir = root[len(dir_name):]
         fake_file = []
         for f in files:
-            fake_file.append(root + os.sep + f + "|" + f);
+            if f.find(".svn") < 0 and root.find(".svn") < 0:
+                fake_file.append(root + os.sep + f + "|" + f);
         if len(fake_file) > 0:
             p[real_dir] = fake_file
 
     print p
     r = p.generate(version,build,changelog=changeloginformation,tar=True,dsc=True,changes=True,build=False,src=True)
     fake_file.append(root + os.sep + f + "|" + f)
-    if len(fake_file) > 0:
-        p[real_dir] = fake_file
+#    if len(fake_file) > 0:
+#        p[real_dir] = fake_file

diff --git a/ussd-widget/po/ru.po b/ussd-widget/po/ru.po
index 9c9df0c..0482d86 100644 (file)
--- a/ussd-widget/po/ru.po
+++ b/ussd-widget/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-18 21:58+0300\n"
+"POT-Creation-Date: 2010-05-23 15:21+0400\n"
 "PO-Revision-Date: 2010-01-29 17:51+0300\n"
 "Last-Translator: Alexey Guseunov <kibergusBarkBarkgmail.com>\n"
 "Language-Team: Russian\n"
@@ -151,146 +151,146 @@ msgstr "серьезная проблема в логике программы"
 msgid "Processing"
 msgstr "Обрабатываю"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:407
+#: src/usr/lib/hildon-desktop/ussd-widget.py:406
 msgid "No config"
 msgstr "Нет конфигурации"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:418
+#: src/usr/lib/hildon-desktop/ussd-widget.py:417
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:441
+#: src/usr/lib/hildon-desktop/ussd-widget.py:440
 msgid "Couldn't exec banner parser:"
 msgstr "Не удалось запустить обработчик для баннера:"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:449
-#: src/usr/lib/hildon-desktop/ussd-widget.py:465
+#: src/usr/lib/hildon-desktop/ussd-widget.py:448
+#: src/usr/lib/hildon-desktop/ussd-widget.py:464
 msgid "Group not found: \n"
 msgstr "Группа не найдена: \n"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:457
+#: src/usr/lib/hildon-desktop/ussd-widget.py:456
 msgid "Couldn't exec widget parser:"
 msgstr "Не удалось запустить обработчик для виджета:"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:471
+#: src/usr/lib/hildon-desktop/ussd-widget.py:470
 msgid "Couldn't exec chain:"
 msgstr "Не удалось запустить следующее звено:"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:509
+#: src/usr/lib/hildon-desktop/ussd-widget.py:508
 msgid "OK"
 msgstr "OK"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:518
-msgid "USSD widget"
-msgstr "USSD виджет"
+#: src/usr/lib/hildon-desktop/ussd-widget.py:517
+msgid "USSD widget : "
+msgstr "USSD виджет : "
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:520
+#: src/usr/lib/hildon-desktop/ussd-widget.py:519
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:554
+#: src/usr/lib/hildon-desktop/ussd-widget.py:553
 msgid "USSD reply language"
 msgstr "Язык USSD ответа"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:559
+#: src/usr/lib/hildon-desktop/ussd-widget.py:558
 msgid "Enable banner. Parser:"
 msgstr "Включить баннер. Обработчик:"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:570
+#: src/usr/lib/hildon-desktop/ussd-widget.py:569
 msgid "Execute query on start"
 msgstr "Выполнять запрос при старте"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:573
+#: src/usr/lib/hildon-desktop/ussd-widget.py:572
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:576
+#: src/usr/lib/hildon-desktop/ussd-widget.py:575
 msgid "Background color"
 msgstr "Цвет фона"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:578
+#: src/usr/lib/hildon-desktop/ussd-widget.py:577
 msgid "Text color"
 msgstr "Цвет шрифта"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:605
+#: src/usr/lib/hildon-desktop/ussd-widget.py:604
 msgid "USSD number"
 msgstr "USSD номер"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:618
+#: src/usr/lib/hildon-desktop/ussd-widget.py:617
 msgid "Name"
 msgstr "Имя"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:627
+#: src/usr/lib/hildon-desktop/ussd-widget.py:626
 msgid "Parser for widget"
 msgstr "Обработчик для виджета"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:645
+#: src/usr/lib/hildon-desktop/ussd-widget.py:644
 msgid "Chain"
 msgstr "Следующее звено"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:655
-#: src/usr/lib/hildon-desktop/ussd-widget.py:734
+#: src/usr/lib/hildon-desktop/ussd-widget.py:654
+#: src/usr/lib/hildon-desktop/ussd-widget.py:733
 msgid "Regular expression"
 msgstr "Регулярное выражение"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:658
+#: src/usr/lib/hildon-desktop/ussd-widget.py:657
 msgid "Group"
 msgstr "Группа"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:673
+#: src/usr/lib/hildon-desktop/ussd-widget.py:672
 msgid "Max. width"
 msgstr "Макс. ширина"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:675
+#: src/usr/lib/hildon-desktop/ussd-widget.py:674
 msgid "symbols"
 msgstr "символов"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:685
+#: src/usr/lib/hildon-desktop/ussd-widget.py:684
 msgid "Update every"
 msgstr "Обновлять каждые"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:687
+#: src/usr/lib/hildon-desktop/ussd-widget.py:686
 msgid "minutes"
 msgstr "минут"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:697
+#: src/usr/lib/hildon-desktop/ussd-widget.py:696
 msgid "Retry pattern"
 msgstr "Шаблон повторных запросов"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:706
+#: src/usr/lib/hildon-desktop/ussd-widget.py:705
 msgid "Additional ussdquery.py options"
 msgstr "Дополнительные опции для ussdquery.py"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:718
+#: src/usr/lib/hildon-desktop/ussd-widget.py:717
 msgid "Enable SMS listener."
 msgstr "Включить обработку СМС"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:726
+#: src/usr/lib/hildon-desktop/ussd-widget.py:725
 msgid "SMS number"
 msgstr "СМС номер"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:745
+#: src/usr/lib/hildon-desktop/ussd-widget.py:744
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:747
+#: src/usr/lib/hildon-desktop/ussd-widget.py:746
 msgid "seconds"
 msgstr "секунд"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:758
+#: src/usr/lib/hildon-desktop/ussd-widget.py:757
 msgid "DO NOT CHANGE. Unspecified is what you want."
 msgstr "НЕ МЕНЯТЬ. \"Не указан\" - то, что надо."
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:768
-#: src/usr/lib/hildon-desktop/ussd-widget.py:773
-#: src/usr/lib/hildon-desktop/ussd-widget.py:778
-#: src/usr/lib/hildon-desktop/ussd-widget.py:783
-#: src/usr/lib/hildon-desktop/ussd-widget.py:788
-#: src/usr/lib/hildon-desktop/ussd-widget.py:793
+#: src/usr/lib/hildon-desktop/ussd-widget.py:767
+#: src/usr/lib/hildon-desktop/ussd-widget.py:772
+#: src/usr/lib/hildon-desktop/ussd-widget.py:777
+#: src/usr/lib/hildon-desktop/ussd-widget.py:782
+#: src/usr/lib/hildon-desktop/ussd-widget.py:787
+#: src/usr/lib/hildon-desktop/ussd-widget.py:792
 msgid "Format help"
 msgstr "Справка по формату"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:768
+#: src/usr/lib/hildon-desktop/ussd-widget.py:767
 msgid ""
 "Reply would be passed to specified utility, output of utility would be shown "
 "to you on widget.\n"
@@ -317,7 +317,7 @@ msgstr ""
 "      Подсказка: используйте echo \"Ваша строка %\" чтобы поместить вашу "
 "строку перед ответом."
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:773
+#: src/usr/lib/hildon-desktop/ussd-widget.py:772
 msgid ""
 "Reply would be passed to specified utility, output of utility would be shown "
 "to you on banner.\n"
@@ -343,7 +343,7 @@ msgstr ""
 "пробелы разделяют аргументы командной строки утилиты      Подсказка: "
 "используйте echo \"Ваша строка %\" чтобы поместить вашу строку перед ответом."
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:778
+#: src/usr/lib/hildon-desktop/ussd-widget.py:777
 msgid ""
 "Reply would be passed to specified utility after parser utility. May be used "
 "for logging, statistics etc.\n"
@@ -367,7 +367,7 @@ msgstr ""
 "\" и ' работают как обычно\n"
 "пробелы разделяют аргументы командной строки утилиты\n"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:783
+#: src/usr/lib/hildon-desktop/ussd-widget.py:782
 msgid ""
 "Standard python regexps. Use\n"
 " (.+?[\\d\\,\\.]+)\n"
@@ -377,7 +377,7 @@ msgstr ""
 " (.+?[\\d\\,\\.]+)\n"
 " чтобы удалить все после первого числа."
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:788
+#: src/usr/lib/hildon-desktop/ussd-widget.py:787
 msgid ""
 "Pauses between attemps (in seconds), delimited by -. For example 15-15-300 "
 "means \"In case of failure wait 15 seconds, try again, on failure wait 15 "
@@ -388,7 +388,7 @@ msgstr ""
 "ждать еще 15 секунд и снова пробовать, в случае ошибки сделать последнюю "
 "попытку еще через 5 минут\""
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:793
+#: src/usr/lib/hildon-desktop/ussd-widget.py:792
 msgid ""
 "USSD number. To perform USSD menu navigation divide queries vith spacebars. "
 "For xample '*100# 1' means 1st entry in *100# menu."
@@ -396,34 +396,39 @@ msgstr ""
 "USSD номер. Чтобы переходить по пунктам USSD меню разделяйте запросы "
 "пробелами. Например, '*100# 1' означает 1ый пункт в меню *100#."
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:798
+#: src/usr/lib/hildon-desktop/ussd-widget.py:797
 msgid "Regexp syntax error"
 msgstr "Синтаксическая ошибка в регулярном выражении"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:803
+#: src/usr/lib/hildon-desktop/ussd-widget.py:802
 msgid "Incorrect USSD number"
 msgstr "Неправильный USSD номер"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:803
+#: src/usr/lib/hildon-desktop/ussd-widget.py:802
 msgid "USSD number should contain only digits, +, * or #"
 msgstr "USSD номер должен состоять только из цифр, +, * и #"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:808
+#: src/usr/lib/hildon-desktop/ussd-widget.py:807
 msgid "Incorrect retry pattern"
 msgstr "Неправильный шаблон повторных запросов"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:808
+#: src/usr/lib/hildon-desktop/ussd-widget.py:807
 msgid "Retry pattern should contain only numbers, delimited by -"
 msgstr "Шаблон повторных запросов должен состоять из чисел, разделенных -"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:813
+#: src/usr/lib/hildon-desktop/ussd-widget.py:812
 msgid "Choose background color"
 msgstr "Выберите цвет фона"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:820
+#: src/usr/lib/hildon-desktop/ussd-widget.py:819
 msgid "Choose text color"
 msgstr "Выберите цвет текста"
 
-#: src/usr/lib/hildon-desktop/ussd-widget.py:827
+#: src/usr/lib/hildon-desktop/ussd-widget.py:826
 msgid "Choose a font"
 msgstr "Выберите шрифт"
+
+#: src/usr/lib/hildon-desktop/ussd-widget.py:1029
+#: src/usr/lib/hildon-desktop/ussd-widget.py:1037
+msgid "Unable to parse colour specification"
+msgstr "Не могу разобрать определение цвета"

diff --git a/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py b/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py
index 3fbe088..52d3141 100755 (executable)
--- a/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py
+++ b/ussd-widget/src/usr/lib/hildon-desktop/ussd-widget.py
@@ -258,7 +258,7 @@ class USSD_Controller:
                        return self.default_config
 
        def on_show_settings( self, widget ) :
-               dialog = UssdConfigDialog(self.config, self.widget.get_bg_color(), self.widget.get_text_color())
+               dialog = UssdConfigDialog(self.config, self.widget.get_bg_color(), self.widget.get_text_color(), self.id)
 
                while True:
                        if dialog.run() != gtk.RESPONSE_OK :
@@ -396,7 +396,6 @@ class USSD_Controller:
                                        self.sms_counter += 1
                                        self.retry_timer = gobject.timeout_add (1000*self.config[18], self.sms_timeout, self.sms_counter)
                                        
-                                       DBusGMainLoop(set_as_default=True)
                                        self.bus = dbus.SystemBus()
                                        self.sms_signal = self.bus.add_signal_receiver(self.handle_sms, path='/com/nokia/phone/SMS',   dbus_interface='Phone.SMS', signal_name='IncomingSegment')
 
@@ -514,8 +513,8 @@ class pHelpDialog(gtk.Dialog):
                self.parent
 
 class UssdConfigDialog(gtk.Dialog):
-       def __init__(self, config, bg_color, text_color):
-               gtk.Dialog.__init__(self, _("USSD widget"), None, 
+       def __init__(self, config, bg_color, text_color, id):
+               gtk.Dialog.__init__(self, _("USSD widget : "+id), None, 
                        gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_NO_SEPARATOR,
                        (_("Save").encode("utf-8"), gtk.RESPONSE_OK))
 
@@ -972,6 +971,12 @@ class UssdWidgetPlugin(hildondesktop.HomePluginItem):
 
                self.vbox.show_all()
 
+               DBusGMainLoop(set_as_default=True)
+               bus = dbus.SystemBus()
+               signal = bus.add_signal_receiver(self.set_bg_color_text, path='/su/kibergus/ussd_widget',   dbus_interface='su.kibergus.ussd_widget', signal_name='set_bg_color')
+               signal = bus.add_signal_receiver(self.set_text_color_text, path='/su/kibergus/ussd_widget',   dbus_interface='su.kibergus.ussd_widget', signal_name='set_text_color')
+               signal = bus.add_signal_receiver(self.ussd_renew, path='/su/kibergus/ussd_widget',   dbus_interface='su.kibergus.ussd_widget', signal_name='renew')
+
        def do_show(self):
                config = self.controller.read_config(self.get_applet_id())
                self.set_width(config[5])
@@ -1012,6 +1017,26 @@ class UssdWidgetPlugin(hildondesktop.HomePluginItem):
                else :
                        self.label.set_width_chars(-1)
 
+       def ussd_renew(self, id):
+               if id == self.get_applet_id():
+                       self.controller.ussd_renew(self, None)
+
+       def set_bg_color_text(self, id, color):
+               if id == self.get_applet_id():
+                       try :
+                               self.set_bg_color(gtk.gdk.color_parse(color.strip()))
+                       except:
+                               print _("Unable to parse colour specification")
+                       self.queue_draw()
+
+       def set_text_color_text(self, id, color):
+               if id == self.get_applet_id():
+                       try:
+                               self.set_text_color(gtk.gdk.color_parse(color.strip()))
+                       except:
+                               print _("Unable to parse colour specification")
+                       self.queue_draw()
+
        def set_bg_color(self, color):
                self.bg_color = color
 

diff --git a/ussd-widget/src/usr/share/locale/ru/LC_MESSAGES/ussd-widget.mo b/ussd-widget/src/usr/share/locale/ru/LC_MESSAGES/ussd-widget.mo
index 09a2f16..76b1602 100644 (file)
Binary files a/ussd-widget/src/usr/share/locale/ru/LC_MESSAGES/ussd-widget.mo and b/ussd-widget/src/usr/share/locale/ru/LC_MESSAGES/ussd-widget.mo differ