Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@manuvarkey
manuvarkey committed Jul 28, 2024
1 parent e8480e7 commit 812e4a3
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 65 deletions.
58 changes: 13 additions & 45 deletions com.kavilgroup.gestimator.json
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id" : "com.kavilgroup.gestimator",
"runtime" : "org.gnome.Platform",
"runtime-version" : "43",
"runtime-version" : "46",
"sdk" : "org.gnome.Sdk",
"command" : "gestimator.py",
"finish-args": [
Expand All @@ -11,63 +11,31 @@
],
"modules" : [
{
"name": "python3-appdirs",
"buildsystem": "simple",
"build-commands": [
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"appdirs\" --no-build-isolation"
],
"sources": [
"name": "python3-package-installation",
"buildsystem": "simple",
"build-commands": [
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} --no-build-isolation appdirs et-xmlfile openpyxl peewee"
],
"sources": [
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/3b/00/2344469e2084fb287c2e0b57b72910309874c3245463acd6cf5e3db69324/appdirs-1.4.4-py2.py3-none-any.whl",
"sha256": "a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"
}
]
},
{
"name": "python3-openpyxl",
"buildsystem": "simple",
"build-commands": [
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"openpyxl\" --no-build-isolation"
],
"sources": [
},
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/96/c2/3dd434b0108730014f1b96fd286040dc3bcb70066346f7e01ec2ac95865f/et_xmlfile-1.1.0-py3-none-any.whl",
"sha256": "a2ba85d1d6a74ef63837eed693bcb89c3f752169b0e3e7ae5b16ca5e1b3deada"
},
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/7b/60/9afac4fd6feee0ac09339de4101ee452ea643d26e9ce44c7708a0023f503/openpyxl-3.0.10-py2.py3-none-any.whl",
"sha256": "0ab6d25d01799f97a9464630abacbb34aafecdcaa0ef3cba6d6b3499867d0355"
}
]
},
{
"name": "python3-peewee",
"buildsystem": "simple",
"build-commands": [
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"peewee\" --no-build-isolation"
],
"sources": [
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/17/c8/8035f2155832580d786c35cb1ce0a89d80a67be522f620878fc294742905/peewee-3.15.4.tar.gz",
"sha256": "2581520c8dfbacd9d580c2719ae259f0637a9e46eda47dfc0ce01864c6366205"
}
]
},
{
"name": "python3-pyblake2",
"buildsystem": "simple",
"build-commands": [
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pyblake2\" --no-build-isolation"
],
"sources": [
"url": "https://files.pythonhosted.org/packages/c0/da/977ded879c29cbd04de313843e76868e6e13408a94ed6b987245dc7c8506/openpyxl-3.1.5-py2.py3-none-any.whl",
"sha256": "5282c12b107bffeef825f4617dc029afaf41d0ea60823bbb665ef3079dc79de2"
},
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/a6/ea/559658f48713567276cabe1344a9ef918adcb34a9da417dbf0a2f7477d8e/pyblake2-1.1.2.tar.gz",
"sha256": "5ccc7eb02edb82fafb8adbb90746af71460fbc29aa0f822526fc976dff83e93f"
"url": "https://files.pythonhosted.org/packages/bd/be/e9c886b4601a19f4c34a1b75c5fe8b98a2115dd964251a76b24c977c369d/peewee-3.17.6.tar.gz",
"sha256": "cea5592c6f4da1592b7cff8eaf655be6648a1f5857469e30037bf920c03fb8fb"
}
]
},
Expand Down
35 changes: 26 additions & 9 deletions estimator/__init__.py
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,15 +468,17 @@ def on_reorder_key_pressed(self, button):

def on_sch_add_clicked(self, button):
"""Add empty row to schedule view"""
items, sub_ana_items = self.sch_dialog.run()
if items:
ret = self.schedule_view.add_item_at_selection(items)
ret2 = None
if sub_ana_items:
ret2 = self.schedule_view.add_sub_ana_items(sub_ana_items)
if (ret and ret[1]) or (ret2 and ret2[1]):
# Refresh resource view to update any items that may be added
self.resource_view.update_store()
retval = self.sch_dialog.run()
if retval:
items, sub_ana_items = retval
if items:
ret = self.schedule_view.add_item_at_selection(items)
ret2 = None
if sub_ana_items:
ret2 = self.schedule_view.add_sub_ana_items(sub_ana_items)
if (ret and ret[1]) or (ret2 and ret2[1]):
# Refresh resource view to update any items that may be added
self.resource_view.update_store()

