Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: iman-salmani/iplan
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.6.0
Choose a base ref
...
head repository: iman-salmani/iplan
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Jun 23, 2023

  1. Copy the full SHA
    bdc84df View commit details

Commits on Jun 25, 2023

  1. Add task-undo to TasksDoneWindow. it emits when task done state changed.

    - Fix bug when done first task of list
    iman-salmani committed Jun 25, 2023
    Copy the full SHA
    efcbefb View commit details
  2. Use task-activated and project-activated signals instead of search.ta…

    …sk and search.project actions
    
    - use icon for search result
    - code refactor
    iman-salmani committed Jun 25, 2023
    Copy the full SHA
    457b580 View commit details

Commits on Jun 27, 2023

  1. Add project info popup

    - Chart for time spent in the last 7 days and move it to the popup
    - Move Total time spent to the popup
    
    Fixes: #43
    iman-salmani committed Jun 27, 2023
    Copy the full SHA
    6804957 View commit details

Commits on Jun 28, 2023

  1. Only manually

    because workflow needs fixes.(old GTK packages)
    iman-salmani authored Jun 28, 2023
    Copy the full SHA
    81855f9 View commit details
  2. Add Preferences window, and option to disable run in background

    - background-play settings renamed to background-run
    - fix bug: always send run in background request in startup
    Fixes: #41
    iman-salmani committed Jun 28, 2023
    Copy the full SHA
    e7beef5 View commit details
  3. Prevent from creating multiple preferences window

    - also close previous modal
    iman-salmani committed Jun 28, 2023
    Copy the full SHA
    0c65f48 View commit details

Commits on Jun 29, 2023

  1. Fix bug: first duration change from 0 will set error style to end tim…

    …e in RecordWindow
    
    - also Check for error style every time time property changed in TimeRow
    iman-salmani committed Jun 29, 2023
    Copy the full SHA
    90f62d5 View commit details
  2. Edit flathub badget

    iman-salmani authored Jun 29, 2023
    Copy the full SHA
    8c19b34 View commit details

Commits on Jun 30, 2023

  1. Improve usability for the phone form factor

    - Fix window sizes
    - Add or remove some scrollbars
    - Shortcuts window still has issue
    issue: #44
    iman-salmani committed Jun 30, 2023
    Copy the full SHA
    7a759f4 View commit details
  2. Copy the full SHA
    f842317 View commit details
  3. Copy the full SHA
    f8a79b6 View commit details
  4. Copy the full SHA
    a04a779 View commit details
  5. Set project for subtasks

    - Fix bug while opening searched subtask
    - Add db version 9(set project id for subtasks)
    iman-salmani committed Jun 30, 2023
    Copy the full SHA
    4fc898b View commit details
  6. Copy the full SHA
    8b698a4 View commit details
  7. Copy the full SHA
    77e770d View commit details
  8. Add leading zero to Record::duration_display

    - Fix bug: add seconds to project stat because case issue with the duration_display method
    iman-salmani committed Jun 30, 2023
    Copy the full SHA
    1fa08c2 View commit details
  9. Copy the full SHA
    5937d49 View commit details
  10. Copy the full SHA
    709aeb6 View commit details
  11. Update translation files

    iman-salmani committed Jun 30, 2023
    Copy the full SHA
    a0057f8 View commit details
  12. Move timer button in TaskRow::refresh_timer

    - fix bug: Changing task duration in subtask pages dont change task_row timer position
    iman-salmani committed Jun 30, 2023
    Copy the full SHA
    257ee3d View commit details
  13. Copy the full SHA
    9ed15e9 View commit details
  14. Copy the full SHA
    06d55de View commit details
  15. Copy the full SHA
    53f277d View commit details

Commits on Jul 1, 2023

  1. Copy the full SHA
    f5207d0 View commit details
  2. Fix bug: Changes dont apply if TaskWindow opened from Calendar ...

    Remove set project label visible without condition in add_task
    Fix bug while moving task back by factor of 7
    iman-salmani committed Jul 1, 2023
    Copy the full SHA
    05c7380 View commit details
  3. Copy the full SHA
    f60e6d7 View commit details
  4. Copy the full SHA
    f26cf43 View commit details
  5. Add MenuItem snippet

    iman-salmani committed Jul 1, 2023
    Copy the full SHA
    b6a6430 View commit details
  6. Add projects stack

    - Rename ProjectLists to ProjectPage
    iman-salmani committed Jul 1, 2023
    Copy the full SHA
    7def070 View commit details

Commits on Jul 2, 2023

  1. Add move up and down menu item to TaskRow options

    - Use Header Capitalization for timer and delete button in TaskRow options
    iman-salmani committed Jul 2, 2023
    Copy the full SHA
    3570c83 View commit details
  2. Copy the full SHA
    4c77945 View commit details

Commits on Jul 3, 2023

  1. Copy the full SHA
    f177df7 View commit details

