[go: up one dir, main page]

Menu

Code Merge Request #3: Multiple improvements (open)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Bruno Marinho wants to merge 30 commits from /u/bapm/rachota/ to default, 2020-12-31

Hello Jiri,

Thank you for your app!
I have been using ir for years. I think I started using around 2006 in Windows.

These days I'm using it in mac and felt I needed some fixes to work with newer versions of java, better integration on the mac and with new features.
Added those and felt it would be great to share with others.

Bruno

Commit Date  
[647524] (multiple-improvementstip) by Bruno Marinho Bruno Marinho

* Ignore mac metadata files
* Create scripts folder and add the mac-run.sh script
* Create script to build icons for mac app
* Add for mac build creating a packaged mac app

2020-12-29 02:36:55 Tree
[2cc12c] by Bruno Marinho Bruno Marinho

* Set minimum size for the window since smaller sizes show weird layout. Fix form definition inconsistency.

2020-04-12 00:56:06 Tree
[fd910f] by Bruno Marinho Bruno Marinho

* Change to java 14 since that is the one now available with brew.

2020-04-12 00:40:05 Tree
[936252] by Bruno Marinho Bruno Marinho

* Merge progress and week progress into progress and use mouse click to switch between the two in a similar way it was done for estimated day.

2020-04-12 00:39:12 Tree
[9f17a8] by Bruno Marinho Bruno Marinho

* Change remain week days to show work day hours and minutes instead of fraction of the day making it easier to read understand.

2020-02-20 03:06:24 Tree
[4b1b3e] by Bruno Marinho Bruno Marinho

* Add keyword column to history task list

2020-02-20 03:03:18 Tree
[1f3a79] by Bruno Marinho Bruno Marinho

* Add remain day time and remain week time

2020-02-09 03:59:31 Tree
[ef69bd] by Bruno Marinho Bruno Marinho

* Make previous day and next day buttons same size

2020-02-09 01:06:23 Tree
[8892fd] by Bruno Marinho Bruno Marinho

* Add to move dialog title the source task
* Adjust the size of the input hour, minutes and seconds on the move dialog

2020-01-18 02:25:47 Tree
[67bff5] by Bruno Marinho Bruno Marinho

* Bump java version to 9 to allow java 9 needed for Mac OS X integration.
* Replace mac system menu (about / preferences / quit) with rachota dialogs
* Disable rachota system menu since Mac has one,

2019-11-24 22:42:55 Tree
[880627] by Bruno Marinho Bruno Marinho

* Fix keyword auto-complete not working in task creation

2019-11-24 03:14:11 Tree
[e2043a] by Bruno Marinho Bruno Marinho

* Set for mac the menu to go in menubar as other mac apps
* Set for mac the dock image with better resolution 180 vs 48
* Add script to start for mac that sets the dock name "Rachota" will be visible instead of "java"

2019-11-24 02:23:53 Tree
[8f0621] by Bruno Marinho Bruno Marinho

* Change look and feel to Nimbus
* Adjust many elements that are too small causing text to not display properly
* Fix alignment of some labels

2019-11-24 02:12:21 Tree
[1188cf] by Bruno Marinho Bruno Marinho

* Add week work hours similar to day work hours.
* Ignore IntelliJ project file.
* Remove duplicate translation keys.

2019-11-18 00:52:06 Tree
[9b0862] by Bruno Marinho Bruno Marinho

* Ignore mac metadata files
* Create scripts folder and add the mac-run.sh script
* Create script to build icons for mac app
* Add for mac build creating a packaged mac app

2020-12-29 02:36:55 Tree
[9f57bb] by Bruno Marinho Bruno Marinho

Merge default changes from parent fork

2020-12-13 02:35:09 Tree
[c65348] by Bruno Marinho Bruno Marinho

* Set minimum size for the window since smaller sizes show weird layout. Fix form definition inconsistency.

2020-04-12 00:56:06 Tree
[8fdee7] by Bruno Marinho Bruno Marinho

* Change to java 14 since that is the one now available with brew.

2020-04-12 00:40:05 Tree
[edccd1] by Bruno Marinho Bruno Marinho

* Merge progress and week progress into progress and use mouse click to switch between the two in a similar way it was done for estimated day.

2020-04-12 00:39:12 Tree
[cdbee9] by Bruno Marinho Bruno Marinho

* Change remain week days to show work day hours and minutes instead of fraction of the day making it easier to read understand.

2020-02-20 03:06:24 Tree
[d60710] by Bruno Marinho Bruno Marinho

* Add keyword column to history task list

2020-02-20 03:03:18 Tree
[d38dcd] by Bruno Marinho Bruno Marinho

* Add remain day time and remain week time

2020-02-09 03:59:31 Tree
[fbcef0] by Bruno Marinho Bruno Marinho

