baseconvert 2.0.1__tar.gz → 2.0.3__tar.gz

{baseconvert-2.0.1/baseconvert.egg-info → baseconvert-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: baseconvert
-Version: 2.0.1
+Version: 2.0.3
 Summary: Convert numbers between bases.
 Home-page: https://github.com/BreadMakesYouFull/baseconvert.git
 Author: squdle, BreadMakesYouFull

{baseconvert-2.0.1 → baseconvert-2.0.3}/README.md

@@ -7,6 +7,10 @@ Convert rational numbers between bases.
 
 [https://github.com/BreadMakesYouFull/baseconvert](https://github.com/BreadMakesYouFull/baseconvert)
 
+<a href='https://flathub.org/apps/io.github.breadmakesyoufull.baseconvert'>
+  <img width='128' alt='Get it on Flathub' src='https://flathub.org/api/badge?locale=en'/>
+</a>
+
 ## Install
 
 Requires:

baseconvert-2.0.3/VERSION.txt

@@ -0,0 +1 @@
+2.0.3

{baseconvert-2.0.1 → baseconvert-2.0.3}/baseconvert/ButtonRow.qml

@@ -17,18 +17,19 @@ Item {
    property bool enable5: true
    property bool enable6: true
    signal buttonPressed(text: string)
-   property color color1: "#333333"
-   property color colorText1: "#ffffff"
-   property color color2: "#333333"
-   property color colorText2: "#ffffff"
-   property color color3: "#333333"
-   property color colorText3: "#ffffff"
-   property color color4: "#333333"
-   property color colorText4: "#ffffff"
-   property color color5: "#333333"
-   property color colorText5: "#ffffff"
-   property color color6: "#333333"
-   property color colorText6: "#ffffff"
+   property bool darkMode: Application.styleHints.colorScheme === Qt.ColorScheme.Dark
+   property color color1: darkMode ? "#333333" : "#ffffff"
+   property color colorText1: darkMode ? "#ffffff" : "#000000"
+   property color color2: darkMode ? "#333333" : "#ffffff"
+   property color colorText2: darkMode ? "#ffffff" : "#000000"
+   property color color3: darkMode ? "#333333" : "#ffffff"
+   property color colorText3: darkMode ? "#ffffff" : "#000000"
+   property color color4: darkMode ? "#333333" : "#ffffff"
+   property color colorText4: darkMode ? "#ffffff" : "#000000"
+   property color color5: darkMode ? "#333333" : "#ffffff"
+   property color colorText5: darkMode ? "#ffffff" : "#000000"
+   property color color6: darkMode ? "#333333" : "#ffffff"
+   property color colorText6: darkMode ? "#ffffff" : "#000000"
    RowLayout {
       anchors.fill: parent
       Button {

{baseconvert-2.0.1 → baseconvert-2.0.3}/baseconvert/app.qml

@@ -4,15 +4,31 @@ import QtQuick.Layouts
 
 
 ApplicationWindow {
+    id: main
     width: 400
     height: 400
+    minimumWidth: 300
+    minimumHeight: 150
     visible: true
     title: "baseconvert"
     property string result: ""
 
-    font.family: "monospace"
+    property bool darkMode: Application.styleHints.colorScheme === Qt.ColorScheme.Dark
+    font: Qt.font({
+                bold: true,
+                underline: false,
+                pixelSize: ((main.height > 300) ? ((main.height > main.width) ? main.width / 30 : main.height / 30) : main.height / 8) * 1.1, // resize relative to parent
+                family: "monospace"
+        })
+    property var fontLarge: Qt.font({
+                bold: true,
+                underline: false,
+                pixelSize: main.font.pixelSize * 1.5,
+                family: "monospace"
+        })
 
     ColumnLayout {
+        id: mainLayout
         anchors.fill: parent
         RowLayout {
             TextField {
@@ -20,45 +36,44 @@ ApplicationWindow {
                 Layout.fillWidth: true
                 Layout.columnSpan: 1
                 placeholderText: qsTr("Input")
+                font: main.fontLarge
                 onTextChanged: {
                     input.text = input.text.toUpperCase().replace(/[^A-Z0-9.]/g, '')
                     backend.input_changed(input.text, from.value, to.value);
                 }
                 width: parent.width
-                font.pointSize: 18
                 focus: true
             }
         }
         RowLayout {
             Label {
-                text: "```From base  ```"
-                textFormat: Text.MarkdownText
-                Layout.fillWidth: false
-                Layout.preferredWidth: parent.width / 3
+                id: from_text
+                text: "from 10"
                 horizontalAlignment: Qt.AlignRight
             }
-            SpinBox {
+            Slider {
                 id: from
                 Layout.fillWidth: true
+                Layout.columnSpan: 2
                 from: 2
                 value: 10
                 to: 36
                 stepSize: 1
-                editable: true
                 onValueChanged: {
                     backend.input_changed(input.text, from.value, to.value);
+                    from_text.text = "from " + from.value.toString();
                 }
+                handle.implicitWidth: to_text.height
+                handle.implicitHeight: to_text.height
             }
         }
         RowLayout {
             Label {
-                text: "```To base  ```"
-                textFormat: Text.MarkdownText
-                Layout.fillWidth: false
-                Layout.preferredWidth: parent.width / 3
+                id: to_text
+                text: "  to 36"
                 horizontalAlignment: Qt.AlignRight
             }
-            SpinBox {
+            Slider {
                 id: to
                 Layout.fillWidth: true
                 Layout.columnSpan: 2
@@ -66,25 +81,27 @@ ApplicationWindow {
                 value: 36
                 to: 36
                 stepSize: 1
-                editable: true
                 onValueChanged: {
                     backend.input_changed(input.text, from.value, to.value);
+                    to_text.text = "  to " + to.value.toString();
                 }
+                handle.implicitWidth: to_text.height
+                handle.implicitHeight: to_text.height
             }
         }
         ColumnLayout {
-            TextArea {
+            TextField {
                 id: output
                 text: backend.result
                 Layout.fillWidth: true
                 Layout.columnSpan: 1
+                font: main.fontLarge
                 readOnly: true
                 width: parent.width
-                font.pointSize: 18
-                //wrapMode: Text.WrapAnywhere
             }
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: true
             text1: "FLIP"
@@ -93,10 +110,10 @@ ApplicationWindow {
             text4: "< DELETE"
             enable5: false
             enable6: false
-            color1: "#0D47A1"
-            color2: "#C8090B"
-            color3: "#C8090B"
-            color4: "#C63100"
+            color1: darkMode ? "#0D47A1" : "#275fb8"
+            color2: darkMode ? "#C8090B" : "#f51618"
+            color3: darkMode ? "#C8090B" : "#f51618"
+            color4: darkMode ? "#C63100" : "#ff6633"
             onButtonPressed: (text) => {
                 if( text == "FLIP"){
                     var base_from = from.value;
@@ -126,6 +143,7 @@ ApplicationWindow {
             }
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: true
             text1: "V"
@@ -140,12 +158,13 @@ ApplicationWindow {
             enable5: (from.value >= 36) ? true : false
             enable6: true
             text6: "."
-            color6: "#006064"
+            color6: darkMode ? "#006064" : "#109ba1"
             onButtonPressed: (text) => {
                 input.text += text
             }
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 26) ? true : false
             text1: "P"
@@ -163,6 +182,7 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 20) ? true : false
             text1: "J"
@@ -180,6 +200,7 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 14) ? true : false
             text1: "D"
@@ -197,6 +218,7 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 8) ? true : false
             text1: "7"
@@ -214,6 +236,7 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 2) ? true : false
             text1: "1"
@@ -231,10 +254,11 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: true
             text1: "0"
-            color1: "#0D47A1"
+            color1: darkMode ? "#0D47A1" : "#275fb8"
             onButtonPressed: (text) => {input.text += text}
             enable2: false
             enable3: false

{baseconvert-2.0.1 → baseconvert-2.0.3/baseconvert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: baseconvert
-Version: 2.0.1
+Version: 2.0.3
 Summary: Convert numbers between bases.
 Home-page: https://github.com/BreadMakesYouFull/baseconvert.git
 Author: squdle, BreadMakesYouFull

baseconvert-2.0.1/VERSION.txt

@@ -1 +0,0 @@
-2.0.1