Commit 3f951b6f authored by Danial Behzadi's avatar Danial Behzadi
Browse files

v2.8

parent 712428cf
......@@ -4,11 +4,9 @@
from distutils.util import strtobool
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('Gdk', '3.0')
from gi.repository import Gdk, Gio, Gtk, GLib
gi.require_versions({'Gdk': '3.0', 'Gtk': '3.0', 'Notify': '0.7'})
from gi.repository import Gdk, Gio, Gtk, GLib, Notify
import gettext
import notify2
import os
import re
import signal
......@@ -26,7 +24,7 @@ locale_dir = s_data_dir+"/locales"
translate = gettext.translation('messages', localedir=locale_dir, fallback=True)
_ = translate.gettext
app_name = _("Carburetor")
notify2.init(app_name)
Notify.init(app_name)
class ToolButton(Gtk.ToolButton):
......@@ -79,8 +77,8 @@ class StartButton(ToolButton):
self.show_all()
def notify(self):
notif = notify2.Notification(app_name, self.notification)
notif.set_timeout(notify2.EXPIRES_DEFAULT)
notif = Notify.Notification.new(app_name, self.notification)
notif.set_timeout(Notify.EXPIRES_DEFAULT)
notif.show()
def update_label(self):
......@@ -148,8 +146,9 @@ class ProgressBar(Gtk.ProgressBar):
Gtk.ProgressBar.__init__(self)
def set_progress(self, percentage):
fraction = float(percentage) / 100
self.set_fraction(fraction)
if isinstance(percentage, int):
fraction = float(percentage) / 100
self.set_fraction(fraction)
class StopButton(Gtk.Button):
def __init__(self):
......@@ -247,10 +246,10 @@ class NewidButton(ToolButton):
if self.is_running():
newid = Popen(command + "newid", stdout=PIPE, shell=True)
newid.wait()
notif = notify2.Notification(app_name, _("You have a new identity!"))
notif = notify.Notification.new(app_name, _("You have a new identity!"))
else:
notif = notify2.Notification(app_name, _("Tractor is not running!"))
notif.set_timeout(notify2.EXPIRES_DEFAULT)
notif = notify.Notification.new(app_name, _("Tractor is not running!"))
notif.set_timeout(notify.EXPIRES_DEFAULT)
notif.show()
......
carburetor (2.8-1) bionic; urgency=medium
* use internal gi notification
* fix a bug in setting progress button
-- Danial Behzadi <dani.behzi@ubuntu.com> Mon, 07 Oct 2019 18:35:00 +0330
carburetor (2.7-1) bionic; urgency=medium
* add http tunnel port
......
......@@ -7,7 +7,7 @@ Build-Depends: debhelper (>=9)
Package: carburetor
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, tractor (>=2.4-0~), python3, python3-gi(>=3.10.2), python3-gi-cairo, gir1.2-gtk-3.0, python3-distutils, python3-notify2
Depends: ${shlibs:Depends}, ${misc:Depends}, tractor (>=2.4-0~), python3, python3-gi(>=3.10.2), python3-gi-cairo, gir1.2-gtk-3.0, python3-distutils
Description: Settings app for Tractor
This package is a graphical settings for tractor
which is an app using Python stem to provide
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-07-09 13:38+0430\n"
"POT-Creation-Date: 2019-10-07 18:35+0330\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -17,232 +17,232 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: carburetor:28
#: carburetor:26
msgid "Carburetor"
msgstr ""
#: carburetor:47
#: carburetor:45
msgid "Stop"
msgstr ""
#: carburetor:62
#: carburetor:60
msgid "Tractor is running"
msgstr ""
#: carburetor:65
#: carburetor:63
msgid "Start"
msgstr ""
#: carburetor:70
#: carburetor:68
msgid "Tractor is stopped"
msgstr ""
#: carburetor:115
#: carburetor:113
msgid "stopping…"
msgstr ""
#: carburetor:121
#: carburetor:119
msgid "starting…"
msgstr ""
#: carburetor:212
#: carburetor:211
msgid "Unset Proxy"
msgstr ""
#: carburetor:217
#: carburetor:216
msgid "Set Proxy"
msgstr ""
#: carburetor:240
#: carburetor:239
msgid "New ID"
msgstr ""
#: carburetor:250
#: carburetor:249
msgid "You have a new identity!"
msgstr ""
#: carburetor:252
#: carburetor:251
msgid "Tractor is not running!"
msgstr ""
#: carburetor:262
#: carburetor:261
msgid "Settings for Tractor"
msgstr ""
#: carburetor:288
#: carburetor:287
msgid "Austria"
msgstr ""
#: carburetor:289
#: carburetor:288
msgid "Bulgaria"
msgstr ""
#: carburetor:290
#: carburetor:289
msgid "Canada"
msgstr ""
#: carburetor:291
#: carburetor:290
msgid "Czech"
msgstr ""
#: carburetor:292
#: carburetor:291
msgid "Finland"
msgstr ""
#: carburetor:293
#: carburetor:292
msgid "France"
msgstr ""
#: carburetor:294
#: carburetor:293
msgid "Germany"
msgstr ""
#: carburetor:295
#: carburetor:294
msgid "Ireland"
msgstr ""
#: carburetor:296
#: carburetor:295
msgid "Moldova"
msgstr ""
#: carburetor:297
#: carburetor:296
msgid "Netherlands"
msgstr ""
#: carburetor:298
#: carburetor:297
msgid "Norway"
msgstr ""
#: carburetor:299
#: carburetor:298
msgid "Poland"
msgstr ""
#: carburetor:300
#: carburetor:299
msgid "Romania"
msgstr ""
#: carburetor:301
#: carburetor:300
msgid "Russia"
msgstr ""
#: carburetor:302
#: carburetor:301
msgid "Seychelles"
msgstr ""
#: carburetor:303
#: carburetor:302
msgid "Singapore"
msgstr ""
#: carburetor:304
#: carburetor:303
msgid "Spain"
msgstr ""
#: carburetor:305
#: carburetor:304
msgid "Sweden"
msgstr ""
#: carburetor:306
#: carburetor:305
msgid "Switzerland"
msgstr ""
#: carburetor:307
#: carburetor:306
msgid "Ukraine"
msgstr ""
#: carburetor:308
#: carburetor:307
msgid "United Kingdom"
msgstr ""
#: carburetor:309
#: carburetor:308
msgid "United States"
msgstr ""
#: carburetor:318
#: carburetor:317
msgid "<b>Exit node</b>"
msgstr ""
#: carburetor:322
#: carburetor:321
msgid "<small>The country you want to connect from</small>"
msgstr ""
#: carburetor:330
#: carburetor:329
msgid "Auto (Best)"
msgstr ""
#: carburetor:347
#: carburetor:346
msgid "<b>Socks Port</b>"
msgstr ""
#: carburetor:351
#: carburetor:350
msgid "<small>Local port on which Tractor would be listen</small>"
msgstr ""
#: carburetor:375
#: carburetor:374
msgid "<b>DNS Port</b>"
msgstr ""
#: carburetor:379
#: carburetor:378
msgid ""
"<small>Local port on which you would have an anonymous name server</small>"
msgstr ""
#: carburetor:403
#: carburetor:402
msgid "<b>HTTP Tunnel Port</b>"
msgstr ""
#: carburetor:407
#: carburetor:406
msgid "<small>Local port on which a HTTP tunnel would be listen</small>"
msgstr ""
#: carburetor:431
#: carburetor:430
msgid "<b>Accept connection</b>"
msgstr ""
#: carburetor:435
#: carburetor:434
msgid ""
"<small>Whether or not allowing external devices to use this network</small>"
msgstr ""
#: carburetor:455
#: carburetor:454
msgid "<b>Use bridges</b>"
msgstr ""
#: carburetor:459
#: carburetor:458
msgid "<small>Bridges help you to bypass tor sensorship</small>"
msgstr ""
#: carburetor:479
#: carburetor:478
msgid "Bridges:"
msgstr ""
#: carburetor:500
#: carburetor:499
msgid "Save"
msgstr ""
#: carburetor:513
#: carburetor:512
msgid "Can not save the bridges"
msgstr ""
#: carburetor:514
#: carburetor:513
msgid "Please check the syntax of bridges"
msgstr ""
#: carburetor:529
#: carburetor:528
msgid "<b>obfs4proxy executable</b>"
msgstr ""
#: carburetor:533
#: carburetor:532
msgid "<small>You should specify where is obfs4proxy file</small>"
msgstr ""
#: carburetor:560
#: carburetor:559
msgid "General"
msgstr ""
#: carburetor:561
#: carburetor:560
msgid "Ports"
msgstr ""
#: carburetor:562
#: carburetor:561
msgid "Bridges"
msgstr ""
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment