diff --git a/.travis.yml b/.travis.yml index 6b0e4916..5dbda892 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,6 @@ addons: - libcap-dev install: - python setup.py install -script: pybitmessage -t +script: + - python checkdeps.py + - pybitmessage -t diff --git a/README.md b/README.md index 5dfe24df..c3dcb540 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ pseudo-mailing list: BM-2D9QKN4teYRvoq2fyzpiftPh9WP9qggtzh Feel welcome to join chan "bitmessage", BM-2cWy7cvHoq3f1rYMerRJp8PT653jjSuEdY -which is on preview here: http://beamstat.com/chan/bitmessage +which is on preview here: https://beamstat.com/chan/bitmessage References ---------- diff --git a/android_instruction.rst b/android_instruction.rst new file mode 100644 index 00000000..fab55b55 --- /dev/null +++ b/android_instruction.rst @@ -0,0 +1,43 @@ +PyBitmessage(Android) + +This sample aims to be as close to a real world example of a mobile. It has a more refined design and also provides a practical example of how a mobile app would interact and communicate with its adresses. + +Steps for trying out this sample: + +Compile and install the mobile app onto your mobile device or emulator. + + +Getting Started + +This sample uses the kivy as Kivy is an open source, cross-platform Python framework for the development of applications that make use of innovative, multi-touch user interfaces. The aim is to allow for quick and easy interaction design and rapid prototyping whilst making your code reusable and deployable. + +Kivy is written in Python and Cython, supports various input devices and has an extensive widget library. With the same codebase, you can target Windows, OS X, Linux, Android and iOS. All Kivy widgets are built with multitouch support. + +Kivy in support take Buildozer which is a tool that automates the entire build process. It downloads and sets up all the prequisites for python-for-android, including the android SDK and NDK, then builds an apk that can be automatically pushed to the device. + +Buildozer currently works only in Linux, and is an alpha release, but it already works well and can significantly simplify the apk build. + +To build this project, use the "Buildozer android release deploy run" command or use. +Buildozer ue=sed for creating application packages easily.The goal is to have one "buildozer.spec" file in your app directory, describing your application requirements and settings such as title, icon, included modules etc. Buildozer will use that spec to create a package for Android, iOS, Windows, OSX and/or Linux. + +Installing Requirements + +You can create a package for android using the python-for-android project as with using the Buildozer tool to automate the entire process. You can also see Packaging your application for the Kivy Launcher to run kivy programs without compiling them. + +You can get buildozer at https://github.com/kivy/buildozer or you can directly install using pip install buildozer + +This will install buildozer in your system. Afterwards, navigate to your project directory and run: + +buildozer init + +This creates a buildozer.spec file controlling your build configuration. You should edit it appropriately with your app name etc. You can set variables to control most or all of the parameters passed to python-for-android. + +Install buildozer’s dependencies. + +Finally, plug in your android device and run: + +buildozer android debug deploy run >> To build, push and automatically run the apk on your device. Here we used debug as tested in debug mode for now. + +Packaging your application for the Kivy Launcher + + diff --git a/checkdeps.py b/checkdeps.py index f261c924..c0e10051 100755 --- a/checkdeps.py +++ b/checkdeps.py @@ -11,6 +11,7 @@ Limitations: """ import os +import sys from distutils.errors import CompileError try: from setuptools.dist import Distribution @@ -136,6 +137,8 @@ if prereqs: OPSYS = detectOS() CMD = PACKAGE_MANAGER[OPSYS] if OPSYS in PACKAGE_MANAGER else 'UNKNOWN_INSTALLER' for lhs, rhs in EXTRAS_REQUIRE.items(): + if OPSYS is None: + break if rhs and any([ EXTRAS_REQUIRE_DEPS[x][OPSYS] for x in rhs @@ -161,5 +164,7 @@ if (not compiler or prereqs) and OPSYS in PACKAGE_MANAGER: if not compiler: compilerToPackages() prereqToPackages() + if mandatory: + sys.exit(1) else: print("All the dependencies satisfied, you can install PyBitmessage") diff --git a/setup.cfg b/setup.cfg index 93efd2d5..3236eed1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,7 +11,11 @@ ignore = E722,F841 # F841: pylint is preferred for unused-variable # pylint honours the [MESSAGES CONTROL] section +# as well as [MASTER] section [MESSAGES CONTROL] disable=invalid-name,bare-except,broad-except # invalid-name: needs fixing during a large, project-wide refactor # bare-except,broad-except: Need fixing once thorough testing is easier + +[MASTER] +init-hook = import sys;sys.path.append('src') diff --git a/src/bitmessagekivy/kivy_helper_search.py b/src/bitmessagekivy/kivy_helper_search.py new file mode 100644 index 00000000..684a1722 --- /dev/null +++ b/src/bitmessagekivy/kivy_helper_search.py @@ -0,0 +1,45 @@ +from helper_sql import * + + +def search_sql(xAddress="toaddress", account=None, folder="inbox", where=None, what=None, unreadOnly=False): + if what is not None and what != "": + what = "%" + what + "%" + else: + what = None + + if folder == "sent": + sqlStatementBase = ''' + SELECT toaddress, fromaddress, subject, status, ackdata, lastactiontime + FROM sent ''' + else: + sqlStatementBase = '''SELECT folder, msgid, toaddress, fromaddress, subject, received, read + FROM inbox ''' + sqlStatementParts = [] + sqlArguments = [] + if account is not None: + if xAddress == 'both': + sqlStatementParts.append("(fromaddress = ? OR toaddress = ?)") + sqlArguments.append(account) + sqlArguments.append(account) + else: + sqlStatementParts.append(xAddress + " = ? ") + sqlArguments.append(account) + if folder is not None: + if folder == "new": + folder = "inbox" + unreadOnly = True + sqlStatementParts.append("folder = ? ") + sqlArguments.append(folder) + else: + sqlStatementParts.append("folder != ?") + sqlArguments.append("trash") + if what is not None: + sqlStatementParts.append("%s LIKE ?" % (where)) + sqlArguments.append(what) + if unreadOnly: + sqlStatementParts.append("read = 0") + if len(sqlStatementParts) > 0: + sqlStatementBase += "WHERE " + " AND ".join(sqlStatementParts) + if folder == "sent": + sqlStatementBase += " ORDER BY lastactiontime" + return sqlQuery(sqlStatementBase, sqlArguments) diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv index 3c73080a..ea8936c5 100644 --- a/src/bitmessagekivy/main.kv +++ b/src/bitmessagekivy/main.kv @@ -1,167 +1,354 @@ -#:import FadeTransition kivy.uix.screenmanager.FadeTransition +#:import la kivy.adapters.listadapter +#:import factory kivy.factory +#:import mpybit bitmessagekivy.mpybit +#:import C kivy.utils.get_color_from_hex -: - BoxLayout: - orientation: "vertical" - BoxLayout: - size_hint: 1, None - height: '48dp' - Button: - text: 'messages' - on_release: sm.current = 'screen_one' - background_color: (0,0,0,0) - color: 0,0,0,1 - Button: - text: 'send' - on_release: sm.current = 'screen_two' - background_color: (0,0,0,0) - color: 0,0,0,1 - Button: - text: 'subscription' - on_release: sm.current = 'screen_three' - background_color: (0,0,0,0) - color: 0,0,0,1 - Button: - text: 'four' - on_release: sm.current = 'screen_four' - background_color: (0,0,0,0) - color: 0,0,0,1 +: + id: nav_drawer + NavigationDrawerIconButton: + Spinner: + pos_hint:{"x":0,"y":.3} + id: btn + background_color: app.theme_cls.primary_dark + text: app.showmeaddresses(name='text') + values: app.showmeaddresses(name='values') + on_text:app.getCurrentAccountData(self.text) - Button: - text: 'chans' - on_release: sm.current = 'screen_five' - background_color: (0,0,0,0) - color: 0,0,0,1 - Button: - text: 'blacklist' - on_release: sm.current = 'screen_six' - background_color: (0,0,0,0) - color: 0,0,0,1 - - ScreenManager: - id: sm - transition: FadeTransition() - Screen_One: - Screen_Two: - Screen_three: - Screen_four: - Screen_five: - Screen_six: - EmailScreen: - -: - name: 'screen_one' - BoxLayout: - padding: 10,10,10,300 - orientation: "vertical" + NavigationDrawerIconButton: + icon: 'email-open' + text: "inbox" + on_release: app.root.ids.scr_mngr.current = 'inbox' + NavigationDrawerIconButton: + icon: 'mail-send' + text: "sent" + on_release: app.root.ids.scr_mngr.current = 'sent' + NavigationDrawerIconButton: + icon: 'dropbox' + text: "trash" + on_release: app.root.ids.scr_mngr.current = 'trash' + NavigationDrawerIconButton: + icon: 'email' + text: "drafts" + on_release: app.root.ids.scr_mngr.current = 'dialog' + NavigationDrawerIconButton: + icon: 'markunread-mailbox' + text: "test" + on_release: app.root.ids.scr_mngr.current = 'test' + NavigationDrawerIconButton: + text: "new identity" + icon:'accounts-add' + on_release: app.root.ids.scr_mngr.current = 'newidentity' + +BoxLayout: + orientation: 'vertical' + Toolbar: + id: toolbar + title: app.getCurrentAccount() + background_color: app.theme_cls.primary_dark + left_action_items: [['menu', lambda x: app.nav_drawer.toggle()]] Button: - text: "create" - size_hint_y: 0.3 - size_hint_x: 0.1 + text:"EXIT" color: 0,0,0,1 background_color: (0,0,0,0) - Button: - text: "inbox" - background_color: (0,0,0,0) - size_hint_y: 0.3 + size_hint_y: 0.4 size_hint_x: 0.1 - color: 0,0,0,1 - Button: - text: "new" - background_color: (0,0,0,0) - size_hint_y: 0.3 - size_hint_x: 0.1 - color: 0,0,0,1 - on_press: - root.manager.current = 'email' - Button: - text: "sents" - background_color: (0,0,0,0) - size_hint_y: 0.3 - size_hint_x: 0.1 - color: 0,0,0,1 + pos_hint: {'x': 0.8, 'y':0.4} + on_press: app.say_exit() -: - name: 'screen_two' - Label: - text: "Two" -: - name: 'screen_three' - Label: - text: "Three" + ScreenManager: + id: scr_mngr + Inbox: + id:sc1 + Sent: + id:sc2 + Trash: + id:sc3 + Dialog: + id:sc4 + Test: + id:sc5 + Create: + id:sc6 + NewIdentity: + id:sc7 + Page: + id:sc8 + AddressSuccessful: + id:sc9 -: - name: 'screen_four' - Label: - text: "four" + Button: + id:create + height:100 + size_hint_y: 0.13 + size_hint_x: 0.1 + pos_hint: {'x': 0.85, 'y': 0.5} + background_color: (0,0,0,0) + on_press: scr_mngr.current = 'create' + Image: + source: 'images/plus.png' + y: self.parent.y - 7.5 + x: self.parent.x + self.parent.width - 50 + size: 70, 70 -: - name: 'screen_five' - Label: - text: "Two" +: + text: '' + size_hint_y: None + height: 48 + ignore_perpendicular_swipes: True + data_index: 0 + min_move: 20 / self.width -: - name: 'screen_six' - Label: - text: "Two" + on__offset: app.update_index(root.data_index, self.index) -: - name: 'email' - BoxLayout: - padding: 100,10,100,100 - id: login_layout - orientation: "vertical" - GridLayout: - rows: 2 + canvas.before: + Color: + rgba: C('FFFFFF33') + + Rectangle: + pos: self.pos + size: self.size + + Line: + rectangle: self.pos + self.size + + Button: + text: 'delete ({}:{})'.format(root.text, root.data_index) + on_press: app.delete(root.data_index) + + Button: + text: root.text + on_press: app.getInboxMessageDetail(self.text) + + Button: + text: 'archive' + on_press: app.archive(root.data_index) + +: + name: 'inbox' + RecycleView: + data: root.data + viewclass: 'SwipeButton' + do_scroll_x: False + scroll_timeout: 100 + + RecycleBoxLayout: + id:rc orientation: 'vertical' - spacing: 10 - Label: - text: 'From: ' - background_color: (0,0,0,0) - color: 0,0,0,1 - font_size: 18 - pos_hint: {"x":.15,"y":1} - text_size: root.width-20, 20 + size_hint_y: None + height: self.minimum_height + default_size_hint: 1, None + canvas.before: + Color: + rgba: 0,0,0, 1 + Rectangle: + pos: self.pos + size: self.size - TextInput: - multiline:False - size_hint: 1,.4 +: + name: 'sent' + RecycleView: + data: root.data + viewclass: 'SwipeButton' + do_scroll_x: False + scroll_timeout: 100 - GridLayout: - rows: 2 + RecycleBoxLayout: + id:rc orientation: 'vertical' - Label: - text: 'To: ' - background_color: (0,0,0,0) - color: 0,0,0,1 - font_size: 18 - pos_hint: {"x":.15,"y":.5} - text_size: root.width-20, 20 + size_hint_y: None + height: self.minimum_height + default_size_hint: 1, None + canvas.before: + Color: + rgba: 0,0,0, 1 + Rectangle: + pos: self.pos + size: self.size - TextInput: - multiline:False - size_hint: 1,.4 - pos_hint: {"x":.2,"y":.5} +: + name: 'trash' + RecycleView: + data: root.data + viewclass: 'SwipeButton' + do_scroll_x: False + scroll_timeout: 100 - GridLayout: - rows: 2 + RecycleBoxLayout: + id:rc orientation: 'vertical' - Label: - text: 'Message' - background_color: (0,0,0,0) - color: 0,0,0,1 - pos_hint: {"x":.15,"y":.5} - font_size: 18 - text_size: root.width-20, 20 + size_hint_y: None + height: self.minimum_height + default_size_hint: 1, None + canvas.before: + Color: + rgba: 0,0,0, 1 + Rectangle: + pos: self.pos + size: self.size +: + name: 'dialog' + Label: + text:"I have a good dialox box" + color: 0,0,0,1 +: + name: 'test' + Label: + text:"I am in test" + color: 0,0,0,1 + +: + name: 'create' + GridLayout: + rows: 5 + cols: 1 + padding: 60,60,60,60 + spacing: 50 + BoxLayout: + size_hint_y: None + height: '32dp' + Label: + text: 'FROM' + color: 0,0,0,1 + Spinner: + size_hint: 1,1 + pos_hint: {"x":0,"top":1.} + pos: 10,10 + id: spinner_id + text: app.showmeaddresses(name='text') + values: app.showmeaddresses(name='values') + + BoxLayout: + size_hint_y: None + height: '32dp' + Label: + text: 'TO' + color: 0,0,0,1 TextInput: - id: msg + id: recipent + hint_text: 'To' + + BoxLayout: + size_hint_y: None + height: '32dp' + Label: + text: 'SUBJECT' + color: 0,0,0,1 + TextInput: + id: subject + hint_text: 'SUBJECT' + + BoxLayout: + size_hint_y: None + height: '32dp' + Label: + text: 'BODY' + color: 0,0,0,1 + TextInput: + id: message multiline:True size_hint: 1,2 - Button: - text: "SEND" - size_hint_y: 0.1 - size_hint_x: 0.2 - pos_hint: {"x":.15,"y":1} \ No newline at end of file + Button: + text: 'send' + size_hint_y: 0.1 + size_hint_x: 0.2 + height: '32dp' + pos_hint: {'x': .5, 'y': 0.1} + on_press: root.send() + Button: + text: 'cancel' + size_hint_y: 0.1 + size_hint_x: 0.2 + height: '32dp' + pos_hint: {'x': .72, 'y': 0.1} + on_press: root.cancel() + +: + name: 'newidentity' + GridLayout: + padding: '120dp' + cols: 1 + Label: + text:"""Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged.""" + line_height:1.5 + text_size:(700,None) + color: 0,0,0,1 + BoxLayout: + CheckBox: + canvas.before: + Color: + rgb: 1,0,0 + Ellipse: + pos:self.center_x-8, self.center_y-8 + size:[16,16] + group: "money" + id:chk + text:"use a random number generator to make an address" + on_active: + root.checked = self.text + active:root.is_active + + Label: + text: "use a random number generator to make an address" + color: 0,0,0,1 + BoxLayout: + CheckBox: + canvas.before: + Color: + rgb: 1,0,0 + Ellipse: + pos:self.center_x-8, self.center_y-8 + size:[16,16] + group: "money" + id:chk + text:"use a pseudo number generator to make an address" + on_active: + root.checked = self.text + active:not root.is_active + Label: + text: "use a pseudo number generator to make an address" + color: 0,0,0,1 + Label: + color: 0,0,0,1 + size_hint_x: .35 + markup: True + text: "[b]{}[/b]".format("Randomly generated addresses") + BoxLayout: + size_hint_y: None + height: '32dp' + Label: + text: "Label (not shown to anyone except you)" + color: 0,0,0,1 + BoxLayout: + size_hint_y: None + height: '32dp' + TextInput: + id: label + + Button: + text: 'Cancel' + size_hint_y: 0.1 + size_hint_x: 0.3 + height: '32dp' + pos_hint: {'x': .1, 'y': 0.1} + Button: + text: 'Ok' + size_hint_y: 0.1 + size_hint_x: 0.3 + height: '32dp' + pos_hint: {'x': .5, 'y': 0.1} + on_press: root.generateaddress() + +: + name: 'page' + Label: + text: 'I am on description of my email yooooo' + color: 0,0,0,1 + +: + name: 'add_sucess' + Label: + text: 'Successfully created a new bit address' + color: 0,0,0,1 diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index 88ffb83a..3f9b198b 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -1,48 +1,314 @@ +import kivy_helper_search +import os +import queues +import shutdown +import state import time from kivy.app import App -from kivy.core.window import Window -from kivy.uix.boxlayout import BoxLayout -# from kivy.uix.gridlayout import GridLayout - -from debug import logger - -from addresses import addBMIfNotPresent, decodeAddress - +from kivy.lang import Builder +from kivy.properties import BooleanProperty +from kivy.clock import Clock +from navigationdrawer import NavigationDrawer +from kivy.properties import ObjectProperty, StringProperty, ListProperty +from kivy.uix.screenmanager import Screen +from kivy.uix.textinput import TextInput +from kivymd.theming import ThemeManager +from kivymd.toolbar import Toolbar from bmconfigparser import BMConfigParser - from helper_ackPayload import genAckPayload - +from addresses import decodeAddress, addBMIfNotPresent from helper_sql import sqlExecute -import queues - -import shutdown statusIconColor = 'red' -class LoginScreen(BoxLayout): - """This will use for sending message to recipents from mobile client.""" +class NavigateApp(App, TextInput): + """Application uses kivy in which base Class of Navigate App inherits from the App class.""" + + theme_cls = ThemeManager() + nav_drawer = ObjectProperty() + + def build(self): + """Return a main_widget as a root widget. + + An application can be built if you return a widget on build(), or if you set + self.root. + """ + main_widget = Builder.load_file( + os.path.join(os.path.dirname(__file__), 'main.kv')) + self.nav_drawer = Navigator() + return main_widget + + def getCurrentAccountData(self, text): + """Get Current Address Account Data.""" + state.association = text + self.root.ids.sc1.clear_widgets() + self.root.ids.sc2.clear_widgets() + self.root.ids.sc3.clear_widgets() + self.root.ids.sc1.add_widget(Inbox()) + self.root.ids.sc2.add_widget(Sent()) + self.root.ids.sc3.add_widget(Trash()) + self.root.ids.toolbar.title = BMConfigParser().get( + state.association, 'label') + '({})'.format(state.association) + Inbox() + Sent() + Trash() + + def say_exit(self): + """Exit the application as uses shutdown PyBitmessage.""" + print("**************************EXITING FROM APPLICATION*****************************") + App.get_running_app().stop() + shutdown.doCleanShutdown() + + @staticmethod + def showmeaddresses(name="text"): + """Show the addresses in spinner to make as dropdown.""" + if name == "text": + return BMConfigParser().addresses()[0] + elif name == "values": + return BMConfigParser().addresses() + + def update_index(self, data_index, index): + """Update index after archieve message to trash.""" + if self.root.ids.scr_mngr.current == 'inbox': + self.root.ids.sc1.data[data_index]['index'] = index + elif self.root.ids.scr_mngr.current == 'sent': + self.root.ids.sc2.data[data_index]['index'] = index + elif self.root.ids.scr_mngr.current == 'trash': + self.root.ids.sc3.data[data_index]['index'] = index + + def delete(self, data_index): + """It will make delete using remove function.""" + print("delete {}".format(data_index)) + self._remove(data_index) + + def archive(self, data_index): + """It will make archieve using remove function.""" + print("archive {}".format(data_index)) + self._remove(data_index) + + def _remove(self, data_index): + """It will remove message by resetting the values in recycleview data.""" + if self.root.ids.scr_mngr.current == 'inbox': + self.root.ids.sc1.data.pop(data_index) + self.root.ids.sc1.data = [{ + 'data_index': i, + 'index': d['index'], + 'height': d['height'], + 'text': d['text']} + for i, d in enumerate(self.root.ids.sc1.data) + ] + elif self.root.ids.scr_mngr.current == 'sent': + self.root.ids.sc2.data.pop(data_index) + self.root.ids.sc2.data = [{ + 'data_index': i, + 'index': d['index'], + 'height': d['height'], + 'text': d['text']} + for i, d in enumerate(self.root.ids.sc2.data) + ] + elif self.root.ids.scr_mngr.current == 'trash': + self.root.ids.sc3.data.pop(data_index) + self.root.ids.sc3.data = [{ + 'data_index': i, + 'index': d['index'], + 'height': d['height'], + 'text': d['text']} + for i, d in enumerate(self.root.ids.sc3.data) + ] + + def getInboxMessageDetail(self, instance): + """It will get message detail after make selected message description.""" + try: + self.root.ids.scr_mngr.current = 'page' + except AttributeError: + self.parent.manager.current = 'page' + print('Message Clicked {}'.format(instance)) + + @staticmethod + def getCurrentAccount(): + """It uses to get current account label.""" + return BMConfigParser().get(state.association, 'label') + '({})'.format(state.association) + + +class Navigator(NavigationDrawer): + """Navigator class uses NavigationDrawer. + + It is an UI panel that shows our app's main navigation menu + It is hidden when not in use, but appears when the user swipes + a finger from the left edge of the screen or, when at the top + level of the app, the user touches the drawer icon in the app bar + """ + + image_source = StringProperty('images/qidenticon_two.png') + title = StringProperty('Navigation') + + +class Inbox(Screen): + """Inbox Screen uses screen to show widgets of screens.""" + + data = ListProperty() + + def __init__(self, *args, **kwargs): + super(Inbox, self).__init__(*args, **kwargs) + if state.association == '': + state.association = Navigator().ids.btn.text + Clock.schedule_once(self.init_ui, 0) + + def init_ui(self, dt=0): + """Clock Schdule for method inbox accounts.""" + self.inboxaccounts() + print(dt) + + def inboxaccounts(self): + """Load inbox accounts.""" + account = state.association + self.loadMessagelist(account, 'All', '') + + def loadMessagelist(self, account, where="", what=""): + """Load Inbox list for inbox messages.""" + xAddress = "toaddress" + queryreturn = kivy_helper_search.search_sql( + xAddress, account, 'inbox', where, what, False) + if queryreturn: + self.data = [{ + 'data_index': i, + 'index': 1, + 'height': 48, + 'text': row[4]} + for i, row in enumerate(queryreturn) + ] + else: + self.data = [{ + 'data_index': 1, + 'index': 1, + 'height': 48, + 'text': "yet no message for this account!!!!!!!!!!!!!"} + ] + + +class Page(Screen): + pass + + +class AddressSuccessful(Screen): + pass + + +class Sent(Screen): + """Sent Screen uses screen to show widgets of screens.""" + + data = ListProperty() + + def __init__(self, *args, **kwargs): + super(Sent, self).__init__(*args, **kwargs) + if state.association == '': + state.association = Navigator().ids.btn.text + Clock.schedule_once(self.init_ui, 0) + + def init_ui(self, dt=0): + """Clock Schdule for method sent accounts.""" + self.sentaccounts() + print(dt) + + def sentaccounts(self): + """Load sent accounts.""" + account = state.association + self.loadSent(account, 'All', '') + + def loadSent(self, account, where="", what=""): + """Load Sent list for Sent messages.""" + xAddress = 'fromaddress' + queryreturn = kivy_helper_search.search_sql( + xAddress, account, "sent", where, what, False) + if queryreturn: + self.data = [{ + 'data_index': i, + 'index': 1, + 'height': 48, + 'text': row[2]} + for i, row in enumerate(queryreturn) + ] + else: + self.data = [{ + 'data_index': 1, + 'index': 1, + 'height': 48, + 'text': "yet no message for this account!!!!!!!!!!!!!"} + ] + + +class Trash(Screen): + """Trash Screen uses screen to show widgets of screens.""" + + data = ListProperty() + + def __init__(self, *args, **kwargs): + super(Trash, self).__init__(*args, **kwargs) + if state.association == '': + state.association = Navigator().ids.btn.text + Clock.schedule_once(self.init_ui, 0) + + def init_ui(self, dt=0): + """Clock Schdule for method inbox accounts.""" + self.inboxaccounts() + print(dt) + + def inboxaccounts(self): + """Load inbox accounts.""" + account = state.association + self.loadTrashlist(account, 'All', '') + + def loadTrashlist(self, account, where="", what=""): + """Load Trash list for trashed messages.""" + xAddress = "toaddress" + queryreturn = kivy_helper_search.search_sql( + xAddress, account, 'trash', where, what, False) + if queryreturn: + self.data = [{ + 'data_index': i, + 'index': 1, + 'height': 48, + 'text': row[4]} + for i, row in enumerate(queryreturn) + ] + else: + self.data = [{ + 'data_index': 1, + 'index': 1, + 'height': 48, + 'text': "yet no message for this account!!!!!!!!!!!!!"} + ] + + +class Dialog(Screen): + """Dialog Screen uses screen to show widgets of screens.""" + + pass + + +class Test(Screen): + """Test Screen uses screen to show widgets of screens.""" + + pass + + +class Create(Screen): + """Create Screen uses screen to show widgets of screens.""" + + def __init__(self, *args, **kwargs): + super(Create, self).__init__(*args, **kwargs) def send(self): - """It is used for sending message with subject and body.""" - queues.apiAddressGeneratorReturnQueue.queue.clear() - streamNumberForAddress = 1 - label = "CisDevelper" - eighteenByteRipe = False - nonceTrialsPerByte = 1000 - payloadLengthExtraBytes = 1000 - queues.addressGeneratorQueue.put(( - 'createRandomAddress', 4, - streamNumberForAddress, label, 1, - "", eighteenByteRipe, nonceTrialsPerByte, - payloadLengthExtraBytes - )) - fromAddress = queues.apiAddressGeneratorReturnQueue.get() + """Send message from one address to another.""" + fromAddress = self.ids.spinner_id.text + # For now we are using static address i.e we are not using recipent field value. toAddress = "BM-2cWyUfBdY2FbgyuCb7abFZ49JYxSzUhNFe" - message = self.ids.user_input.text - subject = 'Test' + message = self.ids.message.text + subject = self.ids.subject.text encoding = 3 + print("message: ", self.ids.message.text) sendMessageToPeople = True if sendMessageToPeople: if toAddress != '': @@ -52,14 +318,15 @@ class LoginScreen(BoxLayout): toAddress = addBMIfNotPresent(toAddress) if addressVersionNumber > 4 or addressVersionNumber <= 1: - logger.info("addressVersionNumber > 4 or addressVersionNumber <= 1") + print("addressVersionNumber > 4 or addressVersionNumber <= 1") if streamNumber > 1 or streamNumber == 0: - logger.info("streamNumber > 1 or streamNumber == 0") + print("streamNumber > 1 or streamNumber == 0") if statusIconColor == 'red': - logger.info("shared.statusIconColor == 'red'") + print("shared.statusIconColor == 'red'") stealthLevel = BMConfigParser().safeGetInt( 'bitmessagesettings', 'ackstealthlevel') ackdata = genAckPayload(streamNumber, stealthLevel) + t = () sqlExecute( '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', '', @@ -77,21 +344,50 @@ class LoginScreen(BoxLayout): 'sent', encoding, BMConfigParser().getint('bitmessagesettings', 'ttl')) + toLabel = '' queues.workerQueue.put(('sendmessage', toAddress)) + print("sqlExecute successfully ##### ##################") + self.ids.message.text = '' + self.ids.spinner_id.text = '' + self.ids.subject.text = '' + self.ids.recipent.text = '' + return None -class MainApp(App): - """The App class is the base for creating Kivy applications - Think of it as your main entry point into the Kivy run loop.""" +class NewIdentity(Screen): + """Create new address for PyBitmessage.""" - def build(self): - """To initialize an app with a widget tree, we need to override the build(). - method in our app class and return the widget tree which we have constructed.. - """ - return LoginScreen() + is_active = BooleanProperty(False) + checked = StringProperty("") + # self.manager.parent.ids.create.children[0].source = 'images/plus-4-xxl.png' + + def generateaddress(self): + """Generate new address.""" + if self.checked == 'use a random number generator to make an address': + queues.apiAddressGeneratorReturnQueue.queue.clear() + streamNumberForAddress = 1 + label = self.ids.label.text + eighteenByteRipe = False + nonceTrialsPerByte = 1000 + payloadLengthExtraBytes = 1000 + + queues.addressGeneratorQueue.put(( + 'createRandomAddress', + 4, streamNumberForAddress, + label, 1, "", eighteenByteRipe, + nonceTrialsPerByte, + payloadLengthExtraBytes) + ) + self.manager.current = 'add_sucess' + + +if __name__ == '__main__': + NavigateApp().run() diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 0848b0e4..fb3cccb9 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -398,8 +398,8 @@ class Main: bitmessagecurses.runwrapper() elif state.kivy: BMConfigParser().remove_option('bitmessagesettings', 'dontconnect') - from bitmessagekivy.mpybit import MainApp - MainApp().run() + from bitmessagekivy.mpybit import NavigateApp + NavigateApp().run() else: import bitmessageqt bitmessageqt.run() diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 5e4c18fd..e8bc9769 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -2581,7 +2581,7 @@ class MyForm(settingsmixin.SMainWindow): os.remove(state.appdata + 'knownnodes.dat') previousAppdataLocation = state.appdata state.appdata = paths.lookupExeFolder() - debug.restartLoggingInUpdatedAppdataLocation() + debug.resetLogging() try: os.remove(previousAppdataLocation + 'debug.log') os.remove(previousAppdataLocation + 'debug.log.1') @@ -2599,7 +2599,7 @@ class MyForm(settingsmixin.SMainWindow): knownnodes.saveKnownNodes(state.appdata) os.remove(paths.lookupExeFolder() + 'keys.dat') os.remove(paths.lookupExeFolder() + 'knownnodes.dat') - debug.restartLoggingInUpdatedAppdataLocation() + debug.resetLogging() try: os.remove(paths.lookupExeFolder() + 'debug.log') os.remove(paths.lookupExeFolder() + 'debug.log.1') @@ -2684,6 +2684,19 @@ class MyForm(settingsmixin.SMainWindow): def network_switch(self): dontconnect_option = not BMConfigParser().safeGetBoolean( 'bitmessagesettings', 'dontconnect') + reply = QtGui.QMessageBox.question( + self, _translate("MainWindow", "Disconnecting") + if dontconnect_option else _translate("MainWindow", "Connecting"), + _translate( + "MainWindow", + "Bitmessage will now drop all connectins. Are you sure?" + ) if dontconnect_option else _translate( + "MainWindow", + "Bitmessage will now start connecting to network. Are you sure?" + ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.Cancel, + QtGui.QMessageBox.Cancel) + if reply != QtGui.QMessageBox.Yes: + return BMConfigParser().set( 'bitmessagesettings', 'dontconnect', str(dontconnect_option)) BMConfigParser().save() diff --git a/src/debug.py b/src/debug.py index e851bd02..d3730d7f 100644 --- a/src/debug.py +++ b/src/debug.py @@ -23,6 +23,7 @@ Use: `from debug import logger` to import this facility into whatever module you """ +import ConfigParser import logging import logging.config import os @@ -44,28 +45,26 @@ def log_uncaught_exceptions(ex_cls, ex, tb): def configureLogging(): - have_logging = False + fail_msg = '' try: - logging.config.fileConfig(os.path.join(state.appdata, 'logging.dat')) - have_logging = True - print( - 'Loaded logger configuration from %s' % - os.path.join(state.appdata, 'logging.dat')) - except: - if os.path.isfile(os.path.join(state.appdata, 'logging.dat')): - print( - 'Failed to load logger configuration from %s, using default' - ' logging config\n%s' % - (os.path.join(state.appdata, 'logging.dat'), sys.exc_info())) + logging_config = os.path.join(state.appdata, 'logging.dat') + logging.config.fileConfig(logging_config) + return ( + False, + 'Loaded logger configuration from %s' % logging_config + ) + except (OSError, ConfigParser.NoSectionError): + if os.path.isfile(logging_config): + fail_msg = \ + 'Failed to load logger configuration from %s, using default' \ + ' logging config\n%s' % \ + (logging_config, sys.exc_info()) else: # no need to confuse the user if the logger config is missing entirely - print "Using default logger configuration" + fail_msg = 'Using default logger configuration' sys.excepthook = log_uncaught_exceptions - if have_logging: - return False - logging.config.dictConfig({ 'version': 1, 'formatters': { @@ -84,7 +83,7 @@ def configureLogging(): 'class': 'logging.handlers.RotatingFileHandler', 'formatter': 'default', 'level': log_level, - 'filename': state.appdata + 'debug.log', + 'filename': os.path.join(state.appdata, 'debug.log'), 'maxBytes': 2097152, # 2 MiB 'backupCount': 1, 'encoding': 'UTF-8', @@ -109,26 +108,28 @@ def configureLogging(): 'handlers': ['console'], }, }) - return True + return True, fail_msg -# TODO (xj9): Get from a config file. -# logger = logging.getLogger('console_only') def initLogging(): - if configureLogging(): + preconfigured, msg = configureLogging() + if preconfigured: if '-c' in sys.argv: logger = logging.getLogger('file_only') else: logger = logging.getLogger('both') else: logger = logging.getLogger('default') + + if msg: + logger.log(logging.WARNING if preconfigured else logging.INFO, msg) return logger -def restartLoggingInUpdatedAppdataLocation(): +def resetLogging(): global logger - for i in list(logger.handlers): + for i in logger.handlers.iterkeys(): logger.removeHandler(i) i.flush() i.close() diff --git a/src/depends.py b/src/depends.py index 06150642..9a2e2158 100755 --- a/src/depends.py +++ b/src/depends.py @@ -19,16 +19,16 @@ import os from importlib import import_module # We can now use logging so set up a simple configuration -formatter = logging.Formatter( - '%(levelname)s: %(message)s' -) +formatter = logging.Formatter('%(levelname)s: %(message)s') handler = logging.StreamHandler(sys.stdout) handler.setFormatter(formatter) logger = logging.getLogger('both') logger.addHandler(handler) logger.setLevel(logging.ERROR) + OS_RELEASE = { + "Debian GNU/Linux".lower(): "Debian", "fedora": "Fedora", "opensuse": "openSUSE", "ubuntu": "Ubuntu", @@ -137,7 +137,7 @@ def detectOSRelease(): for line in osRelease: if line.startswith("NAME="): detectOS.result = OS_RELEASE.get( - line.split("=")[-1].strip().lower()) + line.replace('"', '').split("=")[-1].strip().lower()) elif line.startswith("VERSION_ID="): try: version = float(line.split("=")[1].replace("\"", "")) @@ -363,7 +363,7 @@ def check_curses(): import subprocess try: - subprocess.check_call('which dialog') + subprocess.check_call(['which', 'dialog']) except subprocess.CalledProcessError: logger.error( 'Curses requires the `dialog` command to be installed as well as' @@ -463,3 +463,6 @@ def check_dependencies(verbose=False, optional=False): 'PyBitmessage cannot start. One or more dependencies are' ' unavailable.' ) + + +logger.setLevel(0) diff --git a/src/images/blue-plus-icon-12.png b/src/images/blue-plus-icon-12.png new file mode 100644 index 00000000..f9007861 Binary files /dev/null and b/src/images/blue-plus-icon-12.png differ diff --git a/src/images/kivymd_logo.png b/src/images/kivymd_logo.png new file mode 100644 index 00000000..ce39b0d4 Binary files /dev/null and b/src/images/kivymd_logo.png differ diff --git a/src/images/me.jpg b/src/images/me.jpg new file mode 100644 index 00000000..f54c791f Binary files /dev/null and b/src/images/me.jpg differ diff --git a/src/images/ngletteravatar/1.png b/src/images/ngletteravatar/1.png new file mode 100644 index 00000000..9436c7d2 Binary files /dev/null and b/src/images/ngletteravatar/1.png differ diff --git a/src/images/ngletteravatar/12.png b/src/images/ngletteravatar/12.png new file mode 100644 index 00000000..de894b4a Binary files /dev/null and b/src/images/ngletteravatar/12.png differ diff --git a/src/images/ngletteravatar/14.png b/src/images/ngletteravatar/14.png new file mode 100644 index 00000000..42b692dd Binary files /dev/null and b/src/images/ngletteravatar/14.png differ diff --git a/src/images/ngletteravatar/3.png b/src/images/ngletteravatar/3.png new file mode 100644 index 00000000..ad83cef2 Binary files /dev/null and b/src/images/ngletteravatar/3.png differ diff --git a/src/images/ngletteravatar/5.png b/src/images/ngletteravatar/5.png new file mode 100644 index 00000000..3875aace Binary files /dev/null and b/src/images/ngletteravatar/5.png differ diff --git a/src/images/ngletteravatar/56.png b/src/images/ngletteravatar/56.png new file mode 100644 index 00000000..33f038cf Binary files /dev/null and b/src/images/ngletteravatar/56.png differ diff --git a/src/images/ngletteravatar/65.png b/src/images/ngletteravatar/65.png new file mode 100644 index 00000000..fb608098 Binary files /dev/null and b/src/images/ngletteravatar/65.png differ diff --git a/src/images/ngletteravatar/8.png b/src/images/ngletteravatar/8.png new file mode 100644 index 00000000..dd2671e9 Binary files /dev/null and b/src/images/ngletteravatar/8.png differ diff --git a/src/images/ngletteravatar/90.png b/src/images/ngletteravatar/90.png new file mode 100644 index 00000000..7d1770ab Binary files /dev/null and b/src/images/ngletteravatar/90.png differ diff --git a/src/images/ngletteravatar/Galleryr_rcirclelogo_Small.jpg b/src/images/ngletteravatar/Galleryr_rcirclelogo_Small.jpg new file mode 100644 index 00000000..8e3b1c35 Binary files /dev/null and b/src/images/ngletteravatar/Galleryr_rcirclelogo_Small.jpg differ diff --git a/src/images/ngletteravatar/a.png b/src/images/ngletteravatar/a.png new file mode 100644 index 00000000..1c3bb8bf Binary files /dev/null and b/src/images/ngletteravatar/a.png differ diff --git a/src/images/ngletteravatar/b.png b/src/images/ngletteravatar/b.png new file mode 100644 index 00000000..462bf808 Binary files /dev/null and b/src/images/ngletteravatar/b.png differ diff --git a/src/images/ngletteravatar/c.png b/src/images/ngletteravatar/c.png new file mode 100644 index 00000000..180b7edc Binary files /dev/null and b/src/images/ngletteravatar/c.png differ diff --git a/src/images/ngletteravatar/d.png b/src/images/ngletteravatar/d.png new file mode 100644 index 00000000..9e983e4d Binary files /dev/null and b/src/images/ngletteravatar/d.png differ diff --git a/src/images/ngletteravatar/depositphotos_142729281-stock-illustration-letter-l-sign-design-template.jpg b/src/images/ngletteravatar/depositphotos_142729281-stock-illustration-letter-l-sign-design-template.jpg new file mode 100644 index 00000000..7630511f Binary files /dev/null and b/src/images/ngletteravatar/depositphotos_142729281-stock-illustration-letter-l-sign-design-template.jpg differ diff --git a/src/images/ngletteravatar/e.png b/src/images/ngletteravatar/e.png new file mode 100644 index 00000000..60961992 Binary files /dev/null and b/src/images/ngletteravatar/e.png differ diff --git a/src/images/ngletteravatar/g.png b/src/images/ngletteravatar/g.png new file mode 100644 index 00000000..762cc6fa Binary files /dev/null and b/src/images/ngletteravatar/g.png differ diff --git a/src/images/ngletteravatar/h.png b/src/images/ngletteravatar/h.png new file mode 100644 index 00000000..8f752952 Binary files /dev/null and b/src/images/ngletteravatar/h.png differ diff --git a/src/images/ngletteravatar/i.png b/src/images/ngletteravatar/i.png new file mode 100644 index 00000000..a89710ef Binary files /dev/null and b/src/images/ngletteravatar/i.png differ diff --git a/src/images/ngletteravatar/j.png b/src/images/ngletteravatar/j.png new file mode 100644 index 00000000..926de34c Binary files /dev/null and b/src/images/ngletteravatar/j.png differ diff --git a/src/images/ngletteravatar/k.png b/src/images/ngletteravatar/k.png new file mode 100644 index 00000000..77da163e Binary files /dev/null and b/src/images/ngletteravatar/k.png differ diff --git a/src/images/ngletteravatar/l.png b/src/images/ngletteravatar/l.png new file mode 100644 index 00000000..e6112f2a Binary files /dev/null and b/src/images/ngletteravatar/l.png differ diff --git a/src/images/ngletteravatar/m.png b/src/images/ngletteravatar/m.png new file mode 100644 index 00000000..c93554a1 Binary files /dev/null and b/src/images/ngletteravatar/m.png differ diff --git a/src/images/ngletteravatar/n.png b/src/images/ngletteravatar/n.png new file mode 100644 index 00000000..8158a1e4 Binary files /dev/null and b/src/images/ngletteravatar/n.png differ diff --git a/src/images/ngletteravatar/o.png b/src/images/ngletteravatar/o.png new file mode 100644 index 00000000..729a82a6 Binary files /dev/null and b/src/images/ngletteravatar/o.png differ diff --git a/src/images/ngletteravatar/p.png b/src/images/ngletteravatar/p.png new file mode 100644 index 00000000..b3adb0ce Binary files /dev/null and b/src/images/ngletteravatar/p.png differ diff --git a/src/images/ngletteravatar/r.png b/src/images/ngletteravatar/r.png new file mode 100644 index 00000000..1b64b8ee Binary files /dev/null and b/src/images/ngletteravatar/r.png differ diff --git a/src/images/ngletteravatar/s.png b/src/images/ngletteravatar/s.png new file mode 100644 index 00000000..8813d11a Binary files /dev/null and b/src/images/ngletteravatar/s.png differ diff --git a/src/images/ngletteravatar/t.jpg b/src/images/ngletteravatar/t.jpg new file mode 100644 index 00000000..20932aad Binary files /dev/null and b/src/images/ngletteravatar/t.jpg differ diff --git a/src/images/ngletteravatar/u.png b/src/images/ngletteravatar/u.png new file mode 100644 index 00000000..6af53add Binary files /dev/null and b/src/images/ngletteravatar/u.png differ diff --git a/src/images/ngletteravatar/v.png b/src/images/ngletteravatar/v.png new file mode 100644 index 00000000..aaaf191e Binary files /dev/null and b/src/images/ngletteravatar/v.png differ diff --git a/src/images/ngletteravatar/w.png b/src/images/ngletteravatar/w.png new file mode 100644 index 00000000..20ff7ed9 Binary files /dev/null and b/src/images/ngletteravatar/w.png differ diff --git a/src/images/ngletteravatar/x.jpg b/src/images/ngletteravatar/x.jpg new file mode 100644 index 00000000..107f1732 Binary files /dev/null and b/src/images/ngletteravatar/x.jpg differ diff --git a/src/images/ngletteravatar/z.png b/src/images/ngletteravatar/z.png new file mode 100644 index 00000000..efcda8fe Binary files /dev/null and b/src/images/ngletteravatar/z.png differ diff --git a/src/images/plus-4-xxl.png b/src/images/plus-4-xxl.png new file mode 100644 index 00000000..1f178267 Binary files /dev/null and b/src/images/plus-4-xxl.png differ diff --git a/src/images/plus.png b/src/images/plus.png new file mode 100644 index 00000000..4fd3478c Binary files /dev/null and b/src/images/plus.png differ diff --git a/src/kivymd/LICENSE b/src/kivymd/LICENSE new file mode 100644 index 00000000..a17ea136 --- /dev/null +++ b/src/kivymd/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Andrés Rodríguez and KivyMD contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/src/kivymd/__init__.py b/src/kivymd/__init__.py new file mode 100644 index 00000000..bc07270c --- /dev/null +++ b/src/kivymd/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +import os + +path = os.path.dirname(__file__) +fonts_path = os.path.join(path, "fonts/") +images_path = os.path.join(path, 'images/') diff --git a/src/kivymd/accordion.py b/src/kivymd/accordion.py new file mode 100644 index 00000000..6e816ca6 --- /dev/null +++ b/src/kivymd/accordion.py @@ -0,0 +1,254 @@ +# -*- coding: utf-8 -*- + +from kivy.lang import Builder +from kivy.properties import StringProperty, ListProperty, OptionProperty +from kivy.utils import get_color_from_hex +from kivymd.color_definitions import colors +from kivymd.theming import ThemableBehavior +from kivy.uix.accordion import Accordion, AccordionItem +from kivymd.backgroundcolorbehavior import BackgroundColorBehavior +from kivy.uix.boxlayout import BoxLayout + + +class MDAccordionItemTitleLayout(ThemableBehavior, BackgroundColorBehavior, BoxLayout): + pass + + +class MDAccordion(ThemableBehavior, BackgroundColorBehavior, Accordion): + pass + + +class MDAccordionItem(ThemableBehavior, AccordionItem): + title_theme_color = OptionProperty(None, allownone=True, + options=['Primary', 'Secondary', 'Hint', + 'Error', 'Custom']) + ''' Color theme for title text and icon ''' + + title_color = ListProperty(None, allownone=True) + ''' Color for title text and icon if `title_theme_color` is Custom ''' + + background_color = ListProperty(None, allownone=True) + ''' Color for the background of the accordian item title in rgba format. + ''' + + divider_color = ListProperty(None, allownone=True) + ''' Color for dividers between different titles in rgba format + To remove the divider set a color with an alpha of 0. + ''' + + indicator_color = ListProperty(None, allownone=True) + ''' Color for the indicator on the side of the active item in rgba format + To remove the indicator set a color with an alpha of 0. + ''' + + font_style = OptionProperty( + 'Subhead', options=['Body1', 'Body2', 'Caption', 'Subhead', 'Title', + 'Headline', 'Display1', 'Display2', 'Display3', + 'Display4', 'Button', 'Icon']) + ''' Font style to use for the title text ''' + + title_template = StringProperty('MDAccordionItemTitle') + ''' Template to use for the title ''' + + icon = StringProperty(None,allownone=True) + ''' Icon name to use when this item is expanded ''' + + icon_expanded = StringProperty('chevron-up') + ''' Icon name to use when this item is expanded ''' + + icon_collapsed = StringProperty('chevron-down') + ''' Icon name to use when this item is collapsed ''' + + +Builder.load_string(''' +#:import MDLabel kivymd.label.MDLabel +#:import md_icons kivymd.icon_definitions.md_icons + + +: + canvas.before: + Color: + rgba: self.background_color or self.theme_cls.primary_color + Rectangle: + size:self.size + pos:self.pos + + PushMatrix + Translate: + xy: (dp(2),0) if self.orientation == 'vertical' else (0,dp(2)) + canvas.after: + PopMatrix + Color: + rgba: self.divider_color or self.theme_cls.divider_color + Rectangle: + size:(dp(1),self.height) if self.orientation == 'horizontal' else (self.width,dp(1)) + pos:self.pos + Color: + rgba: [0,0,0,0] if self.collapse else (self.indicator_color or self.theme_cls.accent_color) + Rectangle: + size:(dp(2),self.height) if self.orientation == 'vertical' else (self.width,dp(2)) + pos:self.pos + +[MDAccordionItemTitle@MDAccordionItemTitleLayout]: + padding: '12dp' + spacing: '12dp' + orientation: 'horizontal' if ctx.item.orientation=='vertical' else 'vertical' + canvas: + PushMatrix + Translate: + xy: (-dp(2),0) if ctx.item.orientation == 'vertical' else (0,-dp(2)) + + Color: + rgba: self.background_color or self.theme_cls.primary_color + Rectangle: + size:self.size + pos:self.pos + + canvas.after: + Color: + rgba: [0,0,0,0] if ctx.item.collapse else (ctx.item.indicator_color or self.theme_cls.accent_color) + Rectangle: + size:(dp(2),self.height) if ctx.item.orientation == 'vertical' else (self.width,dp(2)) + pos:self.pos + PopMatrix + MDLabel: + id:_icon + theme_text_color:ctx.item.title_theme_color if ctx.item.icon else 'Custom' + text_color:ctx.item.title_color if ctx.item.icon else [0,0,0,0] + text: md_icons[ctx.item.icon if ctx.item.icon else 'menu'] + font_style:'Icon' + size_hint: (None,1) if ctx.item.orientation == 'vertical' else (1,None) + size: ((self.texture_size[0],1) if ctx.item.orientation == 'vertical' else (1,self.texture_size[1])) \ + if ctx.item.icon else (0,0) + text_size: (self.width, None) if ctx.item.orientation=='vertical' else (None,self.width) + canvas.before: + PushMatrix + Rotate: + angle: 90 if ctx.item.orientation == 'horizontal' else 0 + origin: self.center + canvas.after: + PopMatrix + MDLabel: + id:_label + theme_text_color:ctx.item.title_theme_color + text_color:ctx.item.title_color + text: ctx.item.title + font_style:ctx.item.font_style + text_size: (self.width, None) if ctx.item.orientation=='vertical' else (None,self.width) + canvas.before: + PushMatrix + Rotate: + angle: 90 if ctx.item.orientation == 'horizontal' else 0 + origin: self.center + canvas.after: + PopMatrix + + MDLabel: + id:_expand_icon + theme_text_color:ctx.item.title_theme_color + text_color:ctx.item.title_color + font_style:'Icon' + size_hint: (None,1) if ctx.item.orientation == 'vertical' else (1,None) + size: (self.texture_size[0],1) if ctx.item.orientation == 'vertical' else (1,self.texture_size[1]) + text:md_icons[ctx.item.icon_collapsed if ctx.item.collapse else ctx.item.icon_expanded] + halign: 'right' if ctx.item.orientation=='vertical' else 'center' + #valign: 'middle' if ctx.item.orientation=='vertical' else 'bottom' + canvas.before: + PushMatrix + Rotate: + angle: 90 if ctx.item.orientation == 'horizontal' else 0 + origin:self.center + canvas.after: + PopMatrix + +''') + +if __name__ == '__main__': + from kivy.app import App + from kivymd.theming import ThemeManager + + class AccordionApp(App): + theme_cls = ThemeManager() + + def build(self): + # self.theme_cls.primary_palette = 'Indigo' + return Builder.load_string(""" +#:import MDLabel kivymd.label.MDLabel +#:import MDList kivymd.list.MDList +#:import OneLineListItem kivymd.list.OneLineListItem +BoxLayout: + spacing: '64dp' + MDAccordion: + orientation:'vertical' + MDAccordionItem: + title:'Item 1' + icon: 'home' + ScrollView: + MDList: + OneLineListItem: + text: "Subitem 1" + theme_text_color: 'Custom' + text_color: [1,1,1,1] + OneLineListItem: + text: "Subitem 2" + theme_text_color: 'Custom' + text_color: [1,1,1,1] + OneLineListItem: + text: "Subitem 3" + theme_text_color: 'Custom' + text_color: [1,1,1,1] + MDAccordionItem: + title:'Item 2' + icon: 'globe' + ScrollView: + MDList: + OneLineListItem: + text: "Subitem 4" + theme_text_color: 'Custom' + text_color: [1,1,1,1] + OneLineListItem: + text: "Subitem 5" + theme_text_color: 'Custom' + text_color: [1,1,1,1] + OneLineListItem: + text: "Subitem 6" + theme_text_color: 'Custom' + text_color: [1,1,1,1] + MDAccordionItem: + title:'Item 3' + ScrollView: + MDList: + OneLineListItem: + text: "Subitem 7" + theme_text_color: 'Custom' + text_color: [1,1,1,1] + OneLineListItem: + text: "Subitem 8" + theme_text_color: 'Custom' + text_color: [1,1,1,1] + OneLineListItem: + text: "Subitem 9" + theme_text_color: 'Custom' + text_color: [1,1,1,1] + MDAccordion: + orientation:'horizontal' + MDAccordionItem: + title:'Item 1' + icon: 'home' + MDLabel: + text:'Content 1' + theme_text_color:'Primary' + MDAccordionItem: + title:'Item 2' + MDLabel: + text:'Content 2' + theme_text_color:'Primary' + MDAccordionItem: + title:'Item 3' + MDLabel: + text:'Content 3' + theme_text_color:'Primary' +""") + + + AccordionApp().run() diff --git a/src/kivymd/backgroundcolorbehavior.py b/src/kivymd/backgroundcolorbehavior.py new file mode 100644 index 00000000..bd98f129 --- /dev/null +++ b/src/kivymd/backgroundcolorbehavior.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +from kivy.lang import Builder +from kivy.properties import BoundedNumericProperty, ReferenceListProperty +from kivy.uix.widget import Widget + +Builder.load_string(''' + + canvas: + Color: + rgba: self.background_color + Rectangle: + size: self.size + pos: self.pos +''') + + +class BackgroundColorBehavior(Widget): + r = BoundedNumericProperty(1., min=0., max=1.) + g = BoundedNumericProperty(1., min=0., max=1.) + b = BoundedNumericProperty(1., min=0., max=1.) + a = BoundedNumericProperty(0., min=0., max=1.) + + background_color = ReferenceListProperty(r, g, b, a) diff --git a/src/kivymd/bottomsheet.py b/src/kivymd/bottomsheet.py new file mode 100644 index 00000000..901322b0 --- /dev/null +++ b/src/kivymd/bottomsheet.py @@ -0,0 +1,211 @@ +# -*- coding: utf-8 -*- +''' +Bottom Sheets +============= + +`Material Design spec Bottom Sheets page `_ + +In this module there's the :class:`MDBottomSheet` class which will let you implement your own Material Design Bottom Sheets, and there are two classes called :class:`MDListBottomSheet` and :class:`MDGridBottomSheet` implementing the ones mentioned in the spec. + +Examples +-------- + +.. note:: + + These widgets are designed to be called from Python code only. + +For :class:`MDListBottomSheet`: + +.. code-block:: python + + bs = MDListBottomSheet() + bs.add_item("Here's an item with text only", lambda x: x) + bs.add_item("Here's an item with an icon", lambda x: x, icon='md-cast') + bs.add_item("Here's another!", lambda x: x, icon='md-nfc') + bs.open() + +For :class:`MDListBottomSheet`: + +.. code-block:: python + + bs = MDGridBottomSheet() + bs.add_item("Facebook", lambda x: x, icon_src='./assets/facebook-box.png') + bs.add_item("YouTube", lambda x: x, icon_src='./assets/youtube-play.png') + bs.add_item("Twitter", lambda x: x, icon_src='./assets/twitter.png') + bs.add_item("Da Cloud", lambda x: x, icon_src='./assets/cloud-upload.png') + bs.add_item("Camera", lambda x: x, icon_src='./assets/camera.png') + bs.open() + +API +--- +''' +from kivy.clock import Clock +from kivy.lang import Builder +from kivy.metrics import dp +from kivy.properties import ObjectProperty, StringProperty +from kivy.uix.behaviors import ButtonBehavior +from kivy.uix.boxlayout import BoxLayout +from kivy.uix.floatlayout import FloatLayout +from kivy.uix.gridlayout import GridLayout +from kivy.uix.modalview import ModalView +from kivy.uix.scrollview import ScrollView +from kivymd.backgroundcolorbehavior import BackgroundColorBehavior +from kivymd.label import MDLabel +from kivymd.list import MDList, OneLineListItem, ILeftBody, \ + OneLineIconListItem +from kivymd.theming import ThemableBehavior + +Builder.load_string(''' + + background: 'atlas://data/images/defaulttheme/action_group_disabled' + background_color: 0,0,0,.8 + sv: sv + upper_padding: upper_padding + gl_content: gl_content + ScrollView: + id: sv + do_scroll_x: False + BoxLayout: + size_hint_y: None + orientation: 'vertical' + padding: 0,1,0,0 + height: upper_padding.height + gl_content.height + 1 # +1 to allow overscroll + BsPadding: + id: upper_padding + size_hint_y: None + height: root.height - min(root.width * 9 / 16, gl_content.height) + on_release: root.dismiss() + BottomSheetContent: + id: gl_content + size_hint_y: None + background_color: root.theme_cls.bg_normal + cols: 1 +''') + + +class BsPadding(ButtonBehavior, FloatLayout): + pass + + +class BottomSheetContent(BackgroundColorBehavior, GridLayout): + pass + + +class MDBottomSheet(ThemableBehavior, ModalView): + sv = ObjectProperty() + upper_padding = ObjectProperty() + gl_content = ObjectProperty() + dismiss_zone_scroll = 1000 # Arbitrary high number + + def open(self, *largs): + super(MDBottomSheet, self).open(*largs) + Clock.schedule_once(self.set_dismiss_zone, 0) + + def set_dismiss_zone(self, *largs): + # Scroll to right below overscroll threshold: + self.sv.scroll_y = 1 - self.sv.convert_distance_to_scroll(0, 1)[1] + + # This is a line where m (slope) is 1/6 and b (y-intercept) is 80: + self.dismiss_zone_scroll = self.sv.convert_distance_to_scroll( + 0, (self.height - self.upper_padding.height) * (1 / 6.0) + 80)[ + 1] + # Uncomment next line if the limit should just be half of + # visible content on open (capped by specs to 16 units to width/9: + # self.dismiss_zone_scroll = (self.sv.convert_distance_to_scroll( + # 0, self.height - self.upper_padding.height)[1] * 0.50) + + # Check if user has overscrolled enough to dismiss bottom sheet: + self.sv.bind(on_scroll_stop=self.check_if_scrolled_to_death) + + def check_if_scrolled_to_death(self, *largs): + if self.sv.scroll_y >= 1 + self.dismiss_zone_scroll: + self.dismiss() + + def add_widget(self, widget, index=0): + if type(widget) == ScrollView: + super(MDBottomSheet, self).add_widget(widget, index) + else: + self.gl_content.add_widget(widget,index) + + +Builder.load_string(''' +#:import md_icons kivymd.icon_definitions.md_icons + + font_style: 'Icon' + text: u"{}".format(md_icons[root.icon]) + halign: 'center' + theme_text_color: 'Primary' + valign: 'middle' +''') + + +class ListBSIconLeft(ILeftBody, MDLabel): + icon = StringProperty() + + +class MDListBottomSheet(MDBottomSheet): + mlist = ObjectProperty() + + def __init__(self, **kwargs): + super(MDListBottomSheet, self).__init__(**kwargs) + self.mlist = MDList() + self.gl_content.add_widget(self.mlist) + Clock.schedule_once(self.resize_content_layout, 0) + + def resize_content_layout(self, *largs): + self.gl_content.height = self.mlist.height + + def add_item(self, text, callback, icon=None): + if icon: + item = OneLineIconListItem(text=text, on_release=callback) + item.add_widget(ListBSIconLeft(icon=icon)) + else: + item = OneLineListItem(text=text, on_release=callback) + + item.bind(on_release=lambda x: self.dismiss()) + self.mlist.add_widget(item) + + +Builder.load_string(''' + + orientation: 'vertical' + padding: 0, dp(24), 0, 0 + size_hint_y: None + size: dp(64), dp(96) + BoxLayout: + padding: dp(8), 0, dp(8), dp(8) + size_hint_y: None + height: dp(48) + Image: + source: root.source + MDLabel: + font_style: 'Caption' + theme_text_color: 'Secondary' + text: root.caption + halign: 'center' +''') + + +class GridBSItem(ButtonBehavior, BoxLayout): + source = StringProperty() + + caption = StringProperty() + + +class MDGridBottomSheet(MDBottomSheet): + def __init__(self, **kwargs): + super(MDGridBottomSheet, self).__init__(**kwargs) + self.gl_content.padding = (dp(16), 0, dp(16), dp(24)) + self.gl_content.height = dp(24) + self.gl_content.cols = 3 + + def add_item(self, text, callback, icon_src): + item = GridBSItem( + caption=text, + on_release=callback, + source=icon_src + ) + item.bind(on_release=lambda x: self.dismiss()) + if len(self.gl_content.children) % 3 == 0: + self.gl_content.height += dp(96) + self.gl_content.add_widget(item) diff --git a/src/kivymd/button.py b/src/kivymd/button.py new file mode 100644 index 00000000..75016716 --- /dev/null +++ b/src/kivymd/button.py @@ -0,0 +1,453 @@ +# -*- coding: utf-8 -*- +''' +Buttons +======= + +`Material Design spec, Buttons page `_ + +`Material Design spec, Buttons: Floating Action Button page `_ + +TO-DO: DOCUMENT MODULE +''' +from kivy.clock import Clock +from kivy.lang import Builder +from kivy.metrics import dp +from kivy.utils import get_color_from_hex +from kivy.properties import StringProperty, BoundedNumericProperty, \ + ListProperty, AliasProperty, BooleanProperty, NumericProperty, \ + OptionProperty +from kivy.uix.anchorlayout import AnchorLayout +from kivy.uix.behaviors import ButtonBehavior +from kivy.uix.boxlayout import BoxLayout +from kivy.animation import Animation +from kivymd.backgroundcolorbehavior import BackgroundColorBehavior +from kivymd.ripplebehavior import CircularRippleBehavior, \ + RectangularRippleBehavior +from kivymd.elevationbehavior import ElevationBehavior, \ + RoundElevationBehavior +from kivymd.theming import ThemableBehavior +from kivymd.color_definitions import colors + +Builder.load_string(''' +#:import md_icons kivymd.icon_definitions.md_icons +#:import colors kivymd.color_definitions.colors +#:import MDLabel kivymd.label.MDLabel + + size_hint: (None, None) + size: (dp(48), dp(48)) + padding: dp(12) + theme_text_color: 'Primary' + MDLabel: + id: _label + font_style: 'Icon' + text: u"{}".format(md_icons[root.icon]) + halign: 'center' + theme_text_color: root.theme_text_color + text_color: root.text_color + opposite_colors: root.opposite_colors + valign: 'middle' + + + canvas: + Color: + #rgba: self.background_color if self.state == 'normal' else self._bg_color_down + rgba: self._current_button_color + Rectangle: + size: self.size + pos: self.pos + size_hint: (None, None) + height: dp(36) + width: _label.texture_size[0] + dp(16) + padding: (dp(8), 0) + theme_text_color: 'Custom' + text_color: root.theme_cls.primary_color + MDLabel: + id: _label + text: root._text + font_style: 'Button' + size_hint_x: None + text_size: (None, root.height) + height: self.texture_size[1] + theme_text_color: root.theme_text_color + text_color: root.text_color + valign: 'middle' + halign: 'center' + opposite_colors: root.opposite_colors + +: + canvas: + Clear + Color: + rgba: self.background_color_disabled if self.disabled else \ + (self.background_color if self.state == 'normal' else self.background_color_down) + Rectangle: + size: self.size + pos: self.pos + + anchor_x: 'center' + anchor_y: 'center' + background_color: root.theme_cls.primary_color + background_color_down: root.theme_cls.primary_dark + background_color_disabled: root.theme_cls.divider_color + theme_text_color: 'Primary' + MDLabel: + id: label + font_style: 'Button' + text: root._text + size_hint: None, None + width: root.width + text_size: self.width, None + height: self.texture_size[1] + theme_text_color: root.theme_text_color + text_color: root.text_color + opposite_colors: root.opposite_colors + disabled: root.disabled + halign: 'center' + valign: 'middle' + +: + canvas: + Clear + Color: + rgba: self.background_color_disabled if self.disabled else \ + (self.background_color if self.state == 'normal' else self.background_color_down) + Ellipse: + size: self.size + pos: self.pos + + anchor_x: 'center' + anchor_y: 'center' + background_color: root.theme_cls.accent_color + background_color_down: root.theme_cls.accent_dark + background_color_disabled: root.theme_cls.divider_color + theme_text_color: 'Primary' + MDLabel: + id: label + font_style: 'Icon' + text: u"{}".format(md_icons[root.icon]) + size_hint: None, None + size: dp(24), dp(24) + text_size: self.size + theme_text_color: root.theme_text_color + text_color: root.text_color + opposite_colors: root.opposite_colors + disabled: root.disabled + halign: 'center' + valign: 'middle' +''') + + +class MDIconButton(CircularRippleBehavior, ButtonBehavior, BoxLayout): + icon = StringProperty('circle') + theme_text_color = OptionProperty(None, allownone=True, + options=['Primary', 'Secondary', 'Hint', + 'Error', 'Custom']) + text_color = ListProperty(None, allownone=True) + opposite_colors = BooleanProperty(False) + + +class MDFlatButton(ThemableBehavior, RectangularRippleBehavior, + ButtonBehavior, BackgroundColorBehavior, AnchorLayout): + width = BoundedNumericProperty(dp(64), min=dp(64), max=None, + errorhandler=lambda x: dp(64)) + + text_color = ListProperty() + + text = StringProperty('') + theme_text_color = OptionProperty(None, allownone=True, + options=['Primary', 'Secondary', 'Hint', + 'Error', 'Custom']) + text_color = ListProperty(None, allownone=True) + + _text = StringProperty('') + _bg_color_down = ListProperty([0, 0, 0, 0]) + _current_button_color = ListProperty([0, 0, 0, 0]) + + def __init__(self, **kwargs): + super(MDFlatButton, self).__init__(**kwargs) + self._current_button_color = self.background_color + self._bg_color_down = get_color_from_hex( + colors[self.theme_cls.theme_style]['FlatButtonDown']) + + Clock.schedule_once(lambda x: self.ids._label.bind( + texture_size=self.update_width_on_label_texture)) + + def update_width_on_label_texture(self, instance, value): + self.ids._label.width = value[0] + + def on_text(self, instance, value): + self._text = value.upper() + + def on_touch_down(self, touch): + if touch.is_mouse_scrolling: + return False + elif not self.collide_point(touch.x, touch.y): + return False + elif self in touch.ud: + return False + elif self.disabled: + return False + else: + self.fade_bg = Animation(duration=.2, _current_button_color=get_color_from_hex( + colors[self.theme_cls.theme_style]['FlatButtonDown'])) + self.fade_bg.start(self) + return super(MDFlatButton, self).on_touch_down(touch) + + def on_touch_up(self, touch): + if touch.grab_current is self: + self.fade_bg.stop_property(self, '_current_button_color') + Animation(duration=.05, _current_button_color=self.background_color).start(self) + return super(MDFlatButton, self).on_touch_up(touch) + + +class MDRaisedButton(ThemableBehavior, RectangularRippleBehavior, + ElevationBehavior, ButtonBehavior, + AnchorLayout): + _bg_color_down = ListProperty([]) + background_color = ListProperty() + background_color_down = ListProperty() + background_color_disabled = ListProperty() + theme_text_color = OptionProperty(None, allownone=True, + options=['Primary', 'Secondary', 'Hint', + 'Error', 'Custom']) + text_color = ListProperty(None, allownone=True) + + def _get_bg_color_down(self): + return self._bg_color_down + + def _set_bg_color_down(self, color, alpha=None): + if len(color) == 2: + self._bg_color_down = get_color_from_hex( + colors[color[0]][color[1]]) + if alpha: + self._bg_color_down[3] = alpha + elif len(color) == 4: + self._bg_color_down = color + + background_color_down = AliasProperty(_get_bg_color_down, + _set_bg_color_down, + bind=('_bg_color_down',)) + + _bg_color_disabled = ListProperty([]) + + def _get_bg_color_disabled(self): + return self._bg_color_disabled + + def _set_bg_color_disabled(self, color, alpha=None): + if len(color) == 2: + self._bg_color_disabled = get_color_from_hex( + colors[color[0]][color[1]]) + if alpha: + self._bg_color_disabled[3] = alpha + elif len(color) == 4: + self._bg_color_disabled = color + + background_color_disabled = AliasProperty(_get_bg_color_disabled, + _set_bg_color_disabled, + bind=('_bg_color_disabled',)) + + _elev_norm = NumericProperty(2) + + def _get_elev_norm(self): + return self._elev_norm + + def _set_elev_norm(self, value): + self._elev_norm = value if value <= 12 else 12 + self._elev_raised = (value + 6) if value + 6 <= 12 else 12 + self.elevation = self._elev_norm + + elevation_normal = AliasProperty(_get_elev_norm, _set_elev_norm, + bind=('_elev_norm',)) + + _elev_raised = NumericProperty(8) + + def _get_elev_raised(self): + return self._elev_raised + + def _set_elev_raised(self, value): + self._elev_raised = value if value + self._elev_norm <= 12 else 12 + + elevation_raised = AliasProperty(_get_elev_raised, _set_elev_raised, + bind=('_elev_raised',)) + + text = StringProperty() + + _text = StringProperty() + + def __init__(self, **kwargs): + super(MDRaisedButton, self).__init__(**kwargs) + self.elevation_press_anim = Animation(elevation=self.elevation_raised, + duration=.2, t='out_quad') + self.elevation_release_anim = Animation( + elevation=self.elevation_normal, duration=.2, t='out_quad') + + def on_disabled(self, instance, value): + if value: + self.elevation = 0 + else: + self.elevation = self.elevation_normal + super(MDRaisedButton, self).on_disabled(instance, value) + + def on_touch_down(self, touch): + if not self.disabled: + if touch.is_mouse_scrolling: + return False + if not self.collide_point(touch.x, touch.y): + return False + if self in touch.ud: + return False + Animation.cancel_all(self, 'elevation') + self.elevation_press_anim.start(self) + return super(MDRaisedButton, self).on_touch_down(touch) + + def on_touch_up(self, touch): + if not self.disabled: + if touch.grab_current is not self: + return super(ButtonBehavior, self).on_touch_up(touch) + Animation.cancel_all(self, 'elevation') + self.elevation_release_anim.start(self) + else: + Animation.cancel_all(self, 'elevation') + self.elevation = 0 + return super(MDRaisedButton, self).on_touch_up(touch) + + def on_text(self, instance, text): + self._text = text.upper() + + def on__elev_norm(self, instance, value): + self.elevation_release_anim = Animation(elevation=value, + duration=.2, t='out_quad') + + def on__elev_raised(self, instance, value): + self.elevation_press_anim = Animation(elevation=value, + duration=.2, t='out_quad') + + +class MDFloatingActionButton(ThemableBehavior, CircularRippleBehavior, + RoundElevationBehavior, ButtonBehavior, + AnchorLayout): + _bg_color_down = ListProperty([]) + background_color = ListProperty() + background_color_down = ListProperty() + background_color_disabled = ListProperty() + theme_text_color = OptionProperty(None, allownone=True, + options=['Primary', 'Secondary', 'Hint', + 'Error', 'Custom']) + text_color = ListProperty(None, allownone=True) + + def _get_bg_color_down(self): + return self._bg_color_down + + def _set_bg_color_down(self, color, alpha=None): + if len(color) == 2: + self._bg_color_down = get_color_from_hex( + colors[color[0]][color[1]]) + if alpha: + self._bg_color_down[3] = alpha + elif len(color) == 4: + self._bg_color_down = color + + background_color_down = AliasProperty(_get_bg_color_down, + _set_bg_color_down, + bind=('_bg_color_down',)) + + _bg_color_disabled = ListProperty([]) + + def _get_bg_color_disabled(self): + return self._bg_color_disabled + + def _set_bg_color_disabled(self, color, alpha=None): + if len(color) == 2: + self._bg_color_disabled = get_color_from_hex( + colors[color[0]][color[1]]) + if alpha: + self._bg_color_disabled[3] = alpha + elif len(color) == 4: + self._bg_color_disabled = color + + background_color_disabled = AliasProperty(_get_bg_color_disabled, + _set_bg_color_disabled, + bind=('_bg_color_disabled',)) + icon = StringProperty('android') + + _elev_norm = NumericProperty(6) + + def _get_elev_norm(self): + return self._elev_norm + + def _set_elev_norm(self, value): + self._elev_norm = value if value <= 12 else 12 + self._elev_raised = (value + 6) if value + 6 <= 12 else 12 + self.elevation = self._elev_norm + + elevation_normal = AliasProperty(_get_elev_norm, _set_elev_norm, + bind=('_elev_norm',)) + + # _elev_raised = NumericProperty(12) + _elev_raised = NumericProperty(6) + + def _get_elev_raised(self): + return self._elev_raised + + def _set_elev_raised(self, value): + self._elev_raised = value if value + self._elev_norm <= 12 else 12 + + elevation_raised = AliasProperty(_get_elev_raised, _set_elev_raised, + bind=('_elev_raised',)) + + def __init__(self, **kwargs): + if self.elevation_raised == 0 and self.elevation_normal + 6 <= 12: + self.elevation_raised = self.elevation_normal + 6 + elif self.elevation_raised == 0: + self.elevation_raised = 12 + + super(MDFloatingActionButton, self).__init__(**kwargs) + + self.elevation_press_anim = Animation(elevation=self.elevation_raised, + duration=.2, t='out_quad') + self.elevation_release_anim = Animation( + elevation=self.elevation_normal, duration=.2, t='out_quad') + + def _set_ellipse(self, instance, value): + ellipse = self.ellipse + ripple_rad = self.ripple_rad + + ellipse.size = (ripple_rad, ripple_rad) + ellipse.pos = (self.center_x - ripple_rad / 2., + self.center_y - ripple_rad / 2.) + + def on_disabled(self, instance, value): + super(MDFloatingActionButton, self).on_disabled(instance, value) + if self.disabled: + self.elevation = 0 + else: + self.elevation = self.elevation_normal + + def on_touch_down(self, touch): + if not self.disabled: + if touch.is_mouse_scrolling: + return False + if not self.collide_point(touch.x, touch.y): + return False + if self in touch.ud: + return False + self.elevation_press_anim.stop(self) + self.elevation_press_anim.start(self) + return super(MDFloatingActionButton, self).on_touch_down(touch) + + def on_touch_up(self, touch): + if not self.disabled: + if touch.grab_current is not self: + return super(ButtonBehavior, self).on_touch_up(touch) + self.elevation_release_anim.stop(self) + self.elevation_release_anim.start(self) + return super(MDFloatingActionButton, self).on_touch_up(touch) + + def on_elevation_normal(self, instance, value): + self.elevation = value + + def on_elevation_raised(self, instance, value): + if self.elevation_raised == 0 and self.elevation_normal + 6 <= 12: + self.elevation_raised = self.elevation_normal + 6 + elif self.elevation_raised == 0: + self.elevation_raised = 12 diff --git a/src/kivymd/card.py b/src/kivymd/card.py new file mode 100644 index 00000000..d411644b --- /dev/null +++ b/src/kivymd/card.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +from kivy.lang import Builder +from kivy.properties import BoundedNumericProperty, ReferenceListProperty, ListProperty,BooleanProperty +from kivy.uix.boxlayout import BoxLayout +from kivymd.elevationbehavior import ElevationBehavior +from kivymd.theming import ThemableBehavior +from kivy.metrics import dp +from kivy.uix.widget import Widget + +Builder.load_string(''' + + canvas: + Color: + rgba: self.background_color + RoundedRectangle: + size: self.size + pos: self.pos + radius: [self.border_radius] + Color: + rgba: self.theme_cls.divider_color + a: self.border_color_a + Line: + rounded_rectangle: (self.pos[0],self.pos[1],self.size[0],self.size[1],self.border_radius) + background_color: self.theme_cls.bg_light + + + canvas: + Color: + rgba: self.theme_cls.divider_color + Rectangle: + size: self.size + pos: self.pos +''') + + +class MDSeparator(ThemableBehavior, BoxLayout): + """ A separator line """ + def __init__(self, *args, **kwargs): + super(MDSeparator, self).__init__(*args, **kwargs) + self.on_orientation() + + def on_orientation(self,*args): + self.size_hint = (1, None) if self.orientation == 'horizontal' else (None, 1) + if self.orientation == 'horizontal': + self.height = dp(1) + else: + self.width = dp(1) + + +class MDCard(ThemableBehavior, ElevationBehavior, BoxLayout): + r = BoundedNumericProperty(1., min=0., max=1.) + g = BoundedNumericProperty(1., min=0., max=1.) + b = BoundedNumericProperty(1., min=0., max=1.) + a = BoundedNumericProperty(0., min=0., max=1.) + + border_radius = BoundedNumericProperty(dp(3),min=0) + border_color_a = BoundedNumericProperty(0, min=0., max=1.) + background_color = ReferenceListProperty(r, g, b, a) diff --git a/src/kivymd/color_definitions.py b/src/kivymd/color_definitions.py new file mode 100644 index 00000000..c81bd731 --- /dev/null +++ b/src/kivymd/color_definitions.py @@ -0,0 +1,360 @@ +colors = { + 'Pink': { + '50': 'fce4ec', + '100': 'f8bbd0', + '200': 'f48fb1', + '300': 'f06292', + '400': 'ec407a', + '500': 'e91e63', + '600': 'd81b60', + '700': 'C2185B', + '800': 'ad1457', + '900': '88e4ff', + 'A100': 'ff80ab', + 'A400': 'F50057', + 'A700': 'c51162', + 'A200': 'ff4081' + }, + + 'Blue': { + '200': '90caf9', + '900': '0D47A1', + '600': '1e88e5', + 'A100': '82b1ff', + '300': '64b5f6', + 'A400': '2979ff', + '700': '1976d2', + '50': 'e3f2fd', + 'A700': '2962ff', + '400': '42a5f5', + '100': 'bbdefb', + '800': '1565c0', + 'A200': '448aff', + '500': '2196f3' + }, + + 'Indigo': { + '200': '9fa8da', + '900': '1a237e', + '600': '3949ab', + 'A100': '8c9eff', + '300': '7986cb', + 'A400': '3d5afe', + '700': '303f9f', + '50': 'e8eaf6', + 'A700': '304ffe', + '400': '5c6bc0', + '100': 'c5cae9', + '800': '283593', + 'A200': '536dfe', + '500': '3f51b5' + }, + + 'BlueGrey': { + '200': 'b0bec5', + '900': '263238', + '600': '546e7a', + '300': '90a4ae', + '700': '455a64', + '50': 'eceff1', + '400': '78909c', + '100': 'cfd8dc', + '800': '37474f', + '500': '607d8b' + }, + + 'Brown': { + '200': 'bcaaa4', + '900': '3e2723', + '600': '6d4c41', + '300': 'a1887f', + '700': '5d4037', + '50': 'efebe9', + '400': '8d6e63', + '100': 'd7ccc8', + '800': '4e342e', + '500': '795548' + }, + + 'LightBlue': { + '200': '81d4fa', + '900': '01579B', + '600': '039BE5', + 'A100': '80d8ff', + '300': '4fc3f7', + 'A400': '00B0FF', + '700': '0288D1', + '50': 'e1f5fe', + 'A700': '0091EA', + '400': '29b6f6', + '100': 'b3e5fc', + '800': '0277BD', + 'A200': '40c4ff', + '500': '03A9F4' + }, + + 'Purple': { + '200': 'ce93d8', + '900': '4a148c', + '600': '8e24aa', + 'A100': 'ea80fc', + '300': 'ba68c8', + 'A400': 'D500F9', + '700': '7b1fa2', + '50': 'f3e5f5', + 'A700': 'AA00FF', + '400': 'ab47bc', + '100': 'e1bee7', + '800': '6a1b9a', + 'A200': 'e040fb', + '500': '9c27b0' + }, + + 'Grey': { + '200': 'eeeeee', + '900': '212121', + '600': '757575', + '300': 'e0e0e0', + '700': '616161', + '50': 'fafafa', + '400': 'bdbdbd', + '100': 'f5f5f5', + '800': '424242', + '500': '9e9e9e' + }, + + 'Yellow': { + '200': 'fff59d', + '900': 'f57f17', + '600': 'fdd835', + 'A100': 'ffff8d', + '300': 'fff176', + 'A400': 'FFEA00', + '700': 'fbc02d', + '50': 'fffde7', + 'A700': 'FFD600', + '400': 'ffee58', + '100': 'fff9c4', + '800': 'f9a825', + 'A200': 'FFFF00', + '500': 'ffeb3b' + }, + + 'LightGreen': { + '200': 'c5e1a5', + '900': '33691e', + '600': '7cb342', + 'A100': 'ccff90', + '300': 'aed581', + 'A400': '76FF03', + '700': '689f38', + '50': 'f1f8e9', + 'A700': '64dd17', + '400': '9ccc65', + '100': 'dcedc8', + '800': '558b2f', + 'A200': 'b2ff59', + '500': '8bc34a' + }, + + 'DeepOrange': { + '200': 'ffab91', + '900': 'bf36c', + '600': 'f4511e', + 'A100': 'ff9e80', + '300': 'ff8a65', + 'A400': 'FF3D00', + '700': 'e64a19', + '50': 'fbe9e7', + 'A700': 'DD2C00', + '400': 'ff7043', + '100': 'ffccbc', + '800': 'd84315', + 'A200': 'ff6e40', + '500': 'ff5722' + }, + + 'Green': { + '200': 'a5d6a7', + '900': '1b5e20', + '600': '43a047', + 'A100': 'b9f6ca', + '300': '81c784', + 'A400': '00E676', + '700': '388e3c', + '50': 'e8f5e9', + 'A700': '00C853', + '400': '66bb6a', + '100': 'c8e6c9', + '800': '2e7d32', + 'A200': '69f0ae', + '500': '4caf50' + }, + + 'Red': { + '200': 'ef9a9a', + '900': 'b71c1c', + '600': 'e53935', + 'A100': 'ff8a80', + '300': 'e57373', + 'A400': 'ff1744', + '700': 'd32f2f', + '50': 'ffebee', + 'A700': 'd50000', + '400': 'ef5350', + '100': 'ffcdd2', + '800': 'c62828', + 'A200': 'ff5252', + '500': 'f44336' + }, + + 'Teal': { + '200': '80cbc4', + '900': '004D40', + '600': '00897B', + 'A100': 'a7ffeb', + '300': '4db6ac', + 'A400': '1de9b6', + '700': '00796B', + '50': 'e0f2f1', + 'A700': '00BFA5', + '400': '26a69a', + '100': 'b2dfdb', + '800': '00695C', + 'A200': '64ffda', + '500': '009688' + }, + + 'Orange': { + '200': 'ffcc80', + '900': 'E65100', + '600': 'FB8C00', + 'A100': 'ffd180', + '300': 'ffb74d', + 'A400': 'FF9100', + '700': 'F57C00', + '50': 'fff3e0', + 'A700': 'FF6D00', + '400': 'ffa726', + '100': 'ffe0b2', + '800': 'EF6C00', + 'A200': 'ffab40', + '500': 'FF9800' + }, + + 'Cyan': { + '200': '80deea', + '900': '006064', + '600': '00ACC1', + 'A100': '84ffff', + '300': '4dd0e1', + 'A400': '00E5FF', + '700': '0097A7', + '50': 'e0f7fa', + 'A700': '00B8D4', + '400': '26c6da', + '100': 'b2ebf2', + '800': '00838F', + 'A200': '18ffff', + '500': '00BCD4' + }, + + 'Amber': { + '200': 'ffe082', + '900': 'FF6F00', + '600': 'FFB300', + 'A100': 'ffe57f', + '300': 'ffd54f', + 'A400': 'FFC400', + '700': 'FFA000', + '50': 'fff8e1', + 'A700': 'FFAB00', + '400': 'ffca28', + '100': 'ffecb3', + '800': 'FF8F00', + 'A200': 'ffd740', + '500': 'FFC107' + }, + + 'DeepPurple': { + '200': 'b39ddb', + '900': '311b92', + '600': '5e35b1', + 'A100': 'b388ff', + '300': '9575cd', + 'A400': '651fff', + '700': '512da8', + '50': 'ede7f6', + 'A700': '6200EA', + '400': '7e57c2', + '100': 'd1c4e9', + '800': '4527a0', + 'A200': '7c4dff', + '500': '673ab7' + }, + + 'Lime': { + '200': 'e6ee9c', + '900': '827717', + '600': 'c0ca33', + 'A100': 'f4ff81', + '300': 'dce775', + 'A400': 'C6FF00', + '700': 'afb42b', + '50': 'f9fbe7', + 'A700': 'AEEA00', + '400': 'd4e157', + '100': 'f0f4c3', + '800': '9e9d24', + 'A200': 'eeff41', + '500': 'cddc39' + }, + + 'Light': { + 'StatusBar': 'E0E0E0', + 'AppBar': 'F5F5F5', + 'Background': 'FAFAFA', + 'CardsDialogs': 'FFFFFF', + 'FlatButtonDown': 'cccccc' + }, + + 'Dark': { + 'StatusBar': '000000', + 'AppBar': '212121', + 'Background': '303030', + 'CardsDialogs': '424242', + 'FlatButtonDown': '999999' + } +} + +light_colors = { + 'Pink': ['50' '100', '200', 'A100'], + 'Blue': ['50' '100', '200', '300', '400', 'A100'], + 'Indigo': ['50' '100', '200', 'A100'], + 'BlueGrey': ['50' '100', '200', '300'], + 'Brown': ['50' '100', '200'], + 'LightBlue': ['50' '100', '200', '300', '400', '500', 'A100', 'A200', + 'A400'], + 'Purple': ['50' '100', '200', 'A100'], + 'Grey': ['50' '100', '200', '300', '400', '500'], + 'Yellow': ['50' '100', '200', '300', '400', '500', '600', '700', '800', + '900', 'A100', 'A200', 'A400', 'A700'], + 'LightGreen': ['50' '100', '200', '300', '400', '500', '600', 'A100', + 'A200', 'A400', 'A700'], + 'DeepOrange': ['50' '100', '200', '300', '400', 'A100', 'A200'], + 'Green': ['50' '100', '200', '300', '400', '500', 'A100', 'A200', 'A400', + 'A700'], + 'Red': ['50' '100', '200', '300', 'A100'], + 'Teal': ['50' '100', '200', '300', '400', 'A100', 'A200', 'A400', 'A700'], + 'Orange': ['50' '100', '200', '300', '400', '500', '600', '700', 'A100', + 'A200', 'A400', 'A700'], + 'Cyan': ['50' '100', '200', '300', '400', '500', '600', 'A100', 'A200', + 'A400', 'A700'], + 'Amber': ['50' '100', '200', '300', '400', '500', '600', '700', '800', + '900', 'A100', 'A200', 'A400', 'A700'], + 'DeepPurple': ['50' '100', '200', 'A100'], + 'Lime': ['50' '100', '200', '300', '400', '500', '600', '700', '800', + 'A100', 'A200', 'A400', 'A700'], + 'Dark': [], + 'Light': ['White', 'MainBackground', 'DialogBackground'] +} diff --git a/src/kivymd/date_picker.py b/src/kivymd/date_picker.py new file mode 100644 index 00000000..5194298e --- /dev/null +++ b/src/kivymd/date_picker.py @@ -0,0 +1,325 @@ +# -*- coding: utf-8 -*- +from kivy.lang import Builder +from kivy.uix.modalview import ModalView +from kivymd.label import MDLabel +from kivymd.theming import ThemableBehavior +from kivy.uix.floatlayout import FloatLayout +from kivymd.elevationbehavior import ElevationBehavior +import calendar +from datetime import date +import datetime +from kivy.properties import StringProperty, NumericProperty, ObjectProperty, \ + BooleanProperty +from kivy.uix.anchorlayout import AnchorLayout +from kivy.uix.behaviors import ButtonBehavior +from kivymd.ripplebehavior import CircularRippleBehavior +from kivy.clock import Clock +from kivy.core.window import Window + +Builder.load_string(""" +#:import calendar calendar + + cal_layout: cal_layout + + size_hint: (None, None) + size: [dp(328), dp(484)] if self.theme_cls.device_orientation == 'portrait'\ + else [dp(512), dp(304)] + pos_hint: {'center_x': .5, 'center_y': .5} + canvas: + Color: + rgb: app.theme_cls.primary_color + Rectangle: + size: [dp(328), dp(96)] if self.theme_cls.device_orientation == 'portrait'\ + else [dp(168), dp(304)] + pos: [root.pos[0], root.pos[1] + root.height-dp(96)] if self.theme_cls.device_orientation == 'portrait'\ + else [root.pos[0], root.pos[1] + root.height-dp(304)] + Color: + rgb: app.theme_cls.bg_normal + Rectangle: + size: [dp(328), dp(484)-dp(96)] if self.theme_cls.device_orientation == 'portrait'\ + else [dp(344), dp(304)] + pos: [root.pos[0], root.pos[1] + root.height-dp(96)-(dp(484)-dp(96))]\ + if self.theme_cls.device_orientation == 'portrait' else [root.pos[0]+dp(168), root.pos[1]] #+dp(334) + MDLabel: + id: label_full_date + font_style: 'Display1' + text_color: 1, 1, 1, 1 + theme_text_color: 'Custom' + size_hint: (None, None) + size: [root.width, dp(30)] if root.theme_cls.device_orientation == 'portrait'\ + else [dp(168), dp(30)] + pos: [root.pos[0]+dp(23), root.pos[1] + root.height - dp(74)] \ + if root.theme_cls.device_orientation == 'portrait' \ + else [root.pos[0]+dp(3), root.pos[1] + dp(214)] + line_height: 0.84 + valign: 'middle' + text_size: [root.width, None] if root.theme_cls.device_orientation == 'portrait'\ + else [dp(149), None] + bold: True + text: root.fmt_lbl_date(root.sel_year, root.sel_month, root.sel_day, root.theme_cls.device_orientation) + MDLabel: + id: label_year + font_style: 'Subhead' + text_color: 1, 1, 1, 1 + theme_text_color: 'Custom' + size_hint: (None, None) + size: root.width, dp(30) + pos: (root.pos[0]+dp(23), root.pos[1]+root.height-dp(40)) if root.theme_cls.device_orientation == 'portrait'\ + else (root.pos[0]+dp(16), root.pos[1]+root.height-dp(41)) + valign: 'middle' + text: str(root.sel_year) + GridLayout: + id: cal_layout + cols: 7 + size: (dp(44*7), dp(40*7)) if root.theme_cls.device_orientation == 'portrait'\ + else (dp(46*7), dp(32*7)) + col_default_width: dp(42) if root.theme_cls.device_orientation == 'portrait'\ + else dp(39) + size_hint: (None, None) + padding: (dp(2), 0) if root.theme_cls.device_orientation == 'portrait'\ + else (dp(7), 0) + spacing: (dp(2), 0) if root.theme_cls.device_orientation == 'portrait'\ + else (dp(7), 0) + pos: (root.pos[0]+dp(10), root.pos[1]+dp(60)) if root.theme_cls.device_orientation == 'portrait'\ + else (root.pos[0]+dp(168)+dp(8), root.pos[1]+dp(48)) + MDLabel: + id: label_month_selector + font_style: 'Body2' + text: calendar.month_name[root.month].capitalize() + ' ' + str(root.year) + size_hint: (None, None) + size: root.width, dp(30) + pos: root.pos + theme_text_color: 'Primary' + pos_hint: {'center_x': 0.5, 'center_y': 0.75} if self.theme_cls.device_orientation == 'portrait'\ + else {'center_x': 0.67, 'center_y': 0.915} + valign: "middle" + halign: "center" + MDIconButton: + icon: 'chevron-left' + theme_text_color: 'Secondary' + pos_hint: {'center_x': 0.09, 'center_y': 0.745} if root.theme_cls.device_orientation == 'portrait'\ + else {'center_x': 0.39, 'center_y': 0.925} + on_release: root.change_month('prev') + MDIconButton: + icon: 'chevron-right' + theme_text_color: 'Secondary' + pos_hint: {'center_x': 0.92, 'center_y': 0.745} if root.theme_cls.device_orientation == 'portrait'\ + else {'center_x': 0.94, 'center_y': 0.925} + on_release: root.change_month('next') + MDFlatButton: + pos: root.pos[0]+root.size[0]-dp(72)*2, root.pos[1] + dp(7) + text: "Cancel" + on_release: root.dismiss() + MDFlatButton: + pos: root.pos[0]+root.size[0]-dp(72), root.pos[1] + dp(7) + text: "OK" + on_release: root.ok_click() + + + size_hint: None, None + size: (dp(40), dp(40)) if root.theme_cls.device_orientation == 'portrait'\ + else (dp(32), dp(32)) + MDLabel: + font_style: 'Caption' + theme_text_color: 'Custom' if root.is_today and not root.is_selected else 'Primary' + text_color: root.theme_cls.primary_color + opposite_colors: root.is_selected if root.owner.sel_month == root.owner.month \ + and root.owner.sel_year == root.owner.year and str(self.text) == str(root.owner.sel_day) else False + size_hint_x: None + valign: 'middle' + halign: 'center' + text: root.text + + + font_style: 'Caption' + theme_text_color: 'Secondary' + size: (dp(40), dp(40)) if root.theme_cls.device_orientation == 'portrait'\ + else (dp(32), dp(32)) + size_hint: None, None + text_size: self.size + valign: 'middle' if root.theme_cls.device_orientation == 'portrait' else 'bottom' + halign: 'center' + + + size: (dp(40), dp(40)) if root.theme_cls.device_orientation == 'portrait'\ + else (dp(32), dp(32)) + size_hint: (None, None) + canvas: + Color: + rgba: self.theme_cls.primary_color if self.shown else [0, 0, 0, 0] + Ellipse: + size: (dp(40), dp(40)) if root.theme_cls.device_orientation == 'portrait'\ + else (dp(32), dp(32)) + pos: self.pos if root.theme_cls.device_orientation == 'portrait'\ + else [self.pos[0] + dp(3), self.pos[1]] +""") + + +class DaySelector(ThemableBehavior, AnchorLayout): + shown = BooleanProperty(False) + + def __init__(self, parent): + super(DaySelector, self).__init__() + self.parent_class = parent + self.parent_class.add_widget(self, index=7) + self.selected_widget = None + Window.bind(on_resize=self.move_resize) + + def update(self): + parent = self.parent_class + if parent.sel_month == parent.month and parent.sel_year == parent.year: + self.shown = True + else: + self.shown = False + + def set_widget(self, widget): + self.selected_widget = widget + self.pos = widget.pos + self.move_resize(do_again=True) + self.update() + + def move_resize(self, window=None, width=None, height=None, do_again=True): + self.pos = self.selected_widget.pos + if do_again: + Clock.schedule_once(lambda x: self.move_resize(do_again=False), 0.01) + + +class DayButton(ThemableBehavior, CircularRippleBehavior, ButtonBehavior, + AnchorLayout): + text = StringProperty() + owner = ObjectProperty() + is_today = BooleanProperty(False) + is_selected = BooleanProperty(False) + + def on_release(self): + self.owner.set_selected_widget(self) + + +class WeekdayLabel(MDLabel): + pass + + +class MDDatePicker(FloatLayout, ThemableBehavior, ElevationBehavior, + ModalView): + _sel_day_widget = ObjectProperty() + cal_list = None + cal_layout = ObjectProperty() + sel_year = NumericProperty() + sel_month = NumericProperty() + sel_day = NumericProperty() + day = NumericProperty() + month = NumericProperty() + year = NumericProperty() + today = date.today() + callback = ObjectProperty() + + class SetDateError(Exception): + pass + + def __init__(self, callback, year=None, month=None, day=None, + firstweekday=0, + **kwargs): + self.callback = callback + self.cal = calendar.Calendar(firstweekday) + self.sel_year = year if year else self.today.year + self.sel_month = month if month else self.today.month + self.sel_day = day if day else self.today.day + self.month = self.sel_month + self.year = self.sel_year + self.day = self.sel_day + super(MDDatePicker, self).__init__(**kwargs) + self.selector = DaySelector(parent=self) + self.generate_cal_widgets() + self.update_cal_matrix(self.sel_year, self.sel_month) + self.set_month_day(self.sel_day) + self.selector.update() + + def ok_click(self): + self.callback(date(self.sel_year, self.sel_month, self.sel_day)) + self.dismiss() + + def fmt_lbl_date(self, year, month, day, orientation): + d = datetime.date(int(year), int(month), int(day)) + separator = '\n' if orientation == 'landscape' else ' ' + return d.strftime('%a,').capitalize() + separator + d.strftime( + '%b').capitalize() + ' ' + str(day).lstrip('0') + + def set_date(self, year, month, day): + try: + date(year, month, day) + except Exception as e: + print(e) + if str(e) == "day is out of range for month": + raise self.SetDateError(" Day %s day is out of range for month %s" % (day, month)) + elif str(e) == "month must be in 1..12": + raise self.SetDateError("Month must be between 1 and 12, got %s" % month) + elif str(e) == "year is out of range": + raise self.SetDateError("Year must be between %s and %s, got %s" % + (datetime.MINYEAR, datetime.MAXYEAR, year)) + else: + self.sel_year = year + self.sel_month = month + self.sel_day = day + self.month = self.sel_month + self.year = self.sel_year + self.day = self.sel_day + self.update_cal_matrix(self.sel_year, self.sel_month) + self.set_month_day(self.sel_day) + self.selector.update() + + def set_selected_widget(self, widget): + if self._sel_day_widget: + self._sel_day_widget.is_selected = False + widget.is_selected = True + self.sel_month = int(self.month) + self.sel_year = int(self.year) + self.sel_day = int(widget.text) + self._sel_day_widget = widget + self.selector.set_widget(widget) + + def set_month_day(self, day): + for idx in range(len(self.cal_list)): + if str(day) == str(self.cal_list[idx].text): + self._sel_day_widget = self.cal_list[idx] + self.sel_day = int(self.cal_list[idx].text) + if self._sel_day_widget: + self._sel_day_widget.is_selected = False + self._sel_day_widget = self.cal_list[idx] + self.cal_list[idx].is_selected = True + self.selector.set_widget(self.cal_list[idx]) + + def update_cal_matrix(self, year, month): + try: + dates = [x for x in self.cal.itermonthdates(year, month)] + except ValueError as e: + if str(e) == "year is out of range": + pass + else: + self.year = year + self.month = month + for idx in range(len(self.cal_list)): + if idx >= len(dates) or dates[idx].month != month: + self.cal_list[idx].disabled = True + self.cal_list[idx].text = '' + else: + self.cal_list[idx].disabled = False + self.cal_list[idx].text = str(dates[idx].day) + self.cal_list[idx].is_today = dates[idx] == self.today + self.selector.update() + + def generate_cal_widgets(self): + cal_list = [] + for i in calendar.day_abbr: + self.cal_layout.add_widget(WeekdayLabel(text=i[0].upper())) + for i in range(6 * 7): # 6 weeks, 7 days a week + db = DayButton(owner=self) + cal_list.append(db) + self.cal_layout.add_widget(db) + self.cal_list = cal_list + + def change_month(self, operation): + op = 1 if operation is 'next' else -1 + sl, sy = self.month, self.year + m = 12 if sl + op == 0 else 1 if sl + op == 13 else sl + op + y = sy - 1 if sl + op == 0 else sy + 1 if sl + op == 13 else sy + self.update_cal_matrix(y, m) diff --git a/src/kivymd/dialog.py b/src/kivymd/dialog.py new file mode 100644 index 00000000..cb6b7601 --- /dev/null +++ b/src/kivymd/dialog.py @@ -0,0 +1,176 @@ +# -*- coding: utf-8 -*- + +from kivy.lang import Builder +from kivy.properties import StringProperty, ObjectProperty, ListProperty +from kivy.metrics import dp +from kivy.uix.modalview import ModalView +from kivy.animation import Animation +from kivymd.theming import ThemableBehavior +from kivymd.elevationbehavior import ElevationBehavior +from kivymd.button import MDFlatButton + +Builder.load_string(''' +: + canvas: + Color: + rgba: self.theme_cls.bg_light + Rectangle: + size: self.size + pos: self.pos + + _container: container + _action_area: action_area + elevation: 12 + GridLayout: + cols: 1 + + GridLayout: + cols: 1 + padding: dp(24), dp(24), dp(24), 0 + spacing: dp(20) + MDLabel: + text: root.title + font_style: 'Title' + theme_text_color: 'Primary' + halign: 'left' + valign: 'middle' + size_hint_y: None + text_size: self.width, None + height: self.texture_size[1] + + BoxLayout: + id: container + + AnchorLayout: + anchor_x: 'right' + anchor_y: 'center' + size_hint: 1, None + height: dp(48) + padding: dp(8), dp(8) + spacing: dp(4) + + GridLayout: + id: action_area + rows: 1 + size_hint: None, None if len(root._action_buttons) > 0 else 1 + height: dp(36) if len(root._action_buttons) > 0 else 0 + width: self.minimum_width +''') + + +class MDDialog(ThemableBehavior, ElevationBehavior, ModalView): + title = StringProperty('') + + content = ObjectProperty(None) + + background_color = ListProperty([0, 0, 0, .2]) + + _container = ObjectProperty() + _action_buttons = ListProperty([]) + _action_area = ObjectProperty() + + def __init__(self, **kwargs): + super(MDDialog, self).__init__(**kwargs) + self.bind(_action_buttons=self._update_action_buttons, + auto_dismiss=lambda *x: setattr(self.shadow, 'on_release', + self.shadow.dismiss if self.auto_dismiss else None)) + + def add_action_button(self, text, action=None): + """Add an :class:`FlatButton` to the right of the action area. + + :param icon: Unicode character for the icon + :type icon: str or None + :param action: Function set to trigger when on_release fires + :type action: function or None + """ + button = MDFlatButton(text=text, + size_hint=(None, None), + height=dp(36)) + if action: + button.bind(on_release=action) + button.text_color = self.theme_cls.primary_color + button.background_color = self.theme_cls.bg_light + self._action_buttons.append(button) + + def add_widget(self, widget): + if self._container: + if self.content: + raise PopupException( + 'Popup can have only one widget as content') + self.content = widget + else: + super(MDDialog, self).add_widget(widget) + + def open(self, *largs): + '''Show the view window from the :attr:`attach_to` widget. If set, it + will attach to the nearest window. If the widget is not attached to any + window, the view will attach to the global + :class:`~kivy.core.window.Window`. + ''' + if self._window is not None: + Logger.warning('ModalView: you can only open once.') + return self + # search window + self._window = self._search_window() + if not self._window: + Logger.warning('ModalView: cannot open view, no window found.') + return self + self._window.add_widget(self) + self._window.bind(on_resize=self._align_center, + on_keyboard=self._handle_keyboard) + self.center = self._window.center + self.bind(size=self._align_center) + a = Animation(_anim_alpha=1., d=self._anim_duration) + a.bind(on_complete=lambda *x: self.dispatch('on_open')) + a.start(self) + return self + + def dismiss(self, *largs, **kwargs): + '''Close the view if it is open. If you really want to close the + view, whatever the on_dismiss event returns, you can use the *force* + argument: + :: + + view = ModalView(...) + view.dismiss(force=True) + + When the view is dismissed, it will be faded out before being + removed from the parent. If you don't want animation, use:: + + view.dismiss(animation=False) + + ''' + if self._window is None: + return self + if self.dispatch('on_dismiss') is True: + if kwargs.get('force', False) is not True: + return self + if kwargs.get('animation', True): + Animation(_anim_alpha=0., d=self._anim_duration).start(self) + else: + self._anim_alpha = 0 + self._real_remove_widget() + return self + + def on_content(self, instance, value): + if self._container: + self._container.clear_widgets() + self._container.add_widget(value) + + def on__container(self, instance, value): + if value is None or self.content is None: + return + self._container.clear_widgets() + self._container.add_widget(self.content) + + def on_touch_down(self, touch): + if self.disabled and self.collide_point(*touch.pos): + return True + return super(MDDialog, self).on_touch_down(touch) + + def _update_action_buttons(self, *args): + self._action_area.clear_widgets() + for btn in self._action_buttons: + btn.ids._label.texture_update() + btn.width = btn.ids._label.texture_size[0] + dp(16) + self._action_area.add_widget(btn) diff --git a/src/kivymd/elevationbehavior.py b/src/kivymd/elevationbehavior.py new file mode 100644 index 00000000..19d7985d --- /dev/null +++ b/src/kivymd/elevationbehavior.py @@ -0,0 +1,187 @@ +# -*- coding: utf-8 -*- + +from kivy.app import App +from kivy.lang import Builder +from kivy.properties import (ListProperty, ObjectProperty, NumericProperty) +from kivy.properties import AliasProperty +from kivy.metrics import dp + +Builder.load_string(''' + + canvas.before: + Color: + a: self._soft_shadow_a + Rectangle: + texture: self._soft_shadow_texture + size: self._soft_shadow_size + pos: self._soft_shadow_pos + Color: + a: self._hard_shadow_a + Rectangle: + texture: self._hard_shadow_texture + size: self._hard_shadow_size + pos: self._hard_shadow_pos + Color: + a: 1 + + + canvas.before: + Color: + a: self._soft_shadow_a + Rectangle: + texture: self._soft_shadow_texture + size: self._soft_shadow_size + pos: self._soft_shadow_pos + Color: + a: self._hard_shadow_a + Rectangle: + texture: self._hard_shadow_texture + size: self._hard_shadow_size + pos: self._hard_shadow_pos + Color: + a: 1 +''') + + +class ElevationBehavior(object): + _elevation = NumericProperty(1) + + def _get_elevation(self): + return self._elevation + + def _set_elevation(self, elevation): + try: + self._elevation = elevation + except: + self._elevation = 1 + + elevation = AliasProperty(_get_elevation, _set_elevation, + bind=('_elevation',)) + + _soft_shadow_texture = ObjectProperty() + _soft_shadow_size = ListProperty([0, 0]) + _soft_shadow_pos = ListProperty([0, 0]) + _soft_shadow_a = NumericProperty(0) + _hard_shadow_texture = ObjectProperty() + _hard_shadow_size = ListProperty([0, 0]) + _hard_shadow_pos = ListProperty([0, 0]) + _hard_shadow_a = NumericProperty(0) + + def __init__(self, **kwargs): + super(ElevationBehavior, self).__init__(**kwargs) + self.bind(elevation=self._update_shadow, + pos=self._update_shadow, + size=self._update_shadow) + + def _update_shadow(self, *args): + if self.elevation > 0: + ratio = self.width / (self.height if self.height != 0 else 1) + if ratio > -2 and ratio < 2: + self._shadow = App.get_running_app().theme_cls.quad_shadow + width = soft_width = self.width * 1.9 + height = soft_height = self.height * 1.9 + elif ratio <= -2: + self._shadow = App.get_running_app().theme_cls.rec_st_shadow + ratio = abs(ratio) + if ratio > 5: + ratio = ratio * 22 + else: + ratio = ratio * 11.5 + + width = soft_width = self.width * 1.9 + height = self.height + dp(ratio) + soft_height = self.height + dp(ratio) + dp(self.elevation) * .5 + else: + self._shadow = App.get_running_app().theme_cls.quad_shadow + width = soft_width = self.width * 1.8 + height = soft_height = self.height * 1.8 + # self._shadow = App.get_running_app().theme_cls.rec_shadow + # ratio = abs(ratio) + # if ratio > 5: + # ratio = ratio * 22 + # else: + # ratio = ratio * 11.5 + # + # width = self.width + dp(ratio) + # soft_width = self.width + dp(ratio) + dp(self.elevation) * .9 + # height = soft_height = self.height * 1.9 + + x = self.center_x - width / 2 + soft_x = self.center_x - soft_width / 2 + self._soft_shadow_size = (soft_width, soft_height) + self._hard_shadow_size = (width, height) + + y = self.center_y - soft_height / 2 - dp( + .1 * 1.5 ** self.elevation) + self._soft_shadow_pos = (soft_x, y) + self._soft_shadow_a = 0.1 * 1.1 ** self.elevation + self._soft_shadow_texture = self._shadow.textures[ + str(int(round(self.elevation - 1)))] + + y = self.center_y - height / 2 - dp(.5 * 1.18 ** self.elevation) + self._hard_shadow_pos = (x, y) + self._hard_shadow_a = .4 * .9 ** self.elevation + self._hard_shadow_texture = self._shadow.textures[ + str(int(round(self.elevation)))] + + else: + self._soft_shadow_a = 0 + self._hard_shadow_a = 0 + + +class RoundElevationBehavior(object): + _elevation = NumericProperty(1) + + def _get_elevation(self): + return self._elevation + + def _set_elevation(self, elevation): + try: + self._elevation = elevation + except: + self._elevation = 1 + + elevation = AliasProperty(_get_elevation, _set_elevation, + bind=('_elevation',)) + + _soft_shadow_texture = ObjectProperty() + _soft_shadow_size = ListProperty([0, 0]) + _soft_shadow_pos = ListProperty([0, 0]) + _soft_shadow_a = NumericProperty(0) + _hard_shadow_texture = ObjectProperty() + _hard_shadow_size = ListProperty([0, 0]) + _hard_shadow_pos = ListProperty([0, 0]) + _hard_shadow_a = NumericProperty(0) + + def __init__(self, **kwargs): + super(RoundElevationBehavior, self).__init__(**kwargs) + self._shadow = App.get_running_app().theme_cls.round_shadow + self.bind(elevation=self._update_shadow, + pos=self._update_shadow, + size=self._update_shadow) + + def _update_shadow(self, *args): + if self.elevation > 0: + width = self.width * 2 + height = self.height * 2 + + x = self.center_x - width / 2 + self._soft_shadow_size = (width, height) + + self._hard_shadow_size = (width, height) + + y = self.center_y - height / 2 - dp(.1 * 1.5 ** self.elevation) + self._soft_shadow_pos = (x, y) + self._soft_shadow_a = 0.1 * 1.1 ** self.elevation + self._soft_shadow_texture = self._shadow.textures[ + str(int(round(self.elevation)))] + + y = self.center_y - height / 2 - dp(.5 * 1.18 ** self.elevation) + self._hard_shadow_pos = (x, y) + self._hard_shadow_a = .4 * .9 ** self.elevation + self._hard_shadow_texture = self._shadow.textures[ + str(int(round(self.elevation - 1)))] + + else: + self._soft_shadow_a = 0 + self._hard_shadow_a = 0 diff --git a/src/kivymd/fonts/Material-Design-Iconic-Font.ttf b/src/kivymd/fonts/Material-Design-Iconic-Font.ttf new file mode 100644 index 00000000..5d489fdd Binary files /dev/null and b/src/kivymd/fonts/Material-Design-Iconic-Font.ttf differ diff --git a/src/kivymd/fonts/Roboto-Bold.ttf b/src/kivymd/fonts/Roboto-Bold.ttf new file mode 100644 index 00000000..91ec2122 Binary files /dev/null and b/src/kivymd/fonts/Roboto-Bold.ttf differ diff --git a/src/kivymd/fonts/Roboto-Italic.ttf b/src/kivymd/fonts/Roboto-Italic.ttf new file mode 100644 index 00000000..2041cbc0 Binary files /dev/null and b/src/kivymd/fonts/Roboto-Italic.ttf differ diff --git a/src/kivymd/fonts/Roboto-Light.ttf b/src/kivymd/fonts/Roboto-Light.ttf new file mode 100644 index 00000000..664e1b2f Binary files /dev/null and b/src/kivymd/fonts/Roboto-Light.ttf differ diff --git a/src/kivymd/fonts/Roboto-LightItalic.ttf b/src/kivymd/fonts/Roboto-LightItalic.ttf new file mode 100644 index 00000000..a85444f2 Binary files /dev/null and b/src/kivymd/fonts/Roboto-LightItalic.ttf differ diff --git a/src/kivymd/fonts/Roboto-Medium.ttf b/src/kivymd/fonts/Roboto-Medium.ttf new file mode 100644 index 00000000..aa00de0e Binary files /dev/null and b/src/kivymd/fonts/Roboto-Medium.ttf differ diff --git a/src/kivymd/fonts/Roboto-MediumItalic.ttf b/src/kivymd/fonts/Roboto-MediumItalic.ttf new file mode 100644 index 00000000..b8282055 Binary files /dev/null and b/src/kivymd/fonts/Roboto-MediumItalic.ttf differ diff --git a/src/kivymd/fonts/Roboto-Regular.ttf b/src/kivymd/fonts/Roboto-Regular.ttf new file mode 100644 index 00000000..3e6e2e76 Binary files /dev/null and b/src/kivymd/fonts/Roboto-Regular.ttf differ diff --git a/src/kivymd/fonts/Roboto-Thin.ttf b/src/kivymd/fonts/Roboto-Thin.ttf new file mode 100644 index 00000000..d262d144 Binary files /dev/null and b/src/kivymd/fonts/Roboto-Thin.ttf differ diff --git a/src/kivymd/fonts/Roboto-ThinItalic.ttf b/src/kivymd/fonts/Roboto-ThinItalic.ttf new file mode 100644 index 00000000..b79cb26d Binary files /dev/null and b/src/kivymd/fonts/Roboto-ThinItalic.ttf differ diff --git a/src/kivymd/grid.py b/src/kivymd/grid.py new file mode 100644 index 00000000..db310193 --- /dev/null +++ b/src/kivymd/grid.py @@ -0,0 +1,168 @@ +# coding=utf-8 +from kivy.lang import Builder +from kivy.properties import StringProperty, BooleanProperty, ObjectProperty, \ + NumericProperty, ListProperty, OptionProperty +from kivy.uix.behaviors import ButtonBehavior +from kivy.uix.boxlayout import BoxLayout +from kivy.uix.floatlayout import FloatLayout +from kivymd.ripplebehavior import RectangularRippleBehavior +from kivymd.theming import ThemableBehavior + +Builder.load_string(""" + + _img_widget: img + _img_overlay: img_overlay + _box_overlay: box + AsyncImage: + id: img + allow_stretch: root.allow_stretch + anim_delay: root.anim_delay + anim_loop: root.anim_loop + color: root.img_color + keep_ratio: root.keep_ratio + mipmap: root.mipmap + source: root.source + size_hint_y: 1 if root.overlap else None + x: root.x + y: root.y if root.overlap or root.box_position == 'header' else box.top + BoxLayout: + id: img_overlay + size_hint: img.size_hint + size: img.size + pos: img.pos + BoxLayout: + canvas: + Color: + rgba: root.box_color + Rectangle: + pos: self.pos + size: self.size + id: box + size_hint_y: None + height: dp(68) if root.lines == 2 else dp(48) + x: root.x + y: root.y if root.box_position == 'footer' else root.y + root.height - self.height + + + _img_widget: img + _img_overlay: img_overlay + _box_overlay: box + _box_label: boxlabel + AsyncImage: + id: img + allow_stretch: root.allow_stretch + anim_delay: root.anim_delay + anim_loop: root.anim_loop + color: root.img_color + keep_ratio: root.keep_ratio + mipmap: root.mipmap + source: root.source + size_hint_y: 1 if root.overlap else None + x: root.x + y: root.y if root.overlap or root.box_position == 'header' else box.top + BoxLayout: + id: img_overlay + size_hint: img.size_hint + size: img.size + pos: img.pos + BoxLayout: + canvas: + Color: + rgba: root.box_color + Rectangle: + pos: self.pos + size: self.size + id: box + size_hint_y: None + height: dp(68) if root.lines == 2 else dp(48) + x: root.x + y: root.y if root.box_position == 'footer' else root.y + root.height - self.height + MDLabel: + id: boxlabel + font_style: "Caption" + halign: "center" + text: root.text +""") + + +class Tile(ThemableBehavior, RectangularRippleBehavior, ButtonBehavior, + BoxLayout): + """A simple tile. It does nothing special, just inherits the right behaviors + to work as a building block. + """ + pass + + +class SmartTile(ThemableBehavior, RectangularRippleBehavior, ButtonBehavior, + FloatLayout): + """A tile for more complex needs. + + Includes an image, a container to place overlays and a box that can act + as a header or a footer, as described in the Material Design specs. + """ + + box_color = ListProperty([0, 0, 0, 0.5]) + """Sets the color and opacity for the information box.""" + + box_position = OptionProperty('footer', options=['footer', 'header']) + """Determines wether the information box acts as a header or footer to the + image. + """ + + lines = OptionProperty(1, options=[1, 2]) + """Number of lines in the header/footer. + + As per Material Design specs, only 1 and 2 are valid values. + """ + + overlap = BooleanProperty(True) + """Determines if the header/footer overlaps on top of the image or not""" + + # Img properties + allow_stretch = BooleanProperty(True) + anim_delay = NumericProperty(0.25) + anim_loop = NumericProperty(0) + img_color = ListProperty([1, 1, 1, 1]) + keep_ratio = BooleanProperty(False) + mipmap = BooleanProperty(False) + source = StringProperty() + + _img_widget = ObjectProperty() + _img_overlay = ObjectProperty() + _box_overlay = ObjectProperty() + _box_label = ObjectProperty() + + def reload(self): + self._img_widget.reload() + + def add_widget(self, widget, index=0): + if issubclass(widget.__class__, IOverlay): + self._img_overlay.add_widget(widget, index) + elif issubclass(widget.__class__, IBoxOverlay): + self._box_overlay.add_widget(widget, index) + else: + super(SmartTile, self).add_widget(widget, index) + + +class SmartTileWithLabel(SmartTile): + _box_label = ObjectProperty() + + # MDLabel properties + font_style = StringProperty("Caption") + theme_text_color = StringProperty("") + text = StringProperty("") + """Determines the text for the box footer/header""" + + +class IBoxOverlay(): + """An interface to specify widgets that belong to to the image overlay + in the :class:`SmartTile` widget when added as a child. + """ + pass + + +class IOverlay(): + """An interface to specify widgets that belong to to the image overlay + in the :class:`SmartTile` widget when added as a child. + """ + pass diff --git a/src/kivymd/icon_definitions.py b/src/kivymd/icon_definitions.py new file mode 100644 index 00000000..5b717356 --- /dev/null +++ b/src/kivymd/icon_definitions.py @@ -0,0 +1,1569 @@ +# -*- coding: utf-8 -*- + +# Thanks to Sergey Kupletsky (github.com/zavoloklom) for its Material Design +# Iconic Font, which provides KivyMD's icons. + +# GALLERY HERE: +# https://zavoloklom.github.io/material-design-iconic-font/icons.html + +# LAST UPDATED: version 2.2.0 of Material Design Iconic Font + +md_icons = { + '3d-rotation': u'', + + 'airplane-off': u'', + + 'address': u'', + + 'airplane': u'', + + 'album': u'', + + 'archive': u'', + + 'assignment-account': u'', + + 'assignment-alert': u'', + + 'assignment-check': u'', + + 'assignment-o': u'', + + 'assignment-return': u'', + + 'assignment-returned': u'', + + 'assignment': u'', + + 'attachment-alt': u'', + + 'attachment': u'', + + 'audio': u'', + + 'badge-check': u'', + + 'balance-wallet': u'', + + 'balance': u'', + + 'battery-alert': u'', + + 'battery-flash': u'', + + 'battery-unknown': u'', + + 'battery': u'', + + 'bike': u'', + + 'block-alt': u'', + + 'block': u'', + + 'boat': u'', + + 'book-image': u'', + + 'book': u'', + + 'bookmark-outline': u'', + + 'bookmark': u'', + + 'brush': u'', + + 'bug': u'', + + 'bus': u'', + + 'cake': u'', + + 'car-taxi': u'', + + 'car-wash': u'', + + 'car': u'', + + 'card-giftcard': u'', + + 'card-membership': u'', + + 'card-travel': u'', + + 'card': u'', + + 'case-check': u'', + + 'case-download': u'', + + 'case-play': u'', + + 'case': u'', + + 'cast-connected': u'', + + 'cast': u'', + + 'chart-donut': u'', + + 'chart': u'', + + 'city-alt': u'', + + 'city': u'', + + 'close-circle-o': u'', + + 'close-circle': u'', + + 'close': u'', + + 'cocktail': u'', + + 'code-setting': u'', + + 'code-smartphone': u'', + + 'code': u'', + + 'coffee': u'', + + 'collection-bookmark': u'', + + 'collection-case-play': u'', + + 'collection-folder-image': u'', + + 'collection-image-o': u'', + + 'collection-image': u'', + + 'collection-item-1': u'', + + 'collection-item-2': u'', + + 'collection-item-3': u'', + + 'collection-item-4': u'', + + 'collection-item-5': u'', + + 'collection-item-6': u'', + + 'collection-item-7': u'', + + 'collection-item-8': u'', + + 'collection-item-9-plus': u'', + + 'collection-item-9': u'', + + 'collection-item': u'', + + 'collection-music': u'', + + 'collection-pdf': u'', + + 'collection-plus': u'', + + 'collection-speaker': u'', + + 'collection-text': u'', + + 'collection-video': u'', + + 'compass': u'', + + 'cutlery': u'', + + 'delete': u'', + + 'dialpad': u'', + + 'dns': u'', + + 'drink': u'', + + 'edit': u'', + + 'email-open': u'', + + 'email': u'', + + 'eye-off': u'', + + 'eye': u'', + + 'eyedropper': u'', + + 'favorite-outline': u'', + + 'favorite': u'', + + 'filter-list': u'', + + 'fire': u'', + + 'flag': u'', + + 'flare': u'', + + 'flash-auto': u'', + + 'flash-off': u'', + + 'flash': u'', + + 'flip': u'', + + 'flower-alt': u'', + + 'flower': u'', + + 'font': u'', + + 'fullscreen-alt': u'', + + 'fullscreen-exit': u'', + + 'fullscreen': u'', + + 'functions': u'', + + 'gas-station': u'', + + 'gesture': u'', + + 'globe-alt': u'', + + 'globe-lock': u'', + + 'globe': u'', + + 'graduation-cap': u'', + + 'group': u'', + + 'home': u'', + + 'hospital-alt': u'', + + 'hospital': u'', + + 'hotel': u'', + + 'hourglass-alt': u'', + + 'hourglass-outline': u'', + + 'hourglass': u'', + + 'http': u'', + + 'image-alt': u'', + + 'image-o': u'', + + 'image': u'', + + 'inbox': u'', + + 'invert-colors-off': u'', + + 'invert-colors': u'', + + 'key': u'', + + 'label-alt-outline': u'', + + 'label-alt': u'', + + 'label-heart': u'', + + 'label': u'', + + 'labels': u'', + + 'lamp': u'', + + 'landscape': u'', + + 'layers-off': u'', + + 'layers': u'', + + 'library': u'', + + 'link': u'', + + 'lock-open': u'', + + 'lock-outline': u'', + + 'lock': u'', + + 'mail-reply-all': u'', + + 'mail-reply': u'', + + 'mail-send': u'', + + 'mall': u'', + + 'map': u'', + + 'menu': u'', + + 'money-box': u'', + + 'money-off': u'', + + 'money': u'', + + 'more-vert': u'', + + 'more': u'', + + 'movie-alt': u'', + + 'movie': u'', + + 'nature-people': u'', + + 'nature': u'', + + 'navigation': u'', + + 'open-in-browser': u'', + + 'open-in-new': u'', + + 'palette': u'', + + 'parking': u'', + + 'pin-account': u'', + + 'pin-assistant': u'', + + 'pin-drop': u'', + + 'pin-help': u'', + + 'pin-off': u'', + + 'pin': u'', + + 'pizza': u'', + + 'plaster': u'', + + 'power-setting': u'', + + 'power': u'', + + 'print': u'', + + 'puzzle-piece': u'', + + 'quote': u'', + + 'railway': u'', + + 'receipt': u'', + + 'refresh-alt': u'', + + 'refresh-sync-alert': u'', + + 'refresh-sync-off': u'', + + 'refresh-sync': u'', + + 'refresh': u'', + + 'roller': u'', + + 'ruler': u'', + + 'scissors': u'', + + 'screen-rotation-lock': u'', + + 'screen-rotation': u'', + + 'search-for': u'', + + 'search-in-file': u'', + + 'search-in-page': u'', + + 'search-replace': u'', + + 'search': u'', + + 'seat': u'', + + 'settings-square': u'', + + 'settings': u'', + + 'shape': u'', + + 'shield-check': u'', + + 'shield-security': u'', + + 'shopping-basket': u'', + + 'shopping-cart-plus': u'', + + 'shopping-cart': u'', + + 'sign-in': u'', + + 'sort-amount-asc': u'', + + 'sort-amount-desc': u'', + + 'sort-asc': u'', + + 'sort-desc': u'', + + 'spellcheck': u'', + + 'spinner': u'', + + 'storage': u'', + + 'store-24': u'', + + 'store': u'', + + 'subway': u'', + + 'sun': u'', + + 'tab-unselected': u'', + + 'tab': u'', + + 'tag-close': u'', + + 'tag-more': u'', + + 'tag': u'', + + 'thumb-down': u'', + + 'thumb-up-down': u'', + + 'thumb-up': u'', + + 'ticket-star': u'', + + 'toll': u'', + + 'toys': u'', + + 'traffic': u'', + + 'translate': u'', + + 'triangle-down': u'', + + 'triangle-up': u'', + + 'truck': u'', + + 'turning-sign': u'', + + ' ungroup': u'', + + 'wallpaper': u'', + + 'washing-machine': u'', + + 'window-maximize': u'', + + 'window-minimize': u'', + + 'window-restore': u'', + + 'wrench': u'', + + 'zoom-in': u'', + + 'zoom-out': u'', + + 'alert-circle-o': u'', + + 'alert-circle': u'', + + 'alert-octagon': u'', + + 'alert-polygon': u'', + + 'alert-triangle': u'', + + 'help-outline': u'', + + 'help': u'', + + 'info-outline': u'', + + 'info': u'', + + 'notifications-active': u'', + + 'notifications-add': u'', + + 'notifications-none': u'', + + 'notifications-off': u'', + + 'notifications-paused': u'', + + 'notifications': u'', + + 'account-add': u'', + + 'account-box-mail': u'', + + 'account-box-o': u'', + + 'account-box-phone': u'', + + 'account-box': u'', + + 'account-calendar': u'', + + 'account-circle': u'', + + 'account-o': u'', + + 'account': u'', + + 'accounts-add': u'', + + 'accounts-alt': u'', + + 'accounts-list-alt': u'', + + 'accounts-list': u'', + + 'accounts-outline': u'', + + 'accounts': u'', + + 'face': u'', + + 'female': u'', + + 'male-alt': u'', + + 'male-female': u'', + + 'male': u'', + + 'mood-bad': u'', + + 'mood': u'', + + 'run': u'', + + 'walk': u'', + + 'cloud-box': u'', + + 'cloud-circle': u'', + + 'cloud-done': u'', + + 'cloud-download': u'', + + 'cloud-off': u'', + + 'cloud-outline-alt': u'', + + 'cloud-outline': u'', + + 'cloud-upload': u'', + + 'cloud': u'', + + 'download': u'', + + 'file-plus': u'', + + 'file-text': u'', + + 'file': u'', + + 'folder-outline': u'', + + 'folder-person': u'', + + 'folder-star-alt': u'', + + 'folder-star': u'', + + 'folder': u'', + + 'gif': u'', + + 'upload': u'', + + 'border-all': u'', + + 'border-bottom': u'', + + 'border-clear': u'', + + 'border-color': u'', + + 'border-horizontal': u'', + + 'border-inner': u'', + + 'border-left': u'', + + 'border-outer': u'', + + 'border-right': u'', + + 'border-style': u'', + + 'border-top': u'', + + 'border-vertical': u'', + + 'copy': u'', + + 'crop': u'', + + 'format-align-center': u'', + + 'format-align-justify': u'', + + 'format-align-left': u'', + + 'format-align-right': u'', + + 'format-bold': u'', + + 'format-clear-all': u'', + + 'format-clear': u'', + + 'format-color-fill': u'', + + 'format-color-reset': u'', + + 'format-color-text': u'', + + 'format-indent-decrease': u'', + + 'format-indent-increase': u'', + + 'format-italic': u'', + + 'format-line-spacing': u'', + + 'format-list-bulleted': u'', + + 'format-list-numbered': u'', + + 'format-ltr': u'', + + 'format-rtl': u'', + + 'format-size': u'', + + 'format-strikethrough-s': u'', + + 'format-strikethrough': u'', + + 'format-subject': u'', + + 'format-underlined': u'', + + 'format-valign-bottom': u'', + + 'format-valign-center': u'', + + 'format-valign-top': u'', + + 'redo': u'', + + 'select-all': u'', + + 'space-bar': u'', + + 'text-format': u'', + + 'transform': u'', + + 'undo': u'', + + 'wrap-text': u'', + + 'comment-alert': u'', + + 'comment-alt-text': u'', + + 'comment-alt': u'', + + 'comment-edit': u'', + + 'comment-image': u'', + + 'comment-list': u'', + + 'comment-more': u'', + + 'comment-outline': u'', + + 'comment-text-alt': u'', + + 'comment-text': u'', + + 'comment-video': u'', + + 'comment': u'', + + 'comments': u'', + + 'rm': u'F', + + 'check-all': u'', + + 'check-circle-u': u'', + + 'check-circle': u'', + + 'check-square': u'', + + 'check': u'', + + 'circle-o': u'', + + 'circle': u'', + + 'dot-circle-alt': u'', + + 'dot-circle': u'', + + 'minus-circle-outline': u'', + + 'minus-circle': u'', + + 'minus-square': u'', + + 'minus': u'', + + 'plus-circle-o-duplicate': u'', + + 'plus-circle-o': u'', + + 'plus-circle': u'', + + 'plus-square': u'', + + 'plus': u'', + + 'square-o': u'', + + 'star-circle': u'', + + 'star-half': u'', + + 'star-outline': u'', + + 'star': u'', + + 'bluetooth-connected': u'', + + 'bluetooth-off': u'', + + 'bluetooth-search': u'', + + 'bluetooth-setting': u'', + + 'bluetooth': u'', + + 'camera-add': u'', + + 'camera-alt': u'', + + 'camera-bw': u'', + + 'camera-front': u'', + + 'camera-mic': u'', + + 'camera-party-mode': u'', + + 'camera-rear': u'', + + 'camera-roll': u'', + + 'camera-switch': u'', + + 'camera': u'', + + 'card-alert': u'', + + 'card-off': u'', + + 'card-sd': u'', + + 'card-sim': u'', + + 'desktop-mac': u'', + + 'desktop-windows': u'', + + 'device-hub': u'', + + 'devices-off': u'', + + 'devices': u'', + + 'dock': u'', + + 'floppy': u'', + + 'gamepad': u'', + + 'gps-dot': u'', + + 'gps-off': u'', + + 'gps': u'', + + 'headset-mic': u'', + + 'headset': u'', + + 'input-antenna': u'', + + 'input-composite': u'', + + 'input-hdmi': u'', + + 'input-power': u'', + + 'input-svideo': u'', + + 'keyboard-hide': u'', + + 'keyboard': u'', + + 'laptop-chromebook': u'', + + 'laptop-mac': u'', + + 'laptop': u'', + + 'mic-off': u'', + + 'mic-outline': u'', + + 'mic-setting': u'', + + 'mic': u'', + + 'mouse': u'', + + 'network-alert': u'', + + 'network-locked': u'', + + 'network-off': u'', + + 'network-outline': u'', + + 'network-setting': u'', + + 'network': u'', + + 'phone-bluetooth': u'', + + 'phone-end': u'', + + 'phone-forwarded': u'', + + 'phone-in-talk': u'', + + 'phone-locked': u'', + + 'phone-missed': u'', + + 'phone-msg': u'', + + 'phone-paused': u'', + + 'phone-ring': u'', + + 'phone-setting': u'', + + 'phone-sip': u'', + + 'phone': u'', + + 'portable-wifi-changes': u'', + + 'portable-wifi-off': u'', + + 'portable-wifi': u'', + + 'radio': u'', + + 'reader': u'', + + 'remote-control-alt': u'', + + 'remote-control': u'', + + 'router': u'', + + 'scanner': u'', + + 'smartphone-android': u'', + + 'smartphone-download': u'', + + 'smartphone-erase': u'', + + 'smartphone-info': u'', + + 'smartphone-iphone': u'', + + 'smartphone-landscape-lock': u'', + + 'smartphone-landscape': u'', + + 'smartphone-lock': u'', + + 'smartphone-portrait-lock': u'', + + 'smartphone-ring': u'', + + 'smartphone-setting': u'', + + 'smartphone-setup': u'', + + 'smartphone': u'', + + 'speaker': u'', + + 'tablet-android': u'', + + 'tablet-mac': u'', + + 'tablet': u'', + + 'tv-alt-play': u'', + + 'tv-list': u'', + + 'tv-play': u'', + + 'tv': u'', + + 'usb': u'', + + 'videocam-off': u'', + + 'videocam-switch': u'', + + 'videocam': u'', + + 'watch': u'', + + 'wifi-alt-2': u'', + + 'wifi-alt': u'', + + 'wifi-info': u'', + + 'wifi-lock': u'', + + 'wifi-off': u'', + + 'wifi-outline': u'', + + 'wifi': u'', + + 'arrow-left-bottom': u'', + + 'arrow-left': u'', + + 'arrow-merge': u'', + + 'arrow-missed': u'', + + 'arrow-right-top': u'', + + 'arrow-right': u'', + + 'arrow-split': u'', + + 'arrows': u'', + + 'caret-down-circle': u'', + + 'caret-down': u'', + + 'caret-left-circle': u'', + + 'caret-left': u'', + + 'caret-right-circle': u'', + + 'caret-right': u'', + + 'caret-up-circle': u'', + + 'caret-up': u'', + + 'chevron-down': u'', + + 'chevron-left': u'', + + 'chevron-right': u'', + + 'chevron-up': u'', + + 'forward': u'', + + 'long-arrow-down': u'', + + 'long-arrow-left': u'', + + 'long-arrow-return': u'', + + 'long-arrow-right': u'', + + 'long-arrow-tab': u'', + + 'long-arrow-up': u'', + + 'rotate-ccw': u'', + + 'rotate-cw': u'', + + 'rotate-left': u'', + + 'rotate-right': u'', + + 'square-down': u'', + + 'square-right': u'', + + 'swap-alt': u'', + + 'swap-vertical-circle': u'', + + 'swap-vertical': u'', + + 'swap': u'', + + 'trending-down': u'', + + 'trending-flat': u'', + + 'trending-up': u'', + + 'unfold-less': u'', + + 'unfold-more': u'', + + 'apps': u'', + + 'grid-off': u'', + + 'grid': u'', + + 'view-agenda': u'', + + 'view-array': u'', + + 'view-carousel': u'', + + 'view-column': u'', + + 'view-comfy': u'', + + 'view-compact': u'', + + 'view-dashboard': u'', + + 'view-day': u'', + + 'view-headline': u'', + + 'view-list-alt': u'', + + 'view-list': u'', + + 'view-module': u'', + + 'view-quilt': u'', + + 'view-stream': u'', + + 'view-subtitles': u'', + + 'view-toc': u'', + + 'view-web': u'', + + 'view-week': u'', + + 'widgets': u'', + + 'alarm-check': u'', + + 'alarm-off': u'', + + 'alarm-plus': u'', + + 'alarm-snooze': u'', + + 'alarm': u'', + + 'calendar-alt': u'', + + 'calendar-check': u'', + + 'calendar-close': u'', + + 'calendar-note': u'', + + 'calendar': u'', + + 'time-countdown': u'', + + 'time-interval': u'', + + 'time-restore-setting': u'', + + 'time-restore': u'', + + 'time': u'', + + 'timer-off': u'', + + 'timer': u'', + + 'android-alt': u'', + + 'android': u'', + + 'apple': u'', + + 'behance': u'', + + 'codepen': u'', + + 'dribbble': u'', + + 'dropbox': u'', + + 'evernote': u'', + + 'facebook-box': u'', + + 'facebook': u'', + + 'github-box': u'', + + 'github': u'', + + 'google-drive': u'', + + 'google-earth': u'', + + 'google-glass': u'', + + 'google-maps': u'', + + 'google-pages': u'', + + 'google-play': u'', + + 'google-plus-box': u'', + + 'google-plus': u'', + + 'google': u'', + + 'instagram': u'', + + 'language-css3': u'', + + 'language-html5': u'', + + 'language-javascript': u'', + + 'language-python-alt': u'', + + 'language-python': u'', + + 'lastfm': u'', + + 'linkedin-box': u'', + + 'paypal': u'', + + 'pinterest-box': u'', + + 'pocket': u'', + + 'polymer': u'', + + 'rss': u'', + + 'share': u'', + + 'stackoverflow': u'', + + 'steam-square': u'', + + 'steam': u'', + + 'twitter-box': u'', + + 'twitter': u'', + + 'vk': u'', + + 'wikipedia': u'', + + 'windows': u'', + + '500px': u'', + + '8tracks': u'', + + 'amazon': u'', + + 'blogger': u'', + + 'delicious': u'', + + 'disqus': u'', + + 'flattr': u'', + + 'flickr': u'', + + 'github-alt': u'', + + 'google-old': u'', + + 'linkedin': u'', + + 'odnoklassniki': u'', + + 'outlook': u'', + + 'paypal-alt': u'', + + 'pinterest': u'', + + 'playstation': u'', + + 'reddit': u'', + + 'skype': u'', + + 'slideshare': u'', + + 'soundcloud': u'', + + 'tumblr': u'', + + 'twitch': u'', + + 'vimeo': u'', + + 'whatsapp': u'', + + 'xbox': u'', + + 'yahoo': u'', + + 'youtube-play': u'', + + 'youtube': u'', + + 'aspect-ratio-alt': u'', + + 'aspect-ratio': u'', + + 'blur-circular': u'', + + 'blur-linear': u'', + + 'blur-off': u'', + + 'blur': u'', + + 'brightness-2': u'', + + 'brightness-3': u'', + + 'brightness-4': u'', + + 'brightness-5': u'', + + 'brightness-6': u'', + + 'brightness-7': u'', + + 'brightness-auto': u'', + + 'brightness-setting': u'', + + 'broken-image': u'', + + 'center-focus-strong': u'', + + 'center-focus-weak': u'', + + 'compare': u'', + + 'crop-16-9': u'', + + 'crop-3-2': u'', + + 'crop-5-4': u'', + + 'crop-7-5': u'', + + 'crop-din': u'', + + 'crop-free': u'', + + 'crop-landscape': u'', + + 'crop-portrait': u'', + + 'crop-square': u'', + + 'exposure-alt': u'', + + 'exposure': u'', + + 'filter-b-and-w': u'', + + 'filter-center-focus': u'', + + 'filter-frames': u'', + + 'filter-tilt-shift': u'', + + 'gradient': u'', + + 'grain': u'', + + 'graphic-eq': u'', + + 'hdr-off': u'', + + 'hdr-strong': u'', + + 'hdr-weak': u'', + + 'hdr': u'', + + 'iridescent': u'', + + 'leak-off': u'', + + 'leak': u'', + + 'looks': u'', + + 'loupe': u'', + + 'panorama-horizontal': u'', + + 'panorama-vertical': u'', + + 'panorama-wide-angle': u'', + + 'photo-size-select-large': u'', + + 'photo-size-select-small': u'', + + 'picture-in-picture': u'', + + 'slideshow': u'', + + 'texture': u'', + + 'tonality': u'', + + 'vignette': u'', + + 'wb-auto': u'', + + 'eject-alt': u'', + + 'eject': u'', + + 'equalizer': u'', + + 'fast-forward': u'', + + 'fast-rewind': u'', + + 'forward-10': u'', + + 'forward-30': u'', + + 'forward-5': u'', + + 'hearing': u'', + + 'pause-circle-outline': u'', + + 'pause-circle': u'', + + 'pause': u'', + + 'play-circle-outline': u'', + + 'play-circle': u'', + + 'play': u'', + + 'playlist-audio': u'', + + 'playlist-plus': u'', + + 'repeat-one': u'', + + 'repeat': u'', + + 'replay-10': u'', + + 'replay-30': u'', + + 'replay-5': u'', + + 'replay': u'', + + 'shuffle': u'', + + 'skip-next': u'', + + 'skip-previous': u'', + + 'stop': u'', + + 'surround-sound': u'', + + 'tune': u'', + + 'volume-down': u'', + + 'volume-mute': u'', + + 'volume-off': u'', + + 'volume-up': u'', + + 'n-1-square': u'', + + 'n-2-square': u'', + + 'n-3-square': u'', + + 'n-4-square': u'', + + 'n-5-square': u'', + + 'n-6-square': u'', + + 'neg-1': u'', + + 'neg-2': u'', + + 'plus-1': u'', + + 'plus-2': u'', + + 'sec-10': u'', + + 'sec-3': u'', + + 'zero': u'', + + 'airline-seat-flat-angled': u'', + + 'airline-seat-flat': u'', + + 'airline-seat-individual-suite': u'', + + 'airline-seat-legroom-extra': u'', + + 'airline-seat-legroom-normal': u'', + + 'airline-seat-legroom-reduced': u'', + + 'airline-seat-recline-extra': u'', + + 'airline-seat-recline-normal': u'', + + 'airplay': u'', + + 'closed-caption': u'', + + 'confirmation-number': u'', + + 'developer-board': u'', + + 'disc-full': u'', + + 'explicit': u'', + + 'flight-land': u'', + + 'flight-takeoff': u'', + + 'flip-to-back': u'', + + 'flip-to-front': u'', + + 'group-work': u'', + + 'hd': u'', + + 'hq': u'', + + 'markunread-mailbox': u'', + + 'memory': u'', + + 'nfc': u'', + + 'play-for-work': u'', + + 'power-input': u'', + + 'present-to-all': u'', + + 'satellite': u'', + + 'tap-and-play': u'', + + 'vibration': u'', + + 'voicemail': u'', +} diff --git a/src/kivymd/images/kivymd_512.png b/src/kivymd/images/kivymd_512.png new file mode 100644 index 00000000..7dbae604 Binary files /dev/null and b/src/kivymd/images/kivymd_512.png differ diff --git a/src/kivymd/images/kivymd_logo.png b/src/kivymd/images/kivymd_logo.png new file mode 100644 index 00000000..64d956d4 Binary files /dev/null and b/src/kivymd/images/kivymd_logo.png differ diff --git a/src/kivymd/images/quad_shadow-0.png b/src/kivymd/images/quad_shadow-0.png new file mode 100644 index 00000000..5d64fde5 Binary files /dev/null and b/src/kivymd/images/quad_shadow-0.png differ diff --git a/src/kivymd/images/quad_shadow-1.png b/src/kivymd/images/quad_shadow-1.png new file mode 100644 index 00000000..c0f1e226 Binary files /dev/null and b/src/kivymd/images/quad_shadow-1.png differ diff --git a/src/kivymd/images/quad_shadow-2.png b/src/kivymd/images/quad_shadow-2.png new file mode 100644 index 00000000..44619e56 Binary files /dev/null and b/src/kivymd/images/quad_shadow-2.png differ diff --git a/src/kivymd/images/quad_shadow.atlas b/src/kivymd/images/quad_shadow.atlas new file mode 100644 index 00000000..68e0aad2 --- /dev/null +++ b/src/kivymd/images/quad_shadow.atlas @@ -0,0 +1 @@ +{"quad_shadow-1.png": {"20": [2, 136, 128, 128], "21": [132, 136, 128, 128], "22": [262, 136, 128, 128], "23": [2, 6, 128, 128], "19": [132, 266, 128, 128], "18": [2, 266, 128, 128], "1": [262, 266, 128, 128], "3": [262, 6, 128, 128], "2": [132, 6, 128, 128]}, "quad_shadow-0.png": {"11": [262, 266, 128, 128], "10": [132, 266, 128, 128], "13": [132, 136, 128, 128], "12": [2, 136, 128, 128], "15": [2, 6, 128, 128], "14": [262, 136, 128, 128], "17": [262, 6, 128, 128], "16": [132, 6, 128, 128], "0": [2, 266, 128, 128]}, "quad_shadow-2.png": {"5": [132, 266, 128, 128], "4": [2, 266, 128, 128], "7": [2, 136, 128, 128], "6": [262, 266, 128, 128], "9": [262, 136, 128, 128], "8": [132, 136, 128, 128]}} \ No newline at end of file diff --git a/src/kivymd/images/rec_shadow-0.png b/src/kivymd/images/rec_shadow-0.png new file mode 100644 index 00000000..f02b919a Binary files /dev/null and b/src/kivymd/images/rec_shadow-0.png differ diff --git a/src/kivymd/images/rec_shadow-1.png b/src/kivymd/images/rec_shadow-1.png new file mode 100644 index 00000000..f752fd26 Binary files /dev/null and b/src/kivymd/images/rec_shadow-1.png differ diff --git a/src/kivymd/images/rec_shadow.atlas b/src/kivymd/images/rec_shadow.atlas new file mode 100644 index 00000000..71b0e9d6 --- /dev/null +++ b/src/kivymd/images/rec_shadow.atlas @@ -0,0 +1 @@ +{"rec_shadow-1.png": {"20": [2, 266, 256, 128], "21": [260, 266, 256, 128], "22": [518, 266, 256, 128], "23": [776, 266, 256, 128], "3": [260, 136, 256, 128], "2": [2, 136, 256, 128], "5": [776, 136, 256, 128], "4": [518, 136, 256, 128], "7": [260, 6, 256, 128], "6": [2, 6, 256, 128], "9": [776, 6, 256, 128], "8": [518, 6, 256, 128]}, "rec_shadow-0.png": {"11": [518, 266, 256, 128], "10": [260, 266, 256, 128], "13": [2, 136, 256, 128], "12": [776, 266, 256, 128], "15": [518, 136, 256, 128], "14": [260, 136, 256, 128], "17": [2, 6, 256, 128], "16": [776, 136, 256, 128], "19": [518, 6, 256, 128], "18": [260, 6, 256, 128], "1": [776, 6, 256, 128], "0": [2, 266, 256, 128]}} \ No newline at end of file diff --git a/src/kivymd/images/rec_st_shadow-0.png b/src/kivymd/images/rec_st_shadow-0.png new file mode 100644 index 00000000..887327db Binary files /dev/null and b/src/kivymd/images/rec_st_shadow-0.png differ diff --git a/src/kivymd/images/rec_st_shadow-1.png b/src/kivymd/images/rec_st_shadow-1.png new file mode 100644 index 00000000..759ee652 Binary files /dev/null and b/src/kivymd/images/rec_st_shadow-1.png differ diff --git a/src/kivymd/images/rec_st_shadow-2.png b/src/kivymd/images/rec_st_shadow-2.png new file mode 100644 index 00000000..e9fdaccc Binary files /dev/null and b/src/kivymd/images/rec_st_shadow-2.png differ diff --git a/src/kivymd/images/rec_st_shadow.atlas b/src/kivymd/images/rec_st_shadow.atlas new file mode 100644 index 00000000..d4c24abe --- /dev/null +++ b/src/kivymd/images/rec_st_shadow.atlas @@ -0,0 +1 @@ +{"rec_st_shadow-0.png": {"11": [262, 138, 128, 256], "10": [132, 138, 128, 256], "13": [522, 138, 128, 256], "12": [392, 138, 128, 256], "15": [782, 138, 128, 256], "14": [652, 138, 128, 256], "16": [912, 138, 128, 256], "0": [2, 138, 128, 256]}, "rec_st_shadow-1.png": {"20": [522, 138, 128, 256], "21": [652, 138, 128, 256], "17": [2, 138, 128, 256], "23": [912, 138, 128, 256], "19": [262, 138, 128, 256], "18": [132, 138, 128, 256], "22": [782, 138, 128, 256], "1": [392, 138, 128, 256]}, "rec_st_shadow-2.png": {"3": [132, 138, 128, 256], "2": [2, 138, 128, 256], "5": [392, 138, 128, 256], "4": [262, 138, 128, 256], "7": [652, 138, 128, 256], "6": [522, 138, 128, 256], "9": [912, 138, 128, 256], "8": [782, 138, 128, 256]}} \ No newline at end of file diff --git a/src/kivymd/images/round_shadow-0.png b/src/kivymd/images/round_shadow-0.png new file mode 100644 index 00000000..26d98405 Binary files /dev/null and b/src/kivymd/images/round_shadow-0.png differ diff --git a/src/kivymd/images/round_shadow-1.png b/src/kivymd/images/round_shadow-1.png new file mode 100644 index 00000000..d0f4c0fd Binary files /dev/null and b/src/kivymd/images/round_shadow-1.png differ diff --git a/src/kivymd/images/round_shadow-2.png b/src/kivymd/images/round_shadow-2.png new file mode 100644 index 00000000..d5feef2c Binary files /dev/null and b/src/kivymd/images/round_shadow-2.png differ diff --git a/src/kivymd/images/round_shadow.atlas b/src/kivymd/images/round_shadow.atlas new file mode 100644 index 00000000..f25016dc --- /dev/null +++ b/src/kivymd/images/round_shadow.atlas @@ -0,0 +1 @@ +{"round_shadow-1.png": {"20": [2, 136, 128, 128], "21": [132, 136, 128, 128], "22": [262, 136, 128, 128], "23": [2, 6, 128, 128], "19": [132, 266, 128, 128], "18": [2, 266, 128, 128], "1": [262, 266, 128, 128], "3": [262, 6, 128, 128], "2": [132, 6, 128, 128]}, "round_shadow-0.png": {"11": [262, 266, 128, 128], "10": [132, 266, 128, 128], "13": [132, 136, 128, 128], "12": [2, 136, 128, 128], "15": [2, 6, 128, 128], "14": [262, 136, 128, 128], "17": [262, 6, 128, 128], "16": [132, 6, 128, 128], "0": [2, 266, 128, 128]}, "round_shadow-2.png": {"5": [132, 266, 128, 128], "4": [2, 266, 128, 128], "7": [2, 136, 128, 128], "6": [262, 266, 128, 128], "9": [262, 136, 128, 128], "8": [132, 136, 128, 128]}} \ No newline at end of file diff --git a/src/kivymd/label.py b/src/kivymd/label.py new file mode 100644 index 00000000..844f2a07 --- /dev/null +++ b/src/kivymd/label.py @@ -0,0 +1,94 @@ +# -*- coding: utf-8 -*- +from kivy.lang import Builder +from kivy.metrics import sp +from kivy.properties import OptionProperty, DictProperty, ListProperty +from kivy.uix.label import Label +from kivymd.material_resources import DEVICE_TYPE +from kivymd.theming import ThemableBehavior + +Builder.load_string(''' + + disabled_color: self.theme_cls.disabled_hint_text_color + text_size: (self.width, None) +''') + + +class MDLabel(ThemableBehavior, Label): + font_style = OptionProperty( + 'Body1', options=['Body1', 'Body2', 'Caption', 'Subhead', 'Title', + 'Headline', 'Display1', 'Display2', 'Display3', + 'Display4', 'Button', 'Icon']) + + # Font, Bold, Mobile size, Desktop size (None if same as Mobile) + _font_styles = DictProperty({'Body1': ['Roboto', False, 14, 13], + 'Body2': ['Roboto', True, 14, 13], + 'Caption': ['Roboto', False, 12, None], + 'Subhead': ['Roboto', False, 16, 15], + 'Title': ['Roboto', True, 20, None], + 'Headline': ['Roboto', False, 24, None], + 'Display1': ['Roboto', False, 34, None], + 'Display2': ['Roboto', False, 45, None], + 'Display3': ['Roboto', False, 56, None], + 'Display4': ['RobotoLight', False, 112, None], + 'Button': ['Roboto', True, 14, None], + 'Icon': ['Icons', False, 24, None]}) + + theme_text_color = OptionProperty(None, allownone=True, + options=['Primary', 'Secondary', 'Hint', + 'Error', 'Custom']) + + text_color = ListProperty(None, allownone=True) + + _currently_bound_property = {} + + def __init__(self, **kwargs): + super(MDLabel, self).__init__(**kwargs) + self.on_theme_text_color(None, self.theme_text_color) + self.on_font_style(None, self.font_style) + self.on_opposite_colors(None, self.opposite_colors) + + def on_font_style(self, instance, style): + info = self._font_styles[style] + self.font_name = info[0] + self.bold = info[1] + if DEVICE_TYPE == 'desktop' and info[3] is not None: + self.font_size = sp(info[3]) + else: + self.font_size = sp(info[2]) + + def on_theme_text_color(self, instance, value): + t = self.theme_cls + op = self.opposite_colors + setter = self.setter('color') + t.unbind(**self._currently_bound_property) + c = {} + if value == 'Primary': + c = {'text_color' if not op else 'opposite_text_color': setter} + t.bind(**c) + self.color = t.text_color if not op else t.opposite_text_color + elif value == 'Secondary': + c = {'secondary_text_color' if not op else + 'opposite_secondary_text_color': setter} + t.bind(**c) + self.color = t.secondary_text_color if not op else \ + t.opposite_secondary_text_color + elif value == 'Hint': + c = {'disabled_hint_text_color' if not op else + 'opposite_disabled_hint_text_color': setter} + t.bind(**c) + self.color = t.disabled_hint_text_color if not op else \ + t.opposite_disabled_hint_text_color + elif value == 'Error': + c = {'error_color': setter} + t.bind(**c) + self.color = t.error_color + elif value == 'Custom': + self.color = self.text_color if self.text_color else (0, 0, 0, 1) + self._currently_bound_property = c + + def on_text_color(self, *args): + if self.theme_text_color == 'Custom': + self.color = self.text_color + + def on_opposite_colors(self, instance, value): + self.on_theme_text_color(self, self.theme_text_color) diff --git a/src/kivymd/list.py b/src/kivymd/list.py new file mode 100644 index 00000000..36162329 --- /dev/null +++ b/src/kivymd/list.py @@ -0,0 +1,531 @@ +# -*- coding: utf-8 -*- +''' +Lists +===== + +`Material Design spec, Lists page `_ + +`Material Design spec, Lists: Controls page `_ + +The class :class:`MDList` in combination with a ListItem like +:class:`OneLineListItem` will create a list that expands as items are added to +it, working nicely with Kivy's :class:`~kivy.uix.scrollview.ScrollView`. + + +Simple examples +--------------- + +Kv Lang: + +.. code-block:: python + + ScrollView: + do_scroll_x: False # Important for MD compliance + MDList: + OneLineListItem: + text: "Single-line item" + TwoLineListItem: + text: "Two-line item" + secondary_text: "Secondary text here" + ThreeLineListItem: + text: "Three-line item" + secondary_text: "This is a multi-line label where you can fit more text than usual" + + +Python: + +.. code-block:: python + + # Sets up ScrollView with MDList, as normally used in Android: + sv = ScrollView() + ml = MDList() + sv.add_widget(ml) + + contacts = ["Paula", "John", "Kate", "Vlad"] + for c in contacts: + ml.add_widget( + OneLineListItem( + text=c + ) + ) + +Advanced usage +-------------- + +Due to the variety in sizes and controls in the MD spec, this module suffers +from a certain level of complexity to keep the widgets compliant, flexible +and performant. + +For this KivyMD provides ListItems that try to cover the most common usecases, +when those are insufficient, there's a base class called :class:`ListItem` +which you can use to create your own ListItems. This documentation will only +cover the provided ones, for custom implementations please refer to this +module's source code. + +Text only ListItems +------------------- + +- :class:`~OneLineListItem` +- :class:`~TwoLineListItem` +- :class:`~ThreeLineListItem` + +These are the simplest ones. The :attr:`~ListItem.text` attribute changes the +text in the most prominent line, while :attr:`~ListItem.secondary_text` +changes the second and third line. + +If there are only two lines, :attr:`~ListItem.secondary_text` will shorten +the text to fit in case it is too long; if a third line is available, it will +instead wrap the text to make use of it. + +ListItems with widget containers +-------------------------------- + +- :class:`~OneLineAvatarListItem` +- :class:`~TwoLineAvatarListItem` +- :class:`~ThreeLineAvatarListItem` +- :class:`~OneLineIconListItem` +- :class:`~TwoLineIconListItem` +- :class:`~ThreeLineIconListItem` +- :class:`~OneLineAvatarIconListItem` +- :class:`~TwoLineAvatarIconListItem` +- :class:`~ThreeLineAvatarIconListItem` + +These widgets will take other widgets that inherit from :class:`~ILeftBody`, +:class:`ILeftBodyTouch`, :class:`~IRightBody` or :class:`~IRightBodyTouch` and +put them in their corresponding container. + +As the name implies, :class:`~ILeftBody` and :class:`~IRightBody` will signal +that the widget goes into the left or right container, respectively. + +:class:`~ILeftBodyTouch` and :class:`~IRightBodyTouch` do the same thing, +except these widgets will also receive touch events that occur within their +surfaces. + +Python example: + +.. code-block:: python + + class ContactPhoto(ILeftBody, AsyncImage): + pass + + class MessageButton(IRightBodyTouch, MDIconButton): + phone_number = StringProperty() + + def on_release(self): + # sample code: + Dialer.send_sms(phone_number, "Hey! What's up?") + pass + + # Sets up ScrollView with MDList, as normally used in Android: + sv = ScrollView() + ml = MDList() + sv.add_widget(ml) + + contacts = [ + ["Annie", "555-24235", "http://myphotos.com/annie.png"], + ["Bob", "555-15423", "http://myphotos.com/bob.png"], + ["Claire", "555-66098", "http://myphotos.com/claire.png"] + ] + + for c in contacts: + item = TwoLineAvatarIconListItem( + text=c[0], + secondary_text=c[1] + ) + item.add_widget(ContactPhoto(source=c[2])) + item.add_widget(MessageButton(phone_number=c[1]) + ml.add_widget(item) + +API +--- +''' + +from kivy.lang import Builder +from kivy.metrics import dp +from kivy.properties import ObjectProperty, StringProperty, NumericProperty, \ + ListProperty, OptionProperty +from kivy.uix.behaviors import ButtonBehavior +from kivy.uix.floatlayout import FloatLayout +from kivy.uix.gridlayout import GridLayout +import kivymd.material_resources as m_res +from kivymd.ripplebehavior import RectangularRippleBehavior +from kivymd.theming import ThemableBehavior + +Builder.load_string(''' +#:import m_res kivymd.material_resources + + cols: 1 + size_hint_y: None + height: self._min_list_height + padding: 0, self._list_vertical_padding + + + size_hint_y: None + canvas: + Color: + rgba: self.theme_cls.divider_color + Line: + points: root.x,root.y, root.x+self.width,root.y + BoxLayout: + id: _text_container + orientation: 'vertical' + pos: root.pos + padding: root._txt_left_pad, root._txt_top_pad, root._txt_right_pad, root._txt_bot_pad + MDLabel: + id: _lbl_primary + text: root.text + font_style: root.font_style + theme_text_color: root.theme_text_color + text_color: root.text_color + size_hint_y: None + height: self.texture_size[1] + MDLabel: + id: _lbl_secondary + text: '' if root._num_lines == 1 else root.secondary_text + font_style: root.secondary_font_style + theme_text_color: root.secondary_theme_text_color + text_color: root.secondary_text_color + size_hint_y: None + height: 0 if root._num_lines == 1 else self.texture_size[1] + shorten: True if root._num_lines == 2 else False + + + BoxLayout: + id: _left_container + size_hint: None, None + x: root.x + dp(16) + y: root.y + root.height/2 - self.height/2 + size: dp(40), dp(40) + + + BoxLayout: + id: _left_container + size_hint: None, None + x: root.x + dp(16) + y: root.y + root.height - root._txt_top_pad - self.height - dp(5) + size: dp(40), dp(40) + + + BoxLayout: + id: _left_container + size_hint: None, None + x: root.x + dp(16) + y: root.y + root.height/2 - self.height/2 + size: dp(48), dp(48) + + + BoxLayout: + id: _left_container + size_hint: None, None + x: root.x + dp(16) + y: root.y + root.height - root._txt_top_pad - self.height - dp(5) + size: dp(48), dp(48) + + + BoxLayout: + id: _right_container + size_hint: None, None + x: root.x + root.width - m_res.HORIZ_MARGINS - self.width + y: root.y + root.height/2 - self.height/2 + size: dp(48), dp(48) + + + BoxLayout: + id: _right_container + size_hint: None, None + x: root.x + root.width - m_res.HORIZ_MARGINS - self.width + y: root.y + root.height/2 - self.height/2 + size: dp(48), dp(48) + + + BoxLayout: + id: _right_container + size_hint: None, None + x: root.x + root.width - m_res.HORIZ_MARGINS - self.width + y: root.y + root.height/2 - self.height/2 + size: dp(48), dp(48) + + + BoxLayout: + id: _right_container + size_hint: None, None + x: root.x + root.width - m_res.HORIZ_MARGINS - self.width + y: root.y + root.height/2 - self.height/2 + size: dp(48), dp(48) + + + BoxLayout: + id: _right_container + size_hint: None, None + x: root.x + root.width - m_res.HORIZ_MARGINS - self.width + y: root.y + root.height - root._txt_top_pad - self.height - dp(5) + size: dp(48), dp(48) +''') + + +class MDList(GridLayout): + '''ListItem container. Best used in conjunction with a + :class:`kivy.uix.ScrollView`. + + When adding (or removing) a widget, it will resize itself to fit its + children, plus top and bottom paddings as described by the MD spec. + ''' + selected = ObjectProperty() + _min_list_height = dp(16) + _list_vertical_padding = dp(8) + + icon = StringProperty() + + def add_widget(self, widget, index=0): + super(MDList, self).add_widget(widget, index) + self.height += widget.height + + def remove_widget(self, widget): + super(MDList, self).remove_widget(widget) + self.height -= widget.height + + +class BaseListItem(ThemableBehavior, RectangularRippleBehavior, + ButtonBehavior, FloatLayout): + '''Base class to all ListItems. Not supposed to be instantiated on its own. + ''' + + text = StringProperty() + '''Text shown in the first line. + + :attr:`text` is a :class:`~kivy.properties.StringProperty` and defaults + to "". + ''' + + text_color = ListProperty(None) + ''' Text color used if theme_text_color is set to 'Custom' ''' + + font_style = OptionProperty( + 'Subhead', options=['Body1', 'Body2', 'Caption', 'Subhead', 'Title', + 'Headline', 'Display1', 'Display2', 'Display3', + 'Display4', 'Button', 'Icon']) + + theme_text_color = StringProperty('Primary',allownone=True) + ''' Theme text color for primary text ''' + + secondary_text = StringProperty() + '''Text shown in the second and potentially third line. + + The text will wrap into the third line if the ListItem's type is set to + \'one-line\'. It can be forced into the third line by adding a \\n + escape sequence. + + :attr:`secondary_text` is a :class:`~kivy.properties.StringProperty` and + defaults to "". + ''' + + secondary_text_color = ListProperty(None) + ''' Text color used for secondary text if secondary_theme_text_color + is set to 'Custom' ''' + + secondary_theme_text_color = StringProperty('Secondary',allownone=True) + ''' Theme text color for secondary primary text ''' + + secondary_font_style = OptionProperty( + 'Body1', options=['Body1', 'Body2', 'Caption', 'Subhead', 'Title', + 'Headline', 'Display1', 'Display2', 'Display3', + 'Display4', 'Button', 'Icon']) + + _txt_left_pad = NumericProperty(dp(16)) + _txt_top_pad = NumericProperty() + _txt_bot_pad = NumericProperty() + _txt_right_pad = NumericProperty(m_res.HORIZ_MARGINS) + _num_lines = 2 + + +class ILeftBody: + '''Pseudo-interface for widgets that go in the left container for + ListItems that support it. + + Implements nothing and requires no implementation, for annotation only. + ''' + pass + + +class ILeftBodyTouch: + '''Same as :class:`~ILeftBody`, but allows the widget to receive touch + events instead of triggering the ListItem's ripple effect + ''' + pass + + +class IRightBody: + '''Pseudo-interface for widgets that go in the right container for + ListItems that support it. + + Implements nothing and requires no implementation, for annotation only. + ''' + pass + + +class IRightBodyTouch: + '''Same as :class:`~IRightBody`, but allows the widget to receive touch + events instead of triggering the ListItem's ripple effect + ''' + pass + + +class ContainerSupport: + '''Overrides add_widget in a ListItem to include support for I*Body + widgets when the appropiate containers are present. + ''' + _touchable_widgets = ListProperty() + + def add_widget(self, widget, index=0): + if issubclass(widget.__class__, ILeftBody): + self.ids['_left_container'].add_widget(widget) + elif issubclass(widget.__class__, ILeftBodyTouch): + self.ids['_left_container'].add_widget(widget) + self._touchable_widgets.append(widget) + elif issubclass(widget.__class__, IRightBody): + self.ids['_right_container'].add_widget(widget) + elif issubclass(widget.__class__, IRightBodyTouch): + self.ids['_right_container'].add_widget(widget) + self._touchable_widgets.append(widget) + else: + return super(BaseListItem, self).add_widget(widget,index) + + def remove_widget(self, widget): + super(BaseListItem, self).remove_widget(widget) + if widget in self._touchable_widgets: + self._touchable_widgets.remove(widget) + + def on_touch_down(self, touch): + if self.propagate_touch_to_touchable_widgets(touch, 'down'): + return + super(BaseListItem, self).on_touch_down(touch) + + def on_touch_move(self, touch, *args): + if self.propagate_touch_to_touchable_widgets(touch, 'move', *args): + return + super(BaseListItem, self).on_touch_move(touch, *args) + + def on_touch_up(self, touch): + if self.propagate_touch_to_touchable_widgets(touch, 'up'): + return + super(BaseListItem, self).on_touch_up(touch) + + def propagate_touch_to_touchable_widgets(self, touch, touch_event, *args): + triggered = False + for i in self._touchable_widgets: + if i.collide_point(touch.x, touch.y): + triggered = True + if touch_event == 'down': + i.on_touch_down(touch) + elif touch_event == 'move': + i.on_touch_move(touch, *args) + elif touch_event == 'up': + i.on_touch_up(touch) + return triggered + + +class OneLineListItem(BaseListItem): + _txt_top_pad = NumericProperty(dp(16)) + _txt_bot_pad = NumericProperty(dp(15)) # dp(20) - dp(5) + _num_lines = 1 + + def __init__(self, **kwargs): + super(OneLineListItem, self).__init__(**kwargs) + self.height = dp(48) + + +class TwoLineListItem(BaseListItem): + _txt_top_pad = NumericProperty(dp(20)) + _txt_bot_pad = NumericProperty(dp(15)) # dp(20) - dp(5) + + def __init__(self, **kwargs): + super(TwoLineListItem, self).__init__(**kwargs) + self.height = dp(72) + + +class ThreeLineListItem(BaseListItem): + _txt_top_pad = NumericProperty(dp(16)) + _txt_bot_pad = NumericProperty(dp(15)) # dp(20) - dp(5) + _num_lines = 3 + + def __init__(self, **kwargs): + super(ThreeLineListItem, self).__init__(**kwargs) + self.height = dp(88) + + +class OneLineAvatarListItem(ContainerSupport, BaseListItem): + _txt_left_pad = NumericProperty(dp(72)) + _txt_top_pad = NumericProperty(dp(20)) + _txt_bot_pad = NumericProperty(dp(19)) # dp(24) - dp(5) + _num_lines = 1 + + def __init__(self, **kwargs): + super(OneLineAvatarListItem, self).__init__(**kwargs) + self.height = dp(56) + + +class TwoLineAvatarListItem(OneLineAvatarListItem): + _txt_top_pad = NumericProperty(dp(20)) + _txt_bot_pad = NumericProperty(dp(15)) # dp(20) - dp(5) + _num_lines = 2 + + def __init__(self, **kwargs): + super(BaseListItem, self).__init__(**kwargs) + self.height = dp(72) + + +class ThreeLineAvatarListItem(ContainerSupport, ThreeLineListItem): + _txt_left_pad = NumericProperty(dp(72)) + + +class OneLineIconListItem(ContainerSupport, OneLineListItem): + _txt_left_pad = NumericProperty(dp(72)) + + +class TwoLineIconListItem(OneLineIconListItem): + _txt_top_pad = NumericProperty(dp(20)) + _txt_bot_pad = NumericProperty(dp(15)) # dp(20) - dp(5) + _num_lines = 2 + + def __init__(self, **kwargs): + super(BaseListItem, self).__init__(**kwargs) + self.height = dp(72) + + +class ThreeLineIconListItem(ContainerSupport, ThreeLineListItem): + _txt_left_pad = NumericProperty(dp(72)) + + +class OneLineRightIconListItem(ContainerSupport, OneLineListItem): + # dp(40) = dp(16) + dp(24): + _txt_right_pad = NumericProperty(dp(40) + m_res.HORIZ_MARGINS) + + +class TwoLineRightIconListItem(OneLineRightIconListItem): + _txt_top_pad = NumericProperty(dp(20)) + _txt_bot_pad = NumericProperty(dp(15)) # dp(20) - dp(5) + _num_lines = 2 + + def __init__(self, **kwargs): + super(BaseListItem, self).__init__(**kwargs) + self.height = dp(72) + + +class ThreeLineRightIconListitem(ContainerSupport, ThreeLineListItem): + # dp(40) = dp(16) + dp(24): + _txt_right_pad = NumericProperty(dp(40) + m_res.HORIZ_MARGINS) + + +class OneLineAvatarIconListItem(OneLineAvatarListItem): + # dp(40) = dp(16) + dp(24): + _txt_right_pad = NumericProperty(dp(40) + m_res.HORIZ_MARGINS) + + +class TwoLineAvatarIconListItem(TwoLineAvatarListItem): + # dp(40) = dp(16) + dp(24): + _txt_right_pad = NumericProperty(dp(40) + m_res.HORIZ_MARGINS) + + +class ThreeLineAvatarIconListItem(ThreeLineAvatarListItem): + # dp(40) = dp(16) + dp(24): + _txt_right_pad = NumericProperty(dp(40) + m_res.HORIZ_MARGINS) diff --git a/src/kivymd/material_resources.py b/src/kivymd/material_resources.py new file mode 100644 index 00000000..46270e5c --- /dev/null +++ b/src/kivymd/material_resources.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +from kivy import platform +from kivy.core.window import Window +from kivy.metrics import dp +from kivymd import fonts_path + +# Feel free to override this const if you're designing for a device such as +# a GNU/Linux tablet. +if platform != "android" and platform != "ios": + DEVICE_TYPE = "desktop" +elif Window.width >= dp(600) and Window.height >= dp(600): + DEVICE_TYPE = "tablet" +else: + DEVICE_TYPE = "mobile" + +if DEVICE_TYPE == "mobile": + MAX_NAV_DRAWER_WIDTH = dp(300) + HORIZ_MARGINS = dp(16) + STANDARD_INCREMENT = dp(56) + PORTRAIT_TOOLBAR_HEIGHT = STANDARD_INCREMENT + LANDSCAPE_TOOLBAR_HEIGHT = STANDARD_INCREMENT - dp(8) +else: + MAX_NAV_DRAWER_WIDTH = dp(400) + HORIZ_MARGINS = dp(24) + STANDARD_INCREMENT = dp(64) + PORTRAIT_TOOLBAR_HEIGHT = STANDARD_INCREMENT + LANDSCAPE_TOOLBAR_HEIGHT = STANDARD_INCREMENT + +TOUCH_TARGET_HEIGHT = dp(48) + +FONTS = [ + { + "name": "Roboto", + "fn_regular": fonts_path + 'Roboto-Regular.ttf', + "fn_bold": fonts_path + 'Roboto-Medium.ttf', + "fn_italic": fonts_path + 'Roboto-Italic.ttf', + "fn_bolditalic": fonts_path + 'Roboto-MediumItalic.ttf' + }, + { + "name": "RobotoLight", + "fn_regular": fonts_path + 'Roboto-Thin.ttf', + "fn_bold": fonts_path + 'Roboto-Light.ttf', + "fn_italic": fonts_path + 'Roboto-ThinItalic.ttf', + "fn_bolditalic": fonts_path + 'Roboto-LightItalic.ttf' + }, + { + "name": "Icons", + "fn_regular": fonts_path + 'Material-Design-Iconic-Font.ttf' + } +] diff --git a/src/kivymd/menu.py b/src/kivymd/menu.py new file mode 100644 index 00000000..f4c96ac8 --- /dev/null +++ b/src/kivymd/menu.py @@ -0,0 +1,192 @@ +# -*- coding: utf-8 -*- +from kivy.animation import Animation +from kivy.clock import Clock +from kivy.core.window import Window +from kivy.lang import Builder +from kivy.garden.recycleview import RecycleView +from kivy.metrics import dp +from kivy.properties import NumericProperty, ListProperty, OptionProperty, \ + StringProperty +from kivy.uix.behaviors import ButtonBehavior +from kivy.uix.boxlayout import BoxLayout +import kivymd.material_resources as m_res +from kivymd.theming import ThemableBehavior + +Builder.load_string(''' +#:import STD_INC kivymd.material_resources.STANDARD_INCREMENT + + size_hint_y: None + height: dp(48) + padding: dp(16), 0 + on_release: root.parent.parent.parent.parent.dismiss() # Horrible, but hey it works + MDLabel: + text: root.text + theme_text_color: 'Primary' + + + size_hint: None, None + width: root.width_mult * STD_INC + key_viewclass: 'viewclass' + key_size: 'height' + + + FloatLayout: + id: fl + MDMenu: + id: md_menu + data: root.items + width_mult: root.width_mult + size_hint: None, None + size: 0,0 + canvas.before: + Color: + rgba: root.theme_cls.bg_light + Rectangle: + size: self.size + pos: self.pos +''') + + +class MDMenuItem(ButtonBehavior, BoxLayout): + text = StringProperty() + + +class MDMenu(RecycleView): + width_mult = NumericProperty(1) + + +class MDDropdownMenu(ThemableBehavior, BoxLayout): + items = ListProperty() + '''See :attr:`~kivy.garden.recycleview.RecycleView.data` + ''' + + width_mult = NumericProperty(1) + '''This number multiplied by the standard increment (56dp on mobile, + 64dp on desktop, determines the width of the menu items. + + If the resulting number were to be too big for the application Window, + the multiplier will be adjusted for the biggest possible one. + ''' + + max_height = NumericProperty() + '''The menu will grow no bigger than this number. + + Set to 0 for no limit. Defaults to 0. + ''' + + border_margin = NumericProperty(dp(4)) + '''Margin between Window border and menu + ''' + + ver_growth = OptionProperty(None, allownone=True, + options=['up', 'down']) + '''Where the menu will grow vertically to when opening + + Set to None to let the widget pick for you. Defaults to None. + ''' + + hor_growth = OptionProperty(None, allownone=True, + options=['left', 'right']) + '''Where the menu will grow horizontally to when opening + + Set to None to let the widget pick for you. Defaults to None. + ''' + + def open(self, *largs): + Window.add_widget(self) + Clock.schedule_once(lambda x: self.display_menu(largs[0]), -1) + + def display_menu(self, caller): + # We need to pick a starting point, see how big we need to be, + # and where to grow to. + + c = caller.to_window(caller.center_x, + caller.center_y) # Starting coords + + # ---ESTABLISH INITIAL TARGET SIZE ESTIMATE--- + target_width = self.width_mult * m_res.STANDARD_INCREMENT + # If we're wider than the Window... + if target_width > Window.width: + # ...reduce our multiplier to max allowed. + target_width = int( + Window.width / m_res.STANDARD_INCREMENT) * m_res.STANDARD_INCREMENT + + target_height = sum([dp(48) for i in self.items]) + # If we're over max_height... + if 0 < self.max_height < target_height: + target_height = self.max_height + + # ---ESTABLISH VERTICAL GROWTH DIRECTION--- + if self.ver_growth is not None: + ver_growth = self.ver_growth + else: + # If there's enough space below us: + if target_height <= c[1] - self.border_margin: + ver_growth = 'down' + # if there's enough space above us: + elif target_height < Window.height - c[1] - self.border_margin: + ver_growth = 'up' + # otherwise, let's pick the one with more space and adjust ourselves + else: + # if there's more space below us: + if c[1] >= Window.height - c[1]: + ver_growth = 'down' + target_height = c[1] - self.border_margin + # if there's more space above us: + else: + ver_growth = 'up' + target_height = Window.height - c[1] - self.border_margin + + if self.hor_growth is not None: + hor_growth = self.hor_growth + else: + # If there's enough space to the right: + if target_width <= Window.width - c[0] - self.border_margin: + hor_growth = 'right' + # if there's enough space to the left: + elif target_width < c[0] - self.border_margin: + hor_growth = 'left' + # otherwise, let's pick the one with more space and adjust ourselves + else: + # if there's more space to the right: + if Window.width - c[0] >= c[0]: + hor_growth = 'right' + target_width = Window.width - c[0] - self.border_margin + # if there's more space to the left: + else: + hor_growth = 'left' + target_width = c[0] - self.border_margin + + if ver_growth == 'down': + tar_y = c[1] - target_height + else: # should always be 'up' + tar_y = c[1] + + if hor_growth == 'right': + tar_x = c[0] + else: # should always be 'left' + tar_x = c[0] - target_width + anim = Animation(x=tar_x, y=tar_y, + width=target_width, height=target_height, + duration=.3, transition='out_quint') + menu = self.ids['md_menu'] + menu.pos = c + anim.start(menu) + + def on_touch_down(self, touch): + if not self.ids['md_menu'].collide_point(*touch.pos): + self.dismiss() + return True + super(MDDropdownMenu, self).on_touch_down(touch) + return True + + def on_touch_move(self, touch): + super(MDDropdownMenu, self).on_touch_move(touch) + return True + + def on_touch_up(self, touch): + super(MDDropdownMenu, self).on_touch_up(touch) + return True + + def dismiss(self): + Window.remove_widget(self) diff --git a/src/kivymd/navigationdrawer.py b/src/kivymd/navigationdrawer.py new file mode 100644 index 00000000..42aa9a62 --- /dev/null +++ b/src/kivymd/navigationdrawer.py @@ -0,0 +1,76 @@ +# -*- coding: utf-8 -*- +from kivy.animation import Animation +from kivy.lang import Builder +from kivy.properties import StringProperty, ObjectProperty +from kivymd.elevationbehavior import ElevationBehavior +from kivymd.icon_definitions import md_icons +from kivymd.label import MDLabel +from kivymd.list import OneLineIconListItem, ILeftBody, BaseListItem +from kivymd.slidingpanel import SlidingPanel +from kivymd.theming import ThemableBehavior + +Builder.load_string(''' + + canvas: + Color: + rgba: root.theme_cls.divider_color + Line: + points: self.x, self.y, self.x+self.width,self.y + + + _list: list + elevation: 0 + canvas: + Color: + rgba: root.theme_cls.bg_light + Rectangle: + size: root.size + pos: root.pos + NavDrawerToolbar: + title: root.title + opposite_colors: False + title_theme_color: 'Secondary' + background_color: root.theme_cls.bg_light + elevation: 0 + ScrollView: + do_scroll_x: False + MDList: + id: ml + id: list + + + NDIconLabel: + id: _icon + font_style: 'Icon' + theme_text_color: 'Secondary' +''') + + +class NavigationDrawer(SlidingPanel, ThemableBehavior, ElevationBehavior): + title = StringProperty() + + _list = ObjectProperty() + + def add_widget(self, widget, index=0): + if issubclass(widget.__class__, BaseListItem): + self._list.add_widget(widget, index) + widget.bind(on_release=lambda x: self.toggle()) + else: + super(NavigationDrawer, self).add_widget(widget, index) + + def _get_main_animation(self, duration, t, x, is_closing): + a = super(NavigationDrawer, self)._get_main_animation(duration, t, x, + is_closing) + a &= Animation(elevation=0 if is_closing else 5, t=t, duration=duration) + return a + + +class NDIconLabel(ILeftBody, MDLabel): + pass + + +class NavigationDrawerIconButton(OneLineIconListItem): + icon = StringProperty() + + def on_icon(self, instance, value): + self.ids['_icon'].text = u"{}".format(md_icons[value]) diff --git a/src/kivymd/progressbar.py b/src/kivymd/progressbar.py new file mode 100644 index 00000000..6d3a2ca8 --- /dev/null +++ b/src/kivymd/progressbar.py @@ -0,0 +1,79 @@ +# -*- coding: utf-8 -*- + +from kivy.lang import Builder +from kivy.properties import ListProperty, OptionProperty, BooleanProperty +from kivy.utils import get_color_from_hex +from kivymd.color_definitions import colors +from kivymd.theming import ThemableBehavior +from kivy.uix.progressbar import ProgressBar + + +Builder.load_string(''' +: + canvas: + Clear + Color: + rgba: self.theme_cls.divider_color + Rectangle: + size: (self.width , dp(4)) if self.orientation == 'horizontal' else (dp(4),self.height) + pos: (self.x, self.center_y - dp(4)) if self.orientation == 'horizontal' \ + else (self.center_x - dp(4),self.y) + + + Color: + rgba: self.theme_cls.primary_color + Rectangle: + size: (self.width*self.value_normalized, sp(4)) if self.orientation == 'horizontal' else (sp(4), \ + self.height*self.value_normalized) + pos: (self.width*(1-self.value_normalized)+self.x if self.reversed else self.x, self.center_y - dp(4)) \ + if self.orientation == 'horizontal' else \ + (self.center_x - dp(4),self.height*(1-self.value_normalized)+self.y if self.reversed else self.y) + +''') + + +class MDProgressBar(ThemableBehavior, ProgressBar): + reversed = BooleanProperty(False) + ''' Reverse the direction the progressbar moves. ''' + + orientation = OptionProperty('horizontal', options=['horizontal', 'vertical']) + ''' Orientation of progressbar''' + + +if __name__ == '__main__': + from kivy.app import App + from kivymd.theming import ThemeManager + + class ProgressBarApp(App): + theme_cls = ThemeManager() + + def build(self): + return Builder.load_string("""#:import MDSlider kivymd.slider.MDSlider +BoxLayout: + orientation:'vertical' + padding: '8dp' + MDSlider: + id:slider + min:0 + max:100 + value: 40 + + MDProgressBar: + value: slider.value + MDProgressBar: + reversed: True + value: slider.value + BoxLayout: + MDProgressBar: + orientation:"vertical" + reversed: True + value: slider.value + + MDProgressBar: + orientation:"vertical" + value: slider.value + +""") + + + ProgressBarApp().run() diff --git a/src/kivymd/ripplebehavior.py b/src/kivymd/ripplebehavior.py new file mode 100644 index 00000000..21dd3463 --- /dev/null +++ b/src/kivymd/ripplebehavior.py @@ -0,0 +1,169 @@ +# -*- coding: utf-8 -*- +from kivy.properties import ListProperty, NumericProperty, StringProperty, \ + BooleanProperty +from kivy.animation import Animation +from kivy.graphics import Color, Ellipse, StencilPush, StencilPop, \ + StencilUse, StencilUnUse, Rectangle + + +class CommonRipple(object): + ripple_rad = NumericProperty() + ripple_rad_default = NumericProperty(1) + ripple_post = ListProperty() + ripple_color = ListProperty() + ripple_alpha = NumericProperty(.5) + ripple_scale = NumericProperty(None) + ripple_duration_in_fast = NumericProperty(.3) + # FIXME: These speeds should be calculated based on widget size in dp + ripple_duration_in_slow = NumericProperty(2) + ripple_duration_out = NumericProperty(.3) + ripple_func_in = StringProperty('out_quad') + ripple_func_out = StringProperty('out_quad') + + doing_ripple = BooleanProperty(False) + finishing_ripple = BooleanProperty(False) + fading_out = BooleanProperty(False) + + def on_touch_down(self, touch): + if touch.is_mouse_scrolling: + return False + if not self.collide_point(touch.x, touch.y): + return False + + if not self.disabled: + if self.doing_ripple: + Animation.cancel_all(self, 'ripple_rad', 'ripple_color', + 'rect_color') + self.anim_complete() + self.ripple_rad = self.ripple_rad_default + self.ripple_pos = (touch.x, touch.y) + + if self.ripple_color != []: + pass + elif hasattr(self, 'theme_cls'): + self.ripple_color = self.theme_cls.ripple_color + else: + # If no theme, set Grey 300 + self.ripple_color = [0.8784313725490196, 0.8784313725490196, + 0.8784313725490196, self.ripple_alpha] + self.ripple_color[3] = self.ripple_alpha + + self.lay_canvas_instructions() + self.finish_rad = max(self.width, self.height) * self.ripple_scale + self.start_ripple() + return super(CommonRipple, self).on_touch_down(touch) + + def lay_canvas_instructions(self): + raise NotImplementedError + + def on_touch_move(self, touch, *args): + if not self.collide_point(touch.x, touch.y): + if not self.finishing_ripple and self.doing_ripple: + self.finish_ripple() + return super(CommonRipple, self).on_touch_move(touch, *args) + + def on_touch_up(self, touch): + if self.collide_point(touch.x, touch.y) and self.doing_ripple: + self.finish_ripple() + return super(CommonRipple, self).on_touch_up(touch) + + def start_ripple(self): + if not self.doing_ripple: + anim = Animation( + ripple_rad=self.finish_rad, + t='linear', + duration=self.ripple_duration_in_slow) + anim.bind(on_complete=self.fade_out) + self.doing_ripple = True + anim.start(self) + + def _set_ellipse(self, instance, value): + self.ellipse.size = (self.ripple_rad, self.ripple_rad) + + # Adjust ellipse pos here + + def _set_color(self, instance, value): + self.col_instruction.a = value[3] + + def finish_ripple(self): + if self.doing_ripple and not self.finishing_ripple: + Animation.cancel_all(self, 'ripple_rad') + anim = Animation(ripple_rad=self.finish_rad, + t=self.ripple_func_in, + duration=self.ripple_duration_in_fast) + anim.bind(on_complete=self.fade_out) + self.finishing_ripple = True + anim.start(self) + + def fade_out(self, *args): + rc = self.ripple_color + if not self.fading_out: + Animation.cancel_all(self, 'ripple_color') + anim = Animation(ripple_color=[rc[0], rc[1], rc[2], 0.], + t=self.ripple_func_out, + duration=self.ripple_duration_out) + anim.bind(on_complete=self.anim_complete) + self.fading_out = True + anim.start(self) + + def anim_complete(self, *args): + self.doing_ripple = False + self.finishing_ripple = False + self.fading_out = False + self.canvas.after.clear() + + +class RectangularRippleBehavior(CommonRipple): + ripple_scale = NumericProperty(2.75) + + def lay_canvas_instructions(self): + with self.canvas.after: + StencilPush() + Rectangle(pos=self.pos, size=self.size) + StencilUse() + self.col_instruction = Color(rgba=self.ripple_color) + self.ellipse = \ + Ellipse(size=(self.ripple_rad, self.ripple_rad), + pos=(self.ripple_pos[0] - self.ripple_rad / 2., + self.ripple_pos[1] - self.ripple_rad / 2.)) + StencilUnUse() + Rectangle(pos=self.pos, size=self.size) + StencilPop() + self.bind(ripple_color=self._set_color, + ripple_rad=self._set_ellipse) + + def _set_ellipse(self, instance, value): + super(RectangularRippleBehavior, self)._set_ellipse(instance, value) + self.ellipse.pos = (self.ripple_pos[0] - self.ripple_rad / 2., + self.ripple_pos[1] - self.ripple_rad / 2.) + + +class CircularRippleBehavior(CommonRipple): + ripple_scale = NumericProperty(1) + + def lay_canvas_instructions(self): + with self.canvas.after: + StencilPush() + self.stencil = Ellipse(size=(self.width * self.ripple_scale, + self.height * self.ripple_scale), + pos=(self.center_x - ( + self.width * self.ripple_scale) / 2, + self.center_y - ( + self.height * self.ripple_scale) / 2)) + StencilUse() + self.col_instruction = Color(rgba=self.ripple_color) + self.ellipse = Ellipse(size=(self.ripple_rad, self.ripple_rad), + pos=(self.center_x - self.ripple_rad / 2., + self.center_y - self.ripple_rad / 2.)) + StencilUnUse() + Ellipse(pos=self.pos, size=self.size) + StencilPop() + self.bind(ripple_color=self._set_color, + ripple_rad=self._set_ellipse) + + def _set_ellipse(self, instance, value): + super(CircularRippleBehavior, self)._set_ellipse(instance, value) + if self.ellipse.size[0] > self.width * .6 and not self.fading_out: + self.fade_out() + self.ellipse.pos = (self.center_x - self.ripple_rad / 2., + self.center_y - self.ripple_rad / 2.) diff --git a/src/kivymd/selectioncontrols.py b/src/kivymd/selectioncontrols.py new file mode 100644 index 00000000..b918428a --- /dev/null +++ b/src/kivymd/selectioncontrols.py @@ -0,0 +1,240 @@ +# -*- coding: utf-8 -*- + +from kivy.lang import Builder +from kivy.properties import StringProperty, ListProperty, NumericProperty +from kivy.uix.behaviors import ToggleButtonBehavior +from kivy.uix.label import Label +from kivy.uix.floatlayout import FloatLayout +from kivy.properties import AliasProperty, BooleanProperty +from kivy.metrics import dp, sp +from kivy.animation import Animation +from kivy.utils import get_color_from_hex +from kivymd.color_definitions import colors +from kivymd.icon_definitions import md_icons +from kivymd.theming import ThemableBehavior +from kivymd.elevationbehavior import RoundElevationBehavior +from kivymd.ripplebehavior import CircularRippleBehavior +from kivy.uix.behaviors import ButtonBehavior +from kivy.uix.widget import Widget + +Builder.load_string(''' +: + canvas: + Clear + Color: + rgba: self.color + Rectangle: + texture: self.texture + size: self.texture_size + pos: int(self.center_x - self.texture_size[0] / 2.), int(self.center_y - self.texture_size[1] / 2.) + + text: self._radio_icon if self.group else self._checkbox_icon + font_name: 'Icons' + font_size: sp(24) + color: self.theme_cls.primary_color if self.active else self.theme_cls.secondary_text_color + halign: 'center' + valign: 'middle' + +: + color: 1, 1, 1, 1 + canvas: + Color: + rgba: self.color + Ellipse: + size: self.size + pos: self.pos + +: + canvas.before: + Color: + rgba: self._track_color_disabled if self.disabled else \ + (self._track_color_active if self.active else self._track_color_normal) + Ellipse: + size: dp(16), dp(16) + pos: self.x, self.center_y - dp(8) + angle_start: 180 + angle_end: 360 + Rectangle: + size: self.width - dp(16), dp(16) + pos: self.x + dp(8), self.center_y - dp(8) + Ellipse: + size: dp(16), dp(16) + pos: self.right - dp(16), self.center_y - dp(8) + angle_start: 0 + angle_end: 180 + on_release: thumb.trigger_action() + + Thumb: + id: thumb + size_hint: None, None + size: dp(24), dp(24) + pos: root._thumb_pos + color: root.thumb_color_disabled if root.disabled else \ + (root.thumb_color_down if root.active else root.thumb_color) + elevation: 4 if root.active else 2 + on_release: setattr(root, 'active', not root.active) +''') + + +class MDCheckbox(ThemableBehavior, CircularRippleBehavior, + ToggleButtonBehavior, Label): + active = BooleanProperty(False) + + _checkbox_icon = StringProperty( + u"{}".format(md_icons['square-o'])) + _radio_icon = StringProperty(u"{}".format(md_icons['circle-o'])) + _icon_active = StringProperty(u"{}".format(md_icons['check-square'])) + + def __init__(self, **kwargs): + super(MDCheckbox, self).__init__(**kwargs) + self.register_event_type('on_active') + self.check_anim_out = Animation(font_size=0, duration=.1, t='out_quad') + self.check_anim_in = Animation(font_size=sp(24), duration=.1, + t='out_quad') + self.check_anim_out.bind( + on_complete=lambda *x: self.check_anim_in.start(self)) + + def on_state(self, *args): + if self.state == 'down': + self.check_anim_in.cancel(self) + self.check_anim_out.start(self) + self._radio_icon = u"{}".format(md_icons['dot-circle']) + self._checkbox_icon = u"{}".format(md_icons['check-square']) + self.active = True + else: + self.check_anim_in.cancel(self) + self.check_anim_out.start(self) + self._radio_icon = u"{}".format(md_icons['circle-o']) + self._checkbox_icon = u"{}".format( + md_icons['square-o']) + self.active = False + + def on_active(self, instance, value): + self.state = 'down' if value else 'normal' + + +class Thumb(RoundElevationBehavior, CircularRippleBehavior, ButtonBehavior, + Widget): + ripple_scale = NumericProperty(2) + + def _set_ellipse(self, instance, value): + self.ellipse.size = (self.ripple_rad, self.ripple_rad) + if self.ellipse.size[0] > self.width * 1.5 and not self.fading_out: + self.fade_out() + self.ellipse.pos = (self.center_x - self.ripple_rad / 2., + self.center_y - self.ripple_rad / 2.) + self.stencil.pos = ( + self.center_x - (self.width * self.ripple_scale) / 2, + self.center_y - (self.height * self.ripple_scale) / 2) + + +class MDSwitch(ThemableBehavior, ButtonBehavior, FloatLayout): + active = BooleanProperty(False) + + _thumb_color = ListProperty(get_color_from_hex(colors['Grey']['50'])) + + def _get_thumb_color(self): + return self._thumb_color + + def _set_thumb_color(self, color, alpha=None): + if len(color) == 2: + self._thumb_color = get_color_from_hex(colors[color[0]][color[1]]) + if alpha: + self._thumb_color[3] = alpha + elif len(color) == 4: + self._thumb_color = color + + thumb_color = AliasProperty(_get_thumb_color, _set_thumb_color, + bind=['_thumb_color']) + + _thumb_color_down = ListProperty([1, 1, 1, 1]) + + def _get_thumb_color_down(self): + return self._thumb_color_down + + def _set_thumb_color_down(self, color, alpha=None): + if len(color) == 2: + self._thumb_color_down = get_color_from_hex( + colors[color[0]][color[1]]) + if alpha: + self._thumb_color_down[3] = alpha + else: + self._thumb_color_down[3] = 1 + elif len(color) == 4: + self._thumb_color_down = color + + thumb_color_down = AliasProperty(_get_thumb_color_down, + _set_thumb_color_down, + bind=['_thumb_color_down']) + + _thumb_color_disabled = ListProperty( + get_color_from_hex(colors['Grey']['400'])) + + def _get_thumb_color_disabled(self): + return self._thumb_color_disabled + + def _set_thumb_color_disabled(self, color, alpha=None): + if len(color) == 2: + self._thumb_color_disabled = get_color_from_hex( + colors[color[0]][color[1]]) + if alpha: + self._thumb_color_disabled[3] = alpha + elif len(color) == 4: + self._thumb_color_disabled = color + + thumb_color_down = AliasProperty(_get_thumb_color_disabled, + _set_thumb_color_disabled, + bind=['_thumb_color_disabled']) + + _track_color_active = ListProperty() + _track_color_normal = ListProperty() + _track_color_disabled = ListProperty() + _thumb_pos = ListProperty([0, 0]) + + def __init__(self, **kwargs): + super(MDSwitch, self).__init__(**kwargs) + self.theme_cls.bind(theme_style=self._set_colors, + primary_color=self._set_colors, + primary_palette=self._set_colors) + self._set_colors() + + def _set_colors(self, *args): + self._track_color_normal = self.theme_cls.disabled_hint_text_color + if self.theme_cls.theme_style == 'Dark': + self._track_color_active = self.theme_cls.primary_color + self._track_color_active[3] = .5 + self._track_color_disabled = get_color_from_hex('FFFFFF') + self._track_color_disabled[3] = .1 + self.thumb_color = get_color_from_hex(colors['Grey']['400']) + self.thumb_color_down = get_color_from_hex( + colors[self.theme_cls.primary_palette]['200']) + self.thumb_color_disabled = get_color_from_hex( + colors['Grey']['800']) + else: + self._track_color_active = get_color_from_hex( + colors[self.theme_cls.primary_palette]['200']) + self._track_color_active[3] = .5 + self._track_color_disabled = self.theme_cls.disabled_hint_text_color + self.thumb_color_down = self.theme_cls.primary_color + + def on_pos(self, *args): + if self.active: + self._thumb_pos = (self.right - dp(12), self.center_y - dp(12)) + else: + self._thumb_pos = (self.x - dp(12), self.center_y - dp(12)) + self.bind(active=self._update_thumb) + + def _update_thumb(self, *args): + if self.active: + Animation.cancel_all(self, '_thumb_pos') + anim = Animation( + _thumb_pos=(self.right - dp(12), self.center_y - dp(12)), + duration=.2, + t='out_quad') + else: + Animation.cancel_all(self, '_thumb_pos') + anim = Animation( + _thumb_pos=(self.x - dp(12), self.center_y - dp(12)), + duration=.2, + t='out_quad') + anim.start(self) diff --git a/src/kivymd/slider.py b/src/kivymd/slider.py new file mode 100644 index 00000000..1166bea7 --- /dev/null +++ b/src/kivymd/slider.py @@ -0,0 +1,247 @@ +# -*- coding: utf-8 -*- + +from kivy.lang import Builder +from kivy.properties import StringProperty, ListProperty, NumericProperty,AliasProperty, BooleanProperty +from kivy.utils import get_color_from_hex +from kivy.metrics import dp, sp +from kivymd.color_definitions import colors +from kivymd.theming import ThemableBehavior +from kivy.uix.slider import Slider + + +Builder.load_string(''' +#:import Thumb kivymd.selectioncontrols.Thumb + +: + id: slider + canvas: + Clear + Color: + rgba: self._track_color_disabled if self.disabled else (self._track_color_active if self.active \ + else self._track_color_normal) + Rectangle: + size: (self.width - self.padding*2 - self._offset[0], dp(4)) if self.orientation == 'horizontal' \ + else (dp(4),self.height - self.padding*2 - self._offset[1]) + pos: (self.x + self.padding + self._offset[0], self.center_y - dp(4)) \ + if self.orientation == 'horizontal' else (self.center_x - dp(4),self.y + self.padding + self._offset[1]) + + # If 0 draw circle + Color: + rgba: [0,0,0,0] if not self._is_off else (self._track_color_disabled if self.disabled \ + else (self._track_color_active if self.active else self._track_color_normal)) + Line: + width: 2 + circle: (self.x+self.padding+dp(3),self.center_y-dp(2),8 if self.active else 6 ) \ + if self.orientation == 'horizontal' else (self.center_x-dp(2),self.y+self.padding+dp(3),8 \ + if self.active else 6) + + Color: + rgba: [0,0,0,0] if self._is_off \ + else (self.thumb_color_down if not self.disabled else self._track_color_disabled) + Rectangle: + size: ((self.width-self.padding*2)*self.value_normalized, sp(4)) \ + if slider.orientation == 'horizontal' else (sp(4), (self.height-self.padding*2)*self.value_normalized) + pos: (self.x + self.padding, self.center_y - dp(4)) if self.orientation == 'horizontal' \ + else (self.center_x - dp(4),self.y + self.padding) + Thumb: + id: thumb + size_hint: None, None + size: (dp(12), dp(12)) if root.disabled else ((dp(24), dp(24)) if root.active else (dp(16),dp(16))) + pos: (slider.value_pos[0] - dp(8), slider.center_y - thumb.height/2 - dp(2)) \ + if slider.orientation == 'horizontal' \ + else (slider.center_x - thumb.width/2 - dp(2), slider.value_pos[1]-dp(8)) + color: [0,0,0,0] if slider._is_off else (root._track_color_disabled if root.disabled \ + else root.thumb_color_down) + elevation: 0 if slider._is_off else (4 if root.active else 2) + +''') + + +class MDSlider(ThemableBehavior, Slider): + # If the slider is clicked + active = BooleanProperty(False) + + # Show the "off" ring when set to minimum value + show_off = BooleanProperty(True) + + # Internal state of ring + _is_off = BooleanProperty(False) + + # Internal adjustment to reposition sliders for ring + _offset = ListProperty((0, 0)) + + _thumb_color = ListProperty(get_color_from_hex(colors['Grey']['50'])) + + def _get_thumb_color(self): + return self._thumb_color + + def _set_thumb_color(self, color, alpha=None): + if len(color) == 2: + self._thumb_color = get_color_from_hex(colors[color[0]][color[1]]) + if alpha: + self._thumb_color[3] = alpha + elif len(color) == 4: + self._thumb_color = color + + thumb_color = AliasProperty(_get_thumb_color, _set_thumb_color, + bind=['_thumb_color']) + + _thumb_color_down = ListProperty([1, 1, 1, 1]) + + def _get_thumb_color_down(self): + return self._thumb_color_down + + def _set_thumb_color_down(self, color, alpha=None): + if len(color) == 2: + self._thumb_color_down = get_color_from_hex( + colors[color[0]][color[1]]) + if alpha: + self._thumb_color_down[3] = alpha + else: + self._thumb_color_down[3] = 1 + elif len(color) == 4: + self._thumb_color_down = color + + thumb_color_down = AliasProperty(_get_thumb_color_down, + _set_thumb_color_down, + bind=['_thumb_color_down']) + + _thumb_color_disabled = ListProperty( + get_color_from_hex(colors['Grey']['400'])) + + def _get_thumb_color_disabled(self): + return self._thumb_color_disabled + + def _set_thumb_color_disabled(self, color, alpha=None): + if len(color) == 2: + self._thumb_color_disabled = get_color_from_hex( + colors[color[0]][color[1]]) + if alpha: + self._thumb_color_disabled[3] = alpha + elif len(color) == 4: + self._thumb_color_disabled = color + + thumb_color_down = AliasProperty(_get_thumb_color_disabled, + _set_thumb_color_disabled, + bind=['_thumb_color_disabled']) + + _track_color_active = ListProperty() + _track_color_normal = ListProperty() + _track_color_disabled = ListProperty() + _thumb_pos = ListProperty([0, 0]) + + def __init__(self, **kwargs): + super(MDSlider, self).__init__(**kwargs) + self.theme_cls.bind(theme_style=self._set_colors, + primary_color=self._set_colors, + primary_palette=self._set_colors) + self._set_colors() + + def _set_colors(self, *args): + if self.theme_cls.theme_style == 'Dark': + self._track_color_normal = get_color_from_hex('FFFFFF') + self._track_color_normal[3] = .3 + self._track_color_active = self._track_color_normal + self._track_color_disabled = self._track_color_normal + self.thumb_color = get_color_from_hex(colors['Grey']['400']) + self.thumb_color_down = get_color_from_hex( + colors[self.theme_cls.primary_palette]['200']) + self.thumb_color_disabled = get_color_from_hex( + colors['Grey']['800']) + else: + self._track_color_normal = get_color_from_hex('000000') + self._track_color_normal[3] = 0.26 + self._track_color_active = get_color_from_hex('000000') + self._track_color_active[3] = 0.38 + self._track_color_disabled = get_color_from_hex('000000') + self._track_color_disabled[3] = 0.26 + self.thumb_color_down = self.theme_cls.primary_color + + def on_value_normalized(self, *args): + """ When the value == min set it to "off" state and make slider a ring """ + self._update_is_off() + + def on_show_off(self, *args): + self._update_is_off() + + def _update_is_off(self): + self._is_off = self.show_off and (self.value_normalized == 0) + + def on__is_off(self, *args): + self._update_offset() + + def on_active(self, *args): + self._update_offset() + + def _update_offset(self): + """ Offset is used to shift the sliders so the background color + shows through the off circle. + """ + d = 2 if self.active else 0 + self._offset = (dp(11+d), dp(11+d)) if self._is_off else (0, 0) + + def on_touch_down(self, touch): + if super(MDSlider, self).on_touch_down(touch): + self.active = True + + def on_touch_up(self,touch): + if super(MDSlider, self).on_touch_up(touch): + self.active = False +# thumb = self.ids['thumb'] +# if thumb.collide_point(*touch.pos): +# thumb.on_touch_down(touch) +# thumb.on_touch_up(touch) + +if __name__ == '__main__': + from kivy.app import App + from kivymd.theming import ThemeManager + + class SliderApp(App): + theme_cls = ThemeManager() + + def build(self): + return Builder.load_string(""" +BoxLayout: + orientation:'vertical' + BoxLayout: + size_hint_y:None + height: '48dp' + Label: + text:"Toggle disabled" + color: [0,0,0,1] + CheckBox: + on_press: slider.disabled = not slider.disabled + BoxLayout: + size_hint_y:None + height: '48dp' + Label: + text:"Toggle active" + color: [0,0,0,1] + CheckBox: + on_press: slider.active = not slider.active + BoxLayout: + size_hint_y:None + height: '48dp' + Label: + text:"Toggle show off" + color: [0,0,0,1] + CheckBox: + on_press: slider.show_off = not slider.show_off + + MDSlider: + id:slider + min:0 + max:100 + value: 40 + + MDSlider: + id:slider2 + orientation:"vertical" + min:0 + max:100 + value: 40 + +""") + + + SliderApp().run() diff --git a/src/kivymd/slidingpanel.py b/src/kivymd/slidingpanel.py new file mode 100644 index 00000000..b818505a --- /dev/null +++ b/src/kivymd/slidingpanel.py @@ -0,0 +1,92 @@ +# -*- coding: utf-8 -*- +from kivy.animation import Animation +from kivy.clock import Clock +from kivy.core.window import Window +from kivy.lang import Builder +from kivy.metrics import dp +from kivy.properties import OptionProperty, NumericProperty, StringProperty, \ + BooleanProperty, ListProperty +from kivy.uix.boxlayout import BoxLayout +from kivy.uix.relativelayout import RelativeLayout + +Builder.load_string(""" +#: import Window kivy.core.window.Window + + orientation: 'vertical' + size_hint_x: None + width: dp(320) + x: -1 * self.width if self.side == 'left' else Window.width + + + canvas: + Color: + rgba: root.color + Rectangle: + size: root.size +""") + + +class PanelShadow(BoxLayout): + color = ListProperty([0, 0, 0, 0]) + + +class SlidingPanel(BoxLayout): + anim_length_close = NumericProperty(0.3) + anim_length_open = NumericProperty(0.3) + animation_t_open = StringProperty('out_sine') + animation_t_close = StringProperty('out_sine') + side = OptionProperty('left', options=['left', 'right']) + + _open = False + + def __init__(self, **kwargs): + super(SlidingPanel, self).__init__(**kwargs) + self.shadow = PanelShadow() + Clock.schedule_once(lambda x: Window.add_widget(self.shadow,89), 0) + Clock.schedule_once(lambda x: Window.add_widget(self,90), 0) + + def toggle(self): + Animation.stop_all(self, 'x') + Animation.stop_all(self.shadow, 'color') + if self._open: + if self.side == 'left': + target_x = -1 * self.width + else: + target_x = Window.width + + sh_anim = Animation(duration=self.anim_length_open, + t=self.animation_t_open, + color=[0, 0, 0, 0]) + sh_anim.start(self.shadow) + self._get_main_animation(duration=self.anim_length_close, + t=self.animation_t_close, + x=target_x, + is_closing=True).start(self) + self._open = False + else: + if self.side == 'left': + target_x = 0 + else: + target_x = Window.width - self.width + Animation(duration=self.anim_length_open, t=self.animation_t_open, + color=[0, 0, 0, 0.5]).start(self.shadow) + self._get_main_animation(duration=self.anim_length_open, + t=self.animation_t_open, + x=target_x, + is_closing=False).start(self) + self._open = True + + def _get_main_animation(self, duration, t, x, is_closing): + return Animation(duration=duration, t=t, x=x) + + def on_touch_down(self, touch): + # Prevents touch events from propagating to anything below the widget. + super(SlidingPanel, self).on_touch_down(touch) + if self.collide_point(*touch.pos) or self._open: + return True + + def on_touch_up(self, touch): + if not self.collide_point(touch.x, touch.y) and self._open: + self.toggle() + return True + super(SlidingPanel, self).on_touch_up(touch) diff --git a/src/kivymd/snackbar.py b/src/kivymd/snackbar.py new file mode 100644 index 00000000..e0ac70e8 --- /dev/null +++ b/src/kivymd/snackbar.py @@ -0,0 +1,115 @@ +# -*- coding: utf-8 -*- +from collections import deque +from kivy.animation import Animation +from kivy.clock import Clock +from kivy.core.window import Window +from kivy.lang import Builder +from kivy.metrics import dp +from kivy.properties import ObjectProperty, StringProperty, NumericProperty +from kivy.uix.relativelayout import RelativeLayout +from kivymd.material_resources import DEVICE_TYPE + +Builder.load_string(''' +#:import Window kivy.core.window.Window +#:import get_color_from_hex kivy.utils.get_color_from_hex +#:import MDFlatButton kivymd.button.MDFlatButton +#:import MDLabel kivymd.label.MDLabel +#:import DEVICE_TYPE kivymd.material_resources.DEVICE_TYPE +<_SnackbarWidget> + canvas: + Color: + rgb: get_color_from_hex('323232') + Rectangle: + size: self.size + size_hint_y: None + size_hint_x: 1 if DEVICE_TYPE == 'mobile' else None + height: dp(48) if _label.texture_size[1] < dp(30) else dp(80) + width: dp(24) + _label.width + _spacer.width + root.padding_right if root.button_text == '' else dp(24) + \ + _label.width + _spacer.width + _button.width + root.padding_right + top: 0 + x: 0 if DEVICE_TYPE == 'mobile' else Window.width/2 - self.width/2 + BoxLayout: + width: Window.width - root.padding_right - _spacer.width - dp(24) if DEVICE_TYPE == 'mobile' and \ + root.button_text == '' else Window.width - root.padding_right - _button.width - _spacer.width - dp(24) \ + if DEVICE_TYPE == 'mobile' else _label.texture_size[0] if (dp(568) - root.padding_right - _button.width - \ + _spacer.width - _label.texture_size[0] - dp(24)) >= 0 else (dp(568) - root.padding_right - _button.width - \ + _spacer.width - dp(24)) + size_hint_x: None + x: dp(24) + MDLabel: + id: _label + text: root.text + size: self.texture_size + BoxLayout: + id: _spacer + size_hint_x: None + x: _label.right + width: 0 + MDFlatButton: + id: _button + text: root.button_text + size_hint_x: None + x: _spacer.right if root.button_text != '' else root.right + center_y: root.height/2 + on_release: root.button_callback() +''') + + +class _SnackbarWidget(RelativeLayout): + text = StringProperty() + button_text = StringProperty() + button_callback = ObjectProperty() + duration = NumericProperty() + padding_right = NumericProperty(dp(24)) + + def __init__(self, text, duration, button_text='', button_callback=None, + **kwargs): + super(_SnackbarWidget, self).__init__(**kwargs) + self.text = text + self.button_text = button_text + self.button_callback = button_callback + self.duration = duration + self.ids['_label'].text_size = (None, None) + + def begin(self): + if self.button_text == '': + self.remove_widget(self.ids['_button']) + else: + self.ids['_spacer'].width = dp(16) if \ + DEVICE_TYPE == "mobile" else dp(40) + self.padding_right = dp(16) + Window.add_widget(self) + anim = Animation(y=0, duration=.3, t='out_quad') + anim.start(self) + Clock.schedule_once(lambda dt: self.die(), self.duration) + + def die(self): + anim = Animation(top=0, duration=.3, t='out_quad') + anim.bind(on_complete=lambda *args: _play_next(self)) + anim.bind(on_complete=lambda *args: Window.remove_widget(self)) + anim.start(self) + + +queue = deque() +playing = False + + +def make(text, button_text=None, button_callback=None, duration=3): + if button_text is not None and button_callback is not None: + queue.append(_SnackbarWidget(text=text, + button_text=button_text, + button_callback=button_callback, + duration=duration)) + else: + queue.append(_SnackbarWidget(text=text, + duration=duration)) + _play_next() + + +def _play_next(dying_widget=None): + global playing + if (dying_widget or not playing) and len(queue) > 0: + playing = True + queue.popleft().begin() + elif len(queue) == 0: + playing = False diff --git a/src/kivymd/spinner.py b/src/kivymd/spinner.py new file mode 100644 index 00000000..238062db --- /dev/null +++ b/src/kivymd/spinner.py @@ -0,0 +1,149 @@ +# -*- coding: utf-8 -*- + +from kivy.lang import Builder +from kivy.uix.widget import Widget +from kivy.properties import NumericProperty, ListProperty, BooleanProperty +from kivy.animation import Animation +from kivymd.theming import ThemableBehavior +from kivy.clock import Clock + +Builder.load_string(''' +: + canvas.before: + PushMatrix + Rotate: + angle: self._rotation_angle + origin: self.center + canvas: + Color: + rgba: self.color + a: self._alpha + Line: + circle: self.center_x, self.center_y, self.width / 2, \ + self._angle_start, self._angle_end + cap: 'square' + width: dp(2) + canvas.after: + PopMatrix + +''') + + +class MDSpinner(ThemableBehavior, Widget): + """:class:`MDSpinner` is an implementation of the circular progress + indicator in Google's Material Design. + + It can be used either as an indeterminate indicator that loops while + the user waits for something to happen, or as a determinate indicator. + + Set :attr:`determinate` to **True** to activate determinate mode, and + :attr:`determinate_time` to set the duration of the animation. + """ + + determinate = BooleanProperty(False) + """:attr:`determinate` is a :class:`~kivy.properties.BooleanProperty` and + defaults to False + """ + + determinate_time = NumericProperty(2) + """:attr:`determinate_time` is a :class:`~kivy.properties.NumericProperty` + and defaults to 2 + """ + + active = BooleanProperty(True) + """Use :attr:`active` to start or stop the spinner. + + :attr:`active` is a :class:`~kivy.properties.BooleanProperty` and + defaults to True + """ + + color = ListProperty([]) + """:attr:`color` is a :class:`~kivy.properties.ListProperty` and + defaults to 'self.theme_cls.primary_color' + """ + + _alpha = NumericProperty(0) + _rotation_angle = NumericProperty(360) + _angle_start = NumericProperty(0) + _angle_end = NumericProperty(8) + + def __init__(self, **kwargs): + super(MDSpinner, self).__init__(**kwargs) + Clock.schedule_interval(self._update_color, 5) + self.color = self.theme_cls.primary_color + self._alpha_anim_in = Animation(_alpha=1, duration=.8, t='out_quad') + self._alpha_anim_out = Animation(_alpha=0, duration=.3, t='out_quad') + self._alpha_anim_out.bind(on_complete=self._reset) + + if self.determinate: + self._start_determinate() + else: + self._start_loop() + + def _update_color(self, *args): + self.color = self.theme_cls.primary_color + + def _start_determinate(self, *args): + self._alpha_anim_in.start(self) + + _rot_anim = Animation(_rotation_angle=0, + duration=self.determinate_time * .7, + t='out_quad') + _rot_anim.start(self) + + _angle_start_anim = Animation(_angle_end=360, + duration=self.determinate_time, + t='in_out_quad') + _angle_start_anim.bind(on_complete=lambda *x: \ + self._alpha_anim_out.start(self)) + + _angle_start_anim.start(self) + + def _start_loop(self, *args): + if self._alpha == 0: + _rot_anim = Animation(_rotation_angle=0, + duration=2, + t='linear') + _rot_anim.start(self) + + self._alpha = 1 + self._alpha_anim_in.start(self) + _angle_start_anim = Animation(_angle_end=self._angle_end + 270, + duration=.6, + t='in_out_cubic') + _angle_start_anim.bind(on_complete=self._anim_back) + _angle_start_anim.start(self) + + def _anim_back(self, *args): + _angle_back_anim = Animation(_angle_start=self._angle_end - 8, + duration=.6, + t='in_out_cubic') + _angle_back_anim.bind(on_complete=self._start_loop) + + _angle_back_anim.start(self) + + def on__rotation_angle(self, *args): + if self._rotation_angle == 0: + self._rotation_angle = 360 + if not self.determinate: + _rot_anim = Animation(_rotation_angle=0, + duration=2) + _rot_anim.start(self) + + def _reset(self, *args): + Animation.cancel_all(self, '_angle_start', '_rotation_angle', + '_angle_end', '_alpha') + self._angle_start = 0 + self._angle_end = 8 + self._rotation_angle = 360 + self._alpha = 0 + self.active = False + + def on_active(self, *args): + if not self.active: + self._reset() + else: + if self.determinate: + self._start_determinate() + else: + self._start_loop() diff --git a/src/kivymd/tabs.py b/src/kivymd/tabs.py new file mode 100644 index 00000000..c09f21c2 --- /dev/null +++ b/src/kivymd/tabs.py @@ -0,0 +1,303 @@ +# Created on Jul 8, 2016 +# +# The default kivy tab implementation seems like a stupid design to me. The +# ScreenManager is much better. +# +# @author: jrm + +from kivy.properties import StringProperty, DictProperty, ListProperty, \ + ObjectProperty, OptionProperty, BoundedNumericProperty +from kivy.uix.screenmanager import Screen +from kivy.lang import Builder +from kivy.metrics import dp +from kivy.uix.boxlayout import BoxLayout +from kivymd.theming import ThemableBehavior +from kivymd.backgroundcolorbehavior import BackgroundColorBehavior +from kivymd.button import MDFlatButton + +Builder.load_string(""" +: + id: panel + orientation: 'vertical' if panel.tab_orientation in ['top','bottom'] else 'horizontal' + ScrollView: + id: scroll_view + size_hint_y: None + height: panel._tab_display_height[panel.tab_display_mode] + MDTabBar: + id: tab_bar + size_hint_y: None + height: panel._tab_display_height[panel.tab_display_mode] + background_color: panel.tab_color or panel.theme_cls.primary_color + canvas: + # Draw bottom border + Color: + rgba: (panel.tab_border_color or panel.tab_color or panel.theme_cls.primary_dark) + Rectangle: + size: (self.width,dp(2)) + ScreenManager: + id: tab_manager + current: root.current + screens: root.tabs + + +: + canvas: + Color: + rgba: self.panel.tab_color or self.panel.theme_cls.primary_color + Rectangle: + size: self.size + pos: self.pos + + # Draw indicator + Color: + rgba: (self.panel.tab_indicator_color or self.panel.theme_cls.accent_color) if self.tab \ + and self.tab.manager and self.tab.manager.current==self.tab.name else (self.panel.tab_border_color \ + or self.panel.tab_color or self.panel.theme_cls.primary_dark) + Rectangle: + size: (self.width,dp(2)) + pos: self.pos + + size_hint: (None,None) #(1, None) if self.panel.tab_width_mode=='fixed' else (None,None) + width: (_label.texture_size[0] + dp(16)) + padding: (dp(12), 0) + theme_text_color: 'Custom' + text_color: (self.panel.tab_text_color_active or app.theme_cls.bg_light if app.theme_cls.theme_style == "Light" \ + else app.theme_cls.opposite_bg_light) if self.tab and self.tab.manager \ + and self.tab.manager.current==self.tab.name else (self.panel.tab_text_color \ + or self.panel.theme_cls.primary_light) + on_press: + self.tab.dispatch('on_tab_press') + # self.tab.manager.current = self.tab.name + on_release: self.tab.dispatch('on_tab_release') + on_touch_down: self.tab.dispatch('on_tab_touch_down',*args) + on_touch_move: self.tab.dispatch('on_tab_touch_move',*args) + on_touch_up: self.tab.dispatch('on_tab_touch_up',*args) + + + MDLabel: + id: _label + text: root.tab.text if root.panel.tab_display_mode == 'text' else u"{}".format(md_icons[root.tab.icon]) + font_style: 'Button' if root.panel.tab_display_mode == 'text' else 'Icon' + size_hint_x: None# if root.panel.tab_width_mode=='fixed' else 1 + text_size: (None, root.height) + height: self.texture_size[1] + theme_text_color: root.theme_text_color + text_color: root.text_color + valign: 'middle' + halign: 'center' + opposite_colors: root.opposite_colors +""") + + +class MDTabBar(ThemableBehavior, BackgroundColorBehavior, BoxLayout): + pass + + +class MDTabHeader(MDFlatButton): + """ Internal widget for headers based on MDFlatButton""" + + width = BoundedNumericProperty(dp(None), min=dp(72), max=dp(264), errorhandler=lambda x: dp(72)) + tab = ObjectProperty(None) + panel = ObjectProperty(None) + + +class MDTab(Screen): + """ A tab is simply a screen with meta information + that defines the content that goes in the tab header. + """ + __events__ = ('on_tab_touch_down', 'on_tab_touch_move', 'on_tab_touch_up', 'on_tab_press', 'on_tab_release') + + # Tab header text + text = StringProperty("") + + # Tab header icon + icon = StringProperty("circle") + + # Tab dropdown menu items + menu_items = ListProperty() + + # Tab dropdown menu (if you want to customize it) + menu = ObjectProperty(None) + + def __init__(self, **kwargs): + super(MDTab, self).__init__(**kwargs) + self.index = 0 + self.parent_widget = None + self.register_event_type('on_tab_touch_down') + self.register_event_type('on_tab_touch_move') + self.register_event_type('on_tab_touch_up') + self.register_event_type('on_tab_press') + self.register_event_type('on_tab_release') + + def on_leave(self, *args): + self.parent_widget.ids.tab_manager.transition.direction = self.parent_widget.prev_dir + + def on_tab_touch_down(self, *args): + pass + + def on_tab_touch_move(self, *args): + pass + + def on_tab_touch_up(self, *args): + pass + + def on_tab_press(self, *args): + par = self.parent_widget + if par.previous_tab is not self: + par.prev_dir = str(par.ids.tab_manager.transition.direction) + if par.previous_tab.index > self.index: + par.ids.tab_manager.transition.direction = "right" + elif par.previous_tab.index < self.index: + par.ids.tab_manager.transition.direction = "left" + par.ids.tab_manager.current = self.name + par.previous_tab = self + + def on_tab_release(self, *args): + pass + + def __repr__(self): + return "".format(self.name, self.text) + + +class MDTabbedPanel(ThemableBehavior, BackgroundColorBehavior, BoxLayout): + """ A tab panel that is implemented by delegating all tabs + to a ScreenManager. + """ + # If tabs should fill space + tab_width_mode = OptionProperty('stacked', options=['stacked', 'fixed']) + + # Where the tabs go + tab_orientation = OptionProperty('top', options=['top']) # ,'left','bottom','right']) + + # How tabs are displayed + tab_display_mode = OptionProperty('text', options=['text', 'icons']) # ,'both']) + _tab_display_height = DictProperty({'text': dp(46), 'icons': dp(46), 'both': dp(72)}) + + # Tab background color (leave empty for theme color) + tab_color = ListProperty([]) + + # Tab text color in normal state (leave empty for theme color) + tab_text_color = ListProperty([]) + + # Tab text color in active state (leave empty for theme color) + tab_text_color_active = ListProperty([]) + + # Tab indicator color (leave empty for theme color) + tab_indicator_color = ListProperty([]) + + # Tab bar bottom border color (leave empty for theme color) + tab_border_color = ListProperty([]) + + # List of all the tabs so you can dynamically change them + tabs = ListProperty([]) + + # Current tab name + current = StringProperty(None) + + def __init__(self, **kwargs): + super(MDTabbedPanel, self).__init__(**kwargs) + self.previous_tab = None + self.prev_dir = None + self.index = 0 + self._refresh_tabs() + + def on_tab_width_mode(self, *args): + self._refresh_tabs() + + def on_tab_display_mode(self, *args): + self._refresh_tabs() + + def _refresh_tabs(self): + """ Refresh all tabs """ + # if fixed width, use a box layout + if not self.ids: + return + tab_bar = self.ids.tab_bar + tab_bar.clear_widgets() + tab_manager = self.ids.tab_manager + for tab in tab_manager.screens: + tab_header = MDTabHeader(tab=tab, + panel=self, + height=tab_bar.height, + ) + tab_bar.add_widget(tab_header) + + def add_widget(self, widget, **kwargs): + """ Add tabs to the screen or the layout. + :param widget: The widget to add. + """ + d = {} + if isinstance(widget, MDTab): + self.index += 1 + if self.index == 1: + self.previous_tab = widget + widget.index = self.index + widget.parent_widget = self + self.ids.tab_manager.add_widget(widget) + self._refresh_tabs() + else: + super(MDTabbedPanel, self).add_widget(widget) + + def remove_widget(self, widget): + """ Remove tabs from the screen or the layout. + :param widget: The widget to remove. + """ + self.index -= 1 + if isinstance(widget, MDTab): + self.ids.tab_manager.remove_widget(widget) + self._refresh_tabs() + else: + super(MDTabbedPanel, self).remove_widget(widget) + + +if __name__ == '__main__': + from kivy.app import App + from kivymd.theming import ThemeManager + + class TabsApp(App): + theme_cls = ThemeManager() + + def build(self): + from kivy.core.window import Window + Window.size = (540, 720) + # self.theme_cls.theme_style = 'Dark' + + return Builder.load_string(""" +#:import Toolbar kivymd.toolbar.Toolbar +BoxLayout: + orientation:'vertical' + Toolbar: + id: toolbar + title: 'Page title' + background_color: app.theme_cls.primary_color + left_action_items: [['menu', lambda x: '']] + right_action_items: [['search', lambda x: ''],['more-vert',lambda x:'']] + MDTabbedPanel: + id: tab_mgr + tab_display_mode:'icons' + + MDTab: + name: 'music' + text: "Music" # Why are these not set!!! + icon: "playlist-audio" + MDLabel: + font_style: 'Body1' + theme_text_color: 'Primary' + text: "Here is my music list :)" + halign: 'center' + MDTab: + name: 'movies' + text: 'Movies' + icon: "movie" + + MDLabel: + font_style: 'Body1' + theme_text_color: 'Primary' + text: "Show movies here :)" + halign: 'center' + + +""") + + + TabsApp().run() diff --git a/src/kivymd/textfields.py b/src/kivymd/textfields.py new file mode 100644 index 00000000..18de10e6 --- /dev/null +++ b/src/kivymd/textfields.py @@ -0,0 +1,215 @@ +# -*- coding: utf-8 -*- + +from kivy.lang import Builder +from kivy.uix.textinput import TextInput +from kivy.properties import ObjectProperty, NumericProperty, StringProperty, \ + ListProperty, BooleanProperty +from kivy.metrics import sp, dp +from kivy.animation import Animation +from kivymd.label import MDLabel +from kivymd.theming import ThemableBehavior +from kivy.clock import Clock + +Builder.load_string(''' +: + canvas.before: + Clear + Color: + rgba: self.line_color_normal + Line: + id: "the_line" + points: self.x, self.y + dp(8), self.x + self.width, self.y + dp(8) + width: 1 + dash_length: dp(3) + dash_offset: 2 if self.disabled else 0 + Color: + rgba: self._current_line_color + Rectangle: + size: self._line_width, dp(2) + pos: self.center_x - (self._line_width / 2), self.y + dp(8) + Color: + rgba: self._current_error_color + Rectangle: + texture: self._msg_lbl.texture + size: self._msg_lbl.texture_size + pos: self.x, self.y - dp(8) + Color: + rgba: (self._current_line_color if self.focus and not self.cursor_blink \ + else (0, 0, 0, 0)) + Rectangle: + pos: [int(x) for x in self.cursor_pos] + size: 1, -self.line_height + Color: + #rgba: self._hint_txt_color if not self.text and not self.focus\ + #else (self.line_color_focus if not self.text or self.focus\ + #else self.line_color_normal) + rgba: self._current_hint_text_color + Rectangle: + texture: self._hint_lbl.texture + size: self._hint_lbl.texture_size + pos: self.x, self.y + self._hint_y + Color: + rgba: self.disabled_foreground_color if self.disabled else \ + (self.hint_text_color if not self.text and not self.focus else \ + self.foreground_color) + + font_name: 'Roboto' + foreground_color: app.theme_cls.text_color + font_size: sp(16) + bold: False + padding: 0, dp(16), 0, dp(10) + multiline: False + size_hint_y: None + height: dp(48) +''') + + +class SingleLineTextField(ThemableBehavior, TextInput): + line_color_normal = ListProperty() + line_color_focus = ListProperty() + error_color = ListProperty() + error = BooleanProperty(False) + message = StringProperty("") + message_mode = StringProperty("none") + mode = message_mode + + _hint_txt_color = ListProperty() + _hint_lbl = ObjectProperty() + _hint_lbl_font_size = NumericProperty(sp(16)) + _hint_y = NumericProperty(dp(10)) + _error_label = ObjectProperty() + _line_width = NumericProperty(0) + _hint_txt = StringProperty('') + _current_line_color = line_color_focus + _current_error_color = ListProperty([0.0, 0.0, 0.0, 0.0]) + _current_hint_text_color = _hint_txt_color + + def __init__(self, **kwargs): + Clock.schedule_interval(self._update_color, 5) + self._msg_lbl = MDLabel(font_style='Caption', + theme_text_color='Error', + halign='left', + valign='middle', + text=self.message) + + self._hint_lbl = MDLabel(font_style='Subhead', + halign='left', + valign='middle') + super(SingleLineTextField, self).__init__(**kwargs) + self.line_color_normal = self.theme_cls.divider_color + self.line_color_focus = list(self.theme_cls.primary_color) + self.base_line_color_focus = list(self.theme_cls.primary_color) + self.error_color = self.theme_cls.error_color + + self._hint_txt_color = self.theme_cls.disabled_hint_text_color + self.hint_text_color = (1, 1, 1, 0) + self.cursor_color = self.theme_cls.primary_color + self.bind(message=self._set_msg, + hint_text=self._set_hint, + _hint_lbl_font_size=self._hint_lbl.setter('font_size'), + message_mode=self._set_mode) + self.hint_anim_in = Animation(_hint_y=dp(34), + _hint_lbl_font_size=sp(12), duration=.2, + t='out_quad') + + self.hint_anim_out = Animation(_hint_y=dp(10), + _hint_lbl_font_size=sp(16), duration=.2, + t='out_quad') + + def _update_color(self, *args): + self.line_color_normal = self.theme_cls.divider_color + self.base_line_color_focus = list(self.theme_cls.primary_color) + if not self.focus and not self.error: + self.line_color_focus = self.theme_cls.primary_color + Animation(duration=.2, _current_hint_text_color=self.theme_cls.disabled_hint_text_color).start(self) + if self.mode == "persistent": + Animation(duration=.1, _current_error_color=self.theme_cls.disabled_hint_text_color).start(self) + if self.focus and not self.error: + self.cursor_color = self.theme_cls.primary_color + + def on_hint_text_color(self, instance, color): + self._hint_txt_color = self.theme_cls.disabled_hint_text_color + self.hint_text_color = (1, 1, 1, 0) + + def on_width(self, instance, width): + if self.focus and instance is not None or self.error and instance is not None: + self._line_width = width + self.anim = Animation(_line_width=width, duration=.2, t='out_quad') + self._msg_lbl.width = self.width + self._hint_lbl.width = self.width + + def on_pos(self, *args): + self.hint_anim_in = Animation(_hint_y=dp(34), + _hint_lbl_font_size=sp(12), duration=.2, + t='out_quad') + self.hint_anim_out = Animation(_hint_y=dp(10), + _hint_lbl_font_size=sp(16), duration=.2, + t='out_quad') + + def on_focus(self, *args): + if self.focus: + Animation.cancel_all(self, '_line_width', '_hint_y', + '_hint_lbl_font_size') + if len(self.text) == 0: + self.hint_anim_in.start(self) + if self.error: + Animation(duration=.2, _current_hint_text_color=self.error_color).start(self) + if self.mode == "on_error": + Animation(duration=.2, _current_error_color=self.error_color).start(self) + elif self.mode == "persistent": + Animation(duration=.2, _current_error_color=self.theme_cls.disabled_hint_text_color).start(self) + elif self.mode == "on_focus": + Animation(duration=.2, _current_error_color=self.theme_cls.disabled_hint_text_color).start(self) + else: + pass + elif not self.error: + self.on_width(None, self.width) + self.anim.start(self) + Animation(duration=.2, _current_hint_text_color=self.line_color_focus).start(self) + if self.mode == "on_error": + Animation(duration=.2, _current_error_color=(0, 0, 0, 0)).start(self) + if self.mode == "persistent": + Animation(duration=.2, _current_error_color=self.theme_cls.disabled_hint_text_color).start(self) + elif self.mode == "on_focus": + Animation(duration=.2, _current_error_color=self.theme_cls.disabled_hint_text_color).start(self) + else: + pass + else: + Animation.cancel_all(self, '_line_width', '_hint_y', + '_hint_lbl_font_size') + if len(self.text) == 0: + self.hint_anim_out.start(self) + if not self.error: + self.line_color_focus = self.base_line_color_focus + Animation(duration=.2, _current_line_color=self.line_color_focus, + _current_hint_text_color=self.theme_cls.disabled_hint_text_color).start(self) + if self.mode == "on_error": + Animation(duration=.2, _current_error_color=(0, 0, 0, 0)).start(self) + elif self.mode == "persistent": + Animation(duration=.2, _current_error_color=self.theme_cls.disabled_hint_text_color).start(self) + elif self.mode == "on_focus": + Animation(duration=.2, _current_error_color=(0, 0, 0, 0)).start(self) + + self.on_width(None, 0) + self.anim.start(self) + elif self.error: + Animation(duration=.2, _current_line_color=self.error_color, + _current_hint_text_color=self.error_color).start(self) + if self.mode == "on_error": + Animation(duration=.2, _current_error_color=self.error_color).start(self) + elif self.mode == "persistent": + Animation(duration=.2, _current_error_color=self.theme_cls.disabled_hint_text_color).start(self) + elif self.mode == "on_focus": + Animation(duration=.2, _current_error_color=(0, 0, 0, 0)).start(self) + + def _set_hint(self, instance, text): + self._hint_lbl.text = text + + def _set_msg(self, instance, text): + self._msg_lbl.text = text + self.message = text + + def _set_mode(self, instance, text): + self.mode = text + if self.mode == "persistent": + Animation(duration=.1, _current_error_color=self.theme_cls.disabled_hint_text_color).start(self) diff --git a/src/kivymd/theme_picker.py b/src/kivymd/theme_picker.py new file mode 100644 index 00000000..e5104ce6 --- /dev/null +++ b/src/kivymd/theme_picker.py @@ -0,0 +1,422 @@ +# -*- coding: utf-8 -*- + +from kivy.lang import Builder +from kivy.uix.modalview import ModalView +from kivy.uix.floatlayout import FloatLayout +from kivy.uix.boxlayout import BoxLayout +from kivymd.button import MDFlatButton, MDIconButton +from kivymd.theming import ThemableBehavior +from kivymd.elevationbehavior import ElevationBehavior +from kivy.properties import ObjectProperty, ListProperty +from kivymd.label import MDLabel +from kivy.metrics import dp +from kivy.utils import get_color_from_hex +from kivymd.color_definitions import colors + +Builder.load_string(""" +#:import SingleLineTextField kivymd.textfields.SingleLineTextField +#:import MDTabbedPanel kivymd.tabs.MDTabbedPanel +#:import MDTab kivymd.tabs.MDTab +: + size_hint: (None, None) + size: dp(260), dp(120)+dp(290) + pos_hint: {'center_x': .5, 'center_y': .5} + canvas: + Color: + rgb: app.theme_cls.primary_color + Rectangle: + size: dp(260), dp(120) + pos: root.pos[0], root.pos[1] + root.height-dp(120) + Color: + rgb: app.theme_cls.bg_normal + Rectangle: + size: dp(260), dp(290) + pos: root.pos[0], root.pos[1] + root.height-(dp(120)+dp(290)) + + MDFlatButton: + pos: root.pos[0]+root.size[0]-dp(72), root.pos[1] + dp(10) + text: "Close" + on_release: root.dismiss() + MDLabel: + font_style: "Headline" + text: "Change theme" + size_hint: (None, None) + size: dp(160), dp(50) + pos_hint: {'center_x': 0.5, 'center_y': 0.9} + MDTabbedPanel: + size_hint: (None, None) + size: dp(260), root.height-dp(135) + pos_hint: {'center_x': 0.5, 'center_y': 0.475} + id: tab_panel + tab_display_mode:'text' + + MDTab: + name: 'color' + text: "Theme Color" + BoxLayout: + spacing: dp(4) + size_hint: (None, None) + size: dp(270), root.height # -dp(120) + pos_hint: {'center_x': 0.532, 'center_y': 0.89} + orientation: 'vertical' + BoxLayout: + size_hint: (None, None) + pos_hint: {'center_x': 0.5, 'center_y': 0.5} + size: dp(230), dp(40) + pos: self.pos + halign: 'center' + orientation: 'horizontal' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Red') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Red' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Pink') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Pink' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Purple') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Purple' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('DeepPurple') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'DeepPurple' + BoxLayout: + size_hint: (None, None) + pos_hint: {'center_x': .5, 'center_y': 0.5} + size: dp(230), dp(40) + pos: self.pos + halign: 'center' + orientation: 'horizontal' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Indigo') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Indigo' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Blue') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Blue' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('LightBlue') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'LightBlue' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Cyan') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Cyan' + BoxLayout: + size_hint: (None, None) + pos_hint: {'center_x': .5, 'center_y': 0.5} + size: dp(230), dp(40) + pos: self.pos + halign: 'center' + orientation: 'horizontal' + padding: 0, 0, 0, dp(1) + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Teal') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Teal' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Green') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Green' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('LightGreen') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'LightGreen' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Lime') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Lime' + BoxLayout: + size_hint: (None, None) + pos_hint: {'center_x': .5, 'center_y': 0.5} + size: dp(230), dp(40) + pos: self.pos + orientation: 'horizontal' + halign: 'center' + padding: 0, 0, 0, dp(1) + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Yellow') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Yellow' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Amber') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Amber' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Orange') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Orange' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('DeepOrange') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'DeepOrange' + BoxLayout: + size_hint: (None, None) + pos_hint: {'center_x': .5, 'center_y': 0.5} + size: dp(230), dp(40) + #pos: self.pos + orientation: 'horizontal' + padding: 0, 0, 0, dp(1) + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Brown') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Brown' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('Grey') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'Grey' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + #pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: root.rgb_hex('BlueGrey') + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.primary_palette = 'BlueGrey' + BoxLayout: + MDIconButton: + size: dp(40), dp(40) + size_hint: (None, None) + canvas: + Color: + rgba: app.theme_cls.bg_normal + Ellipse: + size: self.size + pos: self.pos + disabled: True + + MDTab: + name: 'style' + text: "Theme Style" + BoxLayout: + size_hint: (None, None) + pos_hint: {'center_x': .3, 'center_y': 0.5} + size: self.size + pos: self.pos + halign: 'center' + spacing: dp(10) + BoxLayout: + halign: 'center' + size_hint: (None, None) + size: dp(100), dp(100) + pos: self.pos + pos_hint: {'center_x': .3, 'center_y': 0.5} + MDIconButton: + size: dp(100), dp(100) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: 1, 1, 1, 1 + Ellipse: + size: self.size + pos: self.pos + Color: + rgba: 0, 0, 0, 1 + Line: + width: 1. + circle: (self.center_x, self.center_y, 50) + on_release: app.theme_cls.theme_style = 'Light' + BoxLayout: + halign: 'center' + size_hint: (None, None) + size: dp(100), dp(100) + MDIconButton: + size: dp(100), dp(100) + pos: self.pos + size_hint: (None, None) + canvas: + Color: + rgba: 0, 0, 0, 1 + Ellipse: + size: self.size + pos: self.pos + on_release: app.theme_cls.theme_style = 'Dark' +""") + + +class MDThemePicker(ThemableBehavior, FloatLayout, ModalView, ElevationBehavior): + # background_color = ListProperty([0, 0, 0, 0]) + time = ObjectProperty() + + def __init__(self, **kwargs): + super(MDThemePicker, self).__init__(**kwargs) + + def rgb_hex(self, col): + return get_color_from_hex(colors[col][self.theme_cls.accent_hue]) + + +if __name__ == "__main__": + from kivy.app import App + from kivymd.theming import ThemeManager + + class ThemePickerApp(App): + theme_cls = ThemeManager() + + def build(self): + main_widget = Builder.load_string(""" +#:import MDRaisedButton kivymd.button.MDRaisedButton +#:import MDThemePicker kivymd.theme_picker.MDThemePicker +FloatLayout: + MDRaisedButton: + size_hint: None, None + pos_hint: {'center_x': .5, 'center_y': .5} + size: 3 * dp(48), dp(48) + center_x: self.parent.center_x + text: 'Open theme picker' + on_release: MDThemePicker().open() + opposite_colors: True +""") + return main_widget + + ThemePickerApp().run() diff --git a/src/kivymd/theming.py b/src/kivymd/theming.py new file mode 100644 index 00000000..3172ee58 --- /dev/null +++ b/src/kivymd/theming.py @@ -0,0 +1,350 @@ +# -*- coding: utf-8 -*- +from kivy.app import App +from kivy.core.text import LabelBase +from kivy.core.window import Window +from kivy.clock import Clock +from kivy.metrics import dp +from kivy.properties import OptionProperty, AliasProperty, ObjectProperty, \ + StringProperty, ListProperty, BooleanProperty +from kivy.uix.widget import Widget +from kivy.utils import get_color_from_hex +from kivy.atlas import Atlas +from kivymd.color_definitions import colors +from kivymd.material_resources import FONTS, DEVICE_TYPE +from kivymd import images_path + +for font in FONTS: + LabelBase.register(**font) + + +class ThemeManager(Widget): + primary_palette = OptionProperty( + 'Blue', + options=['Pink', 'Blue', 'Indigo', 'BlueGrey', 'Brown', + 'LightBlue', + 'Purple', 'Grey', 'Yellow', 'LightGreen', 'DeepOrange', + 'Green', 'Red', 'Teal', 'Orange', 'Cyan', 'Amber', + 'DeepPurple', 'Lime']) + + primary_hue = OptionProperty( + '500', + options=['50', '100', '200', '300', '400', '500', '600', '700', + '800', + '900', 'A100', 'A200', 'A400', 'A700']) + + primary_light_hue = OptionProperty( + '200', + options=['50', '100', '200', '300', '400', '500', '600', '700', + '800', + '900', 'A100', 'A200', 'A400', 'A700']) + + primary_dark_hue = OptionProperty( + '700', + options=['50', '100', '200', '300', '400', '500', '600', '700', + '800', + '900', 'A100', 'A200', 'A400', 'A700']) + + def _get_primary_color(self): + return get_color_from_hex( + colors[self.primary_palette][self.primary_hue]) + + primary_color = AliasProperty(_get_primary_color, + bind=('primary_palette', 'primary_hue')) + + def _get_primary_light(self): + return get_color_from_hex( + colors[self.primary_palette][self.primary_light_hue]) + + primary_light = AliasProperty( + _get_primary_light, bind=('primary_palette', 'primary_light_hue')) + + def _get_primary_dark(self): + return get_color_from_hex( + colors[self.primary_palette][self.primary_dark_hue]) + + primary_dark = AliasProperty(_get_primary_dark, + bind=('primary_palette', 'primary_dark_hue')) + + accent_palette = OptionProperty( + 'Amber', + options=['Pink', 'Blue', 'Indigo', 'BlueGrey', 'Brown', + 'LightBlue', + 'Purple', 'Grey', 'Yellow', 'LightGreen', 'DeepOrange', + 'Green', 'Red', 'Teal', 'Orange', 'Cyan', 'Amber', + 'DeepPurple', 'Lime']) + + accent_hue = OptionProperty( + '500', + options=['50', '100', '200', '300', '400', '500', '600', '700', + '800', + '900', 'A100', 'A200', 'A400', 'A700']) + + accent_light_hue = OptionProperty( + '200', + options=['50', '100', '200', '300', '400', '500', '600', '700', + '800', + '900', 'A100', 'A200', 'A400', 'A700']) + + accent_dark_hue = OptionProperty( + '700', + options=['50', '100', '200', '300', '400', '500', '600', '700', + '800', + '900', 'A100', 'A200', 'A400', 'A700']) + + def _get_accent_color(self): + return get_color_from_hex( + colors[self.accent_palette][self.accent_hue]) + + accent_color = AliasProperty(_get_accent_color, + bind=['accent_palette', 'accent_hue']) + + def _get_accent_light(self): + return get_color_from_hex( + colors[self.accent_palette][self.accent_light_hue]) + + accent_light = AliasProperty(_get_accent_light, + bind=['accent_palette', 'accent_light_hue']) + + def _get_accent_dark(self): + return get_color_from_hex( + colors[self.accent_palette][self.accent_dark_hue]) + + accent_dark = AliasProperty(_get_accent_dark, + bind=['accent_palette', 'accent_dark_hue']) + + theme_style = OptionProperty('Light', options=['Light', 'Dark']) + + def _get_theme_style(self, opposite): + if opposite: + return 'Light' if self.theme_style == 'Dark' else 'Dark' + else: + return self.theme_style + + def _get_bg_darkest(self, opposite=False): + theme_style = self._get_theme_style(opposite) + if theme_style == 'Light': + return get_color_from_hex(colors['Light']['StatusBar']) + elif theme_style == 'Dark': + return get_color_from_hex(colors['Dark']['StatusBar']) + + bg_darkest = AliasProperty(_get_bg_darkest, bind=['theme_style']) + + def _get_op_bg_darkest(self): + return self._get_bg_darkest(True) + + opposite_bg_darkest = AliasProperty(_get_op_bg_darkest, + bind=['theme_style']) + + def _get_bg_dark(self, opposite=False): + theme_style = self._get_theme_style(opposite) + if theme_style == 'Light': + return get_color_from_hex(colors['Light']['AppBar']) + elif theme_style == 'Dark': + return get_color_from_hex(colors['Dark']['AppBar']) + + bg_dark = AliasProperty(_get_bg_dark, bind=['theme_style']) + + def _get_op_bg_dark(self): + return self._get_bg_dark(True) + + opposite_bg_dark = AliasProperty(_get_op_bg_dark, bind=['theme_style']) + + def _get_bg_normal(self, opposite=False): + theme_style = self._get_theme_style(opposite) + if theme_style == 'Light': + return get_color_from_hex(colors['Light']['Background']) + elif theme_style == 'Dark': + return get_color_from_hex(colors['Dark']['Background']) + + bg_normal = AliasProperty(_get_bg_normal, bind=['theme_style']) + + def _get_op_bg_normal(self): + return self._get_bg_normal(True) + + opposite_bg_normal = AliasProperty(_get_op_bg_normal, bind=['theme_style']) + + def _get_bg_light(self, opposite=False): + theme_style = self._get_theme_style(opposite) + if theme_style == 'Light': + return get_color_from_hex(colors['Light']['CardsDialogs']) + elif theme_style == 'Dark': + return get_color_from_hex(colors['Dark']['CardsDialogs']) + + bg_light = AliasProperty(_get_bg_light, bind=['theme_style']) + + def _get_op_bg_light(self): + return self._get_bg_light(True) + + opposite_bg_light = AliasProperty(_get_op_bg_light, bind=['theme_style']) + + def _get_divider_color(self, opposite=False): + theme_style = self._get_theme_style(opposite) + if theme_style == 'Light': + color = get_color_from_hex('000000') + elif theme_style == 'Dark': + color = get_color_from_hex('FFFFFF') + color[3] = .12 + return color + + divider_color = AliasProperty(_get_divider_color, bind=['theme_style']) + + def _get_op_divider_color(self): + return self._get_divider_color(True) + + opposite_divider_color = AliasProperty(_get_op_divider_color, + bind=['theme_style']) + + def _get_text_color(self, opposite=False): + theme_style = self._get_theme_style(opposite) + if theme_style == 'Light': + color = get_color_from_hex('000000') + color[3] = .87 + elif theme_style == 'Dark': + color = get_color_from_hex('FFFFFF') + return color + + text_color = AliasProperty(_get_text_color, bind=['theme_style']) + + def _get_op_text_color(self): + return self._get_text_color(True) + + opposite_text_color = AliasProperty(_get_op_text_color, + bind=['theme_style']) + + def _get_secondary_text_color(self, opposite=False): + theme_style = self._get_theme_style(opposite) + if theme_style == 'Light': + color = get_color_from_hex('000000') + color[3] = .54 + elif theme_style == 'Dark': + color = get_color_from_hex('FFFFFF') + color[3] = .70 + return color + + secondary_text_color = AliasProperty(_get_secondary_text_color, + bind=['theme_style']) + + def _get_op_secondary_text_color(self): + return self._get_secondary_text_color(True) + + opposite_secondary_text_color = AliasProperty(_get_op_secondary_text_color, + bind=['theme_style']) + + def _get_icon_color(self, opposite=False): + theme_style = self._get_theme_style(opposite) + if theme_style == 'Light': + color = get_color_from_hex('000000') + color[3] = .54 + elif theme_style == 'Dark': + color = get_color_from_hex('FFFFFF') + return color + + icon_color = AliasProperty(_get_icon_color, + bind=['theme_style']) + + def _get_op_icon_color(self): + return self._get_icon_color(True) + + opposite_icon_color = AliasProperty(_get_op_icon_color, + bind=['theme_style']) + + def _get_disabled_hint_text_color(self, opposite=False): + theme_style = self._get_theme_style(opposite) + if theme_style == 'Light': + color = get_color_from_hex('000000') + color[3] = .26 + elif theme_style == 'Dark': + color = get_color_from_hex('FFFFFF') + color[3] = .30 + return color + + disabled_hint_text_color = AliasProperty(_get_disabled_hint_text_color, + bind=['theme_style']) + + def _get_op_disabled_hint_text_color(self): + return self._get_disabled_hint_text_color(True) + + opposite_disabled_hint_text_color = AliasProperty( + _get_op_disabled_hint_text_color, bind=['theme_style']) + + # Hardcoded because muh standard + def _get_error_color(self): + return get_color_from_hex(colors['Red']['A700']) + + error_color = AliasProperty(_get_error_color) + + def _get_ripple_color(self): + return self._ripple_color + + def _set_ripple_color(self, value): + self._ripple_color = value + + _ripple_color = ListProperty(get_color_from_hex(colors['Grey']['400'])) + ripple_color = AliasProperty(_get_ripple_color, + _set_ripple_color, + bind=['_ripple_color']) + + def _determine_device_orientation(self, _, window_size): + if window_size[0] > window_size[1]: + self.device_orientation = 'landscape' + elif window_size[1] >= window_size[0]: + self.device_orientation = 'portrait' + + device_orientation = StringProperty('') + + def _get_standard_increment(self): + if DEVICE_TYPE == 'mobile': + if self.device_orientation == 'landscape': + return dp(48) + else: + return dp(56) + else: + return dp(64) + + standard_increment = AliasProperty(_get_standard_increment, + bind=['device_orientation']) + + def _get_horizontal_margins(self): + if DEVICE_TYPE == 'mobile': + return dp(16) + else: + return dp(24) + + horizontal_margins = AliasProperty(_get_horizontal_margins) + + def on_theme_style(self, instance, value): + if hasattr(App.get_running_app(), 'theme_cls') and \ + App.get_running_app().theme_cls == self: + self.set_clearcolor_by_theme_style(value) + + def set_clearcolor_by_theme_style(self, theme_style): + if theme_style == 'Light': + Window.clearcolor = get_color_from_hex( + colors['Light']['Background']) + elif theme_style == 'Dark': + Window.clearcolor = get_color_from_hex( + colors['Dark']['Background']) + + def __init__(self, **kwargs): + super(ThemeManager, self).__init__(**kwargs) + self.rec_shadow = Atlas('{}rec_shadow.atlas'.format(images_path)) + self.rec_st_shadow = Atlas('{}rec_st_shadow.atlas'.format(images_path)) + self.quad_shadow = Atlas('{}quad_shadow.atlas'.format(images_path)) + self.round_shadow = Atlas('{}round_shadow.atlas'.format(images_path)) + Clock.schedule_once(lambda x: self.on_theme_style(0, self.theme_style)) + self._determine_device_orientation(None, Window.size) + Window.bind(size=self._determine_device_orientation) + + +class ThemableBehavior(object): + theme_cls = ObjectProperty(None) + opposite_colors = BooleanProperty(False) + + def __init__(self, **kwargs): + if self.theme_cls is not None: + pass + elif hasattr(App.get_running_app(), 'theme_cls'): + self.theme_cls = App.get_running_app().theme_cls + else: + self.theme_cls = ThemeManager() + super(ThemableBehavior, self).__init__(**kwargs) diff --git a/src/kivymd/time_picker.py b/src/kivymd/time_picker.py new file mode 100644 index 00000000..6de6fc20 --- /dev/null +++ b/src/kivymd/time_picker.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- + +from kivy.lang import Builder +from kivy.uix.modalview import ModalView +from kivy.uix.floatlayout import FloatLayout +from kivymd.theming import ThemableBehavior +from kivymd.elevationbehavior import ElevationBehavior +from kivy.properties import ObjectProperty, ListProperty + +Builder.load_string(""" +#:import MDFlatButton kivymd.button.MDFlatButton +#:import CircularTimePicker kivymd.vendor.circularTimePicker.CircularTimePicker +#:import dp kivy.metrics.dp +: + size_hint: (None, None) + size: [dp(270), dp(335)+dp(95)] + #if root.theme_cls.device_orientation == 'portrait' else [dp(520), dp(325)] + pos_hint: {'center_x': .5, 'center_y': .5} + canvas: + Color: + rgba: self.theme_cls.bg_light + Rectangle: + size: [dp(270), dp(335)] + #if root.theme_cls.device_orientation == 'portrait' else [dp(250), root.height] + pos: [root.pos[0], root.pos[1] + root.height - dp(335) - dp(95)] + #if root.theme_cls.device_orientation == 'portrait' else [root.pos[0]+dp(270), root.pos[1]] + Color: + rgba: self.theme_cls.primary_color + Rectangle: + size: [dp(270), dp(95)] + #if root.theme_cls.device_orientation == 'portrait' else [dp(270), root.height] + pos: [root.pos[0], root.pos[1] + root.height - dp(95)] + #if root.theme_cls.device_orientation == 'portrait' else [root.pos[0], root.pos[1]] + Color: + rgba: self.theme_cls.bg_dark + Ellipse: + size: [dp(220), dp(220)] + #if root.theme_cls.device_orientation == 'portrait' else [dp(195), dp(195)] + pos: root.pos[0]+dp(270)/2-dp(220)/2, root.pos[1] + root.height - (dp(335)/2+dp(95)) - dp(220)/2 + dp(35) + #Color: + #rgba: (1, 0, 0, 1) + #Line: + #width: 4 + #points: dp(270)/2, root.height, dp(270)/2, 0 + CircularTimePicker: + id: time_picker + pos: (dp(270)/2)-(self.width/2), root.height-self.height + size_hint: [.8, .8] + #if root.theme_cls.device_orientation == 'portrait' else [0.35, 0.9] + pos_hint: {'center_x': 0.5, 'center_y': 0.585} + #if root.theme_cls.device_orientation == 'portrait' else {'center_x': 0.75, 'center_y': 0.7} + MDFlatButton: + pos: root.pos[0]+root.size[0]-dp(72)*2, root.pos[1] + dp(10) + text: "Cancel" + on_release: root.close_cancel() + MDFlatButton: + pos: root.pos[0]+root.size[0]-dp(72), root.pos[1] + dp(10) + text: "OK" + on_release: root.close_ok() +""") + + +class MDTimePicker(ThemableBehavior, FloatLayout, ModalView, ElevationBehavior): + # background_color = ListProperty((0, 0, 0, 0)) + time = ObjectProperty() + + def __init__(self, **kwargs): + super(MDTimePicker, self).__init__(**kwargs) + self.current_time = self.ids.time_picker.time + + def set_time(self, time): + try: + self.ids.time_picker.set_time(time) + except AttributeError: + raise TypeError("MDTimePicker._set_time must receive a datetime object, not a \"" + + type(time).__name__ + "\"") + + def close_cancel(self): + self.dismiss() + + def close_ok(self): + self.current_time = self.ids.time_picker.time + self.time = self.current_time + self.dismiss() diff --git a/src/kivymd/toolbar.py b/src/kivymd/toolbar.py new file mode 100644 index 00000000..fc7b146c --- /dev/null +++ b/src/kivymd/toolbar.py @@ -0,0 +1,98 @@ +# -*- coding: utf-8 -*- +from kivy.clock import Clock +from kivy.lang import Builder +from kivy.metrics import dp +from kivy.properties import ListProperty, StringProperty, OptionProperty +from kivy.uix.boxlayout import BoxLayout +from kivymd.backgroundcolorbehavior import BackgroundColorBehavior +from kivymd.button import MDIconButton +from kivymd.theming import ThemableBehavior +from kivymd.elevationbehavior import ElevationBehavior + +Builder.load_string(''' +#:import m_res kivymd.material_resources + + size_hint_y: None + height: root.theme_cls.standard_increment + background_color: root.background_color + padding: [root.theme_cls.horizontal_margins - dp(12), 0] + opposite_colors: True + elevation: 6 + BoxLayout: + id: left_actions + orientation: 'horizontal' + size_hint_x: None + padding: [0, (self.height - dp(48))/2] + BoxLayout: + padding: dp(12), 0 + MDLabel: + font_style: 'Title' + opposite_colors: root.opposite_colors + theme_text_color: root.title_theme_color + text_color: root.title_color + text: root.title + shorten: True + shorten_from: 'right' + BoxLayout: + id: right_actions + orientation: 'horizontal' + size_hint_x: None + padding: [0, (self.height - dp(48))/2] +''') + + +class Toolbar(ThemableBehavior, ElevationBehavior, BackgroundColorBehavior, + BoxLayout): + left_action_items = ListProperty() + """The icons on the left of the Toolbar. + + To add one, append a list like the following: + + ['icon_name', callback] + + where 'icon_name' is a string that corresponds to an icon definition and + callback is the function called on a touch release event. + """ + + right_action_items = ListProperty() + """The icons on the left of the Toolbar. + + Works the same way as :attr:`left_action_items` + """ + + title = StringProperty() + """The text displayed on the Toolbar.""" + + title_theme_color = OptionProperty(None, allownone=True, + options=['Primary', 'Secondary', 'Hint', + 'Error', 'Custom']) + + title_color = ListProperty(None, allownone=True) + + background_color = ListProperty([0, 0, 0, 1]) + + def __init__(self, **kwargs): + super(Toolbar, self).__init__(**kwargs) + Clock.schedule_once( + lambda x: self.on_left_action_items(0, self.left_action_items)) + Clock.schedule_once( + lambda x: self.on_right_action_items(0, + self.right_action_items)) + + def on_left_action_items(self, instance, value): + self.update_action_bar(self.ids['left_actions'], value) + + def on_right_action_items(self, instance, value): + self.update_action_bar(self.ids['right_actions'], value) + + def update_action_bar(self, action_bar, action_bar_items): + action_bar.clear_widgets() + new_width = 0 + for item in action_bar_items: + new_width += dp(48) + action_bar.add_widget(MDIconButton(icon=item[0], + on_release=item[1], + opposite_colors=True, + text_color=self.title_color, + theme_text_color=self.title_theme_color)) + action_bar.width = new_width diff --git a/src/kivymd/vendor/__init__.py b/src/kivymd/vendor/__init__.py new file mode 100644 index 00000000..9bad5790 --- /dev/null +++ b/src/kivymd/vendor/__init__.py @@ -0,0 +1 @@ +# coding=utf-8 diff --git a/src/kivymd/vendor/circleLayout/LICENSE b/src/kivymd/vendor/circleLayout/LICENSE new file mode 100644 index 00000000..9d6e5b59 --- /dev/null +++ b/src/kivymd/vendor/circleLayout/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 Davide Depau + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/src/kivymd/vendor/circleLayout/README.md b/src/kivymd/vendor/circleLayout/README.md new file mode 100644 index 00000000..6cf54bbe --- /dev/null +++ b/src/kivymd/vendor/circleLayout/README.md @@ -0,0 +1,21 @@ +CircularLayout +============== + +CircularLayout is a special layout that places widgets around a circle. + +See the widget's documentation and the example for more information. + +![Screenshot](screenshot.png) + +size_hint +--------- + +size_hint_x is used as an angle-quota hint (widget with higher +size_hint_x will be farther from each other, and viceversa), while +size_hint_y is used as a widget size hint (widgets with a higher size +hint will be bigger).size_hint_x cannot be None. + +Widgets are all squares, unless you set size_hint_y to None (in that +case you'll be able to specify your own size), and their size is the +difference between the outer and the inner circle's radii. To make the +widgets bigger you can just decrease inner_radius_hint. \ No newline at end of file diff --git a/src/kivymd/vendor/circleLayout/__init__.py b/src/kivymd/vendor/circleLayout/__init__.py new file mode 100644 index 00000000..9d62c99c --- /dev/null +++ b/src/kivymd/vendor/circleLayout/__init__.py @@ -0,0 +1,196 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +""" +CircularLayout +============== + +CircularLayout is a special layout that places widgets around a circle. + +size_hint +--------- + +size_hint_x is used as an angle-quota hint (widget with higher +size_hint_x will be farther from each other, and vice versa), while +size_hint_y is used as a widget size hint (widgets with a higher size +hint will be bigger).size_hint_x cannot be None. + +Widgets are all squares, unless you set size_hint_y to None (in that +case you'll be able to specify your own size), and their size is the +difference between the outer and the inner circle's radii. To make the +widgets bigger you can just decrease inner_radius_hint. +""" + +from kivy.uix.layout import Layout +from kivy.properties import NumericProperty, ReferenceListProperty, OptionProperty, \ + BoundedNumericProperty, VariableListProperty, AliasProperty +from math import sin, cos, pi, radians + +__all__ = ('CircularLayout') + +try: + xrange(1, 2) +except NameError: + def xrange(first, second, third=None): + if third: + return range(first, second, third) + else: + return range(first, second) + + +class CircularLayout(Layout): + ''' + Circular layout class. See module documentation for more information. + ''' + + padding = VariableListProperty([0, 0, 0, 0]) + '''Padding between the layout box and it's children: [padding_left, + padding_top, padding_right, padding_bottom]. + + padding also accepts a two argument form [padding_horizontal, + padding_vertical] and a one argument form [padding]. + + .. version changed:: 1.7.0 + Replaced NumericProperty with VariableListProperty. + + :attr:`padding` is a :class:`~kivy.properties.VariableListProperty` and + defaults to [0, 0, 0, 0]. + ''' + + start_angle = NumericProperty(0) + '''Angle (in degrees) at which the first widget will be placed. + Start counting angles from the X axis, going counterclockwise. + + :attr:`start_angle` is a :class:`~kivy.properties.NumericProperty` and + defaults to 0 (start from the right). + ''' + + circle_quota = BoundedNumericProperty(360, min=0, max=360) + '''Size (in degrees) of the part of the circumference that will actually + be used to place widgets. + + :attr:`circle_quota` is a :class:`~kivy.properties.BoundedNumericProperty` + and defaults to 360 (all the circumference). + ''' + + direction = OptionProperty("ccw", options=("cw", "ccw")) + '''Direction of widgets in the circle. + + :attr:`direction` is an :class:`~kivy.properties.OptionProperty` and + defaults to 'ccw'. Can be 'ccw' (counterclockwise) or 'cw' (clockwise). + ''' + + outer_radius_hint = NumericProperty(1) + '''Sets the size of the outer circle. A number greater than 1 will make the + widgets larger than the actual widget, a number smaller than 1 will leave + a gap. + + :attr:`outer_radius_hint` is a :class:`~kivy.properties.NumericProperty` and + defaults to 1. + ''' + + inner_radius_hint = NumericProperty(.6) + '''Sets the size of the inner circle. A number greater than + :attr:`outer_radius_hint` will cause glitches. The closest it is to + :attr:`outer_radius_hint`, the smallest will be the widget in the layout. + + :attr:`outer_radius_hint` is a :class:`~kivy.properties.NumericProperty` and + defaults to 1. + ''' + + radius_hint = ReferenceListProperty(inner_radius_hint, outer_radius_hint) + '''Combined :attr:`outer_radius_hint` and :attr:`inner_radius_hint` in a list + for convenience. See their documentation for more details. + + :attr:`radius_hint` is a :class:`~kivy.properties.ReferenceListProperty`. + ''' + + def _get_delta_radii(self): + radius = min(self.width-self.padding[0]-self.padding[2], self.height-self.padding[1]-self.padding[3]) / 2. + outer_r = radius * self.outer_radius_hint + inner_r = radius * self.inner_radius_hint + return outer_r - inner_r + delta_radii = AliasProperty(_get_delta_radii, None, bind=("radius_hint", "padding", "size")) + + def __init__(self, **kwargs): + super(CircularLayout, self).__init__(**kwargs) + + self.bind( + start_angle=self._trigger_layout, + parent=self._trigger_layout, + # padding=self._trigger_layout, + children=self._trigger_layout, + size=self._trigger_layout, + radius_hint=self._trigger_layout, + pos=self._trigger_layout) + + def do_layout(self, *largs): + # optimize layout by preventing looking at the same attribute in a loop + len_children = len(self.children) + if len_children == 0: + return + selfcx = self.center_x + selfcy = self.center_y + direction = self.direction + cquota = radians(self.circle_quota) + start_angle_r = radians(self.start_angle) + padding_left = self.padding[0] + padding_top = self.padding[1] + padding_right = self.padding[2] + padding_bottom = self.padding[3] + padding_x = padding_left + padding_right + padding_y = padding_top + padding_bottom + + radius = min(self.width-padding_x, self.height-padding_y) / 2. + outer_r = radius * self.outer_radius_hint + inner_r = radius * self.inner_radius_hint + middle_r = radius * sum(self.radius_hint) / 2. + delta_r = outer_r - inner_r + + stretch_weight_angle = 0. + for w in self.children: + sha = w.size_hint_x + if sha is None: + raise ValueError("size_hint_x cannot be None in a CircularLayout") + else: + stretch_weight_angle += sha + + sign = +1. + angle_offset = start_angle_r + if direction == 'cw': + angle_offset = 2 * pi - start_angle_r + sign = -1. + + for c in reversed(self.children): + sha = c.size_hint_x + shs = c.size_hint_y + + angle_quota = cquota / stretch_weight_angle * sha + angle = angle_offset + (sign * angle_quota / 2) + angle_offset += sign * angle_quota + + # kived: looking it up, yes. x = cos(angle) * radius + centerx; y = sin(angle) * radius + centery + ccx = cos(angle) * middle_r + selfcx + padding_left - padding_right + ccy = sin(angle) * middle_r + selfcy + padding_bottom - padding_top + + c.center_x = ccx + c.center_y = ccy + if shs: + s = delta_r * shs + c.width = s + c.height = s + +if __name__ == "__main__": + from kivy.app import App + from kivy.uix.button import Button + + class CircLayoutApp(App): + def build(self): + cly = CircularLayout(direction="cw", start_angle=-75, inner_radius_hint=.7, padding="20dp") + + for i in xrange(1, 13): + cly.add_widget(Button(text=str(i), font_size="30dp")) + + return cly + + CircLayoutApp().run() diff --git a/src/kivymd/vendor/circularTimePicker/LICENSE b/src/kivymd/vendor/circularTimePicker/LICENSE new file mode 100644 index 00000000..9d6e5b59 --- /dev/null +++ b/src/kivymd/vendor/circularTimePicker/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 Davide Depau + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/src/kivymd/vendor/circularTimePicker/README.md b/src/kivymd/vendor/circularTimePicker/README.md new file mode 100644 index 00000000..20ac2de9 --- /dev/null +++ b/src/kivymd/vendor/circularTimePicker/README.md @@ -0,0 +1,43 @@ +Circular Date & Time Picker for Kivy +==================================== + +(currently only time, date coming soon) + +Based on [CircularLayout](https://github.com/kivy-garden/garden.circularlayout). +The main aim is to provide a date and time selector similar to the +one found in Android KitKat+. + +![Screenshot](screenshot.png) + +Simple usage +------------ + +Import the widget with + +```python +from kivy.garden.circulardatetimepicker import CircularTimePicker +``` + +then use it! That's it! + +```python +c = CircularTimePicker() +c.bind(time=self.set_time) +root.add_widget(c) +``` + +in Kv language: + +``` +: + BoxLayout: + orientation: "vertical" + + CircularTimePicker + + Button: + text: "Dismiss" + size_hint_y: None + height: "40dp" + on_release: root.dismiss() +``` \ No newline at end of file diff --git a/src/kivymd/vendor/circularTimePicker/__init__.py b/src/kivymd/vendor/circularTimePicker/__init__.py new file mode 100644 index 00000000..fbc73954 --- /dev/null +++ b/src/kivymd/vendor/circularTimePicker/__init__.py @@ -0,0 +1,770 @@ +# -*- coding: utf-8 -*- + +""" +Circular Date & Time Picker for Kivy +==================================== + +(currently only time, date coming soon) + +Based on [CircularLayout](https://github.com/kivy-garden/garden.circularlayout). +The main aim is to provide a date and time selector similar to the +one found in Android KitKat+. + +Simple usage +------------ + +Import the widget with + +```python +from kivy.garden.circulardatetimepicker import CircularTimePicker +``` + +then use it! That's it! + +```python +c = CircularTimePicker() +c.bind(time=self.set_time) +root.add_widget(c) +``` + +in Kv language: + +``` +: + BoxLayout: + orientation: "vertical" + + CircularTimePicker + + Button: + text: "Dismiss" + size_hint_y: None + height: "40dp" + on_release: root.dismiss() +``` +""" + +from kivy.animation import Animation +from kivy.clock import Clock +from kivymd.vendor.circleLayout import CircularLayout +from kivy.graphics import Line, Color, Ellipse +from kivy.lang import Builder +from kivy.properties import NumericProperty, BoundedNumericProperty, \ + ObjectProperty, StringProperty, DictProperty, \ + ListProperty, OptionProperty, BooleanProperty, \ + ReferenceListProperty, AliasProperty +from kivy.uix.boxlayout import BoxLayout +from kivy.uix.label import Label +from kivy.metrics import dp +from kivymd.theming import ThemableBehavior +from math import atan, pi, radians, sin, cos +import sys +import datetime +if sys.version_info[0] > 2: + def xrange(first=None, second=None, third=None): + if third: + return range(first, second, third) + else: + return range(first, second) + + +def map_number(x, in_min, in_max, out_min, out_max): + return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min + + +def rgb_to_hex(*color): + tor = "#" + for col in color: + tor += "{:>02}".format(hex(int(col * 255))[2:]) + return tor + + +Builder.load_string(""" + +: + text_size: self.size + valign: "middle" + halign: "center" + font_size: self.height * self.size_factor + +: + canvas.before: + PushMatrix + Scale: + origin: self.center_x + self.padding[0] - self.padding[2], self.center_y + self.padding[3] - self.padding[1] + x: self.scale + y: self.scale + + canvas.after: + PopMatrix + +: + orientation: "vertical" + spacing: "20dp" + + FloatLayout: + anchor_x: "center" + anchor_y: "center" + size_hint_y: 1./3 + size_hint_x: 1 + size: root.size + pos: root.pos + + GridLayout: + cols: 2 + spacing: "10dp" + size_hint_x: None + width: self.minimum_width + pos_hint: {'center_x': .5, 'center_y': .5} + + Label: + id: timelabel + text: root.time_text + markup: True + halign: "right" + valign: "middle" + # text_size: self.size + size_hint_x: None #.6 + width: self.texture_size[0] + font_size: self.height * .75 + + Label: + id: ampmlabel + text: root.ampm_text + markup: True + halign: "left" + valign: "middle" + # text_size: self.size + size_hint_x: None #.4 + width: self.texture_size[0] + font_size: self.height * .3 + + FloatLayout: + id: picker_container + #size_hint_y: 2./3 + _bound: {} +""") + + +class Number(Label): + """The class used to show the numbers in the selector. + """ + + size_factor = NumericProperty(.5) + """Font size scale. + + :attr:`size_factor` is a :class:`~kivy.properties.NumericProperty` and + defaults to 0.5. + """ + + +class CircularNumberPicker(CircularLayout): + """A circular number picker based on CircularLayout. A selector will + help you pick a number. You can also set :attr:`multiples_of` to make + it show only some numbers and use the space in between for the other + numbers. + """ + + min = NumericProperty(0) + """The first value of the range. + + :attr:`min` is a :class:`~kivy.properties.NumericProperty` and + defaults to 0. + """ + + max = NumericProperty(0) + """The last value of the range. Note that it behaves like xrange, so + the actual last displayed value will be :attr:`max` - 1. + + :attr:`max` is a :class:`~kivy.properties.NumericProperty` and + defaults to 0. + """ + + range = ReferenceListProperty(min, max) + """Packs :attr:`min` and :attr:`max` into a list for convenience. See + their documentation for further information. + + :attr:`range` is a :class:`~kivy.properties.ReferenceListProperty`. + """ + + multiples_of = NumericProperty(1) + """Only show numbers that are multiples of this number. The other numbers + will be selectable, but won't have their own label. + + :attr:`multiples_of` is a :class:`~kivy.properties.NumericProperty` and + defaults to 1. + """ + + # selector_color = ListProperty([.337, .439, .490]) + selector_color = ListProperty([1, 1, 1]) + """Color of the number selector. RGB. + + :attr:`selector_color` is a :class:`~kivy.properties.ListProperty` and + defaults to [.337, .439, .490] (material green). + """ + + color = ListProperty([0, 0, 0]) + """Color of the number labels and of the center dot. RGB. + + :attr:`color` is a :class:`~kivy.properties.ListProperty` and + defaults to [1, 1, 1] (white). + """ + + selector_alpha = BoundedNumericProperty(.3, min=0, max=1) + """Alpha value for the transparent parts of the selector. + + :attr:`selector_alpha` is a :class:`~kivy.properties.BoundedNumericProperty` and + defaults to 0.3 (min=0, max=1). + """ + + selected = NumericProperty(None) + """Currently selected number. + + :attr:`selected` is a :class:`~kivy.properties.NumericProperty` and + defaults to :attr:`min`. + """ + + number_size_factor = NumericProperty(.5) + """Font size scale factor fot the :class:`Number`s. + + :attr:`number_size_factor` is a :class:`~kivy.properties.NumericProperty` and + defaults to 0.5. + """ + + number_format_string = StringProperty("{}") + """String that will be formatted with the selected number as the first argument. + Can be anything supported by :meth:`str.format` (es. "{:02d}"). + + :attr:`number_format_string` is a :class:`~kivy.properties.StringProperty` and + defaults to "{}". + """ + + scale = NumericProperty(1) + """Canvas scale factor. Used in :class:`CircularTimePicker` transitions. + + :attr:`scale` is a :class:`~kivy.properties.NumericProperty` and + defaults to 1. + """ + + _selection_circle = ObjectProperty(None) + _selection_line = ObjectProperty(None) + _selection_dot = ObjectProperty(None) + _selection_dot_color = ObjectProperty(None) + _selection_color = ObjectProperty(None) + _center_dot = ObjectProperty(None) + _center_color = ObjectProperty(None) + + def _get_items(self): + return self.max - self.min + + items = AliasProperty(_get_items, None) + + def _get_shown_items(self): + sh = 0 + for i in xrange(*self.range): + if i % self.multiples_of == 0: + sh += 1 + return sh + + shown_items = AliasProperty(_get_shown_items, None) + + def __init__(self, **kw): + self._trigger_genitems = Clock.create_trigger(self._genitems, -1) + self.bind(min=self._trigger_genitems, + max=self._trigger_genitems, + multiples_of=self._trigger_genitems) + super(CircularNumberPicker, self).__init__(**kw) + self.selected = self.min + self.bind(selected=self.on_selected, + pos=self.on_selected, + size=self.on_selected) + + cx = self.center_x + self.padding[0] - self.padding[2] + cy = self.center_y + self.padding[3] - self.padding[1] + sx, sy = self.pos_for_number(self.selected) + epos = [i - (self.delta_radii * self.number_size_factor) for i in (sx, sy)] + esize = [self.delta_radii * self.number_size_factor * 2] * 2 + dsize = [i * .3 for i in esize] + dpos = [i + esize[0] / 2. - dsize[0] / 2. for i in epos] + csize = [i * .05 for i in esize] + cpos = [i - csize[0] / 2. for i in (cx, cy)] + dot_alpha = 0 if self.selected % self.multiples_of == 0 else 1 + color = list(self.selector_color) + + with self.canvas: + self._selection_color = Color(*(color + [self.selector_alpha])) + self._selection_circle = Ellipse(pos=epos, size=esize) + self._selection_line = Line(points=[cx, cy, sx, sy], width=dp(1.25)) + self._selection_dot_color = Color(*(color + [dot_alpha])) + self._selection_dot = Ellipse(pos=dpos, size=dsize) + self._center_color = Color(*self.color) + self._center_dot = Ellipse(pos=cpos, size=csize) + + self.bind(selector_color=lambda ign, u: setattr(self._selection_color, "rgba", u + [self.selector_alpha])) + self.bind(selector_color=lambda ign, u: setattr(self._selection_dot_color, "rgb", u)) + self.bind(selector_color=lambda ign, u: self.dot_is_none()) + self.bind(color=lambda ign, u: setattr(self._center_color, "rgb", u)) + Clock.schedule_once(self._genitems) + Clock.schedule_once(self.on_selected) # Just to make sure pos/size are set + + def dot_is_none(self, *args): + dot_alpha = 0 if self.selected % self.multiples_of == 0 else 1 + if self._selection_dot_color: + self._selection_dot_color.a = dot_alpha + + def _genitems(self, *a): + self.clear_widgets() + for i in xrange(*self.range): + if i % self.multiples_of != 0: + continue + n = Number(text=self.number_format_string.format(i), size_factor=self.number_size_factor, color=self.color) + self.bind(color=n.setter("color")) + self.add_widget(n) + + def on_touch_down(self, touch): + if not self.collide_point(*touch.pos): + return + touch.grab(self) + self.selected = self.number_at_pos(*touch.pos) + if self.selected == 60: + self.selected = 0 + + def on_touch_move(self, touch): + if touch.grab_current is not self: + return super(CircularNumberPicker, self).on_touch_move(touch) + self.selected = self.number_at_pos(*touch.pos) + if self.selected == 60: + self.selected = 0 + + def on_touch_up(self, touch): + if touch.grab_current is not self: + return super(CircularNumberPicker, self).on_touch_up(touch) + touch.ungrab(self) + + def on_selected(self, *a): + cx = self.center_x + self.padding[0] - self.padding[2] + cy = self.center_y + self.padding[3] - self.padding[1] + sx, sy = self.pos_for_number(self.selected) + epos = [i - (self.delta_radii * self.number_size_factor) for i in (sx, sy)] + esize = [self.delta_radii * self.number_size_factor * 2] * 2 + dsize = [i * .3 for i in esize] + dpos = [i + esize[0] / 2. - dsize[0] / 2. for i in epos] + csize = [i * .05 for i in esize] + cpos = [i - csize[0] / 2. for i in (cx, cy)] + dot_alpha = 0 if self.selected % self.multiples_of == 0 else 1 + + if self._selection_circle: + self._selection_circle.pos = epos + self._selection_circle.size = esize + if self._selection_line: + self._selection_line.points = [cx, cy, sx, sy] + if self._selection_dot: + self._selection_dot.pos = dpos + self._selection_dot.size = dsize + if self._selection_dot_color: + self._selection_dot_color.a = dot_alpha + if self._center_dot: + self._center_dot.pos = cpos + self._center_dot.size = csize + + def pos_for_number(self, n): + """Returns the center x, y coordinates for a given number. + """ + + if self.items == 0: + return 0, 0 + radius = min(self.width - self.padding[0] - self.padding[2], + self.height - self.padding[1] - self.padding[3]) / 2. + middle_r = radius * sum(self.radius_hint) / 2. + cx = self.center_x + self.padding[0] - self.padding[2] + cy = self.center_y + self.padding[3] - self.padding[1] + sign = +1. + angle_offset = radians(self.start_angle) + if self.direction == 'cw': + angle_offset = 2 * pi - angle_offset + sign = -1. + quota = 2 * pi / self.items + mult_quota = 2 * pi / self.shown_items + angle = angle_offset + n * sign * quota + + if self.items == self.shown_items: + angle += quota / 2 + else: + angle -= mult_quota / 2 + + # kived: looking it up, yes. x = cos(angle) * radius + centerx; y = sin(angle) * radius + centery + x = cos(angle) * middle_r + cx + y = sin(angle) * middle_r + cy + + return x, y + + def number_at_pos(self, x, y): + """Returns the number at a given x, y position. The number is found + using the widget's center as a starting point for angle calculations. + + Not thoroughly tested, may yield wrong results. + """ + if self.items == 0: + return self.min + cx = self.center_x + self.padding[0] - self.padding[2] + cy = self.center_y + self.padding[3] - self.padding[1] + lx = x - cx + ly = y - cy + quota = 2 * pi / self.items + mult_quota = 2 * pi / self.shown_items + if lx == 0 and ly > 0: + angle = pi / 2 + elif lx == 0 and ly < 0: + angle = 3 * pi / 2 + else: + angle = atan(ly / lx) + if lx < 0 < ly: + angle += pi + if lx > 0 > ly: + angle += 2 * pi + if lx < 0 and ly < 0: + angle += pi + angle += radians(self.start_angle) + if self.direction == "cw": + angle = 2 * pi - angle + if mult_quota != quota: + angle -= mult_quota / 2 + if angle < 0: + angle += 2 * pi + elif angle > 2 * pi: + angle -= 2 * pi + + return int(angle / quota) + self.min + + +class CircularMinutePicker(CircularNumberPicker): + """:class:`CircularNumberPicker` implementation for minutes. + """ + + def __init__(self, **kw): + super(CircularMinutePicker, self).__init__(**kw) + self.min = 0 + self.max = 60 + self.multiples_of = 5 + self.number_format_string = "{:02d}" + self.direction = "cw" + self.bind(shown_items=self._update_start_angle) + Clock.schedule_once(self._update_start_angle) + Clock.schedule_once(self.on_selected) + + def _update_start_angle(self, *a): + self.start_angle = -(360. / self.shown_items / 2) - 90 + + +class CircularHourPicker(CircularNumberPicker): + """:class:`CircularNumberPicker` implementation for hours. + """ + + # military = BooleanProperty(False) + + def __init__(self, **kw): + super(CircularHourPicker, self).__init__(**kw) + self.min = 1 + self.max = 13 + # 25 if self.military else 13 + # self.inner_radius_hint = .8 if self.military else .6 + self.multiples_of = 1 + self.number_format_string = "{}" + self.direction = "cw" + self.bind(shown_items=self._update_start_angle) + # self.bind(military=lambda v: setattr(self, "max", 25 if v else 13)) + # self.bind(military=lambda v: setattr(self, "inner_radius_hint", .8 if self.military else .6)) + # Clock.schedule_once(self._genitems) + Clock.schedule_once(self._update_start_angle) + Clock.schedule_once(self.on_selected) + + def _update_start_angle(self, *a): + self.start_angle = (360. / self.shown_items / 2) - 90 + + +class CircularTimePicker(BoxLayout, ThemableBehavior): + """Widget that makes use of :class:`CircularHourPicker` and + :class:`CircularMinutePicker` to create a user-friendly, animated + time picker like the one seen on Android. + + See module documentation for more details. + """ + + primary_dark = ListProperty([1, 1, 1]) + + hours = NumericProperty(0) + """The hours, in military format (0-23). + + :attr:`hours` is a :class:`~kivy.properties.NumericProperty` and + defaults to 0 (12am). + """ + + minutes = NumericProperty(0) + """The minutes. + + :attr:`minutes` is a :class:`~kivy.properties.NumericProperty` and + defaults to 0. + """ + + time_list = ReferenceListProperty(hours, minutes) + """Packs :attr:`hours` and :attr:`minutes` in a list for convenience. + + :attr:`time_list` is a :class:`~kivy.properties.ReferenceListProperty`. + """ + + # military = BooleanProperty(False) + time_format = StringProperty( + "[color={hours_color}][ref=hours]{hours}[/ref][/color][color={primary_dark}][ref=colon]:[/ref][/color]\ +[color={minutes_color}][ref=minutes]{minutes:02d}[/ref][/color]") + """String that will be formatted with the time and shown in the time label. + Can be anything supported by :meth:`str.format`. Make sure you don't + remove the refs. See the default for the arguments passed to format. + :attr:`time_format` is a :class:`~kivy.properties.StringProperty` and + defaults to "[color={hours_color}][ref=hours]{hours}[/ref][/color]:[color={minutes_color}][ref=minutes]\ + {minutes:02d}[/ref][/color]". + """ + + ampm_format = StringProperty( + "[color={am_color}][ref=am]AM[/ref][/color]\n[color={pm_color}][ref=pm]PM[/ref][/color]") + """String that will be formatted and shown in the AM/PM label. + Can be anything supported by :meth:`str.format`. Make sure you don't + remove the refs. See the default for the arguments passed to format. + + :attr:`ampm_format` is a :class:`~kivy.properties.StringProperty` and + defaults to "[color={am_color}][ref=am]AM[/ref][/color]\n[color={pm_color}][ref=pm]PM[/ref][/color]". + """ + + picker = OptionProperty("hours", options=("minutes", "hours")) + """Currently shown time picker. Can be one of "minutes", "hours". + + :attr:`picker` is a :class:`~kivy.properties.OptionProperty` and + defaults to "hours". + """ + + # selector_color = ListProperty([.337, .439, .490]) + selector_color = ListProperty([0, 0, 0]) + """Color of the number selector and of the highlighted text. RGB. + + :attr:`selector_color` is a :class:`~kivy.properties.ListProperty` and + defaults to [.337, .439, .490] (material green). + """ + + color = ListProperty([1, 1, 1]) + """Color of the number labels and of the center dot. RGB. + + :attr:`color` is a :class:`~kivy.properties.ListProperty` and + defaults to [1, 1, 1] (white). + """ + + selector_alpha = BoundedNumericProperty(.3, min=0, max=1) + """Alpha value for the transparent parts of the selector. + + :attr:`selector_alpha` is a :class:`~kivy.properties.BoundedNumericProperty` and + defaults to 0.3 (min=0, max=1). + """ + + _am = BooleanProperty(True) + _h_picker = ObjectProperty(None) + _m_picker = ObjectProperty(None) + _bound = DictProperty({}) + + def _get_time(self): + try: + return datetime.time(*self.time_list) + except ValueError: + self.time_list = [self.hours, 0] + return datetime.time(*self.time_list) + + def set_time(self, dt): + if dt.hour >= 12: + dt.strftime("%I:%M") + self._am = False + self.time_list = [dt.hour, dt.minute] + + time = AliasProperty(_get_time, set_time, bind=("time_list",)) + """Selected time as a datetime.time object. + + :attr:`time` is an :class:`~kivy.properties.AliasProperty`. + """ + + def _get_picker(self): + if self.picker == "hours": + return self._h_picker + return self._m_picker + + _picker = AliasProperty(_get_picker, None) + + def _get_time_text(self): + hc = rgb_to_hex(0, 0, 0) if self.picker == "hours" else rgb_to_hex(*self.primary_dark) + mc = rgb_to_hex(0, 0, 0) if self.picker == "minutes" else rgb_to_hex(*self.primary_dark) + h = self.hours == 0 and 12 or self.hours <= 12 and self.hours or self.hours - 12 + m = self.minutes + primary_dark = rgb_to_hex(*self.primary_dark) + return self.time_format.format(hours_color=hc, + minutes_color=mc, + hours=h, + minutes=m, + primary_dark=primary_dark) + time_text = AliasProperty(_get_time_text, None, bind=("hours", "minutes", "time_format", "picker")) + + def _get_ampm_text(self, *args): + amc = rgb_to_hex(0, 0, 0) if self._am else rgb_to_hex(*self.primary_dark) + pmc = rgb_to_hex(0, 0, 0) if not self._am else rgb_to_hex(*self.primary_dark) + return self.ampm_format.format(am_color=amc, + pm_color=pmc) + + ampm_text = AliasProperty(_get_ampm_text, None, bind=("hours", "ampm_format", "_am")) + + def __init__(self, **kw): + super(CircularTimePicker, self).__init__(**kw) + self.selector_color = self.theme_cls.primary_color[0], self.theme_cls.primary_color[1], \ + self.theme_cls.primary_color[2] + self.color = self.theme_cls.text_color + self.primary_dark = self.theme_cls.primary_dark[0] / 2, self.theme_cls.primary_dark[1] / 2, \ + self.theme_cls.primary_dark[2] / 2 + self.on_ampm() + if self.hours >= 12: + self._am = False + self.bind(time_list=self.on_time_list, + picker=self._switch_picker, + _am=self.on_ampm, + primary_dark=self._get_ampm_text) + self._h_picker = CircularHourPicker() + self.h_picker_touch = False + self._m_picker = CircularMinutePicker() + self.animating = False + Clock.schedule_once(self.on_selected) + Clock.schedule_once(self.on_time_list) + Clock.schedule_once(self._init_later) + Clock.schedule_once(lambda *a: self._switch_picker(noanim=True)) + + def _init_later(self, *args): + self.ids.timelabel.bind(on_ref_press=self.on_ref_press) + self.ids.ampmlabel.bind(on_ref_press=self.on_ref_press) + + def on_ref_press(self, ign, ref): + if not self.animating: + if ref == "hours": + self.picker = "hours" + elif ref == "minutes": + self.picker = "minutes" + if ref == "am": + self._am = True + elif ref == "pm": + self._am = False + + def on_selected(self, *a): + if not self._picker: + return + if self.picker == "hours": + hours = self._picker.selected if self._am else self._picker.selected + 12 + if hours == 24 and not self._am: + hours = 12 + elif hours == 12 and self._am: + hours = 0 + self.hours = hours + elif self.picker == "minutes": + self.minutes = self._picker.selected + + def on_time_list(self, *a): + if not self._picker: + return + self._h_picker.selected = self.hours == 0 and 12 or self._am and self.hours or self.hours - 12 + self._m_picker.selected = self.minutes + self.on_selected() + + def on_ampm(self, *a): + if self._am: + self.hours = self.hours if self.hours < 12 else self.hours - 12 + else: + self.hours = self.hours if self.hours >= 12 else self.hours + 12 + + def is_animating(self, *args): + self.animating = True + + def is_not_animating(self, *args): + self.animating = False + + def on_touch_down(self, touch): + if not self._h_picker.collide_point(*touch.pos): + self.h_picker_touch = False + else: + self.h_picker_touch = True + super(CircularTimePicker, self).on_touch_down(touch) + + def on_touch_up(self, touch): + try: + if not self.h_picker_touch: + return + if not self.animating: + if touch.grab_current is not self: + if self.picker == "hours": + self.picker = "minutes" + except AttributeError: + pass + super(CircularTimePicker, self).on_touch_up(touch) + + def _switch_picker(self, *a, **kw): + noanim = "noanim" in kw + if noanim: + noanim = kw["noanim"] + + try: + container = self.ids.picker_container + except (AttributeError, NameError): + Clock.schedule_once(lambda *a: self._switch_picker(noanim=noanim)) + + if self.picker == "hours": + picker = self._h_picker + prevpicker = self._m_picker + elif self.picker == "minutes": + picker = self._m_picker + prevpicker = self._h_picker + + if len(self._bound) > 0: + prevpicker.unbind(selected=self.on_selected) + self.unbind(**self._bound) + picker.bind(selected=self.on_selected) + self._bound = {"selector_color": picker.setter("selector_color"), + "color": picker.setter("color"), + "selector_alpha": picker.setter("selector_alpha")} + self.bind(**self._bound) + + if len(container._bound) > 0: + container.unbind(**container._bound) + container._bound = {"size": picker.setter("size"), + "pos": picker.setter("pos")} + container.bind(**container._bound) + + picker.pos = container.pos + picker.size = container.size + picker.selector_color = self.selector_color + picker.color = self.color + picker.selector_alpha = self.selector_alpha + if noanim: + if prevpicker in container.children: + container.remove_widget(prevpicker) + if picker.parent: + picker.parent.remove_widget(picker) + container.add_widget(picker) + else: + self.is_animating() + if prevpicker in container.children: + anim = Animation(scale=1.5, d=.5, t="in_back") & Animation(opacity=0, d=.5, t="in_cubic") + anim.start(prevpicker) + Clock.schedule_once(lambda *y: container.remove_widget(prevpicker), .5) # .31) + picker.scale = 1.5 + picker.opacity = 0 + if picker.parent: + picker.parent.remove_widget(picker) + container.add_widget(picker) + anim = Animation(scale=1, d=.5, t="out_back") & Animation(opacity=1, d=.5, t="out_cubic") + anim.bind(on_complete=self.is_not_animating) + Clock.schedule_once(lambda *y: anim.start(picker), .3) + + +if __name__ == "__main__": + from kivy.base import runTouchApp + + c = CircularTimePicker() + runTouchApp(c) diff --git a/src/knownnodes.py b/src/knownnodes.py index 5755efc0..ac2d668c 100644 --- a/src/knownnodes.py +++ b/src/knownnodes.py @@ -37,6 +37,7 @@ def json_serialize_knownnodes(output): _serialized = [] for stream, peers in knownNodes.iteritems(): for peer, info in peers.iteritems(): + info.update(rating=round(info.get('rating', 0), 2)) _serialized.append({ 'stream': stream, 'peer': peer._asdict(), 'info': info }) @@ -97,7 +98,7 @@ def readKnownNodes(): except ValueError: source.seek(0) pickle_deserialize_old_knownnodes(source) - except (IOError, OSError, KeyError): + except (IOError, OSError, KeyError, EOFError): logger.debug( 'Failed to read nodes from knownnodes.dat', exc_info=True) createDefaultKnownNodes() diff --git a/src/namecoin.py b/src/namecoin.py index 7f081bc6..e8af3349 100644 --- a/src/namecoin.py +++ b/src/namecoin.py @@ -34,7 +34,7 @@ import os import socket import sys -import logging as logger +from debug import logger import defaults import tr # translate from bmconfigparser import BMConfigParser @@ -346,7 +346,7 @@ def ensureNamecoinOptions(): nmc.close() except IOError: - logger.error("%s unreadable or missing, Namecoin support deactivated", nmcConfig) + logger.warning("%s unreadable or missing, Namecoin support deactivated", nmcConfig) except Exception: logger.warning("Error processing namecoin.conf", exc_info=True) diff --git a/src/navigationdrawer/__init__.py b/src/navigationdrawer/__init__.py new file mode 100644 index 00000000..a8fa5ce7 --- /dev/null +++ b/src/navigationdrawer/__init__.py @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- +from kivy.animation import Animation +from kivy.lang import Builder +from kivy.properties import StringProperty, ObjectProperty +from kivymd.elevationbehavior import ElevationBehavior +from kivymd.icon_definitions import md_icons +from kivymd.label import MDLabel +from kivymd.list import OneLineIconListItem, ILeftBody, BaseListItem +from kivymd.slidingpanel import SlidingPanel +from kivymd.theming import ThemableBehavior + +Builder.load_string(''' + + canvas: + Color: + rgba: root.parent.parent.theme_cls.divider_color + Line: + points: self.x, self.y, self.x+self.width,self.y + + + widget_list: widget_list + elevation: 0 + canvas: + Color: + rgba: root.theme_cls.bg_light + Rectangle: + size: root.size + pos: root.pos + BoxLayout: + size_hint: (1, .4) + NavDrawerToolbar: + padding: 10, 10 + canvas.after: + Color: + rgba: (1, 1, 1, 1) + RoundedRectangle: + size: (self.size[1]-dp(14), self.size[1]-dp(14)) + pos: (self.pos[0]+(self.size[0]-self.size[1])/2, self.pos[1]+dp(7)) + source: root.image_source + radius: [self.size[1]-(self.size[1]/2)] + + ScrollView: + do_scroll_x: False + MDList: + id: ml + id: widget_list + + + NDIconLabel: + id: _icon + font_style: 'Icon' + theme_text_color: 'Secondary' +''') + + +class NavigationDrawer(SlidingPanel, ThemableBehavior, ElevationBehavior): + image_source = StringProperty() + widget_list = ObjectProperty() + + def add_widget(self, widget, index=0): + if issubclass(widget.__class__, BaseListItem): + self.widget_list.add_widget(widget, index) + widget.bind(on_release=lambda x: self.toggle()) + else: + super(NavigationDrawer, self).add_widget(widget, index) + + def _get_main_animation(self, duration, t, x, is_closing): + a = super(NavigationDrawer, self)._get_main_animation(duration, t, x, + is_closing) + a &= Animation(elevation=0 if is_closing else 5, t=t, duration=duration) + return a + + +class NDIconLabel(ILeftBody, MDLabel): + pass + + +class NavigationDrawerIconButton(OneLineIconListItem): + icon = StringProperty() + + def on_icon(self, instance, value): + self.ids['_icon'].text = u"{}".format(md_icons[value]) diff --git a/src/network/connectionpool.py b/src/network/connectionpool.py index 7854dec1..fa098411 100644 --- a/src/network/connectionpool.py +++ b/src/network/connectionpool.py @@ -8,6 +8,7 @@ import re from bmconfigparser import BMConfigParser from debug import logger import helper_bootstrap +from knownnodes import knownNodes from network.proxy import Proxy from network.tcp import TCPServer, Socks5BMConnection, Socks4aBMConnection, TCPConnection from network.udp import UDPSocket @@ -138,8 +139,9 @@ class BMConnectionPool(object): acceptConnections = False if spawnConnections: - if not self.bootstrapped: + if not any([knownNodes.iteritems()]): helper_bootstrap.dns() + if not self.bootstrapped: self.bootstrapped = True Proxy.proxy = (BMConfigParser().safeGet("bitmessagesettings", "sockshostname"), BMConfigParser().safeGetInt("bitmessagesettings", "socksport")) diff --git a/src/state.py b/src/state.py index 834b60be..f052d7bb 100644 --- a/src/state.py +++ b/src/state.py @@ -70,3 +70,5 @@ dandelion = 0 testmode = False kivy = False + +association = '' diff --git a/src/translations/bitmessage_eo.qm b/src/translations/bitmessage_eo.qm index ad11c7dd..4b94b3d1 100644 Binary files a/src/translations/bitmessage_eo.qm and b/src/translations/bitmessage_eo.qm differ diff --git a/src/translations/bitmessage_eo.ts b/src/translations/bitmessage_eo.ts index 454189e0..2d243e40 100644 --- a/src/translations/bitmessage_eo.ts +++ b/src/translations/bitmessage_eo.ts @@ -156,7 +156,7 @@ Please type the desired email address (including @mailchuck.com) below: - + # You can use this to configure your email gateway account # Uncomment the setting you want to use # Here are the options: @@ -259,7 +259,7 @@ Please type the desired email address (including @mailchuck.com) below: Aldoni sendinton al via nigra listo - + Move to Trash Movi al rubujo @@ -284,7 +284,7 @@ Please type the desired email address (including @mailchuck.com) below: Marki kiel nelegitan - + New Nova @@ -309,7 +309,7 @@ Please type the desired email address (including @mailchuck.com) below: Kopii adreson al tondejo - + Special address behavior... Speciala sinteno de adreso… @@ -324,37 +324,37 @@ Please type the desired email address (including @mailchuck.com) below: Forigi - + Send message to this address Sendi mesaĝon al tiu adreso - + Subscribe to this address Aboni tiun adreson - + Add New Address Aldoni novan adreson - + Copy destination address to clipboard Kopii cel-adreson al tondejo - + Force send Devigi sendadon - + One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now? Iu de viaj adresoj, %1, estas malnova versio 1 adreso. Versioj 1 adresoj ne estas jam subtenataj. Ĉu ni povas forigi ĝin? - + Waiting for their encryption key. Will request it again soon. Atendado je ilia ĉifroŝlosilo. Baldaŭ petos ĝin denove. @@ -364,17 +364,17 @@ Please type the desired email address (including @mailchuck.com) below: - + Queued. En atendovico. - + Message sent. Waiting for acknowledgement. Sent at %1 Mesaĝo sendita. Atendado je konfirmo. Sendita je %1 - + Message sent. Sent at %1 Mesaĝo sendita. Sendita je %1 @@ -384,47 +384,47 @@ Please type the desired email address (including @mailchuck.com) below: - + Acknowledgement of the message received %1 Ricevis konfirmon de la mesaĝo je %1 - + Broadcast queued. Elsendo en atendovico. - + Broadcast on %1 Elsendo je %1 - + Problem: The work demanded by the recipient is more difficult than you are willing to do. %1 Problemo: la demandita laboro de la ricevonto estas pli malfacila ol vi pretas fari. %1 - + Problem: The recipient's encryption key is no good. Could not encrypt message. %1 Problemo: la ĉifroŝlosilo de la ricevonto estas rompita. Ne povis ĉifri la mesaĝon. %1 - + Forced difficulty override. Send should start soon. Devigita superado de limito de malfacilaĵo. Sendado devus baldaŭ komenci. - + Unknown status: %1 %2 Nekonata stato: %1 %2 - + Not Connected Ne konektita - + Show Bitmessage Montri Bitmesaĝon @@ -434,12 +434,12 @@ Please type the desired email address (including @mailchuck.com) below: Sendi - + Subscribe Aboni - + Channel Kanalo @@ -449,12 +449,12 @@ Please type the desired email address (including @mailchuck.com) below: Eliri - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Vi povas administri viajn ŝlosilojn per redakti la dosieron “keys.dat” en la sama dosierujo kiel tiu programo. Estas grava, ke vi faru sekurkopion de tiu dosiero. - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. @@ -463,17 +463,17 @@ It is important that you back up this file. Estas grava, ke vi faru sekurkopion de tiu dosiero. - + Open keys.dat? Ĉu malfermi keys.dat? - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) Vi povas administri viajn ŝlosilojn per redakti la dosieron “keys.dat” en la sama dosierujo kiel tiu programo. Estas grava ke vi faru sekurkopion de tiu dosiero. Ĉu vi volas malfermi la dosieron nun? (Bonvolu certigi ke Bitmesaĝo estas fermita antaŭ fari ŝanĝojn.) - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) @@ -482,37 +482,37 @@ It is important that you back up this file. Would you like to open the file now? Estas grava, ke vi faru sekurkopion de tiu dosiero. Ĉu vi volas malfermi la dosieron nun? (Bonvolu certigi ke Bitmesaĝo estas fermita antaŭ fari ŝanĝojn.) - + Delete trash? Ĉu malplenigi rubujon? - + Are you sure you want to delete all trashed messages? Ĉu vi certe volas forviŝi ĉiujn mesaĝojn el la rubujo? - + bad passphrase malprava pasvorto - + You must type your passphrase. If you don't have one then this is not the form for you. Vi devas tajpi vian pasvorton. Se vi ne havas pasvorton, tiu ĉi ne estas la prava formularo por vi. - + Bad address version number Erara numero de adresversio - + Your address version number must be a number: either 3 or 4. Via numero de adresversio devas esti: aŭ 3 aŭ 4. - + Your address version number must be either 3 or 4. Via numero de adresversio devas esti: aŭ 3 aŭ 4. @@ -582,22 +582,22 @@ Estas grava, ke vi faru sekurkopion de tiu dosiero. Ĉu vi volas malfermi la dos - + Connection lost Perdis konekton - + Connected Konektita - + Message trashed Movis mesaĝon al rubujo - + The TTL, or Time-To-Live is the length of time that the network will hold the message. The recipient must get it during this time. If your Bitmessage client does not hear an acknowledgement, it will resend the message automatically. The longer the Time-To-Live, the @@ -605,17 +605,17 @@ Estas grava, ke vi faru sekurkopion de tiu dosiero. Ĉu vi volas malfermi la dos La vivdaŭro signifas ĝis kiam la reto tenos la mesaĝon. La ricevonto devos elŝuti ĝin dum tiu tempo. Se via bitmesaĝa kliento ne ricevos konfirmon, ĝi resendos mesaĝon aŭtomate. Ju pli longa vivdaŭro, des pli laboron via komputilo bezonos fari por sendi mesaĝon. Vivdaŭro proksimume kvin aŭ kvar horoj estas ofte konvena. - + Message too long Mesaĝo tro longa - + The message that you are trying to send is too long by %1 bytes. (The maximum is 261644 bytes). Please cut it down before sending. La mesaĝon kiun vi provis sendi estas tro longa je %1 bitokoj. (La maksimumo estas 261644 bitokoj.) Bonvolu mallongigi ĝin antaŭ sendado. - + Error: Your account wasn't registered at an email gateway. Sending registration now as %1, please wait for the registration to be processed before retrying sending. Eraro: via konto ne estas registrita je retpoŝta kluzo. Registranta nun kiel %1, bonvolu atendi ĝis la registrado finos antaŭ vi reprovos sendi iun ajn. @@ -660,57 +660,57 @@ Estas grava, ke vi faru sekurkopion de tiu dosiero. Ĉu vi volas malfermi la dos - + Error: You must specify a From address. If you don't have one, go to the 'Your Identities' tab. Eraro: Vi devas elekti sendontan adreson. Se vi ne havas iun, iru al langeto 'Viaj identigoj'. - + Address version number Numero de adresversio - + Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version. Dum prilaborado de adreso adreso %1, Bitmesaĝo ne povas kompreni numerojn %2 de adresversioj. Eble ĝisdatigu Bitmesaĝon al la plej nova versio. - + Stream number Fluo numero - + Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version. Dum prilaborado de adreso %1, Bitmesaĝo ne povas priservi %2 fluojn numerojn. Eble ĝisdatigu Bitmesaĝon al la plej nova versio. - + Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won't send until you connect. Atentu: vi ne estas nun konektita. Bitmesaĝo faros necesan laboron por sendi mesaĝon, tamen ĝi ne sendos ĝin antaŭ vi konektos. - + Message queued. Mesaĝo envicigita. - + Your 'To' field is empty. Via "Ricevonto"-kampo malplenas. - + Right click one or more entries in your address book and select 'Send message to this address'. Dekstre alklaku kelka(j)n elemento(j)n en via adresaro kaj elektu 'Sendi mesaĝon al tiu adreso'. - + Fetched address from namecoin identity. Venigis adreson de namecoin-a identigo. - + New Message Nova mesaĝo @@ -735,47 +735,47 @@ Estas grava, ke vi faru sekurkopion de tiu dosiero. Ĉu vi volas malfermi la dos La adreso kiun vi enmetis estas malĝusta. Ignoras ĝin. - + Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want. Eraro: Vi ne povas duoble aldoni la saman adreson al via adresaro. Provu renomi la ekzistan se vi volas. - + Error: You cannot add the same address to your subscriptions twice. Perhaps rename the existing one if you want. Eraro: Vi ne povas aldoni duoble la saman adreson al viaj abonoj. Eble renomi la ekzistan se vi volas. - + Restart Restartigi - + You must restart Bitmessage for the port number change to take effect. Vi devas restartigi Bitmesaĝon por ke ŝanĝo de numero de pordo efektivigu. - + Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any). Bitmesaĝo uzos retperanton (proxy) ekde nun, sed eble vi volas permane restartigi Bitmesaĝon nun, por ke ĝi fermu eblajn ekzistajn konektojn. - + Number needed Numero bezonata - + Your maximum download and upload rate must be numbers. Ignoring what you typed. Maksimumaj elŝutrapido kaj alŝutrapido devas esti numeroj. Ignoras kion vi enmetis. - + Will not resend ever Resendos neniam - + Note that the time limit you entered is less than the amount of time Bitmessage waits for the first resend attempt therefore your messages will never be resent. Rimarku, ke la templimon vi enmetis estas pli malgranda ol tempo dum kiu Bitmesaĝo atendas por resendi unuafoje, do viaj mesaĝoj estos senditaj neniam. @@ -810,22 +810,22 @@ Estas grava, ke vi faru sekurkopion de tiu dosiero. Ĉu vi volas malfermi la dos Vi ja vere bezonas pasfrazon. - + Address is gone Adreso foriris - + Bitmessage cannot find your address %1. Perhaps you removed it? Bitmesaĝo ne povas trovi vian adreson %1. Ĉu eble vi forviŝis ĝin? - + Address disabled Adreso malŝaltita - + Error: The address from which you are trying to send is disabled. You'll have to enable it on the 'Your Identities' tab before using it. Eraro: la adreso kun kiu vi provas sendi estas malŝaltita. Vi devos ĝin ŝalti en la langeto 'Viaj identigoj' antaŭ uzi ĝin. @@ -835,42 +835,42 @@ Estas grava, ke vi faru sekurkopion de tiu dosiero. Ĉu vi volas malfermi la dos - + Entry added to the blacklist. Edit the label to your liking. Aldonis elementon al la nigra listo. Redaktu la etikedon laŭvole. - + Error: You cannot add the same address to your blacklist twice. Try renaming the existing one if you want. Eraro: vi ne povas duoble aldoni la saman adreson al via nigra listo. Provu renomi la jaman se vi volas. - + Moved items to trash. Movis elementojn al rubujo. - + Undeleted item. Malforigis elementon. - + Save As... Konservi kiel… - + Write error. Skriberaro. - + No addresses selected. Neniu adreso elektita. - + If you delete the subscription, messages that you already received will become inaccessible. Maybe you can consider disabling the subscription instead. Disabled subscriptions will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the subscription? @@ -879,7 +879,7 @@ Are you sure you want to delete the subscription? Ĉu vi certe volas forigi la abonon? - + If you delete the channel, messages that you already received will become inaccessible. Maybe you can consider disabling the channel instead. Disabled channels will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the channel? @@ -888,32 +888,32 @@ Are you sure you want to delete the channel? Ĉu vi certe volas forigi la kanalon? - + Do you really want to remove this avatar? Ĉu vi certe volas forviŝi tiun ĉi avataron? - + You have already set an avatar for this address. Do you really want to overwrite it? Vi jam agordis avataron por tiu ĉi adreso. Ĉu vi vere volas superskribi ĝin? - + Start-on-login not yet supported on your OS. Starto-dum-ensaluto ne estas ankoraŭ ebla en via operaciumo. - + Minimize-to-tray not yet supported on your OS. Plejetigo al taskopleto ne estas ankoraŭ ebla en via operaciumo. - + Tray notifications not yet supported on your OS. Taskopletaj sciigoj ne estas ankoraŭ eblaj en via operaciumo. - + Testing... Testado… @@ -1188,42 +1188,42 @@ Are you sure you want to delete the channel? - + New version of PyBitmessage is available: %1. Download it from https://github.com/Bitmessage/PyBitmessage/releases/latest La nova versio de PyBitmessage estas disponebla: %1. Elŝutu ĝin de https://github.com/Bitmessage/PyBitmessage/releases/latest - + Waiting for PoW to finish... %1% Atendado ĝis laborpruvo finiĝos… %1% - + Shutting down Pybitmessage... %1% Fermado de PyBitmessage… %1% - + Waiting for objects to be sent... %1% Atendado ĝis objektoj estos senditaj… %1% - + Saving settings... %1% Konservado de agordoj… %1% - + Shutting down core... %1% Fermado de kerno… %1% - + Stopping notifications... %1% Haltigado de sciigoj… %1% - + Shutdown imminent... %1% Fermado tuj… %1% @@ -1233,17 +1233,17 @@ Are you sure you want to delete the channel? %n horo%n horoj - + %n day(s) %n tago%n tagoj - + Shutting down PyBitmessage... %1% Fermado de PyBitmessage… %1% - + Sent Senditaj @@ -1278,12 +1278,12 @@ Are you sure you want to delete the channel? - + Disk full Disko plenplena - + Alert: Your disk or data storage volume is full. Bitmessage will now exit. Atentu: Via disko aŭ subdisko estas plenplena. Bitmesaĝo fermiĝos. @@ -1347,7 +1347,7 @@ Ricevonto postulas malfacilaĵon: %1 kaj %2 Eraro: Vi provis sendi mesaĝon al vi mem aŭ al kanalo, tamen via ĉifroŝlosilo ne estas trovebla en la dosiero keys.dat. Mesaĝo ne povis esti ĉifrita. %1 - + Doing work necessary to send message. Kalkulado de laborpruvo, kiu endas por sendi mesaĝon. @@ -1357,7 +1357,7 @@ Ricevonto postulas malfacilaĵon: %1 kaj %2 Mesaĝo sendita. Atendado je konfirmo. Sendita je %1 - + Doing work necessary to request encryption key. Kalkulado de laborpruvo, kiu endas por peti pri ĉifroŝlosilo. @@ -1387,32 +1387,32 @@ Ricevonto postulas malfacilaĵon: %1 kaj %2 Marki ĉiujn mesaĝojn kiel legitajn - + Are you sure you would like to mark all messages read? Ĉu vi certe volas marki ĉiujn mesaĝojn kiel legitajn? - + Doing work necessary to send broadcast. Kalkulado de laborpruvo, kiu endas por sendi elsendon. - + Proof of work pending Laborpruvo haltigita - + %n object(s) pending proof of work Haltigis laborpruvon por %n objektoHaltigis laborpruvon por %n objektoj - + %n object(s) waiting to be distributed %n objekto atendas je sendato%n objektoj atendas je sendato - + Wait until these tasks finish? Ĉu atendi ĝis tiujn taskojn finos? @@ -1467,12 +1467,12 @@ Ricevonto postulas malfacilaĵon: %1 kaj %2 Via(j) vidprocesoro(j) ne kalkulis senerare, malaktiviganta OpenCL. Bonvolu raporti tion al programistoj. - + Set notification sound... Agordi sciigan sonon… - + Welcome to easy and secure Bitmessage * send messages to other people @@ -1486,112 +1486,132 @@ Bonvenon al facila kaj sekura Bitmesaĝo * babili kun aliaj uloj en mesaĝ-kanaloj - + not recommended for chans malkonsilinda por kanaloj - + Quiet Mode Silenta reĝimo - + Problems connecting? Try enabling UPnP in the Network Settings Ĉu problemo kun konektado? Provu aktivigi UPnP en retaj agordoj. - + You are trying to send an email instead of a bitmessage. This requires registering with a gateway. Attempt to register? Vi provas sendi retmesaĝon anstataŭ bitmesaĝ-mesaĝon. Tio ĉi postulas registriĝi ĉe retpoŝta kluzo. Ĉu provi registriĝi? - + Error: Bitmessage addresses start with BM- Please check the recipient address %1 Eraro: bitmesaĝaj adresoj komenciĝas kun BM-. Bonvolu kontroli la adreson de ricevonto %1 - + Error: The recipient address %1 is not typed or copied correctly. Please check it. Eraro: la adreso de ricevonto %1 estas malprave tajpita aŭ kopiita. Bonvolu kontroli ĝin. - + Error: The recipient address %1 contains invalid characters. Please check it. Eraro: la adreso de ricevonto %1 enhavas malpermesatajn simbolojn. Bonvolu kontroli ĝin. - + Error: The version of the recipient address %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever. Eraro: la versio de adreso de ricevonto %1 estas tro alta. Eble vi devas ĝisdatigi vian bitmesaĝan programon aŭ via sagaca konato uzas alian programon. - + Error: Some data encoded in the recipient address %1 is too short. There might be something wrong with the software of your acquaintance. Eraro: kelkaj datumoj koditaj en la adreso de ricevonto %1 estas tro mallongaj. Povus esti ke io en la programo de via konato malfunkcias. - + Error: Some data encoded in the recipient address %1 is too long. There might be something wrong with the software of your acquaintance. Eraro: kelkaj datumoj koditaj en la adreso de ricevonto %1 estas tro longaj. Povus esti ke io en la programo de via konato malfunkcias. - + Error: Some data encoded in the recipient address %1 is malformed. There might be something wrong with the software of your acquaintance. Eraro: kelkaj datumoj koditaj en la adreso de ricevonto %1 estas misformitaj. Povus esti ke io en la programo de via konato malfunkcias. - + Error: Something is wrong with the recipient address %1. Eraro: io malĝustas kun la adreso de ricevonto %1. - + Error: %1 Eraro: %1 - + From %1 De %1 - + + Disconnecting + Malkonektado + + + + Connecting + Konektado + + + + Bitmessage will now drop all connectins. Are you sure? + Bitmesaĝo ĉesos ĉiujn konektojn. Ĉu pluigi? + + + + Bitmessage will now start connecting to network. Are you sure? + Bitmesaĝo komencos konekti al la reto. Ĉu pluigi? + + + Synchronisation pending Samtempigado haltigita - + Bitmessage hasn't synchronised with the network, %n object(s) to be downloaded. If you quit now, it may cause delivery delays. Wait until the synchronisation finishes? Bitmesaĝo ne estas samtempigita kun la reto, %n objekto elŝutendas. Se vi eliros nun, tio povas igi malfruiĝojn de liveradoj. Ĉu atendi ĝis la samtempigado finiĝos?Bitmesaĝo ne estas samtempigita kun la reto, %n objektoj elŝutendas. Se vi eliros nun, tio povas igi malfruiĝojn de liveradoj. Ĉu atendi ĝis la samtempigado finiĝos? - + Not connected Nekonektita - + Bitmessage isn't connected to the network. If you quit now, it may cause delivery delays. Wait until connected and the synchronisation finishes? - + Bitmesaĝo ne estas konektita al la reto. Se vi eliros nun, tio povas igi malfruiĝojn de liveradoj. Ĉu atendi ĝis ĝi konektos kaj la samtempigado finiĝos? - + Waiting for network connection... Atendado je retkonekto… - + Waiting for finishing synchronisation... Atendado ĝis samtempigado finiĝos… - + You have already set a notification sound for this address book entry. Do you really want to overwrite it? Vi jam agordis sciigan sonon por tiu ĉi adreso. Ĉu vi volas anstataŭigi ĝin? - + Error occurred: could not load message from disk. Eraro okazis: ne povis legi mesaĝon el la disko. diff --git a/src/translations/bitmessage_fr.qm b/src/translations/bitmessage_fr.qm index 53e3fd97..8cb08a3a 100644 Binary files a/src/translations/bitmessage_fr.qm and b/src/translations/bitmessage_fr.qm differ diff --git a/src/translations/bitmessage_fr.ts b/src/translations/bitmessage_fr.ts index 8aec86a8..149fd1ef 100644 --- a/src/translations/bitmessage_fr.ts +++ b/src/translations/bitmessage_fr.ts @@ -702,7 +702,7 @@ Le destinataire doit l’obtenir avant ce temps. Si votre client Bitmessage ne r Erreur : Vous ne pouvez pas ajouter une adresse déjà présente dans votre carnet d’adresses. Essayez de renommer l’adresse existante. - + Error: You cannot add the same address to your subscriptions twice. Perhaps rename the existing one if you want. Erreur : vous ne pouvez pas ajouter la même adresse deux fois à vos abonnements. Peut-être que vous pouvez renommer celle qui existe si vous le souhaitez. @@ -772,22 +772,22 @@ Le destinataire doit l’obtenir avant ce temps. Si votre client Bitmessage ne r Vous devez vraiment utiliser une phrase secrète. - + Address is gone L’adresse a disparu - + Bitmessage cannot find your address %1. Perhaps you removed it? Bitmessage ne peut pas trouver votre adresse %1. Peut-être l’avez-vous supprimée? - + Address disabled Adresse désactivée - + Error: The address from which you are trying to send is disabled. You'll have to enable it on the 'Your Identities' tab before using it. Erreur : L’adresse avec laquelle vous essayez de communiquer est désactivée. Vous devez d’abord l’activer dans l’onglet "Vos identités" avant de l’utiliser. @@ -797,42 +797,42 @@ Le destinataire doit l’obtenir avant ce temps. Si votre client Bitmessage ne r - + Entry added to the blacklist. Edit the label to your liking. Entrée ajoutée à la liste noire. Éditez l’étiquette à votre convenance. - + Error: You cannot add the same address to your blacklist twice. Try renaming the existing one if you want. Erreur : vous ne pouvez pas ajouter la même adresse deux fois à votre liste noire. Essayez de renommer celle qui existe si vous le souhaitez. - + Moved items to trash. Messages déplacés dans la corbeille. - + Undeleted item. Articles restaurés. - + Save As... Enregistrer sous… - + Write error. Erreur d’écriture. - + No addresses selected. Aucune adresse sélectionnée. - + If you delete the subscription, messages that you already received will become inaccessible. Maybe you can consider disabling the subscription instead. Disabled subscriptions will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the subscription? @@ -841,7 +841,7 @@ Are you sure you want to delete the subscription? Êtes-vous sur de vouloir supprimer cet abonnement ? - + If you delete the channel, messages that you already received will become inaccessible. Maybe you can consider disabling the channel instead. Disabled channels will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the channel? @@ -850,32 +850,32 @@ Are you sure you want to delete the channel? Êtes-vous sûr de vouloir supprimer ce canal ? - + Do you really want to remove this avatar? Voulez-vous vraiment enlever cet avatar ? - + You have already set an avatar for this address. Do you really want to overwrite it? Vous avez déjà mis un avatar pour cette adresse. Voulez-vous vraiment l’écraser ? - + Start-on-login not yet supported on your OS. Le démarrage dès l’ouverture de session n’est pas encore supporté sur votre OS. - + Minimize-to-tray not yet supported on your OS. La minimisation en zone système n’est pas encore supportée sur votre OS. - + Tray notifications not yet supported on your OS. Les notifications en zone système ne sont pas encore supportées sur votre OS. - + Testing... Tester… @@ -1155,37 +1155,37 @@ Are you sure you want to delete the channel? Une nouvelle version de PyBitmessage est disponible : %1. Veuillez la télécharger depuis https://github.com/Bitmessage/PyBitmessage/releases/latest - + Waiting for PoW to finish... %1% En attente de la fin de la PoW… %1% - + Shutting down Pybitmessage... %1% Pybitmessage en cours d’arrêt… %1% - + Waiting for objects to be sent... %1% En attente de l’envoi des objets… %1% - + Saving settings... %1% Enregistrement des paramètres… %1% - + Shutting down core... %1% Cœur en cours d’arrêt… %1% - + Stopping notifications... %1% Arrêt des notifications… %1% - + Shutdown imminent... %1% Arrêt imminent… %1% @@ -1200,7 +1200,7 @@ Are you sure you want to delete the channel? %n jour%n jours - + Shutting down PyBitmessage... %1% PyBitmessage en cours d’arrêt… %1% @@ -1359,22 +1359,22 @@ Difficulté requise du destinataire : %1 et %2 Travail en cours afin d’envoyer la diffusion. - + Proof of work pending En attente de preuve de fonctionnement - + %n object(s) pending proof of work %n objet en attente de preuve de fonctionnement%n objet(s) en attente de preuve de fonctionnement - + %n object(s) waiting to be distributed %n objet en attente d'être distribué%n objet(s) en attente d'être distribués - + Wait until these tasks finish? Attendre jusqu'à ce que ces tâches se terminent ? @@ -1429,7 +1429,7 @@ Difficulté requise du destinataire : %1 et %2 Votre GPU(s) n'a pas calculé correctement, mettant OpenCL hors service. Veuillez remonter ceci aux développeurs s'il vous plaît. - + Set notification sound... Mettre un son de notification ... @@ -1519,42 +1519,62 @@ Bienvenue dans le facile et sécurisé Bitmessage De %1 - + + Disconnecting + Déconnexion + + + + Connecting + Connexion + + + + Bitmessage will now drop all connectins. Are you sure? + Bitmessage va maintenant laisser tomber toutes les connections. Êtes-vous sûr(e) ? + + + + Bitmessage will now start connecting to network. Are you sure? + + + + Synchronisation pending En attente de synchronisation - + Bitmessage hasn't synchronised with the network, %n object(s) to be downloaded. If you quit now, it may cause delivery delays. Wait until the synchronisation finishes? Bitmessage ne s'est pas synchronisé avec le réseau, %n objet(s) à télécharger. Si vous quittez maintenant, cela pourrait causer des retards de livraison. Attendre jusqu'à ce que la synchronisation aboutisse ?Bitmessage ne s'est pas synchronisé avec le réseau, %n objet(s) à télécharger. Si vous quittez maintenant, cela pourrait causer des retards de livraison. Attendre jusqu'à ce que la synchronisation aboutisse ? - + Not connected Non connecté - + Bitmessage isn't connected to the network. If you quit now, it may cause delivery delays. Wait until connected and the synchronisation finishes? Bitmessage n'est pas connecté au réseau. Si vous quittez maintenant, cela pourrait causer des retards de livraison. Attendre jusqu'à ce qu'il soit connecté et que la synchronisation se termine ? - + Waiting for network connection... En attente de connexion réseau... - + Waiting for finishing synchronisation... En attente d'achèvement de la synchronisation... - + You have already set a notification sound for this address book entry. Do you really want to overwrite it? Vous avez déjà mis un son de notification pour cette adresse. Voulez-vous vraiment l’écraser ? - + Error occurred: could not load message from disk. Une erreur a eu lieu : ne peut pas charger de message depuis le disque. diff --git a/src/translations/bitmessage_ja.qm b/src/translations/bitmessage_ja.qm index 9135be1a..be2b6b82 100644 Binary files a/src/translations/bitmessage_ja.qm and b/src/translations/bitmessage_ja.qm differ diff --git a/src/translations/bitmessage_ja.ts b/src/translations/bitmessage_ja.ts index 7f1e4515..d2b1e155 100644 --- a/src/translations/bitmessage_ja.ts +++ b/src/translations/bitmessage_ja.ts @@ -112,7 +112,7 @@ Please type the desired email address (including @mailchuck.com) below: Mailchuck - + # You can use this to configure your email gateway account # Uncomment the setting you want to use # Here are the options: @@ -152,6 +152,50 @@ Please type the desired email address (including @mailchuck.com) below: # specified. As this scheme uses deterministic public keys, you will receive # the money directly. To turn it off again, set "feeamount" to 0. Requires # subscription. + + + + + + # You can use this to configure your email gateway account +# Uncomment the setting you want to use +# Here are the options: +# +# pgp: server +# The email gateway will create and maintain PGP keys for you and sign, verify, +# encrypt and decrypt on your behalf. When you want to use PGP but are lazy, +# use this. Requires subscription. +# +# pgp: local +# The email gateway will not conduct PGP operations on your behalf. You can +# either not use PGP at all, or use it locally. +# +# attachments: yes +# Incoming attachments in the email will be uploaded to MEGA.nz, and you can +# download them from there by following the link. Requires a subscription. +# +# attachments: no +# Attachments will be ignored. +# +# archive: yes +# Your incoming emails will be archived on the server. Use this if you need +# help with debugging problems or you need a third party proof of emails. This +# however means that the operator of the service will be able to read your +# emails even after they have been delivered to you. +# +# archive: no +# Incoming emails will be deleted from the server as soon as they are relayed +# to you. +# +# masterpubkey_btc: BIP44 xpub key or electrum v1 public seed +# offset_btc: integer (defaults to 0) +# feeamount: number with up to 8 decimal places +# feecurrency: BTC, XBT, USD, EUR or GBP +# Use these if you want to charge people who send you emails. If this is on and +# an unknown person sends you an email, they will be requested to pay the fee +# specified. As this scheme uses deterministic public keys, you will receive +# the money directly. To turn it off again, set "feeamount" to 0. Requires +# subscription. # これを使用して、メールゲートウェイアカウントを設定できます # 使用する設定のコメントを外してください @@ -180,14 +224,14 @@ Please type the desired email address (including @mailchuck.com) below: # 読むことができるということを意味します。 # # archive: no -# 受信メールは、あなたに中継されるとすぐにサーバーから削除されます。 +# 受信メールは、あなたに転送されるとすぐにサーバーから削除されます。 # # masterpubkey_btc: BIP44 xpub key または electrum v1 public seed # offset_btc: 整数 (デフォルトは 0) # feeamount: 小数点以下 8 桁までの数字 # feecurrency: BTC, XBT, USD, EUR または GBP # メールを送信した人に請求したい場合に、これらを使用します。 これがオンで、 -# 未知の人があなたにメールを送信した場合、指定された料金を支払うように要求されます。 +# 不明な人があなたにメールを送信した場合、指定された手数料を支払うように要求されます。 # この方式は決定的な公開鍵を使用するため、直接お金を受け取ることになります。 # もう一度オフにするには、「feeamount」を 0 に設定します。 # サブスクリプションが必要です。 @@ -197,52 +241,52 @@ Please type the desired email address (including @mailchuck.com) below: MainWindow - + Reply to sender 送信元に返信 - + Reply to channel チャンネルに返信 - + Add sender to your Address Book 送信元をアドレス帳に追加 - + Add sender to your Blacklist 送信元をブラックリストに追加 - + Move to Trash ゴミ箱へ移動 - + Undelete 削除を元に戻す - + View HTML code as formatted text HTMLコードを整形したテキストで表示 - + Save message as... 形式を選択してメッセージを保存 - + Mark Unread 未読にする - + New 新規 @@ -267,12 +311,12 @@ Please type the desired email address (including @mailchuck.com) below: アドレスをコピー - + Special address behavior... アドレスの特別な動作 - + Email gateway メールゲートウェイ @@ -282,37 +326,37 @@ Please type the desired email address (including @mailchuck.com) below: 削除 - + Send message to this address このアドレスへ送信 - + Subscribe to this address このアドレスを購読 - + Add New Address アドレスを追加 - + Copy destination address to clipboard 宛先アドレスをコピー - + Force send 強制的に送信 - + One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now? %1は古いバージョン1のアドレスです。バージョン1のアドレスはサポートが終了しています。すぐに削除しますか？ - + Waiting for their encryption key. Will request it again soon. 暗号鍵を待っています。 すぐにもう一度リクエストします。 @@ -322,17 +366,17 @@ Please type the desired email address (including @mailchuck.com) below: - + Queued. キューに入りました。 - + Message sent. Waiting for acknowledgement. Sent at %1 メッセージを送信しました。 確認応答を待っています。 %1 で送信されました - + Message sent. Sent at %1 メッセージは送信されました。送信先: %1 @@ -342,47 +386,47 @@ Please type the desired email address (including @mailchuck.com) below: - + Acknowledgement of the message received %1 メッセージの確認を受け取りました %1 - + Broadcast queued. 配信がキューに入りました。 - + Broadcast on %1 配信: %1 - + Problem: The work demanded by the recipient is more difficult than you are willing to do. %1 問題: 受信者が要求している処理は現在あなたが設定しているよりも高い難易度です。 %1 - + Problem: The recipient's encryption key is no good. Could not encrypt message. %1 問題: 受信者の暗号鍵は正当でない物です。メッセージを暗号化できません。 %1 - + Forced difficulty override. Send should start soon. 難易度を強制上書きしました。まもなく送信されます。 - + Unknown status: %1 %2 不明なステータス: %1 %2 - + Not Connected 未接続 - + Show Bitmessage Bitmessageを表示 @@ -392,12 +436,12 @@ Please type the desired email address (including @mailchuck.com) below: 送る - + Subscribe 購読 - + Channel チャンネル @@ -407,66 +451,70 @@ Please type the desired email address (including @mailchuck.com) below: 終了 - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. - プログラムを同じディレクトリに保存されているkeys.datファイルを編集することで鍵を管理できます。ファイルをバックアップしておくことも重要です。 + プログラムと同じディレクトリに保存されているkeys.datファイルを編集することで鍵を管理できます。ファイルをバックアップしておくことは重要です。 - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. - %1に保存されているkeys.datファイルを編集することで鍵を管理できます。ファイルをバックアップしておくことも重要です。 + %1 +に保存されているkeys.datファイルを編集することで鍵を管理できます。 +このファイルをバックアップしておくことは重要です。 - + Open keys.dat? keys.datを開きますか？ - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) - プログラムを同じディレクトリに保存されているkeys.datファイルを編集することで鍵を管理できます。ファイルをバックアップしておくことも重要です。すぐにファイルを開きますか？（必ず編集する前にBitmessageを終了してください） + プログラムと同じディレクトリに保存されているkeys.datファイルを編集することで鍵を管理できます。このファイルをバックアップしておくことは重要です。すぐにファイルを開きますか？（必ず編集する前にBitmessageを終了してください） - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) - %1に保存されているkeys.datファイルを編集することで鍵を管理できます。ファイルをバックアップしておくことも重要です。すぐにファイルを開きますか？（必ず編集する前にBitmessageを終了してください） + %1 +に保存されているkeys.datファイルを編集することで鍵を管理できます。 +ファイルをバックアップしておくことは重要です。すぐにファイルを開きますか？（必ず編集する前にBitmessageを終了してください） - + Delete trash? ゴミ箱を空にしますか？ - + Are you sure you want to delete all trashed messages? ゴミ箱内のメッセージを全て削除してもよろしいですか？ - + bad passphrase 不正なパスフレーズ - + You must type your passphrase. If you don't have one then this is not the form for you. パスフレーズを入力してください。パスフレーズがない場合は入力する必要はありません。 - + Bad address version number 不正なアドレスのバージョン番号 - + Your address version number must be a number: either 3 or 4. アドレスのバージョン番号は数字にする必要があります: 3 または 4。 - + Your address version number must be either 3 or 4. アドレスのバージョン番号は、3 または 4 のどちらかにする必要があります。 @@ -536,22 +584,22 @@ It is important that you back up this file. Would you like to open the file now? - + Connection lost 接続が切断されました - + Connected 接続済み - + Message trashed メッセージが削除されました - + The TTL, or Time-To-Live is the length of time that the network will hold the message. The recipient must get it during this time. If your Bitmessage client does not hear an acknowledgement, it will resend the message automatically. The longer the Time-To-Live, the @@ -562,19 +610,19 @@ It is important that you back up this file. Would you like to open the file now? コンピュータがメッセージを送信するために必要な処理が増えます。 多くの場合 4〜5 日のTTL（Time-To-Live）が適切です。 - + Message too long メッセージが長すぎます - + The message that you are trying to send is too long by %1 bytes. (The maximum is 261644 bytes). Please cut it down before sending. 送信しようとしているメッセージが %1 バイト長すぎます。 (最大は261644バイトです)。 送信する前に短くしてください。 - + Error: Your account wasn't registered at an email gateway. Sending registration now as %1, please wait for the registration to be processed before retrying sending. - エラー: アカウントがメールゲートウェイに登録されていません。 今 %1 として登録を送信しています。送信を再試行する前に、登録が処理されるまでお待ちください。 + エラー: アカウントがメールゲートウェイに登録されていません。 今 %1 として登録を送信しています。送信を再試行する前に、登録が処理されるのをお待ちください。 @@ -617,57 +665,57 @@ It is important that you back up this file. Would you like to open the file now? - + Error: You must specify a From address. If you don't have one, go to the 'Your Identities' tab. エラー: 送信元アドレスを指定してください。まだ作成していない場合には「アドレス一覧」のタブを開いてください。 - + Address version number アドレスのバージョン番号 - + Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version. - アドレス %1 に接続。%2 のバージョン番号は処理できません。Bitmessageを最新のバージョンへアップデートしてください。 + アドレス %1 に接続しています。%2 のバージョン番号は処理できません。Bitmessageを最新のバージョンへアップデートしてください。 - + Stream number ストリーム番号 - + Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version. - アドレス %1 に接続。%2 のストリーム番号は処理できません。Bitmessageを最新のバージョンへアップデートしてください。 + アドレス %1 に接続しています。%2 のストリーム番号は処理できません。Bitmessageを最新のバージョンへアップデートしてください。 - + Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won't send until you connect. - 警告: 接続されていません。Bitmessageはメッセージの処理を行いますが、ネットワークに接続するまで送信はされません。 + 警告: 接続されていません。Bitmessageはメッセージ送信の処理を行いますが、ネットワークに接続するまで送信はされません。 - + Message queued. メッセージがキューに入りました。 - + Your 'To' field is empty. 宛先が指定されていません。 - + Right click one or more entries in your address book and select 'Send message to this address'. アドレス帳から一つ、または複数のアドレスを右クリックして「このアドレスへ送信」を選んでください。 - + Fetched address from namecoin identity. namecoin IDからアドレスを取得。 - + New Message 新規メッセージ @@ -692,47 +740,47 @@ It is important that you back up this file. Would you like to open the file now? 入力されたアドレスは不正です。無視されました。 - + Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want. エラー: 同じアドレスを複数アドレス帳に追加する事はできません。既存の項目をリネームしてください。 - + Error: You cannot add the same address to your subscriptions twice. Perhaps rename the existing one if you want. エラー: 購読に、同じアドレスを2回追加することはできません。 必要に応じて、既存の名前を変更してください。 - + Restart 再開 - + You must restart Bitmessage for the port number change to take effect. ポート番号の変更を有効にするにはBitmessageを再起動してください。 - + Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any). プロキシの設定を有効にするには手動でBitmessageを再起動してください。既に接続がある場合は切断されます。 - + Number needed 数字が必要です - + Your maximum download and upload rate must be numbers. Ignoring what you typed. 最大ダウンロード数とアップロード数は数字にする必要があります。 入力されたものを無視します。 - + Will not resend ever 今後再送信されません - + Note that the time limit you entered is less than the amount of time Bitmessage waits for the first resend attempt therefore your messages will never be resent. 入力した時間制限は、Bitmessageが最初の再送試行を待つ時間よりも短いため、メッセージは再送信されないことにご注意ください。 @@ -767,22 +815,22 @@ It is important that you back up this file. Would you like to open the file now? パスフレーズが必要です。 - + Address is gone アドレスが無効になりました - + Bitmessage cannot find your address %1. Perhaps you removed it? アドレス %1 が見つかりません。既に削除していませんか？ - + Address disabled アドレスが無効になりました - + Error: The address from which you are trying to send is disabled. You'll have to enable it on the 'Your Identities' tab before using it. エラー: 送信しようとしたアドレスは無効になっています。使用する前に「アドレス一覧」で有効にしてください。 @@ -792,42 +840,42 @@ It is important that you back up this file. Would you like to open the file now? - + Entry added to the blacklist. Edit the label to your liking. ブラックリストに項目が追加されました。ラベルは自由に編集できます。 - + Error: You cannot add the same address to your blacklist twice. Try renaming the existing one if you want. エラー: ブラックリストに同じアドレスを2回追加することはできません。 必要に応じて既存の名前を変更してみてください。 - + Moved items to trash. アイテムをゴミ箱へ移動。 - + Undeleted item. アイテムの削除を元に戻します。 - + Save As... 形式を選択して保存 - + Write error. 書き込みエラー。 - + No addresses selected. アドレスが未選択です。 - + If you delete the subscription, messages that you already received will become inaccessible. Maybe you can consider disabling the subscription instead. Disabled subscriptions will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the subscription? @@ -836,7 +884,7 @@ Are you sure you want to delete the subscription? 購読を削除してもよろしいですか？ - + If you delete the channel, messages that you already received will become inaccessible. Maybe you can consider disabling the channel instead. Disabled channels will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the channel? @@ -845,32 +893,32 @@ Are you sure you want to delete the channel? チャンネルを削除してもよろしいですか？ - + Do you really want to remove this avatar? このアバターを削除してもよろしいですか？ - + You have already set an avatar for this address. Do you really want to overwrite it? すでにこのアドレスのアバターを設定しています。 上書きしてもよろしいですか？ - + Start-on-login not yet supported on your OS. ログイン時に開始は、まだお使いのOSでサポートされていません。 - + Minimize-to-tray not yet supported on your OS. トレイに最小化は、まだお使いのOSでサポートされていません。 - + Tray notifications not yet supported on your OS. トレイ通知は、まだお使いのOSでサポートされていません。 - + Testing... テスト中 @@ -1120,7 +1168,7 @@ Are you sure you want to delete the channel? ﾁｬﾝﾈﾙに参加 / 作成 - + All accounts すべてのアカウント @@ -1145,42 +1193,42 @@ Are you sure you want to delete the channel? - + New version of PyBitmessage is available: %1. Download it from https://github.com/Bitmessage/PyBitmessage/releases/latest 新しいバージョンの PyBitmessage が利用可能です: %1。 https://github.com/Bitmessage/PyBitmessage/releases/latest からダウンロードしてください - + Waiting for PoW to finish... %1% - PoW（証明）が完了するのを待っています... %1% + PoW（プルーフオブワーク）が完了するのを待っています... %1% - + Shutting down Pybitmessage... %1% Pybitmessageをシャットダウンしています... %1% - + Waiting for objects to be sent... %1% オブジェクトの送信待ち... %1% - + Saving settings... %1% 設定を保存しています... %1% - + Shutting down core... %1% コアをシャットダウンしています... %1% - + Stopping notifications... %1% 通知を停止しています... %1% - + Shutdown imminent... %1% すぐにシャットダウンします... %1% @@ -1190,42 +1238,42 @@ Are you sure you want to delete the channel? %n 時間 - + %n day(s) %n 日 - + Shutting down PyBitmessage... %1% PyBitmessageをシャットダウンしています... %1% - + Sent 送信済 - + Generating one new address 新しいアドレスを生成しています - + Done generating address. Doing work necessary to broadcast it... アドレスの生成を完了しました。 配信に必要な処理を行っています... - + Generating %1 new addresses. %1 の新しいアドレスを生成しています。 - + %1 is already in 'Your Identities'. Not adding it again. %1はすでに「アドレス一覧」にあります。 もう一度追加できません。 - + Done generating address アドレスの生成を完了しました @@ -1235,96 +1283,96 @@ Are you sure you want to delete the channel? - + Disk full ディスクがいっぱいです - + Alert: Your disk or data storage volume is full. Bitmessage will now exit. アラート: ディスクまたはデータストレージのボリュームがいっぱいです。 Bitmessageが終了します。 - + Error! Could not find sender address (your address) in the keys.dat file. エラー！ keys.datファイルで送信元アドレス (あなたのアドレス) を見つけることができませんでした。 - + Doing work necessary to send broadcast... 配信に必要な処理を行っています... - + Broadcast sent on %1 配信が送信されました %1 - + Encryption key was requested earlier. 暗号鍵は以前にリクエストされました。 - + Sending a request for the recipient's encryption key. 受信者の暗号鍵のリクエストを送信します。 - + Looking up the receiver's public key 受信者の公開鍵を探しています - + Problem: Destination is a mobile device who requests that the destination be included in the message but this is disallowed in your settings. %1 問題: メッセージに含まれた宛先のリクエストはモバイルデバイスですが、設定では許可されていません。 %1 - + Doing work necessary to send message. There is no required difficulty for version 2 addresses like this. メッセージの送信に必要な処理を行っています。 このようなバージョン2のアドレスには、必要な難易度はありません。 - + Doing work necessary to send message. Receiver's required difficulty: %1 and %2 メッセージの送信に必要な処理を行っています。 受信者の必要な難易度: %1 および %2 - + Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do. %3 問題: 受信者が要求している処理 (%1 および %2) は、現在あなたが設定しているよりも高い難易度です。 %3 - + Problem: You are trying to send a message to yourself or a chan but your encryption key could not be found in the keys.dat file. Could not encrypt message. %1 問題: あなた自身またはﾁｬﾝﾈﾙにメッセージを送信しようとしていますが、暗号鍵がkeys.datファイルに見つかりませんでした。 メッセージを暗号化できませんでした。 ％1 - + Doing work necessary to send message. メッセージの送信に必要な処理を行っています。 - + Message sent. Waiting for acknowledgement. Sent on %1 メッセージを送信しました。 確認応答を待っています。 %1 で送信しました - + Doing work necessary to request encryption key. 暗号鍵のリクエストに必要な処理を行っています。 - + Broadcasting the public key request. This program will auto-retry if they are offline. 公開鍵のリクエストを配信しています。 このプログラムがオフラインの場合、自動的に再試行されます。 - + Sending public key request. Waiting for reply. Requested at %1 公開鍵のリクエストを送信しています。 返信を待っています。 %1 でリクエストしました @@ -1339,82 +1387,82 @@ Receiver's required difficulty: %1 and %2 UPnPポートマッピングを削除しました - + Mark all messages as read すべてのメッセージを既読にする - + Are you sure you would like to mark all messages read? すべてのメッセージを既読にしてもよろしいですか？ - + Doing work necessary to send broadcast. 配信に必要な処理を行っています。 - + Proof of work pending PoW（証明）を待っています - + %n object(s) pending proof of work %n オブジェクトが証明待ち (PoW) - + %n object(s) waiting to be distributed %n オブジェクトが配布待ち - + Wait until these tasks finish? これらのタスクが完了するまで待ちますか？ - + The name %1 was not found. 名前 %1 が見つかりませんでした。 - + The namecoin query failed (%1) namecoin のクエリに失敗しました (%1) - + The namecoin query failed. namecoin のクエリに失敗しました。 - + The name %1 has no valid JSON data. 名前 %1 は有効な JSON データがありません。 - + The name %1 has no associated Bitmessage address. 名前 %1 は関連付けられた Bitmessage アドレスがありません。 - + Success! Namecoind version %1 running. 成功! Namecoind バージョン %1 が実行中。 - + Success! NMControll is up and running. 成功! NMControll が開始して実行中です。 - + Couldn't understand NMControl. NMControl を理解できませんでした。 - + The connection to namecoin failed. namecoin への接続に失敗しました。 @@ -1424,12 +1472,12 @@ Receiver's required difficulty: %1 and %2 GPUが正しく求められないため、OpenCLが無効になりました。 開発者に報告してください。 - + Set notification sound... 通知音を設定... - + Welcome to easy and secure Bitmessage * send messages to other people @@ -1444,112 +1492,132 @@ Receiver's required difficulty: %1 and %2 - + not recommended for chans ﾁｬﾝﾈﾙにはお勧めしません - + Quiet Mode マナーモード - + Problems connecting? Try enabling UPnP in the Network Settings 接続に問題がありますか? ネットワーク設定でUPnPを有効にしてみてください - + You are trying to send an email instead of a bitmessage. This requires registering with a gateway. Attempt to register? Bitmessage の代わりにメールを送信しようとしています。 これは、ゲートウェイに登録する必要があります。 登録しますか? - + Error: Bitmessage addresses start with BM- Please check the recipient address %1 エラー: BitmessageのアドレスはBM-で始まります。 受信者のアドレス %1 を確認してください - + Error: The recipient address %1 is not typed or copied correctly. Please check it. エラー: 受信者のアドレス %1 は正しく入力、またはコピーされていません。確認して下さい。 - + Error: The recipient address %1 contains invalid characters. Please check it. エラー: 受信者のアドレス %1 は不正な文字を含んでいます。確認して下さい。 - + Error: The version of the recipient address %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever. エラー: 受信者アドレスのバージョン %1 は高すぎます。 Bitmessageソフトウェアをアップグレードする必要があるか、連絡先が賢明になっているかのいずれかです。 - + Error: Some data encoded in the recipient address %1 is too short. There might be something wrong with the software of your acquaintance. エラー: アドレス %1 でエンコードされたデータが短すぎます。連絡先のソフトウェアが何かしら誤っている可能性があります。 - + Error: Some data encoded in the recipient address %1 is too long. There might be something wrong with the software of your acquaintance. エラー: 受信者のアドレス %1 でエンコードされたデータが短すぎます。連絡先のソフトウェアが何かしら誤っている可能性があります。 - + Error: Some data encoded in the recipient address %1 is malformed. There might be something wrong with the software of your acquaintance. エラー: 受信者のアドレス %1 でエンコードされたデータの一部が不正です。連絡先のソフトウェアが何かしら誤っている可能性があります。 - + Error: Something is wrong with the recipient address %1. エラー: 受信者のアドレス %1 には何かしら誤りがあります。 - + Error: %1 エラー: %1 - + From %1 送信元 %1 - + + Disconnecting + 切断しています + + + + Connecting + 接続しています + + + + Bitmessage will now drop all connectins. Are you sure? + + + + + Bitmessage will now start connecting to network. Are you sure? + + + + Synchronisation pending 同期を保留しています - + Bitmessage hasn't synchronised with the network, %n object(s) to be downloaded. If you quit now, it may cause delivery delays. Wait until the synchronisation finishes? - Bitmessageはネットワークと同期していません。%n のオブジェクトをダウンロードする必要があります。 今、終了すると、配送が遅れることがあります。 同期が完了するまで待ちますか？ + Bitmessageはネットワークと同期されていません。%n のオブジェクトをダウンロードする必要があります。 今、終了すると、配信が遅れる可能性があります。 同期が完了するまで待ちますか？ - + Not connected 未接続 - + Bitmessage isn't connected to the network. If you quit now, it may cause delivery delays. Wait until connected and the synchronisation finishes? - Bitmessageはネットワークに接続していません。 今、終了すると、配送が遅れることがあります。 接続して、同期が完了するまで待ちますか？ + Bitmessageはネットワークに接続していません。 今、終了すると、配信が遅れる可能性があります。 接続して、同期が完了するまで待ちますか？ - + Waiting for network connection... ネットワーク接続を待っています... - + Waiting for finishing synchronisation... 同期の完了を待っています... - + You have already set a notification sound for this address book entry. Do you really want to overwrite it? すでにこのアドレス帳エントリの通知音を設定しています。 上書きしてもよろしいですか？ - + Error occurred: could not load message from disk. エラーが発生しました: ディスクからメッセージを読み込みできません。 @@ -1574,22 +1642,22 @@ Receiver's required difficulty: %1 and %2 クリア - + inbox 受信トレイ - + new 新規 - + sent 送信済 - + trash ゴミ箱 @@ -1620,14 +1688,14 @@ Receiver's required difficulty: %1 and %2 MsgDecode - + The message has an unknown encoding. Perhaps you should upgrade Bitmessage. メッセージのエンコードが不明です。 Bitmessageをアップグレードする必要があるかもしれません。 - + Unknown encoding 不明なエンコード @@ -1888,7 +1956,7 @@ The 'Random Number' option is selected by default but deterministic ad Work offline - + オフラインで動作 @@ -2209,14 +2277,6 @@ The 'Random Number' option is selected by default but deterministic ad C PoW モジュールが利用できません。ビルドしてください。 - - qrcodeDialog - - - QR-code - QR コード - - regenerateAddressesDialog @@ -2227,7 +2287,7 @@ The 'Random Number' option is selected by default but deterministic ad Regenerate existing addresses - + 既存のアドレスを再生成する @@ -2273,218 +2333,218 @@ The 'Random Number' option is selected by default but deterministic ad settingsDialog - + Settings 設定 - + Start Bitmessage on user login ユーザのログイン時にBitmessageを起動 - + Tray トレイ - + Start Bitmessage in the tray (don't show main window) Bitmessageをトレイ内で起動する（メインウィンドウを表示しない） - + Minimize to tray タスクトレイへ最小化 - + Close to tray トレイに閉じる - + Show notification when message received メッセージの受信時に通知する - + Run in Portable Mode ポータブルモードで実行 - + In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive. ポータブルモード時、メッセージと設定ファイルは通常のアプリケーションデータのフォルダではなく同じディレクトリに保存されます。これによりBitmessageをUSBドライブから実行できます。 - + Willingly include unencrypted destination address when sending to a mobile device 携帯端末にメッセージを送る時は暗号化されていないアドレスを許可する - + Use Identicons Identiconsを使用する - + Reply below Quote 下に返信 - + Interface Language インターフェイス言語 - + System Settings system システム設定 - + User Interface ユーザインターフェース - + Listening port リスニングポート - + Listen for connections on port: 接続を待つポート: - + UPnP: UPnP: - + Bandwidth limit 帯域幅の制限 - + Maximum download rate (kB/s): [0: unlimited] 最大ダウンロード速度 (kB/秒): [0: 無制限] - + Maximum upload rate (kB/s): [0: unlimited] 最大アップロード速度 (kB/秒): [0: 無制限] - + Proxy server / Tor プロキシサーバー/Tor - + Type: タイプ: - + Server hostname: サーバーホスト名: - + Port: ポート: - + Authentication 認証 - + Username: ユーザー名: - + Pass: パス: - + Listen for incoming connections when using proxy プロキシ使用時に外部からの接続を待機する - + none 無し - + SOCKS4a SOCKS4a - + SOCKS5 SOCKS5 - + Network Settings ネットワーク設定 - + Total difficulty: 全体の難易度: - + The 'Total difficulty' affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work. 「全体の難易度」は完全に全てのメッセージに影響します。この値を二倍にすると処理量も二倍になります。 - + Small message difficulty: 小さいメッセージの難易度: - + When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. 誰かがあなたにメッセージを送る時、相手のコンピューターはいくらか計算処理を行います。処理の難易度はデフォルトでは1です。この値を変更すると新しいアドレスではこのデフォルト値を引き上げることができます。その場合、新しいアドレスはメッセージの送信者により高い難易度を要求します。例外もあります: 友人や知り合いをアドレス帳に登録すると、Bitmessageは次にメッセージを送る際、自動的に要求される処理の難易度を最低限の1で済むように通知します。 - + The 'Small message difficulty' mostly only affects the difficulty of sending small messages. Doubling this value makes it almost twice as difficult to send a small message but doesn't really affect large messages. 「小さいメッセージの難易度」は小さいメッセージを行う時にだけ影響します。この値を二倍にすれば小さなメッセージに必要な処理の難易度は二倍になりますが、実際にはデータ量の多いメッセージには影響しません。 - + Demanded difficulty 要求される難易度 - + Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable. ここでは他のユーザーへメッセージを送る際に行うことを許可する処理量の上限を設定します。0を設定するとどんな量でも許容します。 - + Maximum acceptable total difficulty: 許可する難易度の上限: - + Maximum acceptable small message difficulty: 小さなメッセージに許可する難易度の上限: - + Max acceptable difficulty 許可する最大の難易度 @@ -2494,87 +2554,87 @@ The 'Random Number' option is selected by default but deterministic ad - + <html><head/><body><p>Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to <span style=" font-style:italic;">test. </span></p><p>(Getting your own Bitmessage address into Namecoin is still rather difficult).</p><p>Bitmessage can use either namecoind directly or a running nmcontrol instance.</p></body></html> <html><head/><body><p>Bitmessageはアドレスを読みやすくするため、NamecoinというBitcoinベースの別のプログラムを利用できます。例えば、あなたの友人に長いBitmessageアドレスを伝える代わりに、単純に<span style=" font-style:italic;">テスト</span>でメッセージを送るよう伝えることができます。</p><p>（Bitmessageアドレスを独自にNamecoinにするのはかなり難しいです）。</p><p>Bitmessageは直接namecoindを使うか、nmcontrolインスタンスを使うことができます。</p></body></html> - + Host: ホスト: - + Password: パスワード: - + Test テスト - + Connect to: 接続先: - + Namecoind Namecoind - + NMControl NMControl - + Namecoin integration Namecoin連携 - + <html><head/><body><p>By default, if you send a message to someone and he is offline for more than two days, Bitmessage will send the message again after an additional two days. This will be continued with exponential backoff forever; messages will be resent after 5, 10, 20 days ect. until the receiver acknowledges them. Here you may change that behavior by having Bitmessage give up after a certain number of days or months.</p><p>Leave these input fields blank for the default behavior. </p></body></html> <html><head/><body><p>デフォルトでは、あなたが誰かにメッセージを送信して、相手が 2 日以上オフラインになっている場合、 Bitmessage はさらに 2 日後にメッセージを再送信します。 これは指数関数的後退で永遠に続きます。 受信者がそれらを確認するまで、メッセージは 5、10、20 日後に再送信されます。 ここで Bitmessage が一定の日数または月数後に諦める数を入力して、その動作を変更することができます。</p><p>デフォルトの動作は、この入力フィールドを空白のままにします。 </p></body></html> - + Give up after 次の期間後に諦める - + and と - + days 日 - + months. ヶ月。 - + Resends Expire 再送信の期限 - + Hide connection notifications 接続通知を非表示 - + Maximum outbound connections: [0: none] 最大アウトバウンド接続: [0: なし] - + Hardware GPU acceleration (OpenCL): ハードウェア GPU アクセラレーション (OpenCL): diff --git a/src/translations/bitmessage_pl.qm b/src/translations/bitmessage_pl.qm index cbb8aa46..5e0e39f7 100644 Binary files a/src/translations/bitmessage_pl.qm and b/src/translations/bitmessage_pl.qm differ diff --git a/src/translations/bitmessage_pl.ts b/src/translations/bitmessage_pl.ts index 68f8f414..2ecb3441 100644 --- a/src/translations/bitmessage_pl.ts +++ b/src/translations/bitmessage_pl.ts @@ -156,7 +156,7 @@ Please type the desired email address (including @mailchuck.com) below: - + # You can use this to configure your email gateway account # Uncomment the setting you want to use # Here are the options: @@ -263,7 +263,7 @@ Please type the desired email address (including @mailchuck.com) below: Dodaj nadawcę do Listy Blokowanych - + Move to Trash Przenieś do kosza @@ -288,7 +288,7 @@ Please type the desired email address (including @mailchuck.com) below: Oznacz jako nieprzeczytane - + New Nowe @@ -313,7 +313,7 @@ Please type the desired email address (including @mailchuck.com) below: Kopiuj adres do schowka - + Special address behavior... Specjalne zachowanie adresu… @@ -328,37 +328,37 @@ Please type the desired email address (including @mailchuck.com) below: Usuń - + Send message to this address Wyślij wiadomość pod ten adres - + Subscribe to this address Subskrybuj ten adres - + Add New Address Dodaj nowy adres - + Copy destination address to clipboard Kopiuj adres odbiorcy do schowka - + Force send Wymuś wysłanie - + One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now? Jeden z adresów, %1, jest starym adresem wersji 1. Adresy tej wersji nie są już wspierane. Usunąć go? - + Waiting for their encryption key. Will request it again soon. Oczekiwanie na klucz szyfrujący odbiorcy. Niedługo nastąpi ponowne wysłanie o niego prośby. @@ -368,17 +368,17 @@ Please type the desired email address (including @mailchuck.com) below: - + Queued. W kolejce do wysłania. - + Message sent. Waiting for acknowledgement. Sent at %1 Wiadomość wysłana. Oczekiwanie na potwierdzenie odbioru. Wysłano o %1 - + Message sent. Sent at %1 Wiadomość wysłana. Wysłano o %1 @@ -388,47 +388,47 @@ Please type the desired email address (including @mailchuck.com) below: - + Acknowledgement of the message received %1 Otrzymano potwierdzenie odbioru wiadomości %1 - + Broadcast queued. Przekaz w kolejce do wysłania. - + Broadcast on %1 Wysłana o %1 - + Problem: The work demanded by the recipient is more difficult than you are willing to do. %1 Problem: dowód pracy wymagany przez odbiorcę jest trudniejszy niż zaakceptowany przez Ciebie. %1 - + Problem: The recipient's encryption key is no good. Could not encrypt message. %1 Problem: klucz szyfrujący odbiorcy jest nieprawidłowy. Nie można zaszyfrować wiadomości. %1 - + Forced difficulty override. Send should start soon. Wymuszono ominięcie trudności. Wysłanie zostanie wkrótce rozpoczęte. - + Unknown status: %1 %2 Nieznany status: %1 %2 - + Not Connected Brak połączenia - + Show Bitmessage Pokaż Bitmessage @@ -438,12 +438,12 @@ Please type the desired email address (including @mailchuck.com) below: Wyślij - + Subscribe Subskrybuj - + Channel Kanał @@ -453,12 +453,12 @@ Please type the desired email address (including @mailchuck.com) below: Zamknij - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Możesz zarządzać swoimi kluczami edytując plik keys.dat znajdujący się w tym samym katalogu co program. Zaleca się zrobienie kopii zapasowej tego pliku. - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. @@ -467,17 +467,17 @@ It is important that you back up this file. Zaleca się zrobienie kopii zapasowej tego pliku. - + Open keys.dat? Otworzyć plik keys.dat? - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) Możesz zarządzać swoimi kluczami edytując plik keys.dat znajdujący się w tym samym katalogu co program. Zaleca się zrobienie kopii zapasowej tego pliku. Czy chcesz otworzyć ten plik teraz? (Zamknij Bitmessage, przed wprowadzeniem jakichkolwiek zmian.) - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) @@ -486,37 +486,37 @@ It is important that you back up this file. Would you like to open the file now? Zaleca się zrobienie kopii zapasowej tego pliku. Czy chcesz otworzyć ten plik teraz? (Zamknij Bitmessage przed wprowadzeniem jakichkolwiek zmian.) - + Delete trash? Opróżnić kosz? - + Are you sure you want to delete all trashed messages? Czy na pewno usunąć wszystkie wiadomości z kosza? - + bad passphrase nieprawidłowe hasło - + You must type your passphrase. If you don't have one then this is not the form for you. Musisz wpisać swoje hasło. Jeżeli go nie posiadasz, to ten formularz nie jest dla Ciebie. - + Bad address version number Nieprawidłowy numer wersji adresu - + Your address version number must be a number: either 3 or 4. Twój numer wersji adresu powinien wynosić: 3 lub 4. - + Your address version number must be either 3 or 4. Twój numer wersji adresu powinien wynosić: 3 lub 4. @@ -586,22 +586,22 @@ Zaleca się zrobienie kopii zapasowej tego pliku. Czy chcesz otworzyć ten plik - + Connection lost Połączenie utracone - + Connected Połączono - + Message trashed Wiadomość usunięta - + The TTL, or Time-To-Live is the length of time that the network will hold the message. The recipient must get it during this time. If your Bitmessage client does not hear an acknowledgement, it will resend the message automatically. The longer the Time-To-Live, the @@ -612,17 +612,17 @@ Im dłuższy TTL, tym więcej pracy będzie musiał wykonac komputer wysyłając Zwykle 4-5 dniowy TTL jest odpowiedni. - + Message too long Wiadomość zbyt długa - + The message that you are trying to send is too long by %1 bytes. (The maximum is 261644 bytes). Please cut it down before sending. Wiadomość jest za długa o %1 bajtów (maksymalna długość wynosi 261644 bajty). Przed wysłaniem należy ją skrócić. - + Error: Your account wasn't registered at an email gateway. Sending registration now as %1, please wait for the registration to be processed before retrying sending. Błąd: Twoje konto nie było zarejestrowane w bramce poczty. Rejestrowanie jako %1, proszę poczekać na zakończenie procesu przed ponowną próbą wysłania wiadomości. @@ -667,57 +667,57 @@ Zwykle 4-5 dniowy TTL jest odpowiedni. - + Error: You must specify a From address. If you don't have one, go to the 'Your Identities' tab. Błąd: musisz wybrać adres wysyłania. Jeżeli go nie posiadasz, przejdź do zakładki 'Twoje tożsamości'. - + Address version number Numer wersji adresu - + Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version. Odnośnie adresu %1, Bitmessage nie potrafi odczytać wersji adresu %2. Może uaktualnij Bitmessage do najnowszej wersji. - + Stream number Numer strumienia - + Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version. Odnośnie adresu %1, Bitmessage nie potrafi operować na strumieniu adresu %2. Może uaktualnij Bitmessage do najnowszej wersji. - + Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won't send until you connect. Uwaga: nie jesteś obecnie połączony. Bitmessage wykona niezbędną pracę do wysłania wiadomości, ale nie wyśle jej póki się nie połączysz. - + Message queued. W kolejce do wysłania - + Your 'To' field is empty. Pole 'Do' jest puste - + Right click one or more entries in your address book and select 'Send message to this address'. Użyj prawego przycisku myszy na adresie z książki adresowej i wybierz opcję "Wyślij wiadomość do tego adresu". - + Fetched address from namecoin identity. Pobrano adres z identyfikatora Namecoin. - + New Message Nowa wiadomość @@ -742,47 +742,47 @@ Zwykle 4-5 dniowy TTL jest odpowiedni. Wprowadzono niewłaściwy adres, który został zignorowany. - + Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want. Błąd: Adres znajduje się już w książce adresowej. - + Error: You cannot add the same address to your subscriptions twice. Perhaps rename the existing one if you want. Błąd: Adres znajduje się już na liście subskrybcji. - + Restart Uruchom ponownie - + You must restart Bitmessage for the port number change to take effect. Musisz zrestartować Bitmessage, aby zmiana numeru portu weszła w życie. - + Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any). Bitmessage będzie of teraz korzystał z serwera proxy, ale możesz ręcznie zrestartować Bitmessage, aby zamknąć obecne połączenia (jeżeli występują). - + Number needed Wymagany numer - + Your maximum download and upload rate must be numbers. Ignoring what you typed. Maksymalne prędkości wysyłania i pobierania powinny być liczbami. Zignorowano zmiany. - + Will not resend ever Nigdy nie wysyłaj ponownie - + Note that the time limit you entered is less than the amount of time Bitmessage waits for the first resend attempt therefore your messages will never be resent. Zauważ, że wpisany limit czasu wynosi mniej niż czas, który Bitmessage czeka przed pierwszą ponowną próbą wysłania wiadomości, więc Twoje wiadomości nie zostaną nigdy wysłane ponownie. @@ -817,22 +817,22 @@ Zwykle 4-5 dniowy TTL jest odpowiedni. Naprawdę musisz wpisać hasło. - + Address is gone Adres zniknął - + Bitmessage cannot find your address %1. Perhaps you removed it? Bitmessage nie może odnaleźć Twojego adresu %1. Może go usunąłeś? - + Address disabled Adres nieaktywny - + Error: The address from which you are trying to send is disabled. You'll have to enable it on the 'Your Identities' tab before using it. Błąd: adres, z którego próbowałeś wysłać wiadomość jest nieaktywny. Włącz go w zakładce „Twoje tożsamości”, zanim go użyjesz. @@ -842,42 +842,42 @@ Zwykle 4-5 dniowy TTL jest odpowiedni. - + Entry added to the blacklist. Edit the label to your liking. Dodano wpis do listy blokowanych. Można teraz zmienić jego nazwę. - + Error: You cannot add the same address to your blacklist twice. Try renaming the existing one if you want. Błąd: adres znajduje się już na liście blokowanych. - + Moved items to trash. Przeniesiono wiadomości do kosza. - + Undeleted item. Przywrócono wiadomość. - + Save As... Zapisz jako… - + Write error. Błąd zapisu. - + No addresses selected. Nie wybrano adresu. - + If you delete the subscription, messages that you already received will become inaccessible. Maybe you can consider disabling the subscription instead. Disabled subscriptions will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the subscription? @@ -886,7 +886,7 @@ Are you sure you want to delete the subscription? Czy na pewno chcesz usunąć tę subskrypcję? - + If you delete the channel, messages that you already received will become inaccessible. Maybe you can consider disabling the channel instead. Disabled channels will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the channel? @@ -895,32 +895,32 @@ Are you sure you want to delete the channel? Czy na pewno chcesz usunąć ten kanał? - + Do you really want to remove this avatar? Czy na pewno chcesz usunąć ten awatar? - + You have already set an avatar for this address. Do you really want to overwrite it? Już ustawiłeś awatar dla tego adresu. Czy na pewno chcesz go nadpisać? - + Start-on-login not yet supported on your OS. Start po zalogowaniu jeszcze nie jest wspierany pod Twoim systemem. - + Minimize-to-tray not yet supported on your OS. Minimalizacja do zasobnika nie jest jeszcze wspierana pod Twoim systemem. - + Tray notifications not yet supported on your OS. Powiadomienia w zasobniku nie są jeszcze wspierane pod Twoim systemem. - + Testing... Testowanie… @@ -1195,42 +1195,42 @@ Czy na pewno chcesz usunąć ten kanał? - + New version of PyBitmessage is available: %1. Download it from https://github.com/Bitmessage/PyBitmessage/releases/latest Nowa wersja Bitmessage jest dostępna: %1. Pobierz ją z https://github.com/Bitmessage/PyBitmessage/releases/latest - + Waiting for PoW to finish... %1% Oczekiwanie na wykonanie dowodu pracy… %1% - + Shutting down Pybitmessage... %1% Zamykanie PyBitmessage… %1% - + Waiting for objects to be sent... %1% Oczekiwanie na wysłanie obiektów… %1% - + Saving settings... %1% Zapisywanie ustawień… %1% - + Shutting down core... %1% Zamykanie rdzenia programu… %1% - + Stopping notifications... %1% Zatrzymywanie powiadomień… %1% - + Shutdown imminent... %1% Zaraz zamknę… %1% @@ -1240,17 +1240,17 @@ Czy na pewno chcesz usunąć ten kanał? %n godzina%n godziny%n godzin%n godzin - + %n day(s) %n dzień%n dni%n dni%n dni - + Shutting down PyBitmessage... %1% Zamykanie PyBitmessage… %1% - + Sent Wysłane @@ -1285,12 +1285,12 @@ Czy na pewno chcesz usunąć ten kanał? - + Disk full Dysk pełny - + Alert: Your disk or data storage volume is full. Bitmessage will now exit. Uwaga: Twój dysk lub partycja jest pełny. Bitmessage zamknie się. @@ -1354,7 +1354,7 @@ Odbiorca wymaga trudności: %1 i %2 Problem: próbujesz wysłać wiadomość do siebie lub na kanał, ale Twój klucz szyfrujący nie został znaleziony w pliku keys.dat. Nie można zaszyfrować wiadomości. %1 - + Doing work necessary to send message. Wykonywanie pracy potrzebnej do wysłania wiadomości. @@ -1364,7 +1364,7 @@ Odbiorca wymaga trudności: %1 i %2 Wiadomość wysłana. Oczekiwanie na potwierdzenie odbioru. Wysłano o %1 - + Doing work necessary to request encryption key. Wykonywanie pracy niezbędnej do prośby o klucz szyfrujący. @@ -1394,32 +1394,32 @@ Odbiorca wymaga trudności: %1 i %2 Oznacz wszystkie jako przeczytane - + Are you sure you would like to mark all messages read? Czy na pewno chcesz oznaczyć wszystkie wiadomości jako przeczytane? - + Doing work necessary to send broadcast. Wykonywanie dowodu pracy niezbędnego do wysłania przekazu. - + Proof of work pending Dowód pracy zawieszony - + %n object(s) pending proof of work Zawieszony dowód pracy %n obiektuZawieszony dowód pracy %n obiektówZawieszony dowód pracy %n obiektówZawieszony dowód pracy %n obiektów - + %n object(s) waiting to be distributed %n obiekt oczekuje na wysłanie%n obiektów oczekuje na wysłanie%n obiektów oczekuje na wysłanie%n obiektów oczekuje na wysłanie - + Wait until these tasks finish? Czy poczekać aż te zadania zostaną zakończone? @@ -1474,12 +1474,12 @@ Odbiorca wymaga trudności: %1 i %2 Twoje procesory graficzne nie obliczyły poprawnie, wyłączam OpenCL. Prosimy zaraportować przypadek twórcom programu. - + Set notification sound... Ustaw dźwięk powiadomień… - + Welcome to easy and secure Bitmessage * send messages to other people @@ -1493,112 +1493,132 @@ Witamy w przyjaznym i bezpiecznym Bitmessage * dyskutuj na kanałach (chany) z innymi ludźmi - + not recommended for chans niezalecany dla kanałów - + Quiet Mode Tryb cichy - + Problems connecting? Try enabling UPnP in the Network Settings Problem z połączeniem? Spróbuj włączyć UPnP w ustawieniach sieci. - + You are trying to send an email instead of a bitmessage. This requires registering with a gateway. Attempt to register? Próbujesz wysłać e-mail zamiast wiadomość bitmessage. To wymaga zarejestrowania się na bramce. Czy zarejestrować? - + Error: Bitmessage addresses start with BM- Please check the recipient address %1 Błąd: adresy Bitmessage zaczynają się od BM-. Proszę sprawdzić adres odbiorcy %1. - + Error: The recipient address %1 is not typed or copied correctly. Please check it. Błąd: adres odbiorcy %1 nie został skopiowany lub przepisany poprawnie. Proszę go sprawdzić. - + Error: The recipient address %1 contains invalid characters. Please check it. Błąd: adres odbiorcy %1 zawiera nieprawidłowe znaki. Proszę go sprawdzić. - + Error: The version of the recipient address %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever. Błąd: wersja adresu odbiorcy %1 jest za wysoka. Musisz albo zaktualizować Twoje oprogramowanie Bitmessage, albo twój znajomy Cię trolluje. - + Error: Some data encoded in the recipient address %1 is too short. There might be something wrong with the software of your acquaintance. Błąd: niektóre dane zakodowane w adresie odbiorcy %1 są zbyt krótkie. Być może coś nie działa należycie w programie Twojego znajomego. - + Error: Some data encoded in the recipient address %1 is too long. There might be something wrong with the software of your acquaintance. Błąd: niektóre dane zakodowane w adresie odbiorcy %1 są zbyt długie. Być może coś nie działa należycie w programie Twojego znajomego. - + Error: Some data encoded in the recipient address %1 is malformed. There might be something wrong with the software of your acquaintance. Błąd: niektóre dane zakodowane w adresie odbiorcy %1 są uszkodzone. Być może coś nie działa należycie w programie Twojego znajomego. - + Error: Something is wrong with the recipient address %1. Błąd: coś jest nie tak z adresem odbiorcy %1. - + Error: %1 Błąd: %1 - + From %1 Od %1 - + + Disconnecting + Rozłączanie + + + + Connecting + Łączenie + + + + Bitmessage will now drop all connectins. Are you sure? + Bitmessage zatrzyma wszystkie połączenia? Czy kontynuować? + + + + Bitmessage will now start connecting to network. Are you sure? + Bitmessage rozpocznie łączenie z siecią. Czy kontynuować? + + + Synchronisation pending Synchronizacja zawieszona - + Bitmessage hasn't synchronised with the network, %n object(s) to be downloaded. If you quit now, it may cause delivery delays. Wait until the synchronisation finishes? Bitmessage nie zsynchronizował się z siecią, %n obiekt oczekuje na pobranie. Jeżeli zamkniesz go teraz, może to spowodować opóźnienia dostarczeń. Czy poczekać na zakończenie synchronizacji?Bitmessage nie zsynchronizował się z siecią, %n obiekty oczekują na pobranie. Jeżeli zamkniesz go teraz, może to spowodować opóźnienia dostarczeń. Czy poczekać na zakończenie synchronizacji?Bitmessage nie zsynchronizował się z siecią, %n obiektów oczekuje na pobranie. Jeżeli zamkniesz go teraz, może to spowodować opóźnienia dostarczeń. Czy poczekać na zakończenie synchronizacji?Bitmessage nie zsynchronizował się z siecią, %n obiektów oczekuje na pobranie. Jeżeli zamkniesz go teraz, może to spowodować opóźnienia dostarczeń. Czy poczekać na zakończenie synchronizacji? - + Not connected Niepołączony - + Bitmessage isn't connected to the network. If you quit now, it may cause delivery delays. Wait until connected and the synchronisation finishes? Bitmessage nie połączył się z siecią. Jeżeli zamkniesz go teraz, może to spowodować opóźnienia dostarczeń. Czy poczekać na połączenie i zakończenie synchronizacji? - + Waiting for network connection... Oczekiwanie na połączenie sieciowe… - + Waiting for finishing synchronisation... Oczekiwanie na zakończenie synchronizacji… - + You have already set a notification sound for this address book entry. Do you really want to overwrite it? Już ustawiłeś dźwięk powiadomienia dla tego kontaktu. Czy chcesz go zastąpić? - + Error occurred: could not load message from disk. Wystąpił błąd: nie można załadować wiadomości z dysku. diff --git a/src/translations/bitmessage_zh_cn.qm b/src/translations/bitmessage_zh_cn.qm index 204047e1..6a77636d 100644 Binary files a/src/translations/bitmessage_zh_cn.qm and b/src/translations/bitmessage_zh_cn.qm differ diff --git a/src/translations/bitmessage_zh_cn.ts b/src/translations/bitmessage_zh_cn.ts index 3a5c4aab..60c999bf 100644 --- a/src/translations/bitmessage_zh_cn.ts +++ b/src/translations/bitmessage_zh_cn.ts @@ -112,7 +112,7 @@ Please type the desired email address (including @mailchuck.com) below: Mailchuck - + # You can use this to configure your email gateway account # Uncomment the setting you want to use # Here are the options: @@ -153,17 +153,61 @@ Please type the desired email address (including @mailchuck.com) below: # the money directly. To turn it off again, set "feeamount" to 0. Requires # subscription. - #您可以用它来配置你的电子邮件网关帐户 + + + + + # You can use this to configure your email gateway account +# Uncomment the setting you want to use +# Here are the options: +# +# pgp: server +# The email gateway will create and maintain PGP keys for you and sign, verify, +# encrypt and decrypt on your behalf. When you want to use PGP but are lazy, +# use this. Requires subscription. +# +# pgp: local +# The email gateway will not conduct PGP operations on your behalf. You can +# either not use PGP at all, or use it locally. +# +# attachments: yes +# Incoming attachments in the email will be uploaded to MEGA.nz, and you can +# download them from there by following the link. Requires a subscription. +# +# attachments: no +# Attachments will be ignored. +# +# archive: yes +# Your incoming emails will be archived on the server. Use this if you need +# help with debugging problems or you need a third party proof of emails. This +# however means that the operator of the service will be able to read your +# emails even after they have been delivered to you. +# +# archive: no +# Incoming emails will be deleted from the server as soon as they are relayed +# to you. +# +# masterpubkey_btc: BIP44 xpub key or electrum v1 public seed +# offset_btc: integer (defaults to 0) +# feeamount: number with up to 8 decimal places +# feecurrency: BTC, XBT, USD, EUR or GBP +# Use these if you want to charge people who send you emails. If this is on and +# an unknown person sends you an email, they will be requested to pay the fee +# specified. As this scheme uses deterministic public keys, you will receive +# the money directly. To turn it off again, set "feeamount" to 0. Requires +# subscription. + + #您可以用它来配置您的电子邮件网关帐户 #取消您要使用的设定 #这里的选项： # # pgp: server #电子邮件网关将创建和维护PGP密钥，为您签名和验证， -#代表加密和解密。当你想使用PGP，但懒惰， +#代表加密和解密。当您想使用PGP，但懒惰， #用这个。需要订阅。 # # pgp: local -#电子邮件网关不会代你进行PGP操作。您可以 +#电子邮件网关不会代您进行PGP操作。您可以 #选择或者不使用PGP, 或在本地使用它。 # # attachement: yes @@ -177,7 +221,7 @@ Please type the desired email address (including @mailchuck.com) below: #您收到的邮件将在服务器上存档。如果您有需要请使用 #帮助调试问题，或者您需要第三方电子邮件的证明。这 #然而，意味着服务的操作运将能够读取您的 -#电子邮件即使电子邮件已经传送给你。 +#电子邮件即使电子邮件已经传送给您。 # # archive: no # 已传入的电子邮件将从服务器被删除只要他们已中继。 @@ -186,132 +230,133 @@ Please type the desired email address (including @mailchuck.com) below: #offset_btc：整数（默认为0） #feeamount：多达8位小数 #feecurrency号：BTC，XBT，美元，欧元或英镑 -#用这些，如果你想主管谁送你的电子邮件的人。如果这是在和 +#用这些，如果您想主管谁送您的电子邮件的人。如果这是在和 #一个不明身份的人向您发送一封电子邮件，他们将被要求支付规定的费用 -#。由于这个方案使用确定性的公共密钥，你会直接接收 +#。由于这个方案使用确定性的公共密钥，您会直接接收 #钱。要再次将其关闭，设置“feeamount”0 -#需要订阅。 +#需要订阅。 + MainWindow - + Reply to sender 回复发件人 - + Reply to channel 回复通道 - + Add sender to your Address Book 将发送者添加到您的通讯簿 - + Add sender to your Blacklist 将发件人添加到您的黑名单 - + Move to Trash 移入回收站 - + Undelete 取消删除 - + View HTML code as formatted text 作为HTML查看 - + Save message as... 将消息保存为... - + Mark Unread 标记为未读 - + New 新建 - + Enable 启用 - + Disable 禁用 - + Set avatar... 设置头像... - + Copy address to clipboard 将地址复制到剪贴板 - + Special address behavior... 特别的地址行为... - + Email gateway 电子邮件网关 - + Delete 删除 - + Send message to this address 发送消息到这个地址 - + Subscribe to this address 订阅到这个地址 - + Add New Address 创建新地址 - + Copy destination address to clipboard 复制目标地址到剪贴板 - + Force send 强制发送 - + One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. May we delete it now? 您的地址中的一个, %1,是一个过时的版本1地址. 版本1地址已经不再受到支持了. 我们可以将它删除掉么? - + Waiting for their encryption key. Will request it again soon. 正在等待他们的加密密钥，我们会在稍后再次请求。 @@ -321,17 +366,17 @@ Please type the desired email address (including @mailchuck.com) below: - + Queued. 已经添加到队列。 - + Message sent. Waiting for acknowledgement. Sent at %1 消息已经发送. 正在等待回执. 发送于 %1 - + Message sent. Sent at %1 消息已经发送. 发送于 %1 @@ -341,47 +386,47 @@ Please type the desired email address (including @mailchuck.com) below: - + Acknowledgement of the message received %1 消息的回执已经收到于 %1 - + Broadcast queued. 广播已经添加到队列中。 - + Broadcast on %1 已经广播于 %1 - + Problem: The work demanded by the recipient is more difficult than you are willing to do. %1 错误： 收件人要求的做工量大于我们的最大接受做工量。 %1 - + Problem: The recipient's encryption key is no good. Could not encrypt message. %1 错误： 收件人的加密密钥是无效的。不能加密消息。 %1 - + Forced difficulty override. Send should start soon. 已经忽略最大做工量限制。发送很快就会开始。 - + Unknown status: %1 %2 未知状态： %1 %2 - + Not Connected 未连接 - + Show Bitmessage 显示比特信 @@ -391,12 +436,12 @@ Please type the desired email address (including @mailchuck.com) below: 发送 - + Subscribe 订阅 - + Channel 频道 @@ -406,66 +451,66 @@ Please type the desired email address (including @mailchuck.com) below: 退出 - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. 您可以通过编辑和程序储存在同一个目录的 keys.dat 来编辑密钥。备份这个文件十分重要。 - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. 您可以通过编辑储存在 %1 的 keys.dat 来编辑密钥。备份这个文件十分重要。 - + Open keys.dat? 打开 keys.dat ？ - + You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) 您可以通过编辑和程序储存在同一个目录的 keys.dat 来编辑密钥。备份这个文件十分重要。您现在想打开这个文件么？（请在进行任何修改前关闭比特信） - + You may manage your keys by editing the keys.dat file stored in %1 It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.) 您可以通过编辑储存在 %1 的 keys.dat 来编辑密钥。备份这个文件十分重要。您现在想打开这个文件么？（请在进行任何修改前关闭比特信） - + Delete trash? 清空回收站？ - + Are you sure you want to delete all trashed messages? 您确定要删除全部被回收的消息么？ - + bad passphrase 错误的密钥 - + You must type your passphrase. If you don't have one then this is not the form for you. 您必须输入您的密钥。如果您没有的话，这个表单不适用于您。 - + Bad address version number 地址的版本号无效 - + Your address version number must be a number: either 3 or 4. 您的地址的版本号必须是一个数字： 3 或 4. - + Your address version number must be either 3 or 4. 您的地址的版本号必须是 3 或 4. @@ -535,41 +580,41 @@ It is important that you back up this file. Would you like to open the file now? - + Connection lost 连接已丢失 - + Connected 已经连接 - + Message trashed 消息已经移入回收站 - + The TTL, or Time-To-Live is the length of time that the network will hold the message. The recipient must get it during this time. If your Bitmessage client does not hear an acknowledgement, it will resend the message automatically. The longer the Time-To-Live, the more work your computer must do to send the message. A Time-To-Live of four or five days is often appropriate. - 這TTL，或Time-To-Time是保留信息网络时间的长度. -收件人必须在此期间得到它. 如果您的Bitmessage客户沒有听到确认, 它会自动重新发送信息. Time-To-Live的时间越长, 您的电脑必须要做更多工作來发送信息. 四天或五天的 Time-To-Time, 经常是合适的. + TTL，或Time-To-Time是保留信息网络时间的长度. +收件人必须在此期间得到它. 如果您的Bitmessage客户沒有听到确认, 它会自动重新发送信息. Time-To-Live的时间越长, 您的电脑必须要做更多工作來发送信息. 四天或五天的 Time-To-Time, 通常是合适的. - + Message too long 信息太长 - + The message that you are trying to send is too long by %1 bytes. (The maximum is 261644 bytes). Please cut it down before sending. - 你正在尝试发送的信息已超过％1个字节太长, (最大为261644个字节). 发送前请剪下来。 + 您正在尝试发送的信息已超过 ％1 个字节太长（最大为261644个字节），发送前请先缩短一些。 - + Error: Your account wasn't registered at an email gateway. Sending registration now as %1, please wait for the registration to be processed before retrying sending. 错误: 您的帐户没有在电子邮件网关注册。现在发送注册为％1​​, 注册正在处理请稍候重试发送. @@ -614,57 +659,57 @@ It is important that you back up this file. Would you like to open the file now? - + Error: You must specify a From address. If you don't have one, go to the 'Your Identities' tab. 错误： 您必须指出一个表单地址， 如果您没有，请到“您的身份”标签页。 - + Address version number 地址版本号 - + Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version. - 地址 %1 的地址版本号 %2 无法被比特信理解。也许你应该升级你的比特信到最新版本。 + 地址 %1 的地址版本号 %2 无法被比特信理解。也许您应该升级您的比特信到最新版本。 - + Stream number 节点流序号 - + Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version. - 地址 %1 的节点流序号 %2 无法被比特信理解。也许你应该升级你的比特信到最新版本。 + 地址 %1 的节点流序号 %2 无法被比特信所理解。也许您应该升级您的比特信到最新版本。 - + Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won't send until you connect. 警告： 您尚未连接。 比特信将做足够的功来发送消息，但是消息不会被发出直到您连接。 - + Message queued. 信息排队。 - + Your 'To' field is empty. “收件人"是空的。 - + Right click one or more entries in your address book and select 'Send message to this address'. 在您的地址本的一个条目上右击，之后选择”发送消息到这个地址“。 - + Fetched address from namecoin identity. 已经自namecoin接收了地址。 - + New Message 新消息 @@ -679,57 +724,57 @@ It is important that you back up this file. Would you like to open the file now? - + Address is valid. 地址有效。 - + The address you entered was invalid. Ignoring it. 您输入的地址是无效的，将被忽略。 - + Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want. 错误：您无法将一个地址添加到您的地址本两次，请尝试重命名已经存在的那个。 - + Error: You cannot add the same address to your subscriptions twice. Perhaps rename the existing one if you want. 错误: 您不能在同一地址添加到您的订阅两次. 也许您可重命名现有之一. - + Restart 重启 - + You must restart Bitmessage for the port number change to take effect. 您必须重启以便使比特信对于使用的端口的改变生效。 - + Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any). 比特信将会从现在开始使用代理，但是您可能想手动重启比特信以便使之前的连接关闭（如果有的话）。 - + Number needed 需求数字 - + Your maximum download and upload rate must be numbers. Ignoring what you typed. 您最大的下载和上传速率必须是数字. 忽略您键入的内容. - + Will not resend ever 不尝试再次发送 - + Note that the time limit you entered is less than the amount of time Bitmessage waits for the first resend attempt therefore your messages will never be resent. 请注意，您所输入的时间限制小于比特信的最小重试时间，因此您将永远不会重发消息。 @@ -764,22 +809,22 @@ It is important that you back up this file. Would you like to open the file now? 您真的需要一个密码。 - + Address is gone 已经失去了地址 - + Bitmessage cannot find your address %1. Perhaps you removed it? - 比特信无法找到你的地址 %1。 也许你已经把它删掉了？ + 比特信无法找到您的地址 %1 ，也许您已经把它删掉了？ - + Address disabled 地址已经禁用 - + Error: The address from which you are trying to send is disabled. You'll have to enable it on the 'Your Identities' tab before using it. 错误： 您想以一个您已经禁用的地址发出消息。在使用之前您需要在“您的身份”处再次启用。 @@ -789,85 +834,85 @@ It is important that you back up this file. Would you like to open the file now? - + Entry added to the blacklist. Edit the label to your liking. 条目添加到黑名单. 根据自己的喜好编辑标签. - + Error: You cannot add the same address to your blacklist twice. Try renaming the existing one if you want. 错误: 您不能在同一地址添加到您的黑名单两次. 也许您可重命名现有之一. - + Moved items to trash. 已经移动项目到回收站。 - + Undeleted item. 未删除的项目。 - + Save As... 另存为... - + Write error. 写入失败。 - + No addresses selected. 没有选择地址。 - + If you delete the subscription, messages that you already received will become inaccessible. Maybe you can consider disabling the subscription instead. Disabled subscriptions will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the subscription? - 如果删除订阅, 您已经收到的信息将无法访问. 也许你可以考虑禁用订阅.禁用订阅将不会收到新信息, 但您仍然可以看到你已经收到的信息. + 如果删除订阅, 您已经收到的信息将无法访问. 也许您可以考虑禁用订阅.禁用订阅将不会收到新信息, 但您仍然可以看到您已经收到的信息. -你确定要删除订阅? +您确定要删除订阅? - + If you delete the channel, messages that you already received will become inaccessible. Maybe you can consider disabling the channel instead. Disabled channels will not receive new messages, but you can still view messages you already received. Are you sure you want to delete the channel? - 如果您删除的频道, 你已经收到的信息将无法访问. 也许你可以考虑禁用频道. 禁用频道将不会收到新信息, 但你仍然可以看到你已经收到的信息. + 如果您删除的频道, 您已经收到的信息将无法访问. 也许您可以考虑禁用频道. 禁用频道将不会收到新信息, 但您仍然可以看到您已经收到的信息. -你确定要删除频道？ +您确定要删除频道？ - + Do you really want to remove this avatar? 您真的想移除这个头像么？ - + You have already set an avatar for this address. Do you really want to overwrite it? 您已经为这个地址设置了头像了。您真的想移除么？ - + Start-on-login not yet supported on your OS. 登录时启动尚未支持您在使用的操作系统。 - + Minimize-to-tray not yet supported on your OS. 最小化到托盘尚未支持您的操作系统。 - + Tray notifications not yet supported on your OS. 托盘提醒尚未支持您所使用的操作系统。 - + Testing... 正在测试... @@ -1049,7 +1094,7 @@ Are you sure you want to delete the channel? Chans - Chans + 频道 @@ -1117,7 +1162,7 @@ Are you sure you want to delete the channel? 加入或创建一个频道 - + All accounts 所有帐户 @@ -1127,12 +1172,12 @@ Are you sure you want to delete the channel? 缩放级别％1％ - + Error: You cannot add the same address to your list twice. Perhaps rename the existing one if you want. 错误: 您不能在同一地址添加到列表中两次. 也许您可重命名现有之一. - + Add new entry 添加新条目 @@ -1142,42 +1187,42 @@ Are you sure you want to delete the channel? - + New version of PyBitmessage is available: %1. Download it from https://github.com/Bitmessage/PyBitmessage/releases/latest PyBitmessage的新版本可用: %1. 从https://github.com/Bitmessage/PyBitmessage/releases/latest下载 - + Waiting for PoW to finish... %1% 等待PoW完成...%1% - + Shutting down Pybitmessage... %1% 关闭Pybitmessage ...%1% - + Waiting for objects to be sent... %1% 等待要发送对象...%1% - + Saving settings... %1% 保存设置...%1% - + Shutting down core... %1% 关闭核心...%1% - + Stopping notifications... %1% 停止通知...%1% - + Shutdown imminent... %1% 关闭即将来临...%1% @@ -1187,42 +1232,42 @@ Are you sure you want to delete the channel? %n 小时 - + %n day(s) %n 天 - + Shutting down PyBitmessage... %1% 关闭PyBitmessage...%1% - + Sent 发送 - + Generating one new address 生成一个新的地址 - + Done generating address. Doing work necessary to broadcast it... 完成生成地址. 做必要的工作, 以播放它... - + Generating %1 new addresses. 生成%1个新地址. - + %1 is already in 'Your Identities'. Not adding it again. %1已经在'您的身份'. 不必重新添加. - + Done generating address 完成生成地址 @@ -1232,96 +1277,96 @@ Are you sure you want to delete the channel? - + Disk full 磁盘已满 - + Alert: Your disk or data storage volume is full. Bitmessage will now exit. 警告: 您的磁盘或数据存储量已满. 比特信将立即退出. - + Error! Could not find sender address (your address) in the keys.dat file. 错误! 找不到在keys.dat 件发件人的地址 ( 您的地址). - + Doing work necessary to send broadcast... 做必要的工作, 以发送广播... - + Broadcast sent on %1 广播发送%1 - + Encryption key was requested earlier. 加密密钥已请求. - + Sending a request for the recipient's encryption key. 发送收件人的加密密钥的请求. - + Looking up the receiver's public key 展望接收方的公钥 - + Problem: Destination is a mobile device who requests that the destination be included in the message but this is disallowed in your settings. %1 - 问题: 目标是移动电话设备所请求的目的地包括在消息中, 但是这是在你的设置禁止. %1 + 问题：对方是移动设备，并且对方的地址包含在此消息中，但是您的设置禁止了。 %1 - + Doing work necessary to send message. There is no required difficulty for version 2 addresses like this. 做必要的工作, 以发送信息. 这样第2版的地址没有难度. - + Doing work necessary to send message. Receiver's required difficulty: %1 and %2 做必要的工作, 以发送短信. 接收者的要求难度: %1与%2 - + Problem: The work demanded by the recipient (%1 and %2) is more difficult than you are willing to do. %3 问题: 由接收者(%1%2)要求的工作量比您愿意做的工作量來得更困难. %3 - + Problem: You are trying to send a message to yourself or a chan but your encryption key could not be found in the keys.dat file. Could not encrypt message. %1 问题: 您正在尝试将信息发送给自己或频道, 但您的加密密钥无法在keys.dat文件中找到. 无法加密信息. %1 - + Doing work necessary to send message. 做必要的工作, 以发送信息. - + Message sent. Waiting for acknowledgement. Sent on %1 信息发送. 等待确认. 已发送%1 - + Doing work necessary to request encryption key. 做必要的工作以要求加密密钥. - + Broadcasting the public key request. This program will auto-retry if they are offline. 广播公钥请求. 这个程序将自动重试, 如果他们处于离线状态. - + Sending public key request. Waiting for reply. Requested at %1 发送公钥的请求. 等待回复. 请求在%1 @@ -1336,112 +1381,97 @@ Receiver's required difficulty: %1 and %2 UPnP端口映射被删除 - + Mark all messages as read 标记全部信息为已读 - + Are you sure you would like to mark all messages read? 确定将所有信息标记为已读吗？ - + Doing work necessary to send broadcast. 持续进行必要的工作，以发送广播。 - + Proof of work pending 待传输内容的校验 - + %n object(s) pending proof of work %n 待传输内容校验任务 - + %n object(s) waiting to be distributed %n 任务等待分配 - + Wait until these tasks finish? 等待所有任务执行完？ - - Problem communicating with proxy: %1. Please check your network settings. - 与代理通信故障率：%1。请检查你的网络连接。 - - - - SOCKS5 Authentication problem: %1. Please check your SOCKS5 settings. - SOCK5认证错误：%1。请检查你的SOCK5设置。 - - - - The time on your computer, %1, may be wrong. Please verify your settings. - 你电脑上时间有误：%1。请检查你的设置。 - - - + The name %1 was not found. 名字%1未找到。 - + The namecoin query failed (%1) 域名币查询失败(%1) - + The namecoin query failed. 域名币查询失败。 - + The name %1 has no valid JSON data. 名字%1没有有效地JSON数据。 - + The name %1 has no associated Bitmessage address. 名字%1没有关联比特信地址。 - + Success! Namecoind version %1 running. 成功！域名币系统%1运行中。 - + Success! NMControll is up and running. 成功！域名币控制上线运行！ - + Couldn't understand NMControl. 不能理解 NMControl。 - + The connection to namecoin failed. 连接到 Namecoin 失败。 Your GPU(s) did not calculate correctly, disabling OpenCL. Please report to the developers. - 你的GPU不能够正确计算，正在关闭OpenGL。请报告给开发者。 + 您的GPU不能够正确计算，正在关闭OpenGL。请报告给开发者。 - + Set notification sound... 设置通知提示音... - + Welcome to easy and secure Bitmessage * send messages to other people @@ -1455,112 +1485,112 @@ Receiver's required difficulty: %1 and %2 *在频道里和其他人讨论 - + not recommended for chans 频道内不建议的内容 - + Quiet Mode 静默模式 - + Problems connecting? Try enabling UPnP in the Network Settings 连接问题？请尝试在网络设置里打开UPnP - + You are trying to send an email instead of a bitmessage. This requires registering with a gateway. Attempt to register? 您将要尝试经由 Bitmessage 发送一封电子邮件。该操作需要在一个网关上注册。尝试注册？ - + Error: Bitmessage addresses start with BM- Please check the recipient address %1 错误：Bitmessage地址是以BM-开头的，请检查收信地址%1. - + Error: The recipient address %1 is not typed or copied correctly. Please check it. 错误：收信地址%1未填写或复制错误。请检查。 - + Error: The recipient address %1 contains invalid characters. Please check it. 错误：收信地址%1还有非法字符。请检查。 - + Error: The version of the recipient address %1 is too high. Either you need to upgrade your Bitmessage software or your acquaintance is being clever. - 错误：收信地址%1版本太高。要么你需要更新你的软件，要么对方需要降级 。 + 错误：收信地址 %1 版本太高。要么您需要更新您的软件，要么对方需要降级 。 - + Error: Some data encoded in the recipient address %1 is too short. There might be something wrong with the software of your acquaintance. 错误：收信地址%1编码数据太短。可能对方使用的软件有问题。 - + Error: Some data encoded in the recipient address %1 is too long. There might be something wrong with the software of your acquaintance. 错误： - + Error: Some data encoded in the recipient address %1 is malformed. There might be something wrong with the software of your acquaintance. 错误：收信地址%1编码数据太长。可能对方使用的软件有问题。 - + Error: Something is wrong with the recipient address %1. 错误：收信地址%1有问题。 - + Error: %1 错误：%1 - + From %1 来自 %1 - + Synchronisation pending 待同步 - + Bitmessage hasn't synchronised with the network, %n object(s) to be downloaded. If you quit now, it may cause delivery delays. Wait until the synchronisation finishes? - Bitmessage还没有与网络同步，%n 件任务需要下载。如果你现在退出软件，可能会造成传输延时。是否等同步完成？ + - + Not connected 未连接成功。 - + Bitmessage isn't connected to the network. If you quit now, it may cause delivery delays. Wait until connected and the synchronisation finishes? - Bitmessage未连接到网络。如果现在退出软件，可能会造成传输延时。是否等待同步完成？ + - + Waiting for network connection... 等待网络连接…… - + Waiting for finishing synchronisation... 等待同步完成…… - + You have already set a notification sound for this address book entry. Do you really want to overwrite it? 您已经为该地址簿条目设置了通知提示音。您想要覆盖它吗？ - + Error occurred: could not load message from disk. 发生错误：无法从磁盘读取消息。 @@ -1585,24 +1615,24 @@ Receiver's required difficulty: %1 and %2 清除 - + inbox 收件箱 - + new 新信息 - + sent 已发送 - + trash - 垃圾箱 + 回收站 @@ -1615,7 +1645,7 @@ Receiver's required difficulty: %1 and %2 The link "%1" will open in a browser. It may be a security risk, it could de-anonymise you or download malicious data. Are you sure? - 此链接“%1”将在浏览器中打开。可能会有安全风险，可能会暴露你或下载恶意数据。确定吗？ + 此链接“%1”将在浏览器中打开。可能会有安全风险，可能会暴露您或下载恶意数据。确定吗？ @@ -1631,14 +1661,14 @@ Receiver's required difficulty: %1 and %2 MsgDecode - + The message has an unknown encoding. Perhaps you should upgrade Bitmessage. 这些消息使用了未知编码方式。 -你可能需要更新Bitmessage软件。 +您可能需要更新Bitmessage软件。 - + Unknown encoding 未知编码 @@ -1654,7 +1684,7 @@ Perhaps you should upgrade Bitmessage. Here you may generate as many addresses as you like. Indeed, creating and abandoning addresses is encouraged. You may generate addresses by using either random numbers or by using a passphrase. If you use a passphrase, the address is called a "deterministic" address. The 'Random Number' option is selected by default but deterministic addresses have several pros and cons: - 在这里，您想创建多少地址就创建多少。诚然，创建和丢弃地址受到鼓励。你既可以使用随机数来创建地址，也可以使用密钥。如果您使用密钥的话，生成的地址叫“静态地址”。随机数选项默认为选择，不过相比而言静态地址既有缺点也有优点： + 在这里，您想创建多少地址就创建多少。诚然，创建和丢弃地址受到鼓励。您既可以使用随机数来创建地址，也可以使用密钥。如果您使用密钥的话，生成的地址叫“静态地址”。随机数选项默认为选择，不过相比而言静态地址既有缺点也有优点： @@ -1739,7 +1769,7 @@ The 'Random Number' option is selected by default but deterministic ad (saves you some bandwidth and processing power) - （节省你的带宽和处理能力） + （节省您的带宽和处理能力） @@ -1864,12 +1894,12 @@ The 'Random Number' option is selected by default but deterministic ad 地址 - + Blacklist 黑名单 - + Whitelist 白名单 @@ -1935,7 +1965,7 @@ The 'Random Number' option is selected by default but deterministic ad You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn't configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node. - 你有至少一个到其他节点的出站连接，但是尚未收到入站连接。您的防火墙或路由器可能尚未设置转发入站TCP连接到您的电脑。比特信将正常运行，不过如果您允许入站连接的话将帮助比特信网络并成为一个通信状态更好的节点。 + 您有至少一个到其他节点的出站连接，但是尚未收到入站连接。您的防火墙或路由器可能尚未设置转发入站TCP连接到您的电脑。比特信将正常运行，不过如果您允许入站连接的话将帮助比特信网络并成为一个通信状态更好的节点。 @@ -2161,7 +2191,7 @@ The 'Random Number' option is selected by default but deterministic ad <html><head/><body><p>A chan exists when a group of people share the same decryption keys. The keys and bitmessage address used by a chan are generated from a human-friendly word or phrase (the chan name). To send a message to everyone in the chan, send a message to the chan address.</p><p>Chans are experimental and completely unmoderatable.</p><p>Enter a name for your chan. If you choose a sufficiently complex chan name (like a strong and unique passphrase) and none of your friends share it publicly, then the chan will be secure and private. However if you and someone else both create a chan with the same chan name, the same chan will be shared.</p></body></html> - <html><head/><body><p>当一群人共享同一样的加密钥匙时会创建一个频道。使用一个词组来命名密钥和bitmessage地址。发送信息到频道地址就可以发送消息给每个成员。</p><p>频道功能为实验性功能，也不稳定。</p><p>为你的频道命名。如果你选择使用一个十分复杂的名字命令并且你的朋友不会公开它，那这个频道就是安全和私密的。然而如果你和其他人都创建了一个同样命名的频道，那么相同名字的频道将会被共享。</p></body></html> + <html><head/><body><p>当一群人共享同一样的加密钥匙时会创建一个频道。使用一个词组来命名密钥和Bitmessage地址。发送信息到频道地址就可以发送消息给每个成员。</p><p>频道功能为实验性功能，也不稳定。</p><p>为您的频道命名。如果您选择使用一个十分复杂的名字命令并且您的朋友不会公开它，那这个频道就是安全和私密的。然而如果您和其他人都创建了一个同样命名的频道，那么相同名字的频道将会被共享。</p></body></html> @@ -2220,14 +2250,6 @@ The 'Random Number' option is selected by default but deterministic ad C PoW模块不可用。请编译它。 - - qrcodeDialog - - - QR-code - 二维码 - - regenerateAddressesDialog @@ -2284,218 +2306,218 @@ The 'Random Number' option is selected by default but deterministic ad settingsDialog - + Settings 设置 - + Start Bitmessage on user login 在用户登录时启动比特信 - + Tray 任务栏 - + Start Bitmessage in the tray (don't show main window) 启动比特信到托盘 （不要显示主窗口） - + Minimize to tray 最小化到托盘 - + Close to tray 关闭任务栏 - + Show notification when message received 在收到消息时提示 - + Run in Portable Mode 以便携方式运行 - + In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive. 在便携模式下， 消息和配置文件和程序保存在同一个目录而不是通常的程序数据文件夹。 这使在U盘中允许比特信很方便。 - + Willingly include unencrypted destination address when sending to a mobile device 愿意在发送到手机时使用不加密的目标地址 - + Use Identicons 用户身份 - + Reply below Quote 回复 引述如下 - + Interface Language 界面语言 - + System Settings system 系统设置 - + User Interface 用户界面 - + Listening port 监听端口 - + Listen for connections on port: 监听连接于端口： - + UPnP: UPnP: - + Bandwidth limit 带宽限制 - + Maximum download rate (kB/s): [0: unlimited] 最大下载速率(kB/秒): [0: 无限制] - + Maximum upload rate (kB/s): [0: unlimited] 最大上传速度 (kB/秒): [0: 无限制] - + Proxy server / Tor 代理服务器 / Tor - + Type: 类型： - + Server hostname: 服务器主机名： - + Port: 端口： - + Authentication 认证 - + Username: 用户名： - + Pass: 密码： - + Listen for incoming connections when using proxy 在使用代理时仍然监听入站连接 - + none 无 - + SOCKS4a SOCKS4a - + SOCKS5 SOCKS5 - + Network Settings 网络设置 - + Total difficulty: 总难度： - + The 'Total difficulty' affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work. “总难度”影响发送者所需要的做工总数。当这个值翻倍时，做工的总数也翻倍。 - + Small message difficulty: 小消息难度： - + When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. 当一个人向您发送消息的时候， 他们的电脑必须先做工。这个难度的默认值是1,您可以在创建新的地址前提高这个值。任何新创建的地址都会要求更高的做工量。这里有一个例外，当您将您的朋友添加到地址本的时候，比特信将自动提示他们，当他们下一次向您发送的时候，他们需要的做功量将总是1. - + The 'Small message difficulty' mostly only affects the difficulty of sending small messages. Doubling this value makes it almost twice as difficult to send a small message but doesn't really affect large messages. “小消息困难度”几乎仅影响发送消息。当这个值翻倍时，发小消息时做工的总数也翻倍，但是并不影响大的消息。 - + Demanded difficulty 要求的难度 - + Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable. - 你可以在这里设置您所愿意接受的发送消息的最大难度。0代表接受任何难度。 + 您可以在这里设置您所愿意接受的发送消息的最大难度。0代表接受任何难度。 - + Maximum acceptable total difficulty: 最大接受难度： - + Maximum acceptable small message difficulty: 最大接受的小消息难度： - + Max acceptable difficulty 最大可接受难度 @@ -2505,87 +2527,87 @@ The 'Random Number' option is selected by default but deterministic ad - + <html><head/><body><p>Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to <span style=" font-style:italic;">test. </span></p><p>(Getting your own Bitmessage address into Namecoin is still rather difficult).</p><p>Bitmessage can use either namecoind directly or a running nmcontrol instance.</p></body></html> <html><head/><body><p>比特信可以利用基于比特币的Namecoin让地址更加友好。比如除了告诉您的朋友您的长长的比特信地址，您还可以告诉他们发消息给 <span style=" font-style:italic;">test. </span></p><p>把您的地址放入Namecoin还是相当的难的.</p><p>比特信可以不但直接连接到namecoin守护程序或者连接到运行中的nmcontrol实例.</p></body></html> - + Host: 主机名： - + Password: 密码： - + Test 测试 - + Connect to: 连接到： - + Namecoind Namecoind - + NMControl NMControl - + Namecoin integration Namecoin整合 - + <html><head/><body><p>By default, if you send a message to someone and he is offline for more than two days, Bitmessage will send the message again after an additional two days. This will be continued with exponential backoff forever; messages will be resent after 5, 10, 20 days ect. until the receiver acknowledges them. Here you may change that behavior by having Bitmessage give up after a certain number of days or months.</p><p>Leave these input fields blank for the default behavior. </p></body></html> - <html><head/><body><p>您发给他们的消息默认会在网络上保存两天，之后比特信会再重发一次. 重发时间会随指数上升; 消息会在5, 10, 20... 天后重发并以此类推. 直到收到收件人的回执. 你可以在这里改变这一行为，让比特信在尝试一段时间后放弃.</p><p>留空意味着默认行为. </p></body></html> + <html><head/><body><p>您发给他们的消息默认会在网络上保存两天，之后比特信会再重发一次. 重发时间会随指数上升; 消息会在5, 10, 20... 天后重发并以此类推. 直到收到收件人的回执. 您可以在这里改变这一行为，让比特信在尝试一段时间后放弃.</p><p>留空意味着默认行为. </p></body></html> - + Give up after 在 - + and 和 - + days 天 - + months. 月后放弃。 - + Resends Expire 重发超时 - + Hide connection notifications 隐藏连接通知 - + Maximum outbound connections: [0: none] 最大外部连接：[0: 无] - + Hardware GPU acceleration (OpenCL): 硬件GPU加速(OpenCL)：