From 0def75552649c7edde9f33d272ce3e03728af408 Mon Sep 17 00:00:00 2001
From: Nathan_SR <cquickcal@gmail.com>
Date: Sat, 16 Dec 2017 22:58:07 +0530
Subject: [PATCH] On branch master new file: LICENSE modified:
quickcal modified: quickcal.1.gz modified: quickcal.glade
new file: setup.py
---
LICENSE | 15 ++++++
quickcal | 138 +++++++++++++++++++++++++------------------------
quickcal.1.gz | Bin 549 -> 560 bytes
quickcal.glade | 2 +-
setup.py | 16 ++++++
5 files changed, 102 insertions(+), 69 deletions(-)
create mode 100644 LICENSE
create mode 100644 setup.py
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..ff82b02
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,15 @@
+# License
+
+ * GNU General Public License (GPL)
+
+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.
+
+Quickcal Copyright (c) Nathan SR <cquickcal@gmail.com>
+num Copyright (c) Joel Parker Henderson / SixArm
diff --git a/quickcal b/quickcal
index 599fa1d..bd287e7 100755
--- a/quickcal
+++ b/quickcal
@@ -46,38 +46,38 @@ def check_existenceiii(text):
# Following executes os commands after replacing any currency symbols in input
def execute_command(dc):
- start = textbuffer.get_start_iter()
- end = textbuffer.get_end_iter()
- if check_existence(textbuffer.get_text(start,end,"false")):
- result.set_text("Input Contains Non Numerical Characters")
- else:
- static_command = "echo " + textbuffer.get_text(start,end,"false").replace('\n', ' ').replace('\r', ' ').replace('$', '').replace(',', '').replace('Ø‹', '').replace('.د.ب', '').replace('¢', '').replace('£', '').replace('Â¥', '').replace('৳', '').replace('฿', '').replace('៛', '').replace('â‚¡', '').replace('â‚¥', '').replace('₦', '').replace('â‚©', '').replace('₪', '').replace('â‚«', '').replace('€', '').replace('â‚', '').replace('â‚®', '').replace('₱', '').replace('₲', '').replace('â‚´', '').replace('₹', '').replace('Æ’', '').replace('د.Ø¥', '').replace('د.ت', '').replace('د.ع', '').replace('د.Ùƒ', '').replace('د.Ù….', '').replace('دج', '').replace('ر.س', '').replace('ر.ع.', '').replace('ر.Ù‚', '').replace('ر.ÙŠ', '').replace('Ù„.د', '')
- full_command = static_command + dc
- proc = subprocess.Popen(full_command,stdout=subprocess.PIPE,stderr=subprocess.PIPE,shell=True)
- (out, err) = proc.communicate()
- # outwithoutreturn = out.rstrip('\n')
- if err:
- result.set_text("Input Contains Non Numerical Characters")
- else:
- result.set_text(out.rstrip('\n'))
+ start = textbuffer.get_start_iter()
+ end = textbuffer.get_end_iter()
+ if check_existence(textbuffer.get_text(start,end,"false")):
+ result.set_text("Input Contains Non Numerical Characters")
+ else:
+ static_command = "echo " + textbuffer.get_text(start,end,"false").replace('\n', ' ').replace('\r', ' ').replace('$', '').replace(',', '').replace('Ø‹', '').replace('.د.ب', '').replace('¢', '').replace('£', '').replace('Â¥', '').replace('৳', '').replace('฿', '').replace('៛', '').replace('â‚¡', '').replace('â‚¥', '').replace('₦', '').replace('â‚©', '').replace('₪', '').replace('â‚«', '').replace('€', '').replace('â‚', '').replace('â‚®', '').replace('₱', '').replace('₲', '').replace('â‚´', '').replace('₹', '').replace('Æ’', '').replace('د.Ø¥', '').replace('د.ت', '').replace('د.ع', '').replace('د.Ùƒ', '').replace('د.Ù….', '').replace('دج', '').replace('ر.س', '').replace('ر.ع.', '').replace('ر.Ù‚', '').replace('ر.ÙŠ', '').replace('Ù„.د', '')
+ full_command = static_command + dc
+ proc = subprocess.Popen(full_command,stdout=subprocess.PIPE,stderr=subprocess.PIPE,shell=True,universal_newlines=True)
+ (out, err) = proc.communicate()
+ # outwithoutreturn = out.rstrip('\n')
+ if err:
+ result.set_text("Input Contains Non Numerical Characters")
+ else:
+ result.set_text(out.rstrip('\n'))
def execute_commandii():
- start = textbuffer.get_start_iter()
- end = textbuffer.get_end_iter()
- if not check_existenceii(textbuffer.get_text(start,end,"false")):
- result.set_text("BM needs any of +,-,*,/,%,^,() operators")
- elif check_existenceiii(textbuffer.get_text(start,end,"false")):
- result.set_text("Input Contains Invalid Characters")
- else:
- full_command = "awk \"BEGIN {printf \\\"%." + str(spinbutton.get_value_as_int()) + "f\\\", " + textbuffer.get_text(start,end,"false").replace('\n', ' ').replace('\r', ' ').replace('$', '').replace(',', ',').replace('Ø‹', '').replace('.د.ب', '').replace('¢', '').replace('£', '').replace('Â¥', '').replace('৳', '').replace('฿', '').replace('៛', '').replace('â‚¡', '').replace('â‚¥', '').replace('₦', '').replace('â‚©', '').replace('₪', '').replace('â‚«', '').replace('€', '').replace('â‚', '').replace('â‚®', '').replace('₱', '').replace('₲', '').replace('â‚´', '').replace('₹', '').replace('Æ’', '').replace('د.Ø¥', '').replace('د.ت', '').replace('د.ع', '').replace('د.Ùƒ', '').replace('د.Ù….', '').replace('دج', '').replace('ر.س', '').replace('ر.ع.', '').replace('ر.Ù‚', '').replace('ر.ÙŠ', '').replace('Ù„.د', '') + "}\""
- proc = subprocess.Popen(full_command,stdout=subprocess.PIPE,stderr=subprocess.PIPE,shell=True)
- (out, err) = proc.communicate()
- # outwithoutreturn = out.rstrip('\n')
- if err:
- result.set_text("Input Contains Invalid Characters")
- else:
- result.set_text(out)
+ start = textbuffer.get_start_iter()
+ end = textbuffer.get_end_iter()
+ if not check_existenceii(textbuffer.get_text(start,end,"false")):
+ result.set_text("BM needs any of +,-,*,/,%,^,() operators")
+ elif check_existenceiii(textbuffer.get_text(start,end,"false")):
+ result.set_text("Input Contains Invalid Characters")
+ else:
+ full_command = "awk \"BEGIN {printf \\\"%." + str(spinbutton.get_value_as_int()) + "f\\\", " + textbuffer.get_text(start,end,"false").replace('\n', ' ').replace('\r', ' ').replace('$', '').replace(',', ',').replace('Ø‹', '').replace('.د.ب', '').replace('¢', '').replace('£', '').replace('Â¥', '').replace('৳', '').replace('฿', '').replace('៛', '').replace('â‚¡', '').replace('â‚¥', '').replace('₦', '').replace('â‚©', '').replace('₪', '').replace('â‚«', '').replace('€', '').replace('â‚', '').replace('â‚®', '').replace('₱', '').replace('₲', '').replace('â‚´', '').replace('₹', '').replace('Æ’', '').replace('د.Ø¥', '').replace('د.ت', '').replace('د.ع', '').replace('د.Ùƒ', '').replace('د.Ù….', '').replace('دج', '').replace('ر.س', '').replace('ر.ع.', '').replace('ر.Ù‚', '').replace('ر.ÙŠ', '').replace('Ù„.د', '') + "}\""
+ proc = subprocess.Popen(full_command,stdout=subprocess.PIPE,stderr=subprocess.PIPE,shell=True,universal_newlines=True)
+ (out, err) = proc.communicate()
+ # outwithoutreturn = out.rstrip('\n')
+ if err:
+ result.set_text("Input Contains Invalid Characters")
+ else:
+ result.set_text(out)
# Following functions creates folder, does filing and viewing of files
@@ -95,15 +95,15 @@ def fileit():
datestring = datetime.strftime(datetime.now(), '%Y-%m-%d')
try:
- f = open(path + '/' + 'Inputs_' + datestring + '.txt', 'a+')
- start = textbuffer.get_start_iter()
- end = textbuffer.get_end_iter()
- f.write ('\n' + '\n' + textbuffer.get_text(start,end,"false"))
- f.close()
+ f = open(path + '/' + 'Inputs_' + datestring + '.txt', 'a+')
+ start = textbuffer.get_start_iter()
+ end = textbuffer.get_end_iter()
+ f.write ('\n' + '\n' + textbuffer.get_text(start,end,"false"))
+ f.close()
- g = open(path + '/' + 'Results_' + datestring + '.txt', 'a+')
- g.write ('\n' + '\n' + result.get_text())
- g.close()
+ g = open(path + '/' + 'Results_' + datestring + '.txt', 'a+')
+ g.write ('\n' + '\n' + result.get_text())
+ g.close()
result.set_text("Filed Successfully")
@@ -116,10 +116,12 @@ def viewit(file):
from datetime import datetime
datestring = datetime.strftime(datetime.now(), '%Y-%m-%d')
- if sys.platform == 'linux2':
- subprocess.call(["xdg-open", path + '/' + file + datestring + '.txt'])
- else:
- os.startfile(path + '/' + file + datestring + '.txt')
+ subprocess.call(["xdg-open", path + '/' + file + datestring + '.txt'])
+
+ # if sys.platform == 'linux2':
+ # subprocess.call(["xdg-open", path + '/' + file + datestring + '.txt'])
+ # else:
+ # os.startfile(path + '/' + file + datestring + '.txt')
class Handler:
@@ -127,59 +129,59 @@ class Handler:
# Calculator buttons and their respective clicked actions. Calls the functions above with their respective parameters.
def basicbutton(self, button):
- execute_commandii()
+ execute_commandii()
def sumbutton(self, button):
- dynamic_command = " | awk '{ for(i=1; i<=NF;i++) j+=$i; printf \"%." + str(spinbutton.get_value_as_int()) + "f\", j; j=0 }'"
- execute_command(dynamic_command)
+ dynamic_command = " | awk '{ for(i=1; i<=NF;i++) j+=$i; printf \"%." + str(spinbutton.get_value_as_int()) + "f\", j; j=0 }'"
+ execute_command(dynamic_command)
def averagebutton(self, button):
- dynamic_command = " | awk '{ for(i=1; i<=NF;i++) j+=$i; printf \"%." + str(spinbutton.get_value_as_int()) + "f\", j/NF; j=0 }'"
- execute_command(dynamic_command)
+ dynamic_command = " | awk '{ for(i=1; i<=NF;i++) j+=$i; printf \"%." + str(spinbutton.get_value_as_int()) + "f\", j/NF; j=0 }'"
+ execute_command(dynamic_command)
def countbutton(self, button):
- dynamic_command = " | awk '{ printf NF }'"
- execute_command(dynamic_command)
+ dynamic_command = " | awk '{ printf NF }'"
+ execute_command(dynamic_command)
def minimumbutton(self, button):
- dynamic_command = " | awk '{m=$1;for(i=1;i<=NF;i++)if($i<m)m=$i;printf m}'"
- execute_command(dynamic_command)
+ dynamic_command = " | awk '{m=$1;for(i=1;i<=NF;i++)if($i<m)m=$i;printf m}'"
+ execute_command(dynamic_command)
def maximumbutton(self, button):
- dynamic_command = " | awk '{m=$1;for(i=1;i<=NF;i++)if($i>m)m=$i;printf m}'"
- execute_command(dynamic_command)
+ dynamic_command = " | awk '{m=$1;for(i=1;i<=NF;i++)if($i>m)m=$i;printf m}'"
+ execute_command(dynamic_command)
def rangebutton(self, button):
- dynamic_command = " | awk '{{min=max=$i};for(i=1;i<=NF;i++){if($i>max) {max=$i} if($i<min) {min=$i}} } END {printf \"%." + str(spinbutton.get_value_as_int()) + "f\", max-min}'"
- execute_command(dynamic_command)
+ dynamic_command = " | awk '{{min=max=$i};for(i=1;i<=NF;i++){if($i>max) {max=$i} if($i<min) {min=$i}} } END {printf \"%." + str(spinbutton.get_value_as_int()) + "f\", max-min}'"
+ execute_command(dynamic_command)
def stddevbutton(self, button):
- dynamic_command = " | awk '{ A=0; V=0; for(N=1; N<=NF; N++) A+=$N ; A/=NF ; for(N=1; N<=NF; N++) V+=(($N-A)*($N-A))/(NF-1); printf \"%." + str(spinbutton.get_value_as_int()) + "f\", sqrt(V) }'"
- execute_command(dynamic_command)
+ dynamic_command = " | awk '{ A=0; V=0; for(N=1; N<=NF; N++) A+=$N ; A/=NF ; for(N=1; N<=NF; N++) V+=(($N-A)*($N-A))/(NF-1); printf \"%." + str(spinbutton.get_value_as_int()) + "f\", sqrt(V) }'"
+ execute_command(dynamic_command)
def comboboxtext1_changed(self, comboboxtext):
- dynamic_command = " | num " + ourcomboboxtext.get_active_text() + " OFMT=\"%." + str(spinbutton.get_value_as_int()) + "f\""
- execute_command(dynamic_command)
+ dynamic_command = " | num " + ourcomboboxtext.get_active_text() + " OFMT=\"%." + str(spinbutton.get_value_as_int()) + "f\""
+ execute_command(dynamic_command)
def clearbutton(self, button):
- textbuffer.set_text("")
- result.set_text("")
- textview.grab_focus()
+ textbuffer.set_text("")
+ result.set_text("")
+ textview.grab_focus()
def detailsbutton(self, button):
- ouraboutwindow.set_transient_for(window)
- ouraboutwindow.run()
- ouraboutwindow.hide()
- # ouraboutwindow.destroy()
+ ouraboutwindow.set_transient_for(window)
+ ouraboutwindow.run()
+ ouraboutwindow.hide()
+ # ouraboutwindow.destroy()
def fileitbutton(self, button):
- fileit()
+ fileit()
def view_todays_inputs_button(self, button):
- viewit("Inputs_")
+ viewit("Inputs_")
def view_todays_results_button(self, button):
- viewit("Results_")
+ viewit("Results_")
builder = Gtk.Builder()
diff --git a/quickcal.1.gz b/quickcal.1.gz
index 8281a5adc15a0fefad60ab1fe147b099c5c04087..54e114cadb2d3594939c94092703cb3b4b6bcea4 100644
GIT binary patch
literal 560
zcmV-00?+*)iwFo1KQ&qa195d}V{2n!Y%VbXjZ;gH(=ZUe`&W!AA@RtD?Me$5gy@#S
zR@$aZ(>)-qkS4C%nmV3fJCy!=#!ga@0EtT@&&>CjNAt%KEYLQ%Q?Mlm-&!pX5=}00
z&P>S$lmX-rez&Vpn_N;2fk2XTiqpzDavm5SP7Qg+u5Y163u72vT|+_N;p%eydc?2%
zl79!bR1>8~A}?>Dm@H=EoO`^0c>wJJ;RE^rXg4rJe~QAbS1?5*TZ4gBk2>tZw@pJX
zq%OAFXuHc3Yx%iY-k0<8%$%a{XXSJ?zhBRnh4?f`{*PFe1RCY|Q?m$69IMwVXelD9
z3>dWM7xN7$P1a|C0lv1(9rg;OVM(AZ>s4(CWb@c88be3l8RfY!3-hNUgN_&ERftd9
z)|GP1=v9LbgW7Zxu<FQdtGEc^8<eVB306M!(|h(Hf3pP@dd8DYwmL7+IORE-!^8`1
zfjH&PD2mFA(vsK5s*-nDsezrj0#Vi(Vw`x9U1ZO*m)Vo-3lJCe1UiDkQ7JpLlS8RO
z>Nq+nSx)r>i4zw!IRzUfb&bZywXo(!`^MlYIW?YDv7$D>tLuMmLHyyiI)U61`6$de
zYGNI1UA%Div52yf&BGlN!VUfC&T5%%=hs!ihIrnVc)xgH=l0Zd`Th)NGnm|!OTq0v
y9Y0I4n}?63C<qRgj%=&l^|h0S_3d&c3LY<8Dp&C4FMq(dAjD5-+-V`c0{{TuI1T9l
literal 549
zcmV+=0^0o_iwFo7<QZB3195d}V{2n!Y%VbXjZ@u=(?Ae^-@jrg2!7<^_2BeH#9pml
z;o6=}??E_($#&bW-R#7jjkW*1vuRQV6?{p^%=|v)Bl+V1X6S3&8rV>PZ;jP^jV@QY
zWX9wp>Ik|IzuQ)5U9PEuNT4YMBWV)?1qOk~V@)jB)h$%$VF-h(Ynan_xVjv^9>8Fj
zU&^y*YipA9K;^|P%ty0{I_DlQU>d<PAbdcMfPM`V<YN+U*uWT_ZX8Amd5bPS&lmT_
zv^X=g(f5;Lyqw;zri;1y)KmWtY1WRTHbGvM^;;MP8+Vn7R;z?6B1X&dC44=~lIILC
z!q-N)<IaF~A_=q+y|Rgse4d&@=jgyEqtd^y2!C7TFvud<#PsQ#sx(0u+0+;?nl&86
z19)?A)|)hN#WiYk8a<ZW_S1Q0(7)M&5?S!%TU#eDPzS>j&0)mKdLT)KGm4V3psbcP
ziK>=em8NGGu1J)f3<*xX$S$(y*~{!n_610aIs%(O@nDSa+sUCYvF$iHDMZe614$EC
z6$Jxpqiuzb(^^DxZMk-MY@Iq5RV=BA@ap=XTTp+vEsvmgM4W^rM|G-$O-Pq4K4wWa
zu`%2UA>7c9(^)Or+xc}>uqK(eC)qFV#koIrT-=@EWCEkRVxgqnr^9D$?B?NPq2>g8
nPY1EpY`fag!|HaiRC5`xSSptA<}W|mTTtpJTi$s2rUL)~<SY<*
diff --git a/quickcal.glade b/quickcal.glade
index 6f23c86..abd015b 100644
--- a/quickcal.glade
+++ b/quickcal.glade
@@ -11,7 +11,7 @@
<property name="icon">/usr/share/pixmaps/quickcal.png</property>
<property name="type_hint">normal</property>
<property name="has_resize_grip">True</property>
- <property name="program_name">Quickcal Calculator 1.0</property>
+ <property name="program_name">Quickcal Calculator</property>
<property name="copyright" translatable="yes">Files: quickcal*
Copyright: 2017 Nathan SR <cquickcal@gmail.com>
License: GPL-3+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..de8c5e0
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,16 @@
+from distutils.core import setup
+setup(name = "quickcal",
+version = "2.0",
+description = "fast and easy to use calculator with support for filing",
+author = "Nathan SR",
+author_email = "cquickcal@gmail.com",
+url = "https://git.fosscommunity.in/SRNathan/Quickcal_Calculator",
+license='GPLv3',
+scripts=['quickcal'],
+data_files = [ ("lib/quickcal", ["quickcal.glade"]),
+("share/pixmaps", ["quickcal.png"]),
+("share/pixmaps", ["quickcal_small.png"]),
+("share/man/man1", ["quickcal.1.gz"]),
+("share/man/man1", ["num.1.gz"]),
+("bin", ["num"]),
+("share/applications", ["quickcal.desktop"]) ] )
--
GitLab