From c40dc4edf66e9ff817e9971c7376cdd7e2ed3764 Mon Sep 17 00:00:00 2001 From: Sander Land Date: Wed, 3 Jun 2020 19:02:53 +0200 Subject: [PATCH] no dp sizing --- INSTALL.md | 4 ++-- README.md | 4 ++-- katrain/__main__.py | 2 -- katrain/core/constants.py | 2 +- katrain/gui.kv | 4 ++-- katrain/gui/widgets/filebrowser.py | 12 ++++++------ katrain/popups.kv | 6 +++--- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index afb0452..76046cf 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -45,9 +45,9 @@ Older linux machines may have trouble installing, you can try to manually instal The following packages may help resolve missing OS packages for Kivy or KataGo. ``` sudo apt-get install python3-pip build-essential git python3 python3-dev ffmpeg libsdl2-dev libsdl2-image-dev\ - libsdl2-mixer-dev libsdl2-ttf-dev libportmidi-dev libswscale-dev libavformat-dev libavcodec-dev zlib1g-dev \ + libsdl2-mixer-dev libsdl2-ttf-dev libportmidi-dev libswscale-dev libavformat-dev libavcodec-dev zlib1g-dev\ libgstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good\ - pkg-config libgl-dev opencl-headers ocl-icd-opencl-dev + pkg-config libgl-dev opencl-headers ocl-icd-opencl-dev python3-pygame ``` Then, try installing python package dependencies using: ``` diff --git a/README.md b/README.md index 99f4f34..05b6813 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ In addition to shortcuts mentioned above and those shown in the main menu: * **[Shift]**: Open the main menu. * **[Tab]**: Switch between analysis and play modes. -* **[~]** or **[`]** or **[m]**: Toggles only showing the board. +* **[~]** or **[ ` ]** or **[m]**: Toggles only showing the board. * **[p]**: Pass * **[spacebar]**: Pause/Resume timer * **[arrow up]** or **[z]**: Undo move. Hold shift for 10 moves at a time, or ctrl to skip to the start. @@ -131,7 +131,7 @@ In addition to shortcuts mentioned above and those shown in the main menu: [![GitHub issues](https://img.shields.io/github/issues/sanderland/katrain)](https://github.com/sanderland/katrain/issues) [![GitHub contributors](https://img.shields.io/github/contributors/sanderland/katrain?label=github%20contributors)](https://github.com/sanderland/katrain/graphs/contributors) [![Liberapay Patrons](https://img.shields.io/liberapay/patrons/KaTrain)](https://liberapay.com/sanderbaduk/) -![Github sponsors](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=dcb424&link=https://github.com/sponsors/sanderland/) +[![Github sponsors](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=dcb424&link=https://github.com/sponsors/sanderland/)](https://github.com/sponsors/sanderland) * Donations for improving and promoting KaTrain are taken supported through [Liberapay](https://liberapay.com/KaTrain/). * You also can contact me on [discord](https://discord.gg/AjTPFpN) (Sander#3278), [KakaoTalk](https://open.kakao.com/o/gTsMJCac) diff --git a/katrain/__main__.py b/katrain/__main__.py index 2d1c528..323ddc5 100644 --- a/katrain/__main__.py +++ b/katrain/__main__.py @@ -66,8 +66,6 @@ from katrain.gui.badukpan import AnalysisControls, BadukPanControls, BadukPanWid from katrain.gui.controlspanel import ControlsPanel - - class KaTrainGui(Screen, KaTrainBase): """Top level class responsible for tying everything together""" diff --git a/katrain/core/constants.py b/katrain/core/constants.py index ad4fbcd..1a15251 100644 --- a/katrain/core/constants.py +++ b/katrain/core/constants.py @@ -1,4 +1,4 @@ -VERSION = "1.1.0" +VERSION = "1.1.1" HOMEPAGE = "https://github.com/sanderland/katrain" PLAYER_HUMAN, PLAYER_AI = "player:human", "player:ai" diff --git a/katrain/gui.kv b/katrain/gui.kv index 3998790..a51a251 100644 --- a/katrain/gui.kv +++ b/katrain/gui.kv @@ -34,7 +34,7 @@ #:set GRAPH_DOT_COLOR [0.85, 0.3, 0.3,1] #:set BUTTON_INACTIVE_COLOR LIGHTGREY -#:set NOTES_FONT_SIZE dp(18) +#:set NOTES_FONT_SIZE 18 # for sizing help @@ -713,7 +713,7 @@ width: 0 Label: id: label - size: dp(30) + size: 30 font_size: root.font_size text: root.text color: LIGHTGREY diff --git a/katrain/gui/widgets/filebrowser.py b/katrain/gui/widgets/filebrowser.py index b8ffb39..9f0ba06 100644 --- a/katrain/gui/widgets/filebrowser.py +++ b/katrain/gui/widgets/filebrowser.py @@ -128,7 +128,7 @@ Builder.load_string( is_selected: self.path in ctx.controller().selection orientation: 'horizontal' size_hint_y: None - height: '24dp' + height: 24 # Don't allow expansion of the ../ node is_leaf: not ctx.isdir or ctx.name.endswith('..' + ctx.sep) or self.locked on_touch_down: self.collide_point(*args[1].pos) and ctx.controller().entry_touched(self, args[1]) @@ -136,7 +136,7 @@ Builder.load_string( BoxLayout: pos: root.pos size_hint_x: None - width: root.width - dp(10) + width: root.width - 10 Label: id: filename text_size: self.width, None @@ -202,9 +202,9 @@ Builder.load_string( orientation: 'vertical' Label: size_hint_y: None - height: '22dp' + height: 22 text_size: self.size - padding_x: '10dp' + padding_x: 10 text: abspath(root.path) track_lang: i18n._('') valign: 'middle' @@ -231,11 +231,11 @@ Builder.load_string( text: (root.selection and (root._shorten_filenames(root.selection) if root.multiselect else root.selection[0])) or '' hint_text: i18n._('Filename') multiline: False - height: '40dp' + height: 40 AutoSizedRoundedRectangleButton: id: select_button padding_x: 15 - height: '40dp' + height: 40 size_hint_x: None text: root.select_string on_release: root.dispatch('on_success') diff --git a/katrain/popups.kv b/katrain/popups.kv index d487425..52e3d47 100644 --- a/katrain/popups.kv +++ b/katrain/popups.kv @@ -8,8 +8,8 @@ #:set CP_SMALL_SPACING 3 #:set CP_PADDING 6 -#:set INPUT_FONT_SIZE dp(25) -#:set DESC_FONT_SIZE dp(20) +#:set INPUT_FONT_SIZE 25 +#:set DESC_FONT_SIZE 20 #:import BACKGROUND_COLOR katrain.gui.style.BACKGROUND_COLOR #:import BOX_BACKGROUND_COLOR katrain.gui.style.BOX_BACKGROUND_COLOR @@ -29,7 +29,7 @@ helper_text: "" : - font_size: dp(16) + font_size: 16 multiline: True # just for wrapping helper_text_mode: "on_error" helper_text: i18n._("file not found")