Skip to content

Commit

Permalink
The appearance is more compact, the text is in the line on the right,…
Browse files Browse the repository at this point in the history
… the copyright file has been added, unnecessary files have been removed from the deb
  • Loading branch information
limafresh committed Nov 10, 2024
1 parent 1fac94f commit 1f000d5
Show file tree
Hide file tree
Showing 13 changed files with 224 additions and 190 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sudo add-apt-repository ppa:limafresh/pyqulator
sudo apt update
sudo apt install pyqulator
```
### From PyPi via pip
### From PyPi via pip (any OS)
```bash
pip install pyqulator
```
Expand All @@ -40,6 +40,8 @@ pyqulator
Or run it from the applications menu (it doesn't work from PyPi).

## Screenshots
Screenshots taken on Lubuntu 24.10.

*Standard mode*

![Screenshot](https://raw.githubusercontent.com/limafresh/pyqulator/main/screenshots/screenshot1.png)
Expand Down
6 changes: 3 additions & 3 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pyqulator (1.11.0.post1-noble) noble; urgency=medium
pyqulator (1.12.0-noble) noble; urgency=medium

* Initial release
* The appearance is more compact, the text is in the line on the right, the copyright file has been added, unnecessary files have been removed from the deb

-- limafresh <limafresh@proton.me> Thu, 07 Nov 2024 15:47:33 +0200
-- limafresh <limafresh@proton.me> Sun, 10 Nov 2024 11:27:01 +0200
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Standards-Version: 4.5.0
Homepage: https://github.com/limafresh/pyqulator

Package: pyqulator
Description: A fully functional Qt calculator written in Python using Sympy for calculations.
Description: A fully functional Qt calculator written in Python using Sympy for calculations
Features
+ Simple and lightweight
+ Standard, engineer and paper modes
Expand Down
29 changes: 29 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: pyqulator
Upstream-Contact: limafresh <limafresh@proton.me>
Source: http://github.com/limafresh/pyqulator

Files: *
Copyright: 2024 limafresh <limafresh@proton.me>
License: GPL-3+

License: GPL-3+
Pyqulator, a lightweight Qt calculator
Copyright (C) 2024 limafresh

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/.

On Debian systems, the full text of the GNU General Public
License version 3 can be found in the file
'/usr/share/common-licenses/GPL-3'.
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ override_dh_auto_install:
mkdir -p debian/pyqulator/usr/bin
cp -a pyqulator debian/pyqulator/usr/bin/
mkdir -p debian/pyqulator/usr/lib/python3/dist-packages/pyqulator
cp -a src/pyqulator/* debian/pyqulator/usr/lib/python3/dist-packages/pyqulator/
rsync -av --exclude="*.ts" --exclude="*.ui" src/pyqulator/ debian/pyqulator/usr/lib/python3/dist-packages/pyqulator/
mkdir -p debian/pyqulator/usr/share/applications
cp -a pyqulator.desktop debian/pyqulator/usr/share/applications/
mkdir -p debian/pyqulator/usr/share/doc/pyqulator
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "pyqulator"
version = "1.11.0.post1"
version = "1.12.0"
dependencies = [
"PyQt6>=6.4.2",
"sympy>=1.13.3",
Expand Down
Binary file modified screenshots/screenshot1.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshots/screenshot2.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshots/screenshot3.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshots/screenshot4.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 15 additions & 15 deletions src/pyqulator/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def sum(self):
for button in buttons:
button.clicked.connect(lambda checked, btn=button: self.write_symbol(btn.text()))

equal_buttons = [self.ui.btn_equal, self.ui.btn_equal_2, self.ui.btn_equal_3]
equal_buttons = [self.ui.btn_equal, self.ui.btn_equal_2, self.ui.btn_calculate]
for btn_equal in equal_buttons:
btn_equal.clicked.connect(self.calculate)
clear_buttons = [self.ui.btn_clear, self.ui.btn_clear_2]
Expand Down Expand Up @@ -554,24 +554,24 @@ def line_result_paste(self):
self.clear_line_result()

def line_top(self):
while self.ui.horizontalLayout.count():
widget = self.ui.horizontalLayout.takeAt(0).widget()
self.ui.horizontalLayout.removeWidget(widget)
self.ui.verticalLayout.removeItem(self.ui.horizontalLayout)
self.ui.verticalLayout.insertLayout(0, self.ui.horizontalLayout)
self.ui.horizontalLayout.addWidget(self.ui.line_result_3)
self.ui.horizontalLayout.addWidget(self.ui.btn_equal_3)
while self.ui.line_result_3_layout.count():
widget = self.ui.line_result_3_layout.takeAt(0).widget()
self.ui.line_result_3_layout.removeWidget(widget)
self.ui.paper_page_layout.removeItem(self.ui.line_result_3_layout)
self.ui.paper_page_layout.insertLayout(0, self.ui.line_result_3_layout)
self.ui.line_result_3_layout.addWidget(self.ui.line_result_3)
self.ui.line_result_3_layout.addWidget(self.ui.btn_calculate)
settings = QSettings("pyqulator")
settings.setValue("paper_mode_line", "top")

def line_down(self):
while self.ui.horizontalLayout.count():
widget = self.ui.horizontalLayout.takeAt(0).widget()
self.ui.horizontalLayout.removeWidget(widget)
self.ui.verticalLayout.removeItem(self.ui.horizontalLayout)
self.ui.verticalLayout.addLayout(self.ui.horizontalLayout)
self.ui.horizontalLayout.addWidget(self.ui.line_result_3)
self.ui.horizontalLayout.addWidget(self.ui.btn_equal_3)
while self.ui.line_result_3_layout.count():
widget = self.ui.line_result_3_layout.takeAt(0).widget()
self.ui.line_result_3_layout.removeWidget(widget)
self.ui.paper_page_layout.removeItem(self.ui.line_result_3_layout)
self.ui.paper_page_layout.addLayout(self.ui.line_result_3_layout)
self.ui.line_result_3_layout.addWidget(self.ui.line_result_3)
self.ui.line_result_3_layout.addWidget(self.ui.btn_calculate)
settings = QSettings("pyqulator")
settings.setValue("paper_mode_line", "down")

Expand Down
Loading

0 comments on commit 1f000d5

Please sign in to comment.