Skip to content

Commit 7dd9991

Browse files
amirnajaffiamirnajaffi
committed
Port Plasma 6
1 parent 5ce6405 commit 7dd9991

28 files changed

+1615
-1478
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## [3.0.0] - 2023-10-18
4+
Port to Plasma 6
5+
36
## [2.1.0] - 2023-09-15
47
Bugfix: Hijri Dates for iran - Using [tarikh-npm](https://github.com/SCR-IR/tarikh-npm)
58

@@ -47,6 +50,7 @@ The calendar has been completely rewritten and many features have been added to
4750
## [0.1.0] - 2020-12-15
4851
- Initial release.
4952

53+
[3.0.0]: https://github.com/amirnajaffi/shamsi-calendar-plasmoid/releases/tag/3.0.0
5054
[2.1.0]: https://github.com/amirnajaffi/shamsi-calendar-plasmoid/releases/tag/2.1.0
5155
[2.0.1]: https://github.com/amirnajaffi/shamsi-calendar-plasmoid/releases/tag/2.0.1
5256
[2.0.0]: https://github.com/amirnajaffi/shamsi-calendar-plasmoid/releases/tag/2.0.0

‎OLD-README.md

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# KDE Plasma Shamsi Calendar
2+
3+
Integrate the Persian (Shamsi - Jalali) calendar into your KDE Plasma desktop with the Shamsi Calendar Plasmoid. Developed with precision and user-centric design, this plasmoid has evolved from a personal project to a feature-rich tool tailored to your needs.
4+
5+
You can find and download the Shamsi Calendar plugin on the KDE Store [here](https://store.kde.org/p/1460130/).
6+
7+
**Features**
8+
9+
- Multi-language support for a personalized experience.
10+
- 5 adjustable events types.
11+
- Navigate using stack navigation.
12+
- Display dual parallel configurable texts (Primary and Secondary) on the panel.
13+
- Personalize colors, fonts, sizes, and events to suit your style.
14+
- And more!
15+
16+
![Shamsi Calendar Plasmoidscreenshot](./img/featured.png)
17+
18+
[KDE Store](https://store.kde.org/p/1460130/) - [CHANGELOG](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/blob/main/CHANGELOG.md)
19+
20+
## Requirement
21+
22+
| Plasma Version | Widget Version |
23+
| -------------- | ---------------------------------------------------------------------- |
24+
| 5.25 and above | 2.x |
25+
| 5.24 and below | [1.x](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/tree/v1) |
26+
27+
Check: `plasmashell --version`
28+
29+
## Install/Update 📦
30+
31+
You've got two options to get this plasmoid up and running: you can either grab it from the [KDE Store](https://store.kde.org/p/1460130/) or follow these simple steps below.
32+
33+
34+
**1. Clone/Download repo:**
35+
36+
Let's get the plasmoid's source code. Open your terminal again and enter:
37+
```
38+
git clone https://github.com/amirnajaffi/shamsi-calendar-plasmoid.git
39+
```
40+
41+
**2. Open directory:**
42+
43+
Navigate into the newly created directory:
44+
```
45+
cd shamsi-calendar-plasmoid
46+
```
47+
48+
**\*Optional:** If you're feeling nostalgic and want to install version 1 (or! maybe your out of Requirement of v2), type:
49+
50+
```
51+
git checkout v1
52+
```
53+
54+
**3. Install:**
55+
56+
It's time to bring the magic to life! Use this command in your terminal:
57+
58+
```
59+
kpackagetool5 -t Plasma/Applet --install package
60+
```
61+
62+
If you have a previous version installed, use `--upgrade` in above command instead.
63+
64+
<br />
65+
66+
_Or alternatively, type in the terminal to remove the previous versions:_ (And you can re-install the new version after that).
67+
```
68+
kpackagetool5 -t Plasma/Applet --remove org.kde.plasma.shamsi-calendar
69+
```
70+
71+
72+
**4. Log Out/In**
73+
74+
Log out of your system and then log back in. Now everything is done! 😃
75+
76+
<br />
77+
78+
**As an alternative way** simply you can grab the latest `.plasmoid` file from [this page](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/releases/latest) and install it with above commands.
79+
80+
## Contributing
81+
82+
Thank you for considering contributing to the KDE Plasma Shamsi Calendar! Any contributions you make are greatly appreciated. You can also check [this list](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/issues/10).
83+
84+
For major changes, please open an issue first to discuss what you would like to change.
85+
86+
## License
87+
88+
Distributed under the GPL v3 License. See LICENSE for more information.
89+
90+
## Acknowledgements
91+
92+
- [i18next](https://github.com/i18next/i18next)
93+
- [jalaali-js](https://github.com/jalaali/jalaali-js)
94+
- [Persian Date](https://github.com/babakhani/PersianDate)
95+
- [Persian Calendar for Gnome-Shell](https://github.com/omid/Persian-Calendar-for-Gnome-Shell)
96+
- [tarikh-npm](https://github.com/SCR-IR/tarikh-npm)
97+
- [Vazirmatn Font](https://github.com/rastikerdar/vazirmatn)
98+
99+
## FAQ
100+
101+
- **Having Trouble Installing or Updating via KDE Store?**
102+
If you're facing issues with installation or updates from the KDE Store, don't worry! We've got you covered with a simple [manual installation guide](https://github.com/amirnajaffi/shamsi-calendar-plasmoid#installupdate).
103+
104+
- **Encountering Errors After Installation?**
105+
Sometimes, errors might pop up after installation, and that's okay. Often, these errors are caused by having an older version of Plasma. Make sure you have at least the [minimum required Plasma version](https://github.com/amirnajaffi/shamsi-calendar-plasmoid#requirement) installed. If you're still facing issues, feel free to open a new issue – we're here to help!

‎README.md

Lines changed: 39 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,73 @@
11
# KDE Plasma Shamsi Calendar
22

3-
Integrate the Persian (Shamsi - Jalali) calendar into your KDE Plasma desktop with the Shamsi Calendar Plasmoid. Developed with precision and user-centric design, this plasmoid has evolved from a personal project to a feature-rich tool tailored to your needs.
3+
Integrate the Persian Calendar into your KDE Plasma desktop. Also known as Shamsi Calenar or Jalali Calendar.
44

5-
You can find and download the Shamsi Calendar plugin on the KDE Store [here](https://store.kde.org/p/1460130/).
5+
Download the plugin from the [KDE Store](https://store.kde.org/p/2216432/).
66

7-
**Features**
7+
## Features
88

9-
- Multi-language support for a personalized experience.
10-
- 5 adjustable events types.
11-
- Navigate using stack navigation.
12-
- Display dual parallel configurable texts (Primary and Secondary) on the panel.
13-
- Personalize colors, fonts, sizes, and events to suit your style.
14-
- And more!
9+
- Multi-language support
10+
- Five adjustable event types
11+
- Stack navigation
12+
- Dual configurable texts on the panel
13+
- Customize colors, fonts, sizes, and events
1514

16-
![Shamsi Calendar Plasmoidscreenshot](./img/featured.png)
15+
![Shamsi Calendar Plasmoid Screenshot](./img/featured.png)
1716

18-
[KDE Store](https://store.kde.org/p/1460130/) - [CHANGELOG](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/blob/main/CHANGELOG.md)
17+
[Changelog](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/blob/main/CHANGELOG.md)
1918

20-
## Requirement
19+
## Requirements
2120

22-
| Plasma Version | Widget Version |
23-
| -------------- | ---------------------------------------------------------------------- |
24-
| 5.25 and above | 2.x |
25-
| 5.24 and below | [1.x](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/tree/v1) |
21+
| Plasma Version | Widget Version | Link |
22+
| ----------------- | ---------------------------------------------------------------------- | ------------------------------------------------------ |
23+
| 6 and above | 3.x | [Plasma 6 Store](https://store.kde.org/p/2216432/) |
24+
| 5.25 > plasma < 6 | [2.x](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/tree/v2) | [Plasma 5 Store](https://store.kde.org/p/1460130/) |
25+
| 5.24 and below | [1.x](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/tree/v1) | [Plasma 5 Store](https://store.kde.org/p/1460130/) |
2626

27-
Check: `plasmashell --version`
27+
Check your Plasma version: `plasmashell --version`
2828

29-
## Install/Update 📦
29+
## Install or Update
3030

31-
You've got two options to get this plasmoid up and running: you can either grab it from the [KDE Store](https://store.kde.org/p/1460130/) or follow these simple steps below.
31+
**Option 1: Install from KDE Store**
3232

33+
Download directly from the [KDE Store](https://store.kde.org/p/1460130/).
3334

34-
**1. Clone/Download repo:**
35+
**Option 2: Manual Installation**
3536

36-
Let's get the plasmoid's source code. Open your terminal again and enter:
37+
1. **Clone the repository:**
3738
```
3839
git clone https://github.com/amirnajaffi/shamsi-calendar-plasmoid.git
3940
```
4041

41-
**2. Open directory:**
42-
43-
Navigate into the newly created directory:
42+
2. **Navigate to the directory:**
4443
```
4544
cd shamsi-calendar-plasmoid
4645
```
4746

48-
**\*Optional:** If you're feeling nostalgic and want to install version 1 (or! maybe your out of Requirement of v2), type:
49-
47+
3. **(Optional) Switch to version 1 for Plasma < 5.24, or version 2 for 5.25 > plasma < 6:**
5048
```
51-
git checkout v1
49+
git checkout v1 (or v2)
5250
```
5351

54-
**3. Install:**
55-
56-
It's time to bring the magic to life! Use this command in your terminal:
57-
52+
4. **Install the plasmoid:**
5853
```
59-
kpackagetool5 -t Plasma/Applet --install package
54+
kpackagetool6 -t Plasma/Applet --install package
6055
```
61-
62-
If you have a previous version installed, use `--upgrade` in above command instead.
63-
56+
To upgrade from a previous version, use `--upgrade` instead of `--install`. There is a `--delete` flag too.
6457
<br />
58+
Alternatively use `kpackagetool5` for V1 and V2
6559

66-
_Or alternatively, type in the terminal to remove the previous versions:_ (And you can re-install the new version after that).
67-
```
68-
kpackagetool5 -t Plasma/Applet --remove org.kde.plasma.shamsi-calendar
69-
```
70-
71-
72-
**4. Log Out/In**
73-
74-
Log out of your system and then log back in. Now everything is done! 😃
60+
5. **Log out and log back in.**
7561

7662
<br />
7763

78-
**As an alternative way** simply you can grab the latest `.plasmoid` file from [this page](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/releases/latest) and install it with above commands.
64+
**Alternative Method:**
65+
Download the latest `.plasmoid` file from [here](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/releases/latest) and install it using the command above.
7966

8067
## Contributing
8168

82-
Thank you for considering contributing to the KDE Plasma Shamsi Calendar! Any contributions you make are greatly appreciated. You can also check [this list](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/issues/10).
69+
Contributions are welcome! Please check [this list](https://github.com/amirnajaffi/shamsi-calendar-plasmoid/issues/10). For major changes, open an issue to discuss them first.
8370

84-
For major changes, please open an issue first to discuss what you would like to change.
8571

8672
## License
8773

@@ -98,8 +84,10 @@ Distributed under the GPL v3 License. See LICENSE for more information.
9884

9985
## FAQ
10086

101-
- **Having Trouble Installing or Updating via KDE Store?**
102-
If you're facing issues with installation or updates from the KDE Store, don't worry! We've got you covered with a simple [manual installation guide](https://github.com/amirnajaffi/shamsi-calendar-plasmoid#installupdate).
87+
- **Trouble installing or updating via KDE Store?**
88+
89+
Try the [manual installation guide](#install-or-update) above.
90+
91+
- **Errors after installation?**
10392

104-
- **Encountering Errors After Installation?**
105-
Sometimes, errors might pop up after installation, and that's okay. Often, these errors are caused by having an older version of Plasma. Make sure you have at least the [minimum required Plasma version](https://github.com/amirnajaffi/shamsi-calendar-plasmoid#requirement) installed. If you're still facing issues, feel free to open a new issue – we're here to help!
93+
Ensure you meet the [minimum Plasma version requirements](#requirements). If issues persist, please open a new issue.

‎package/contents/config/config.qml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
1-
import QtQuick 2.0
1+
import QtQuick
22

3-
import org.kde.plasma.configuration 2.0
4-
import org.kde.plasma.plasmoid 2.0
3+
import org.kde.plasma.configuration
4+
import org.kde.plasma.plasmoid
55

6-
import "../js/store.js" as Store
7-
import "../js/constants.js" as Constants
86
import "../js/translate.js" as Translate
9-
import "../js/utils.js" as Utils
10-
import "../js/bin/persian-date.js" as PersianDate
117

128
ConfigModel {
139

1410
ConfigCategory {
15-
name: Qt.i18next.t('appearance', {lng: Plasmoid.configuration.language})
11+
name: Translate.tConfigScope('appearance', {lng: Plasmoid.configuration.language})
1612
icon: "preferences-desktop-color"
1713
source: "config/appearance.qml"
1814
}
1915

2016
ConfigCategory {
21-
name: Qt.i18next.t('event', {lng: Plasmoid.configuration.language})
17+
name: Translate.tConfigScope('event', {lng: Plasmoid.configuration.language})
2218
icon: "view-calendar-week"
2319
source: "config/event.qml"
2420
}
2521

2622
ConfigCategory {
27-
name: Qt.i18next.t('other', {lng: Plasmoid.configuration.language})
23+
name: Translate.tConfigScope('other', {lng: Plasmoid.configuration.language})
2824
icon: "view-more-horizontal-symbolic"
2925
source: "config/other.qml"
3026
}

0 commit comments

Comments
 (0)