From 96c84fe9835e90fac95e387707f71a94248ed93a Mon Sep 17 00:00:00 2001 From: itwrx Date: Wed, 5 Jul 2023 14:47:04 -0500 Subject: [PATCH] updates for installable version --- CHANGELOG.md | 8 ++++++++ ez_bkup.nim | 7 +++++-- icons/EZ-Bkup-icon.png | Bin 2303 -> 0 bytes models/routine.nim | 11 ++++++++++- views/app_menu_button.nim | 4 ++-- 5 files changed, 25 insertions(+), 5 deletions(-) delete mode 100644 icons/EZ-Bkup-icon.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 73dec4c..47e7097 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.9.8 - 7-5-23 +### Added +- Added icons and css paths that work with installed version in ez_bkup.nim. (ITwrx) +### Changed +- Made some file names more uniform. (ITwrx) +- Re-added selectedPreload proc accidentally removed from Routine.nim in last release. (ITwrx) +- Updated EZ-Bkup version in app_menu_button.nim and ez_bkup.desktop (included with installer in the funded release). (ITwrx) + ## 0.9.7 - 7-1-23 ### Added - Added check that sources actually got copied to destination(s) prior to showing success msg. (ITwrx) diff --git a/ez_bkup.nim b/ez_bkup.nim index 1665e02..278e13e 100644 --- a/ez_bkup.nim +++ b/ez_bkup.nim @@ -20,7 +20,7 @@ method view(app: AppState): Widget = defaultSize = (1024, 768) HeaderBar {.addTitlebar.}: Icon {.addLeft.}: - name = "EZ-Bkup-icon" + name = "ez_bkup" pixelSize = 40 margin = 4 # Button to open the main menu @@ -66,5 +66,8 @@ when isMainModule: # Loads the model from the database and starts the application. #databasePath is coming from shared.nim let model = newRoutineModel(databasePath) - brew("org.itwrx.EZ-Bkup", gui(App(routineModel = model)), darkTheme = true, icons=["icons/"], stylesheets=[loadStylesheet("styles.css")]) + #if running manually from src directory. + #brew("org.itwrx.EZ-Bkup", gui(App(routineModel = model)), darkTheme = true, icons=["icons/"], stylesheets=[loadStylesheet("styles.css")]) + #if installed. + brew("org.itwrx.EZ-Bkup", gui(App(routineModel = model)), darkTheme = true, icons=["/usr/local/share/ez_bkup/icons/"], stylesheets=[loadStylesheet("/usr/local/share/ez_bkup/styles.css")]) \ No newline at end of file diff --git a/icons/EZ-Bkup-icon.png b/icons/EZ-Bkup-icon.png deleted file mode 100644 index 8834ba80e687f7d413a67a1ac8ba17cd6d1d4ba8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2303 zcmVEX>4Tx04R}tkv&MmKpe$iQ$>-Ah#j;zWT;LSL`596 z3Pq?8YK2xEOfLO`CJjl7i=*ILaPVWX>fqw6tAnc`2!4P#IXWr2NQwVT3N2zhIPS;0 zdyl(!fKV?p&FUBjG~G5+iMW`_u8Li+2w@2Q03tH8j5$e4!gqY#Bf!_Y7|-%Q_vh$U za~1;vBJnIUOq+OvczV+|IPVjOSy5Jr&xyxOx*+i**AGj4P0EeG-VIC+yMrk4B3=jDM(Yu=YjV#`lc)}a0~RT zdA&9FarywHsjK7-aBv8W7ASk&=iS}yz5RQp+20Q`X>yJF18-&k000JJOGiWibpUn% zaL5R;9smFU32;bRa{vG?BLDy{BLR4&KXw2B2LMS#K~#9!?V5jV)OQ)jU(fgM3Z+As z?cKGtuxyJlSx~1_G1E!igqav{)fAYMrL?^=de;hU2t*}yQ`v^Dj^1@^?~a0IFxd?1 zf*NHI{K1T2!EJGxB`Q$B``)#HtSPhYeINhe&Xw!+Cv7R$dy@O(`+Pq4d4A;iyq_Q6 zFJx(YlMJ<3W%~aluyDMD<%rB~c6qz{^Quk1AMj43k?G_n$(ZgDFzp>+AKitKEg_fp z@$pn3KAgh-ixJPM&iFJ~ZTdHgvNDC;X}4@;t;K7)Gui>wrhhT8Ej1uiS@CSq+7lC3 z2TT#r0|tPes%#7wdS9Nhy?`p7aG@`BwV-F&dS3xPl(O_($nE=T#+SmDy>I70Z+?FB|cm1baxpx;Yj_gR)K-&yQEnbF-~rP+Lo zf$mKOJyCsRXOZ`CMz_POBHQx}to^`yQ;_?|!NR(yGkzX0gWNQr$E&^Fc{Le75b;F) zn-G?#uw(H)Dcg1P>UXZqKxER|+opR}831}>80Bs6t8E`oSyL_oYRnzCDzZ0KHxbO(OyMwN}riqX_r5rF*X0?GVxUz=kSYLPELlY%)%3wfM z)W1bl%Tw4<99G$`!tn#WDH#D((ZJ_L`A!PESB3IWe*Ni*lzq(|P-E`6RaEy3&_!4u zcKLoc(ekgU0~)l!o)+|!wvfvgm<$~z_1&O~)P-GMfAYEFeB)eukK_DA8>#R_*zMbV z-OmFuJ`H9mOIga&WRr~dfz_t}AaKu6sb?yYJw^HN0}l_fw_A}jg7u1Ev;^JWqth)7 z&Jy(fAP*|~M~~_Mb|yQZGvxM3@>k;Ou=R-)q1-3%W}>>X|R9@ z@bj9pPajvC?IeJux(xV3#yg-twHANvRJG}k0xn?IX#ekt_*bg18^{sl$)MZ2DS@oEHdCwr5RWZGWgi2BA~T+O?SAc{?8$|cO|Mv zfSCpwZqNpM`sojqC?5xUEsVvj?)raBQgMHJm~{T{%iF{?wksf_Vi?IZRni{KUzmOj zCBFjB0S*J*RT~Z5Fe&z{>V!{()Ur&jSo_7KNfiL-5k z8%OT2x*_w1%4R^(<$W3*`$)`q*JuL<%>+B$^{*MKcLOotQ-;<3n+G~~yl0T@Z(p|3 zC>d0F;r0<|x2Q&29O)L$#+-L1i#NmK*w`GPDyUQ>A8mH~kigbjSocQUvPuCH1Zmo;v53`guTacaP5WW#m~&G?LQKK5m*7- zQDyqu41;YKq8%q@7r06c(MnWDGh2AvWBPAUyA}LTfYQ|LV&Rp7t;PQHie;Ampt5smJsmP?0YP zRH#M8oPvVO&~RDiQ9-*DSu$jR3eSsjm%>*1jIDDD3b+CnMZOz!dH0V61bcup2rr@X zl@eF1^tt@{i=(+cL8tF618WgNJLpGp92}}S+ftCsE*CmGzl6vZ;IF_tKo`m}RoP&; z9HkcW_V8DflSbTeyP%E0TfilOiy|BrWogLe{pN&@#I6;MbrhF&Wf1@X diff --git a/models/routine.nim b/models/routine.nim index 4fdd74c..238dece 100644 --- a/models/routine.nim +++ b/models/routine.nim @@ -184,4 +184,13 @@ proc delete*(model: RoutineModel, id: RoutineId) = model.db.exec("DELETE FROM Routine WHERE id = ?", id) # Update RoutineModel.routines - model.routines.del(id) \ No newline at end of file + model.routines.del(id) + +#preload the selected seq with routines that have selByDef == true. +proc selectedPreload*(): seq[RoutineId] = + var selected: seq[RoutineId] + let model = newRoutineModel(databasePath) + for routine in model.routineSeq(): + if routine.selByDef == true: + selected.add(routine.id) + return selected \ No newline at end of file diff --git a/views/app_menu_button.nim b/views/app_menu_button.nim index 6a73153..cafa5d2 100644 --- a/views/app_menu_button.nim +++ b/views/app_menu_button.nim @@ -29,9 +29,9 @@ method view(button: AppMenuButtonState): Widget = discard button.app.open: gui: AboutDialog: programName = "EZ-Bkup" - logo = "EZ-Bkup-icon" + logo = "ez_bkup" style = [StyleClass("about-dialog")] - version = "0.9.7" + version = "0.9.8" credits = @{ "Created By": @["https://ITwrx.org"], "License": @["GPLv3"]