* Make previous day and next day buttons same size

2020-02-09 01:06:23 Tree
[1b5520] by Bruno Marinho Bruno Marinho

* Add to move dialog title the source task
* Adjust the size of the input hour, minutes and seconds on the move dialog

2020-01-18 02:25:47 Tree
[e6b0e5] by Bruno Marinho Bruno Marinho

* Add file and permissions lost using hg import

2020-01-18 01:17:26 Tree
[d41fa8] by Bruno Marinho Bruno Marinho

* Bump java version to 9 to allow java 9 needed for Mac OS X integration.
* Replace mac system menu (about / preferences / quit) with rachota dialogs
* Disable rachota system menu since Mac has one,

2019-11-24 22:42:55 Tree
[4f84e0] by Bruno Marinho Bruno Marinho

* Fix keyword auto-complete not working in task creation

2019-11-24 03:14:11 Tree
[c5465e] by Bruno Marinho Bruno Marinho

* Set for mac the menu to go in menubar as other mac apps
* Set for mac the dock image with better resolution 180 vs 48
* Add script to start for mac that sets the dock name "Rachota" will be visible instead of "java"

2019-11-24 02:23:53 Tree
[4e1113] by Bruno Marinho Bruno Marinho

* Change look and feel to Nimbus
* Adjust many elements that are too small causing text to not display properly
* Fix alignment of some labels

2019-11-24 02:12:21 Tree
[65b8ab] by Bruno Marinho Bruno Marinho

* Add week work hours similar to day work hours.
* Ignore IntelliJ project file.
* Remove duplicate translation keys.

2019-11-18 00:52:06 Tree

Discussion

  • Jiri Kovalsky

    Jiri Kovalsky - 2020-01-18

    Hi Bruno,

    thank you very much for your kind words and mainly the patch(es). I will take a look at it and test before merging to master. I only have Mac mini at my disposal at work so it will take some time but I really want to see how it looks on Mac! :)

    However, once again thanks a lot for your time and complying with the license. I am so glad that Rachota is still useful for somebody.

    And long live open source software. :)

    Have a good weekend,
    -Jirka

     
  • Bruno Marinho

    Bruno Marinho - 2020-02-08

    You're welcome.

    Thank you,

    Bruno

     
  • Bruno Marinho

    Bruno Marinho - 2020-03-25

    Hi Jiri,

    I added many changes in this PR that are a bit incremental and not only just for macs.
    Do let me what you think. I'm happy to change it if useful to others and not aligned with the project goals.

    Bruno

     
  • Jiri Kovalsky

    Jiri Kovalsky - 2020-03-26

    Hi Bruno,

    I apologize for my hesitation. I looked at your changes but while I would merge some of the commits right away (duplicates entries in US/NL dictionaries, same sized previous/next buttons, keyword completion in task dialog) I am not as enthusiastic about others (remaining week time - I would rather use the same progress bar changing its value between day and week time on a single click). Next time I recommend to rather group related commits and create individual merge requests for these so that I can better decide what to merge and what to leave aside. If you would like to separate the commits I would very much appreciate it!

    Thanks a lot!
    -Jirka

     
  • Bruno Marinho

    Bruno Marinho - 2020-04-11

    Hi Jiri,

    I agree with splitting the merge requests into simple changes.

    I agree with the change to make the bar switch between the two like it's done on the end period. It's either remain time or time of day.

    Can I fix this one? Is there other changes that need improvement?

    Thank you,

    Bruno

     
  • Bruno Marinho

    Bruno Marinho - 2020-04-12

    Hi Jiri,

    Just completed pushing the suggested improvement. Looks better :)

    Thank you,

    Bruno

     
  • Bruno Marinho

    Bruno Marinho - 2020-12-29

    Hi Jiri,

    I agree with splitting the merge requests into simple changes.

    Need to know from all the changes, which ones I can group and will be accepted as improvements. This way I only create merge requests that are likely to be accepted.

    Thank you,

    Bruno

     

    Last edit: Bruno Marinho 2020-12-29
  • Jiri Kovalsky

    Jiri Kovalsky - 2020-12-30

    Hi Bruno, as I have already said in March please prepare first three merge requests for:

    • duplicates entries in US/NL dictionaries
    • same sized previous/next buttons
    • keyword completion in task dialog

    Once we have these in the master branch, we will continue with other 3. Would you agree?

    Thanks,
    -Jirka

     
  • Bruno Marinho

    Bruno Marinho - 2020-12-30

    Thank you for reviewing my merge request.

    My bad, misread your initial proposal and focused on fixing the one that had issues.

    Just finished creating the proposed merged requests.
    Will also cleanup this merge request after merging to be easier to understand what is pending.

    Bruno

     

Log in to post a comment.