Skip to content

Commit

Permalink
new: updated readme about new features
Browse files Browse the repository at this point in the history
fix: no pdf export for x32 windows

fix: code cleanup
  • Loading branch information
4silvertooth committed Apr 11, 2023
1 parent f8c45cb commit 088a7e7
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 36 deletions.
44 changes: 21 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,20 @@
alt="QwikTape logo by Viral Ghelani" width="144" height="166">
Do calculations, annotate it like you would on a paper "qwikly".

```js
100.00 my wallet balance
- 40.00 food
═══════════
60.00
```
Create unlimited documents called tapes and switch between created tapes easily using browser like tabs.

<img src="build/main-screen.png" width="750">

# Features

* Write text, calculate, annotate it like you would on a paper or in a book.
* Never forget what was the calculation about by annotating it.
* Do calculations like addition `+`, subtraction `-`, division `÷`, multiplication `×`, percentage `%` and power `^`.
* Create unlimited tapes using [+] button in tabs bar, switch between tapes using tabs.
* Write text, calculations, and annotations with the same ease as you would on paper or in a book.
* Annotate your calculations to avoid forgetting what they were about.
* Perform calculations such as addition <kbd>+</kbd>, subtraction <kbd>-</kbd>, division <kbd>÷</kbd>, multiplication <kbd>×</kbd>, percentage <kbd>%</kbd>, and power <kbd>^</kbd>.
* Create unlimited tapes using `+` button in tabs bar, switch between tapes using browser like tabs.
* View/Rename/Delete your saved tapes in the Bookmark menu, use the top left menu to view all tapes.
* Tapes are auto saved.
* Tapes will auto save, allowing you to pick up right where you left off.
* The numbers will auto format and auto indented as you type.
* Numbers are formatted according to the locale.
* User can define variables and use it in calculations.
* Numbers are formatted according to your locale.
* You can define variables and use it in calculations.
* Hover cursor over variables to check it's value.
* Customize colors using the settings menu, number of decimals to use and indent length can be changed too.
* Customize colors using the settings menu <img src="src/assets/gear.svg" width="20">, number of decimals to display and indent length can be changed too.
* Tape calculation doesn't use operator precedence, the results will be as you would type it on a calculator.
```
1.00
Expand All @@ -34,8 +25,8 @@ Create unlimited documents called tapes and switch between created tapes easily
9.00
```
* Expressions use operator precedence. `myvar = 1 + 2 × 3` myvar is `7`.
* All the calculations are done with infinite precision, so [`0.1 + 0.2 = 0.3`](https://0.30000000000000004.com/)

* All calculations are performed with infinite precision, resulting in highly accurate and reliable results, so [`0.1 + 0.2 = 0.3`](https://0.30000000000000004.com/)
* Export your tape as PDF <img src="src/assets/pdf.svg" width="24">.

<br></br>
EITHER
Expand All @@ -62,10 +53,15 @@ The logo is inspired by the [Rail-Road](build/railroad-diagram.htm) diagram the

Also inspired by [CalcTape](https://calctape.app/), [Numi](https://numi.app/), [Soulver](https://soulver.app/), [Calca](http://calca.io/)

# Coming up.
* i18n
* Printing support
* PDF export
# Keyboard Shortcuts
| | Windows/Linux | Mac |
| :---: | :---: | :---: |
| New Tape | <kbd>Ctrl</kbd>+<kbd>T</kbd> | <kbd>&#8984;</kbd>+<kbd>T</kbd> |
| New Tape | <kbd>Ctrl</kbd>+<kbd>N</kbd> | <kbd>&#8984;</kbd>+<kbd>N</kbd> |
| Switch Tapes | <kbd>Ctrl</kbd>+<kbd>Tab</kbd> | <kbd>&#8984;</kbd>+<kbd>Tab</kbd> |
| Close Tape | <kbd>Ctrl</kbd>+<kbd>W</kbd> | <kbd>&#8984;</kbd>+<kbd>W</kbd> |
| Clear Tape | <kbd>ESC</kbd> * | <kbd>ESC</kbd> * |
*Select `Press ESC to clear tape content?` from settings to clear tape on pressing ESC.

# FAQ
To execute linux binary after downloading use this command.
Expand All @@ -78,6 +74,8 @@ To execute macosx binary use this command.
sudo chmod +x qwiktape
sudo xattr -d com.apple.quarantine qwiktape
```
# Coming up.
* i18n

# Developers
QwikTape uses awesome Sciter SDK for its gui and chevrotain for the parser,
Expand Down
2 changes: 1 addition & 1 deletion build/setupx32.iss
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ArchitecturesInstallIn64BitMode="x64"

[Files]
Source: {#SourcePath}\windows\{#ARCH}\qwiktape.exe; DestDir: "{app}"; DestName: {#executable}
Source: {#SourcePath}\windows\{#ARCH}\sciter-pdf.dll; DestDir: "{app}"; DestName: {#executable}
Source: {#SourcePath}\windows\{#ARCH}\sciter-pdf.dll; DestDir: "{app}";
Source: {#SourcePath}\..\sdk\bin\windows\{#ARCH}\sciter.dll; DestDir: "{app}"

[Run]
Expand Down
10 changes: 5 additions & 5 deletions main/res/qwiktape.rc
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_INDIA
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,3,0,0
PRODUCTVERSION 0,3,0,0
FILEVERSION 0,4,0,0
PRODUCTVERSION 0,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "TechViral"
VALUE "FileDescription", "Write Calculate Annotate"
VALUE "FileVersion", "0.3.0.0"
VALUE "FileVersion", "0.4.0.0"
VALUE "InternalName", "qwiktape.exe"
VALUE "LegalCopyright", "Copyright (C) 2022 Viral Ghelani @4silvertooth"
VALUE "LegalCopyright", "Copyright (C) 2023 Viral Ghelani @4silvertooth"
VALUE "OriginalFilename", "qwiktape.exe"
VALUE "ProductName", "QwikTape"
VALUE "ProductVersion", "0.3.0.0"
VALUE "ProductVersion", "0.4.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
5 changes: 0 additions & 5 deletions src/main.htm
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@

restoreWindowState() {
const winPos = Storage.getWindowState();
console.log(winPos);
if(winPos?.maximized){
Window.this.state = Window.WINDOW_MAXIMIZED;
}
Expand Down Expand Up @@ -187,10 +186,6 @@
this.componentUpdate({settings: evt.data});
}

["on save-window-state"](evt){
console.log("evt data", evt.data);
}

["on click at :root section.editor > div.controls > #pdf"](evt, el)=>{
const name = this.currentTape.name;
const file = Window.this.selectFile({
Expand Down
2 changes: 0 additions & 2 deletions src/parser/bignum.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ BigNumEnv.initLocale = function(format = NUMBER_LOCALE_STRING){
}

BigNumEnv.getLocale = function(format){
//console.log("getLocale> format >", format);

const match = /^\d{1,2}[^\d]?(\d{2,3})([^\d])?\d{3}([^\d])(\d+)$/m.exec(format);
if(!match) {
return null;
Expand Down

0 comments on commit 088a7e7

Please sign in to comment.