Commits on Jul 4, 2023

  1. Get task as argument in create_task

    Fix bug: use new_position for subtask in TaskPage new task(top)
    Prevent from change siblings position, for tasks without section while updating task section
    iman-salmani committed Jul 4, 2023
    Copy the full SHA
    7424962 View commit details

Commits on Jul 6, 2023

  1. Fix bug: Fix bug while truncating non-ASCII characters

    Used in shortening the toast message name
    fixes: #46
    iman-salmani committed Jul 6, 2023
    Copy the full SHA
    bfb2b75 View commit details

Commits on Jul 7, 2023

  1. Add date_display method for Task

    - Consistent date format for where make sense
    - Fixes issue #47 misleading date label in the TaskRow
    iman-salmani committed Jul 7, 2023
    Copy the full SHA
    b7e1144 View commit details
  2. Align popovers to edge of screen and remove popovers arrow

    Fix positioning problem for modal windows popovers
    issue #44
    iman-salmani committed Jul 7, 2023
    Copy the full SHA
    c269e5b View commit details
  3. Copy the full SHA
    3626405 View commit details
  4. Copy the full SHA
    747a231 View commit details
  5. Copy the full SHA
    0818426 View commit details
  6. Copy the full SHA
    b1782f8 View commit details
  7. Copy the full SHA
    1e0f008 View commit details

Commits on Jul 8, 2023

  1. Add getting start guide to translation guidelines

    Add add a new language part
    Remove create iplan.pot part
    iman-salmani committed Jul 8, 2023
    Copy the full SHA
    e91e931 View commit details
  2. Copy the full SHA
    c992b99 View commit details
  3. Copy the full SHA
    a0de346 View commit details
  4. Update README.md

    iman-salmani authored Jul 8, 2023
    Copy the full SHA
    fa8d113 View commit details
  5. Update README.md

    iman-salmani authored Jul 8, 2023
    Copy the full SHA
    2ddbfda View commit details
  6. Copy the full SHA
    339a786 View commit details
  7. Copy the full SHA
    083aba8 View commit details
  8. Copy the full SHA
    c01f2b1 View commit details
Showing with 6,408 additions and 4,004 deletions.
  1. +5 −3 .github/workflows/rust.yml
  2. +20 −15 CONTRIBUTING.md
  3. +70 −71 Cargo.lock
  4. +5 −8 Cargo.toml
  5. +6 −72 README.md
  6. +4 −3 build-aux/flathub-export.sh
  7. +2 −0 data/icons/hicolor/scalable/actions/arrow1-down-symbolic.svg
  8. +2 −0 data/icons/hicolor/scalable/actions/arrow1-up-symbolic.svg
  9. +2 −0 data/icons/meson.build
  10. +3 −1 data/ir.imansalmani.IPlan.desktop.in
  11. +1 −1 data/ir.imansalmani.IPlan.gschema.xml
  12. +79 −11 data/ir.imansalmani.IPlan.metainfo.xml.in
  13. +1 −1 meson.build
  14. +1 −0 po/LINGUAS
  15. +10 −6 po/POTFILES
  16. +347 −263 po/cs.po
  17. +174 −317 po/fa.po
  18. +326 −268 po/fr.po
  19. +147 −245 po/iplan.pot
  20. +1 −1 po/meson.build
  21. +330 −274 po/pt_BR.po
  22. +589 −0 po/ru.po
  23. +316 −335 po/tr.po
  24. +207 −71 src/application.rs
  25. +1 −1 src/db/manager.rs
  26. +46 −2 src/db/migrate.rs
  27. +35 −8 src/db/models/project.rs
  28. +41 −6 src/db/models/record.rs
  29. +171 −16 src/db/models/task.rs
  30. +9 −0 src/db/operations/project.rs
  31. +11 −8 src/db/operations/record.rs
  32. +148 −57 src/db/operations/task.rs
  33. +7 −13 src/iplan.gresource.xml
  34. +1 −1 src/ui/backup_window.ui
  35. +0 −53 src/ui/calendar/calendar.ui
  36. +59 −10 src/ui/calendar/calendar_page.ui
  37. +4 −3 src/ui/calendar/{tasks_list.ui → day_view.ui}
  38. +32 −0 src/ui/preferences_window.ui
  39. +2 −1 src/ui/project/project_create_window.ui
  40. +112 −115 src/ui/project/project_edit_window.ui
  41. +92 −43 src/ui/project/project_header.ui
  42. +47 −4 src/ui/project/{project_lists.ui → project_page.ui}
  43. +10 −42 src/ui/project/section_box.ui
  44. +8 −3 src/ui/record/record_row.ui
  45. +9 −30 src/ui/record/record_window.ui
  46. +2 −2 src/ui/reminder/reminder_window.ui
  47. +4 −3 src/ui/schema.dtd
  48. +12 −3 src/ui/search/search_result.ui
  49. +8 −4 src/ui/search/search_window.ui
  50. +9 −12 src/ui/shortcuts_window.ui
  51. +2 −2 src/ui/sidebar/project_row.ui
  52. +7 −4 src/ui/sidebar/sidebar_projects.ui
  53. +29 −0 src/ui/snippets/chart.ui
  54. +17 −0 src/ui/snippets/chart_bar.ui
  55. +2 −0 src/ui/snippets/date_row.ui
  56. +1 −1 src/ui/snippets/delete_dialog.ui
  57. +25 −0 src/ui/snippets/menu_item.ui
  58. +2 −0 src/ui/snippets/time_row.ui
  59. +8 −0 src/ui/style.css
  60. +1 −1 src/ui/task/task_drag_icon.ui
  61. +38 −21 src/ui/task/task_page.ui
  62. +35 −31 src/ui/task/task_row.ui
  63. +12 −7 src/ui/task/task_window.ui
  64. +2 −2 src/ui/task/tasks_box.ui
  65. +4 −3 src/ui/task/tasks_done_window.ui
  66. +39 −146 src/ui/window.ui
  67. +1 −6 src/views/backup_window.rs
  68. +0 −255 src/views/calendar/calendar.rs
  69. +436 −68 src/views/calendar/calendar_page.rs
  70. +1 −1 src/views/calendar/day_indicator.rs
  71. +69 −53 src/views/calendar/{tasks_list.rs → day_view.rs}
  72. +2 −5 src/views/calendar/mod.rs
  73. +4 −1 src/views/mod.rs
  74. +100 −0 src/views/preferences_window.rs
  75. +2 −2 src/views/project/mod.rs
  76. +1 −7 src/views/project/project_create_window.rs
  77. +17 −20 src/views/project/project_edit_window.rs
  78. +115 −74 src/views/project/project_header.rs
  79. +133 −50 src/views/project/{project_lists.rs → project_page.rs}
  80. +128 −59 src/views/project/section_box.rs
  81. +35 −36 src/views/record/record_row.rs
  82. +37 −32 src/views/record/record_window.rs
  83. +26 −4 src/views/reminder/reminder_row.rs
  84. +1 −1 src/views/reminder/reminder_window.rs
  85. +1 −1 src/views/search/mod.rs
  86. +51 −20 src/views/search/search_result.rs
  87. +54 −37 src/views/search/search_window.rs
  88. +15 −30 src/views/sidebar/project_row.rs
  89. +80 −53 src/views/sidebar/sidebar_projects.rs
  90. +140 −0 src/views/snippets/chart.rs
  91. +49 −0 src/views/snippets/chart_bar.rs
  92. +3 −9 src/views/snippets/date_row.rs
  93. +90 −0 src/views/snippets/menu_item.rs
  94. +9 −0 src/views/snippets/mod.rs
  95. +8 −4 src/views/snippets/time_row.rs
  96. +7 −9 src/views/task/subtask_row.rs
  97. +95 −40 src/views/task/task_page.rs
  98. +142 −104 src/views/task/task_row.rs
  99. +120 −107 src/views/task/task_window.rs
  100. +143 −84 src/views/task/tasks_box.rs
  101. +115 −28 src/views/task/tasks_done_window.rs
  102. +426 −180 src/views/window.rs
8 changes: 5 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -15,17 +15,19 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/gtk-rs/gtk4-rs/gtk4:latest
image: ubuntu:23.04

steps:
- name: Update repositories
run: apt update
- name: Install dependencies
run: apt install -y curl libgtk-4-dev libadwaita-1-dev gettext python3 ninja-build meson desktop-file-utils
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- name: install msgfmt
run: sudo apt install -y msgfmt
- uses: BSFishy/meson-build@v1.0.3
with:
action: build
35 changes: 20 additions & 15 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -2,20 +2,25 @@
Thank you for considering contributing to the IPlan project!

## Translation
First of all, Check if your language already exists. You can find po files in the po folder which are named by languages code.
1. Clone repository
```bash
git clone https://github.com/iman-salmani/iplan.git
```
2. Build project
```bash
meson setup _build .
meson compile -C _build
Let's get started with where files are located and what they are for.

Localization-related files are inside [po](https://github.com/iman-salmani/iplan/tree/1e0f0081acebff48db156300498e86ca437b2cef/po) directory.
The directory should be something like this:
```
3. Generate the pot file.
```bash
cd _build
meson compile iplan-pot
po
- LINGUAS
- iplan.pot
- fa.po
- fr.po
...
```
4. Rename the iplan.pot file (you can find it on po folder) to your language code like 'en.po' (remember to change file extension ).
5. Also, add your language code to the end of the LINGUAS file.

* **LINGUAS** contains available languages represented by their code
* **iplan.pot** is a sample for adding a new language
* Files with `.po` extension contains translation texts

As I mentioned, translation files use po file format. if you are not familiar with that there are plenty of articles about how to edit them.

If you wanna add a new language follow this:
1. Duplicated the `iplan.pot` file and rename it to `language_code.po`
2. Add language code to `LINGUAS` file
Loading