def on_sch_add_item_clicked(self, button):
"""Add empty row to schedule view"""
Expand Down Expand Up @@ -540,6 +542,10 @@ def on_sch_colour_clicked(self, button):

self.schedule_view.update_colour(colour)

def on_sch_reset_colour_clicked(self, button):
"""Reset color of selection in schedule view"""
self.schedule_view.update_colour(None)

def on_sch_refresh_clicked(self, button):
ret_code = self.schedule_view.update_selected_rates()
if ret_code:
Expand Down Expand Up @@ -1266,6 +1272,17 @@ def initialise(self):
# Initialise window variables
self.hidden_stack = self.builder.get_object("hidden_stack")
self.hidden_stack_header = self.builder.get_object("hidden_stack_header")

# Setup darkmode
text_color = self.window.get_style_context().get_color(Gtk.StateFlags.NORMAL)
back_color = self.window.get_style_context().get_background_color(Gtk.StateFlags.NORMAL)
textavg = (text_color.red + text_color.green + text_color.blue)/3
backavg = (back_color.red + back_color.green + back_color.blue)/3
misc.MEAS_COLOR_NORMAL = misc.rgb2hex(back_color.red, back_color.green, back_color.blue)
if textavg > backavg: # Darkish theme
self.darkmode = True
else: # Lightish theme
self.darkmode = False

# Setup font settings
# Set default application font for windows
Expand Down
22 changes: 18 additions & 4 deletions estimator/interface/mainwindow.glade
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<!-- Generated with glade 3.40.0 -->
<interface>
<requires lib="gtk+" version="3.18"/>
<object class="GtkLabel" id="buttonlabel_add_new_resource">
Expand Down Expand Up @@ -372,7 +372,7 @@
<property name="can-focus">False</property>
<property name="tooltip-markup" translatable="yes">Add blank item &lt;i&gt;(Ctrl+i)&lt;/i&gt;</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Add balnk item</property>
<property name="label" translatable="yes">Add blank item</property>
<property name="use-underline">True</property>
<property name="icon-name">list-add-symbolic</property>
<signal name="clicked" handler="on_sch_add_item_clicked" swapped="no"/>
Expand Down Expand Up @@ -570,9 +570,8 @@
<property name="can-focus">False</property>
<property name="tooltip-markup" translatable="yes">Mark items with selected colour &lt;i&gt;(Ctrl+m)&lt;/i&gt;</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Mark mismatch</property>
<property name="label" translatable="yes">■</property>
<property name="use-underline">True</property>
<property name="icon-name">color-select-symbolic</property>
<signal name="clicked" handler="on_sch_colour_clicked" swapped="no"/>
<accelerator key="m" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object>
Expand All @@ -581,6 +580,21 @@
<property name="homogeneous">False</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="toolbutton_schedule_colour1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="tooltip-markup" translatable="yes">Clear color for selected items</property>
<property name="halign">start</property>
<property name="label" translatable="yes">□</property>
<property name="use-underline">True</property>
<signal name="clicked" handler="on_sch_reset_colour_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">False</property>
</packing>
</child>
<child>
<object class="GtkSeparatorToolItem" id="separatortoolitem2">
<property name="visible">True</property>
Expand Down
21 changes: 21 additions & 0 deletions estimator/misc.py
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1174,3 +1174,24 @@ def round_value(value, rounding='Round to 0'):
rounded = value
return rounded

# Cairo drawing functions

def rgb2hex(r,g,b,a=None):
if a:
return "#{:02x}{:02x}{:02x}{:02x}".format(int(r*255),int(g*255),int(b*255),int(a*255))
else:
return "#{:02x}{:02x}{:02x}".format(int(r*255),int(g*255),int(b*255))

def hex2rgb(hexcode):
if len(hexcode) == 7:
r = int(hexcode[1:3],16)/255
g = int(hexcode[3:5],16)/255
b = int(hexcode[5:7],16)/255
a = 1
elif len(hexcode) == 9:
r = int(hexcode[1:3],16)/255
g = int(hexcode[3:5],16)/255
b = int(hexcode[5:7],16)/255
a = int(hexcode[7:9],16)/255
return (r, g, b, a)

9 changes: 2 additions & 7 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
appdirs==1.4.4
certifi==2024.7.4
charset-normalizer==3.1.0
et-xmlfile==1.1.0
idna==3.7
openpyxl==3.1.2
peewee==3.16.2
requests==2.32.0
urllib3==2.0.7
openpyxl==3.1.5
peewee==3.17.6

0 comments on commit 812e4a3

Please sign in to comment.