[EGIT] [apps/ephoto] master 01/01: cosmetic - dismiss popopup for swettings not del
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=4b71bb9e1b8bea28b8c7c2e7a64eea810bc142b5
commit 4b71bb9e1b8bea28b8c7c2e7a64eea810bc142b5
Author: Carsten Haitzler (Rasterman)
Date: Wed Aug 11 15:41:56 2021 +0100
cosmetic - dismiss popopup for swettings not del
---
src/bin/ephoto_config.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 5cd2c55..e6aded8 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -10,6 +10,14 @@ static Eina_Bool _ephoto_gadget_on_config_save(void *data);
static Eet_Data_Descriptor *edd = NULL;
static Eet_Data_Descriptor *gedd = NULL;
+static void
+_config_popup_dismissed_cb(void *data, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ Evas_Object *popup = data;
+ evas_object_del(popup);
+}
+
static void
_config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
@@ -69,7 +77,8 @@ _config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
eina_stringshare_replace(>config->slideshow_transition,
elm_object_text_get(ephoto->config->slide_trans));
- evas_object_del(popup);
+ evas_object_smart_callback_add(popup, "dismissed",
_config_popup_dismissed_cb, popup);
+ elm_popup_dismiss(popup);
elm_object_focus_set(ephoto->pager, EINA_TRUE);
if (ephoto->state == EPHOTO_STATE_THUMB)
ephoto_thumb_browser_recalc(ephoto);
--
[EGIT] [apps/rage] master 01/01: video smart - we dont need to handle the move func - smart clipped does
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=7d7c825ecd808fb4caccf13e23cc90a5c0d833e5
commit 7d7c825ecd808fb4caccf13e23cc90a5c0d833e5
Author: Carsten Haitzler (Rasterman)
Date: Fri Jul 9 11:35:34 2021 +0100
video smart - we dont need to handle the move func - smart clipped does
---
src/bin/video.c | 16 +++-
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/bin/video.c b/src/bin/video.c
index dc8fa30..25f6842 100644
--- a/src/bin/video.c
+++ b/src/bin/video.c
@@ -409,9 +409,9 @@ _smart_add(Evas_Object *obj)
_parent_sc.add(obj);
o = evas_object_rectangle_add(evas_object_evas_get(obj));
+ evas_object_color_set(o, 255, 255, 255, 255);
evas_object_smart_member_add(o, obj);
sd->clip = o;
- evas_object_color_set(o, 255, 255, 255, 255);
}
static void
@@ -450,12 +450,11 @@ static void
_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
Video *sd = evas_object_smart_data_get(obj);
- Evas_Coord ox, oy, ow, oh;
+ Evas_Coord ow, oh;
if (!sd) return;
- evas_object_geometry_get(obj, , , , );
+ evas_object_geometry_get(obj, NULL, NULL, , );
if ((ow == w) && (oh == h)) return;
evas_object_smart_changed(obj);
- evas_object_resize(sd->clip, ow, oh);
}
static Eina_Bool
@@ -523,14 +522,6 @@ _smart_calculate(Evas_Object *obj)
evas_object_resize(sd->clip, ow, oh);
}
-static void
-_smart_move(Evas_Object *obj, Evas_Coord x EINA_UNUSED, Evas_Coord y
EINA_UNUSED)
-{
- Video *sd = evas_object_smart_data_get(obj);
- if (!sd) return;
- evas_object_smart_changed(obj);
-}
-
static void
_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event)
{
@@ -574,7 +565,6 @@ _smart_init(void)
sc.add = _smart_add;
sc.del = _smart_del;
sc.resize= _smart_resize;
- sc.move = _smart_move;
sc.calculate = _smart_calculate;
_smart = evas_smart_class_new();
}
--
[EGIT] [website/www-content] master 01/01: Revert "Wiki page start changed with summary [] by Saim khan"
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=2649428a79ac19f880a6321c2a267b046f4549e3 commit 2649428a79ac19f880a6321c2a267b046f4549e3 Author: Carsten Haitzler (Rasterman) Date: Thu Jun 17 14:28:14 2021 +0100 Revert "Wiki page start changed with summary [] by Saim khan" This reverts commit 739150d6e413737c43f02b298fc748035b70e5b0. spam --- pages/contrib/start.txt | 36 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pages/contrib/start.txt b/pages/contrib/start.txt index 34ce6b7c9..3a5951d8c 100644 --- a/pages/contrib/start.txt +++ b/pages/contrib/start.txt @@ -1,11 +1,31 @@ -~~Procedural Posture~~ +~~Title: Contribute~~ -Appellant leasehold owners sought review of a decision of the trial court (California), which ordered dismissal of appellant's complaint for damages and injunctive relief against respondents, county and state, and ruled in favor of respondent commission in appellant's petition for writ of mandate, arising from the denial of a coastal building permit. - -Overview: [[https://california-business-lawyer-corporate-lawyer.com/rules-of-court-crc-california/california-rules-of-court-crc-rule-3-35-definition-of-limited-scope-representation-application-of-rules/|limited scope definition]] +== How to Contribute to EFL and Enlightenment == -Appellant leasehold owners were initially granted a permit from respondent commission to build a hotel on coastal property owned in fee by respondent county, but then denied a permit after respondent county intervened in opposition. The court affirmed the decision of the trial court and found that the initial grant of the permit did not become final until 60 days had elapsed, pursuant to Cal. Pub. Res. Code ยง 27423(b) because appellant agreed to time extensions. The court found that resp [...] - -Outcome -The court affirmed the decision of the trial court dismissing appellant leasehold owners' complaint against respondents, county and state, and ruling in favor of respondent commission in appellant's petition for writ of mandate because appellants' building permit was properly and timely opposed and appellants had no action for inverse condemnation. +Whether you're an end-user or a developer there are ways to get involved in the Enlightenment Project. Below you'll find various ways you can help out, from offering your time to improve the project's documentation or provide patches to offering to maintain the servers or supply hardware for development and testing. +However you want to contribute, know that your contribution will always be warmly received and go towards making the Enlightenment Project the best it can possibly be. + +Information on the current status of Enlightenment Project development, along with a list of open issues requiring attention, can be found on the [[https://phab.enlightenment.org/|Phabricator Ticket System]]. Assistance with any and all of the listed tickets is always welcome. + += Contributing Time = + +If you have free time help is always welcome, with a variety of areas suited to different skill sets. + +If you have development skills you'll find ways to contribute in the [[https://www.enlightenment.org/contrib/devs/start.md|Developer Contributions section]], from resolving issues raised in the [[https://phab.enlightenment.org/|Phabricator Ticket System]] to [[https://www.enlightenment.org/contrib/devs/arcanist-guide.md|submitting and reviewing patches]]. You'll also find information for joining the official IRC channels and mailing lists, where you can ask for assistance in getting star [...] + +If you have good written skills you'll find guidelines for contributing to project documentation in the [[https://www.enlightenment.org/contrib/docs/start.md|Documentation Contributions section]]. Whether you want to write lengthy tutorials or simply fix a spelling mistake, your assistance will always be gratefully received. + +Other skill sets, including translators to assist with bringing the Enlightenment ecosystem to as many users in their native languages as possible and designers to work on new Enlightenment and application themes, are welcome to contribute too. Join the [[/contact|official IRC channel]] and ask how you can help. + +Terminology has been translated into several languages already. If your language is missing or incomplete, please use [[https://hosted.weblate.org/engage/terminology/|Weblate]] to help translate Terminology. + += Contributing Financially = + +The Enlightenment Project is run by the Enlightenment Association, a non-profit organization registered under French law. Donations of money, support, or equipment are always welcome, and go fully to help maintain the Enlightenment Project and improve the ecosystem for all its users. + +You can contribute by offering to maintain addition
[EGIT] [website/www] master 01/01: www - remove errant squiggly
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=93846861d5b453b523fc041aca89c3c85a8f346e commit 93846861d5b453b523fc041aca89c3c85a8f346e Author: Carsten Haitzler (Rasterman) Date: Tue Jun 15 12:15:36 2021 +0100 www - remove errant squiggly --- public_html/lib/tpl/e/footer.html | 1 - 1 file changed, 1 deletion(-) diff --git a/public_html/lib/tpl/e/footer.html b/public_html/lib/tpl/e/footer.html index e903be7b..4738689a 100644 --- a/public_html/lib/tpl/e/footer.html +++ b/public_html/lib/tpl/e/footer.html @@ -159,7 +159,6 @@ var nick = n1[Math.floor(Math.random() * n1.length)] + '-' + n2[Math.floor(Math.random() * n2.length)]; - }
[EGIT] [website/www] master 01/01: ok - whatever. iframe not working. go to new tab and full page for chat
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=f6af920a2fb421a91ed2ca379cb9a04523c28098
commit f6af920a2fb421a91ed2ca379cb9a04523c28098
Author: Carsten Haitzler (Rasterman)
Date: Tue Jun 15 12:02:47 2021 +0100
ok - whatever. iframe not working. go to new tab and full page for chat
---
public_html/lib/tpl/e/footer.html | 19 +--
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/public_html/lib/tpl/e/footer.html
b/public_html/lib/tpl/e/footer.html
index 7beff5e6..e903be7b 100644
--- a/public_html/lib/tpl/e/footer.html
+++ b/public_html/lib/tpl/e/footer.html
@@ -159,17 +159,6 @@ var nick =
n1[Math.floor(Math.random() * n1.length)] +
'-' +
n2[Math.floor(Math.random() * n2.length)];
-var iframe;
-
- function initFrame() {
-if (!iframe) {
- iframe = document.createElement('iframe');
- iframe.setAttribute('src',
-'https://kiwiirc.com/client/irc.libera.chat/?port=6667=true='
+ nick + '=cli#e');
- iframe.setAttribute('sandbox', 'allow-forms allow-scripts
allow-same-origin');
- iframe.setAttribute('style', 'border:0; width:360px; height:500px;');
- document.getElementById('ircbubble2').appendChild(iframe);
-}
}
https://kiwiirc.com/client/irc.libera.chat/?port=6667=true='
+ nick + '=cli#e');
}"
>
http://www.w3.org/2000/svg;>
--
[EGIT] [website/www] master 01/01: fix chat url
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=667ad9c152e7b81871b605ef9280ed6c9c9c3adc
commit 667ad9c152e7b81871b605ef9280ed6c9c9c3adc
Author: Carsten Haitzler (Rasterman)
Date: Tue Jun 15 08:25:34 2021 +0100
fix chat url
---
public_html/lib/tpl/e/footer.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/lib/tpl/e/footer.html
b/public_html/lib/tpl/e/footer.html
index 6bf5c48f..7beff5e6 100644
--- a/public_html/lib/tpl/e/footer.html
+++ b/public_html/lib/tpl/e/footer.html
@@ -165,7 +165,7 @@ var iframe;
if (!iframe) {
iframe = document.createElement('iframe');
iframe.setAttribute('src',
-'https://kiwiirc.com/client/irc.libera.chat/?port=6667=true?nick='
+ nick + '=cli#e');
+'https://kiwiirc.com/client/irc.libera.chat/?port=6667=true='
+ nick + '=cli#e');
iframe.setAttribute('sandbox', 'allow-forms allow-scripts
allow-same-origin');
iframe.setAttribute('style', 'border:0; width:360px; height:500px;');
document.getElementById('ircbubble2').appendChild(iframe);
--
[EGIT] [website/www-content] master 01/01: irc - conact - add back de and fr channels
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b48b93ef6fa112291ce11a7f1a831f45e8d69b22 commit b48b93ef6fa112291ce11a7f1a831f45e8d69b22 Author: Carsten Haitzler (Rasterman) Date: Mon Jun 14 12:27:07 2021 +0100 irc - conact - add back de and fr channels --- pages/contact.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/contact.txt b/pages/contact.txt index c31dcf963..3be7d2336 100644 --- a/pages/contact.txt +++ b/pages/contact.txt @@ -37,6 +37,8 @@ Not everyone speaks English natively, but it is the primary language used here. ^IRC Server ^Port ^Channel ^ Topic^ |[[http://www.libera.chat|irc.libera.chat]] |6667 |#e | General | +|[[http://www.libera.chat|irc.libera.chat]] |6667 |#e.de | German | +|[[http://www.libera.chat|irc.libera.chat]] |6667 |#e.fr | French | Many of the core developers involved in Enlightenment as well as a lot of users are on IRC. They use IRC often and will discuss many --
[EGIT] [website/www] master 01/01: final try for chat box to libera - works when manually tested
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=ab88e102e292fd13480abef4df3f50ab77ce4bc3
commit ab88e102e292fd13480abef4df3f50ab77ce4bc3
Author: Carsten Haitzler (Rasterman)
Date: Mon Jun 14 12:20:40 2021 +0100
final try for chat box to libera - works when manually tested
---
public_html/lib/tpl/e/footer.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/lib/tpl/e/footer.html
b/public_html/lib/tpl/e/footer.html
index a2b09c3b..6bf5c48f 100644
--- a/public_html/lib/tpl/e/footer.html
+++ b/public_html/lib/tpl/e/footer.html
@@ -165,7 +165,7 @@ var iframe;
if (!iframe) {
iframe = document.createElement('iframe');
iframe.setAttribute('src',
-'https://kiwiirc.com/client/irc.libera.chat:+6697/?nick=' + nick +
'=cli#e');
+'https://kiwiirc.com/client/irc.libera.chat/?port=6667=true?nick='
+ nick + '=cli#e');
iframe.setAttribute('sandbox', 'allow-forms allow-scripts
allow-same-origin');
iframe.setAttribute('style', 'border:0; width:360px; height:500px;');
document.getElementById('ircbubble2').appendChild(iframe);
--
[EGIT] [website/www-content] master 01/01: adjust contenty to point to #e on libera
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=62aa4f6d5ec72e64b3227787f5965321c7b382f4 commit 62aa4f6d5ec72e64b3227787f5965321c7b382f4 Author: Carsten Haitzler (Rasterman) Date: Mon Jun 14 11:38:26 2021 +0100 adjust contenty to point to #e on libera --- pages/about-edi.md.txt | 3 ++- pages/contact.txt | 13 - pages/contrib/devs/start.md.txt | 11 +++ pages/contrib/docs/start.md.txt | 11 +++ pages/develop/start.md.txt | 11 +++ 5 files changed, 15 insertions(+), 34 deletions(-) diff --git a/pages/about-edi.md.txt b/pages/about-edi.md.txt index adf56e0df..b6e5a4684 100644 --- a/pages/about-edi.md.txt +++ b/pages/about-edi.md.txt @@ -40,4 +40,5 @@ So far the main features include: * No screen waste (toolbar, menu, tab are out of the way of the developer). * Creation of new projects from name input and skeleton project files. -If you have ideas for features please let us know in the #edi-ide chat room on [irc.freenode.net](https://webchat.freenode.net/). \ No newline at end of file +If you have ideas for features please let us know in the #e chat room on +[IRC](/contact)). diff --git a/pages/contact.txt b/pages/contact.txt index 0c54a4272..c31dcf963 100644 --- a/pages/contact.txt +++ b/pages/contact.txt @@ -36,23 +36,18 @@ Not everyone speaks English natively, but it is the primary language used here. IRC ^IRC Server ^Port ^Channel ^ Topic^ -|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e | General | -|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.py | Python related | -|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.bsd | BSD related | -|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.de | General in German | -|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.fr | General in French | -|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.kr | General in Korean | +|[[http://www.libera.chat|irc.libera.chat]] |6667 |#e | General | Many of the core developers involved in Enlightenment as well as a lot of users are on IRC. They use IRC often and will discuss many development issues there instead of e-mail, due to it having immediate feedback as well as convenient shared discussion channels. -We use the Freenode IRC network, and you will find us on the #e +We use the Libera Chat IRC network, and you will find us on the #e channel. You can use a, IRC client like X-Chat, Konversation, Pidgin, and many others. If your client already has a listing for -freenode, just select it. If not just set up the server as -irc.freenode.net as your server with the normal IRC port of 6667. Once +Libera, just select it. If not just set up the server as +irc.libera.chat as your server with the normal IRC port of 6667. Once connected just join #e (you can just type in the command: /join #e then Enter). Just type + press Enter to talk. diff --git a/pages/contrib/devs/start.md.txt b/pages/contrib/devs/start.md.txt index 820afc4d9..4cc517979 100644 --- a/pages/contrib/devs/start.md.txt +++ b/pages/contrib/devs/start.md.txt @@ -71,18 +71,13 @@ If you are sure the functionality you wish to implement doesn't yet exist, talk ## IRC Channels ## -The official Enlightenment IRC channels, hosted on the Freenode network, are often the quickest way to communicate with fellow developers. Available in English, German, French, and Korean, the channels are accessible 24/7 and are open to both developers and end-users. +The official Enlightenment IRC channels, hosted on the Libera Chat network, are often the quickest way to communicate with fellow developers. Available in English, German, French, and Korean, the channels are accessible 24/7 and are open to both developers and end-users. Connection information is as follows: | IRC Server | Port | Channel | Topic | |--|--|-|-| -| irc.freenode.net | 6667 | #e | General | -| irc.freenode.net | 6667 | #e.py | Python-related | -| irc.freenode.net | 6667 | #e.bsd | BSD-related | -| irc.freenode.net | 6667 | #e.de | General - German| -| irc.freenode.net | 6667 | #e.fr | General - French| -| irc.freenode.net | 6667 | #e.kr | General - Korean| +| irc.libera.char | 6667 | #e | General | ## Mailing Lists ## @@ -94,4 +89,4 @@ The Enlightenment Project maintains several mailing lists, full details of which | [enlightenment-announce](http://lists.sourceforge.net/lists/listinfo/enlightenment-announce) | [SourceForge](http://sourceforge.net/mailarchive/forum.php?forum_name=enlightenment-announce) | E/EFL announcements | | [enlightenment-intl](http://lists.sourceforge.net/lists/listinfo/enlightenment-intl) | [SourceForge](http://sourceforge.net/mailarchive/forum.php?forum_name=enlightenment-intl
[EGIT] [website/www] master 01/01: www try this for kiwii irc + libera...
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=d74ceabee7adcb53c57682244230a6599c115c57
commit d74ceabee7adcb53c57682244230a6599c115c57
Author: Carsten Haitzler (Rasterman)
Date: Mon Jun 14 11:43:00 2021 +0100
www try this for kiwii irc + libera...
---
public_html/lib/tpl/e/footer.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/lib/tpl/e/footer.html
b/public_html/lib/tpl/e/footer.html
index 47363c57..a2b09c3b 100644
--- a/public_html/lib/tpl/e/footer.html
+++ b/public_html/lib/tpl/e/footer.html
@@ -165,7 +165,7 @@ var iframe;
if (!iframe) {
iframe = document.createElement('iframe');
iframe.setAttribute('src',
-'https://kiwiirc.com/client/irc.libera.chat/?nick=' + nick +
'=cli#e');
+'https://kiwiirc.com/client/irc.libera.chat:+6697/?nick=' + nick +
'=cli#e');
iframe.setAttribute('sandbox', 'allow-forms allow-scripts
allow-same-origin');
iframe.setAttribute('style', 'border:0; width:360px; height:500px;');
document.getElementById('ircbubble2').appendChild(iframe);
--
[EGIT] [website/www] master 01/01: move chat bubble to libera
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=cc62d8c175d58c5525edf45567ac4305076529a2
commit cc62d8c175d58c5525edf45567ac4305076529a2
Author: Carsten Haitzler (Rasterman)
Date: Mon Jun 14 11:32:25 2021 +0100
move chat bubble to libera
---
public_html/lib/tpl/e/footer.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/lib/tpl/e/footer.html
b/public_html/lib/tpl/e/footer.html
index 6d9a3574..47363c57 100644
--- a/public_html/lib/tpl/e/footer.html
+++ b/public_html/lib/tpl/e/footer.html
@@ -165,7 +165,7 @@ var iframe;
if (!iframe) {
iframe = document.createElement('iframe');
iframe.setAttribute('src',
-'https://kiwiirc.com/client/irc.freenode.net/?nick=' + nick +
'=cli#e');
+'https://kiwiirc.com/client/irc.libera.chat/?nick=' + nick +
'=cli#e');
iframe.setAttribute('sandbox', 'allow-forms allow-scripts
allow-same-origin');
iframe.setAttribute('style', 'border:0; width:360px; height:500px;');
document.getElementById('ircbubble2').appendChild(iframe);
--
[EGIT] [apps/ecrire] master 01/01: icon - add svg and make flat ecrire icon and isntall in right places
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=ec46b1fe7f90816d74fbbd0d178eca7a025c9095
commit ec46b1fe7f90816d74fbbd0d178eca7a025c9095
Author: Carsten Haitzler (Rasterman)
Date: Tue May 18 15:20:51 2021 +0100
icon - add svg and make flat ecrire icon and isntall in right places
---
data/icons/ecrire.png | Bin 11911 -> 6202 bytes
data/icons/ecrire.svg | 204 +
data/icons/meson.build | 6 ++
3 files changed, 210 insertions(+)
diff --git a/data/icons/ecrire.png b/data/icons/ecrire.png
index c08f5b9..57912b9 100644
Binary files a/data/icons/ecrire.png and b/data/icons/ecrire.png differ
diff --git a/data/icons/ecrire.svg b/data/icons/ecrire.svg
new file mode 100644
index 000..a3628d7
--- /dev/null
+++ b/data/icons/ecrire.svg
@@ -0,0 +1,204 @@
+
+http://purl.org/dc/elements/1.1/;
+ xmlns:cc="http://creativecommons.org/ns#;
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+ xmlns:svg="http://www.w3.org/2000/svg;
+ xmlns="http://www.w3.org/2000/svg;
+ xmlns:xlink="http://www.w3.org/1999/xlink;
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape;
+ inkscape:export-ydpi="48"
+ inkscape:export-xdpi="48"
+ inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/file-040.png"
+ inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"
+ sodipodi:docname="ecrire.svg"
+ viewBox="0 0 80 80"
+ height="80"
+ width="80"
+ id="svg2"
+ version="1.1">
+
+
+
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage; />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 817293f..be19c0e 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,2 +1,8 @@
install_data('ecrire.png',
install_dir: join_paths(dir_data, 'icons'))
+install_data('ecrire.svg',
+ install_dir: join_paths(dir_data, 'icons'))
+install_data('ecrire.png',
+ install_dir: join_paths(dir_data, 'icons/hicolor/128x128/apps'))
+install_data('ecrire.svg',
+ install_dir: join_paths(dir_data, 'icons/hicolor/scalable/apps'))
--
[EGIT] [apps/rage] master 01/03: remove comment out of encoding
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=d64f9c3da578b1f9a47fd11cdcf7596adfb5db4c commit d64f9c3da578b1f9a47fd11cdcf7596adfb5db4c Author: Carsten Haitzler (Rasterman) Date: Tue Apr 6 00:57:10 2021 +0100 remove comment out of encoding --- data/desktop/rage.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/desktop/rage.desktop b/data/desktop/rage.desktop index 7fcf000..058ed8d 100644 --- a/data/desktop/rage.desktop +++ b/data/desktop/rage.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -#Encoding=UTF-8 +Encoding=UTF-8 Type=Application Name=Rage GenericName=Video Player --
[EGIT] [apps/rage] master 02/03: update copying dates
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=78868b42ca170b4cadbade72e30d0d047f1b52d1 commit 78868b42ca170b4cadbade72e30d0d047f1b52d1 Author: Carsten Haitzler (Rasterman) Date: Tue Apr 6 01:13:33 2021 +0100 update copying dates --- COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYING b/COPYING index a278c22..b40b51e 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,6 @@ Copyright notice for Rage: -Copyright (C) 2014 Carsten Haitzler and various contributors (see AUTHORS) +Copyright (C) 2014-2021 Carsten Haitzler and various contributors (see AUTHORS) All rights reserved. --
[EGIT] [apps/rage] master 03/03: update to efl 1.25 and silence edje_cc warn
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=db95c4c10c3dd6bcfc568c07146764272ea6
commit db95c4c10c3dd6bcfc568c07146764272ea6
Author: Carsten Haitzler (Rasterman)
Date: Wed May 12 20:13:37 2021 +0100
update to efl 1.25 and silence edje_cc warn
---
data/themes/default.edc | 2 ++
meson.build | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index f2aa99b..e282e54 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1,3 +1,5 @@
+efl_version: 1 25;
+
collections {
#define CTRLSIZE 26
diff --git a/meson.build b/meson.build
index 702029f..4d8c32f 100644
--- a/meson.build
+++ b/meson.build
@@ -13,7 +13,7 @@ ver = meson.project_version()
# dependencies
cc = meson.get_compiler('c')
m_dep = cc.find_library('m', required : false)
-efl_version = '>= 1.22.3'
+efl_version = '>= 1.25.0'
deps = [ dependency('elementary', version: efl_version), m_dep ]
edje = dependency('edje', version: efl_version)
--
[EGIT] [apps/edi] master 01/01: disable focus hilight ... as we want itin auto - show when using tab etc
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/edi.git/commit/?id=06bf332331107f2f2b08c533c867f2cc2495e4dc
commit 06bf332331107f2f2b08c533c867f2cc2495e4dc
Author: Carsten Haitzler (Rasterman)
Date: Fri Apr 9 10:06:29 2021 +0100
disable focus hilight ... as we want itin auto - show when using tab etc
---
src/bin/edi_main.c| 1 -
src/bin/screens/edi_about.c | 1 -
src/bin/screens/edi_welcome.c | 2 --
3 files changed, 4 deletions(-)
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index f7abeca..0a38eb7 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -1806,7 +1806,6 @@ edi_open(const char *inputpath)
if (!win) return EINA_FALSE;
_edi_main_win = win;
- elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
evas_object_smart_callback_add(win, "delete,request", _edi_exit, NULL);
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _edi_resize_cb,
NULL);
evas_object_smart_callback_add(win, "focused", _edi_focused_cb, NULL);
diff --git a/src/bin/screens/edi_about.c b/src/bin/screens/edi_about.c
index 0b466d3..4618f68 100644
--- a/src/bin/screens/edi_about.c
+++ b/src/bin/screens/edi_about.c
@@ -33,7 +33,6 @@ edi_about_show(Evas_Object *mainwin)
title_text = eina_slstr_printf(_("About Edi %s"), PACKAGE_VERSION);
elm_win_title_set(win, title_text);
- elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
evas_object_smart_callback_add(win, "delete,request", _edi_about_exit, win);
table = elm_table_add(win);
diff --git a/src/bin/screens/edi_welcome.c b/src/bin/screens/edi_welcome.c
index 0018f03..7fe2f40 100644
--- a/src/bin/screens/edi_welcome.c
+++ b/src/bin/screens/edi_welcome.c
@@ -151,7 +151,6 @@ _edi_welcome_project_choose_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNU
win = elm_win_util_standard_add("projectselector", _("Choose a Project
Folder"));
if (!win) return;
- elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
evas_object_smart_callback_add(win, "delete,request",
_edi_welcome_choose_exit, win);
fs = elm_fileselector_add(win);
@@ -921,7 +920,6 @@ Evas_Object *edi_welcome_show()
if (!win) return NULL;
_welcome_window = win;
- elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
evas_object_smart_callback_add(win, "delete,request", _edi_welcome_exit,
win);
naviframe = elm_naviframe_add(win);
--
[EGIT] [apps/ecrire] master 01/01: Revert "ecrire: wrap mode."
raster pushed a commit to branch master. http://git.enlightenment.org/apps/ecrire.git/commit/?id=5072846a260deeddaa8c6c20195e103968b2da33 commit 5072846a260deeddaa8c6c20195e103968b2da33 Author: Carsten Haitzler (Rasterman) Date: Fri Apr 9 09:41:12 2021 +0100 Revert "ecrire: wrap mode." This reverts commit 5e4777204e69be33f3811d55c55972f062417a3e. It is handled properly. Look at every other entry out there in every toolkit and not to mention word, libreoffice, every browser and if they implement complex document views like google docs... --- src/bin/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/main.c b/src/bin/main.c index 6b2fd9c..9b38292 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -756,7 +756,7 @@ ecrire_editor_add(const char *filename, const char *font_name, int font_size) inst->entry = entry = elm_entry_add(win); elm_entry_scrollable_set(entry, EINA_TRUE); - elm_entry_line_wrap_set(entry, ELM_WRAP_NONE); //_ent_cfg->wrap_type); + elm_entry_line_wrap_set(entry, _ent_cfg->wrap_type); elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); --
[EGIT] [apps/ecrire] master 01/01: add busy progress while text is still appending in the bg
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=964ac6b0dc08a3a9923bed7adb43901194e23f7b
commit 964ac6b0dc08a3a9923bed7adb43901194e23f7b
Author: Carsten Haitzler (Rasterman)
Date: Thu Apr 8 16:23:14 2021 +0100
add busy progress while text is still appending in the bg
for big txt files this is most useful.
---
src/bin/Ecrire.h | 1 +
src/bin/main.c | 36 ++--
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/bin/Ecrire.h b/src/bin/Ecrire.h
index 9b50ca2..3cbaa41 100644
--- a/src/bin/Ecrire.h
+++ b/src/bin/Ecrire.h
@@ -16,6 +16,7 @@ typedef struct _Ecrire_Editor
{
Evas_Object *win;
Evas_Object *entry;
+ Evas_Object *busy;
Evas_Object *search_win;
Evas_Object *settings_popup;
diff --git a/src/bin/main.c b/src/bin/main.c
index 6741974..63a243a 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -103,6 +103,15 @@ _cb_sel_clear(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
elm_object_item_disabled_set(inst->toolbar.cut, EINA_TRUE);
}
+static void
+_cb_text_set_done(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ Ecrire_Editor *inst = data;
+
+ elm_progressbar_pulse(inst->busy, EINA_FALSE);
+}
+
static void
_update_cur_file(const char *file, Ecrire_Editor *inst)
{
@@ -388,6 +397,7 @@ _editor_file_open(Ecrire_Editor *inst, const char *file)
else
{
_editor_reset(inst);
+ elm_progressbar_pulse(inst->busy, EINA_TRUE);
elm_entry_entry_append(inst->entry, buf);
elm_object_item_disabled_set(inst->menu.save, EINA_TRUE);
elm_object_item_disabled_set(inst->toolbar.save, EINA_TRUE);
@@ -708,7 +718,7 @@ _ecrire_menu_add(Ecrire_Editor *inst)
void
ecrire_editor_add(const char *filename, const char *font_name, int font_size)
{
- Evas_Object *win, *pad, *fr, *bx, *entry, *cur_info;
+ Evas_Object *win, *pad, *fr, *bx, *entry, *cur_info, *tab, *busy;
Evas_Object *toolbar;
Evas_Coord w = 600, h = 600;
@@ -738,15 +748,36 @@ ecrire_editor_add(const char *filename, const char
*font_name, int font_size)
toolbar = _ecrire_toolbar_add(inst);
elm_box_pack_end(bx, toolbar);
+ tab = elm_table_add(win);
+ evas_object_size_hint_align_set(tab, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(tab, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_box_pack_end(bx, tab);
+ evas_object_show(tab);
+
inst->entry = entry = elm_entry_add(win);
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_line_wrap_set(entry, _ent_cfg->wrap_type);
elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_box_pack_end(bx, entry);
+ elm_table_pack(tab, entry, 0, 0, 1, 1);
evas_object_show(entry);
+ pad = elm_frame_add(win);
+ elm_object_style_set(pad, "pad_large");
+ evas_object_size_hint_align_set(pad, 1.0, 1.0);
+ evas_object_size_hint_weight_set(pad, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_table_pack(tab, pad, 0, 0, 1, 1);
+ evas_object_pass_events_set(pad, EINA_TRUE);
+ evas_object_show(pad);
+
+ inst->busy = busy = elm_progressbar_add(win);
+ elm_object_style_set(busy, "hidden_wheel");
+ elm_progressbar_pulse_set(busy, EINA_TRUE);
+ elm_object_content_set(pad, busy);
+ evas_object_pass_events_set(busy, EINA_TRUE);
+ evas_object_show(busy);
+
pad = elm_frame_add(win);
elm_object_style_set(pad, "pad_medium");
evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, 1.0);
@@ -776,6 +807,7 @@ ecrire_editor_add(const char *filename, const char
*font_name, int font_size)
evas_object_smart_callback_add(entry, "selection,start", _cb_sel_start,
inst);
evas_object_smart_callback_add(entry, "selection,cleared", _cb_sel_clear,
inst);
evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN, _cb_key_down,
inst);
+ evas_object_smart_callback_add(entry, "text,set,done", _cb_text_set_done,
inst);
_ecrire_menu_add(inst);
--
[EGIT] [apps/ecrire] master 01/01: remove frame around entry - superflous and space filling
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=401e31585152591a5db690bd4c4cb8a7f9da7bc2
commit 401e31585152591a5db690bd4c4cb8a7f9da7bc2
Author: Carsten Haitzler (Rasterman)
Date: Thu Apr 8 15:47:09 2021 +0100
remove frame around entry - superflous and space filling
---
src/bin/Ecrire.h | 1 -
src/bin/main.c | 13 +
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/bin/Ecrire.h b/src/bin/Ecrire.h
index b9f1a4a..9b50ca2 100644
--- a/src/bin/Ecrire.h
+++ b/src/bin/Ecrire.h
@@ -15,7 +15,6 @@ extern int _ecrire_log_dom;
typedef struct _Ecrire_Editor
{
Evas_Object *win;
- Evas_Object *frame;
Evas_Object *entry;
Evas_Object *search_win;
diff --git a/src/bin/main.c b/src/bin/main.c
index b4562fc..6741974 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -118,11 +118,6 @@ _update_cur_file(const char *file, Ecrire_Editor *inst)
snprintf(buf, sizeof(buf), _("%sUntitled %d - %s"), saving,
inst->unsaved, PACKAGE_NAME);
- if (inst->filename)
- elm_object_text_set(inst->frame, inst->filename);
- else
- elm_object_text_set(inst->frame, buf);
-
elm_win_title_set(inst->win, buf);
}
@@ -743,19 +738,13 @@ ecrire_editor_add(const char *filename, const char
*font_name, int font_size)
toolbar = _ecrire_toolbar_add(inst);
elm_box_pack_end(bx, toolbar);
- inst->frame = fr = elm_frame_add(win);
- evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(fr);
-
inst->entry = entry = elm_entry_add(win);
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_line_wrap_set(entry, _ent_cfg->wrap_type);
elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_object_content_set(fr, entry);
- elm_box_pack_end(bx, fr);
+ elm_box_pack_end(bx, entry);
evas_object_show(entry);
pad = elm_frame_add(win);
--
[EGIT] [enlightenment/modules/forecasts] master 01/01: lets disable debug now things seem stable and working
raster pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=343b2a38660845c6cc12a7ae1736bde700c463d2
commit 343b2a38660845c6cc12a7ae1736bde700c463d2
Author: Carsten Haitzler (Rasterman)
Date: Tue Apr 6 15:20:45 2021 +0100
lets disable debug now things seem stable and working
---
src/e_mod_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index e847d7a..cf8a670 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -10,7 +10,7 @@ char *strptime(const char *s, const char *format, struct tm
*tm);
#define GOLDEN_RATIO 1.618033989
-#define ENABLE_DEBUG 1
+#define ENABLE_DEBUG 0
#define DEBUG(f, ...) if (ENABLE_DEBUG) \
printf("[forecasts] "f "\n", __VA_ARGS__)
--
[EGIT] [apps/edi] master 01/01: edi about - remove or fix broken buttons like donate, website etc.
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/edi.git/commit/?id=019451e8b640edc3c942ebc4c5cfecf55d14b05c
commit 019451e8b640edc3c942ebc4c5cfecf55d14b05c
Author: Carsten Haitzler (Rasterman)
Date: Mon Apr 5 16:41:02 2021 +0100
edi about - remove or fix broken buttons like donate, website etc.
donmations - zero ever happened, so stop sounding beggy. about website
doesnt exist - point to e's about edit page, and well bugs are not
going to get looke dat on github.
---
src/bin/screens/edi_about.c | 20 +++-
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/bin/screens/edi_about.c b/src/bin/screens/edi_about.c
index 736a327..0b466d3 100644
--- a/src/bin/screens/edi_about.c
+++ b/src/bin/screens/edi_about.c
@@ -127,7 +127,7 @@ edi_about_show(Evas_Object *mainwin)
button = elm_button_add(box);
elm_object_text_set(button, _("Visit Website"));
evas_object_smart_callback_add(button, "clicked", _edi_about_url_cb,
- "http://edi-ide.com;);
+
"https://www.enlightenment.org/about-edi.md;);
elm_box_pack_end(buttonbox, button);
evas_object_show(button);
@@ -137,9 +137,9 @@ edi_about_show(Evas_Object *mainwin)
evas_object_show(space);
button = elm_button_add(box);
- elm_object_text_set(button, _("Report Issue"));
+ elm_object_text_set(button, _("Report Issues"));
evas_object_smart_callback_add(button, "clicked", _edi_about_url_cb,
-
"https://github.com/Enlightenment/edi/issues/new;);
+ "https://phab.enlightenment.org;);
elm_box_pack_end(buttonbox, button);
evas_object_show(button);
@@ -148,25 +148,11 @@ edi_about_show(Evas_Object *mainwin)
elm_box_pack_end(buttonbox, space);
evas_object_show(space);
- button = elm_button_add(box);
- elm_object_text_set(button, _("Help Translate"));
- evas_object_smart_callback_add(button, "clicked", _edi_about_url_cb,
-
"https://www.transifex.com/enlightenment/edi-ide/languages/;);
- elm_box_pack_end(buttonbox, button);
- evas_object_show(button);
-
space = elm_box_add(box);
evas_object_size_hint_min_set(space, 20 * elm_config_scale_get(), 0);
elm_box_pack_end(buttonbox, space);
evas_object_show(space);
- button = elm_button_add(box);
- elm_object_text_set(button, _("Donate Now"));
- evas_object_smart_callback_add(button, "clicked", _edi_about_url_cb,
-
"https://www.bountysource.com/teams/edi-ide;);
- elm_box_pack_end(buttonbox, button);
- evas_object_show(button);
-
evas_object_resize(win, 520 * elm_config_scale_get(), 360 *
elm_config_scale_get());
evas_object_show(win);
--
[EGIT] [apps/edi] master 01/03: polish up settings panel
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/edi.git/commit/?id=15a38bcddcb356cfed642a06862c52eaedfc55d7
commit 15a38bcddcb356cfed642a06862c52eaedfc55d7
Author: Carsten Haitzler (Rasterman)
Date: Mon Apr 5 16:04:39 2021 +0100
polish up settings panel
---
src/bin/edi_config.c| 2 +-
src/bin/screens/edi_settings.c | 175 +++-
src/bin/screens/edi_settings_font.c | 55 +---
3 files changed, 98 insertions(+), 134 deletions(-)
diff --git a/src/bin/edi_config.c b/src/bin/edi_config.c
index 0c6caf5..bc759ec 100644
--- a/src/bin/edi_config.c
+++ b/src/bin/edi_config.c
@@ -534,7 +534,7 @@ _edi_project_config_load()
IFPCFG(0x0002);
_edi_project_config->font.name = eina_stringshare_add("Mono");
- _edi_project_config->font.size = 11;
+ _edi_project_config->font.size = 10;
IFPCFGEND;
IFPCFG(0x0003);
diff --git a/src/bin/screens/edi_settings.c b/src/bin/screens/edi_settings.c
index ee35582..f3dbfb6 100644
--- a/src/bin/screens/edi_settings.c
+++ b/src/bin/screens/edi_settings.c
@@ -44,16 +44,16 @@ _edi_settings_panel_create(Evas_Object *parent, const char
*title)
box = elm_box_add(parent);
elm_box_horizontal_set(box, EINA_FALSE);
- evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, 0.0);
+ evas_object_size_hint_align_set(box, EVAS_HINT_FILL, 0.0);
evas_object_show(box);
frame = elm_frame_add(parent);
elm_object_text_set(frame, title);
elm_object_style_set(frame, "outdent_top");
elm_object_part_content_set(frame, "default", box);
- evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, 0.0);
+ evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, 0.0);
evas_object_show(frame);
return frame;
@@ -173,9 +173,18 @@ _edi_settings_font_choose_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSE
static Evas_Object *
_edi_settings_font_preview_add(Evas_Object *parent, const char *font_name, int
font_size)
{
- Elm_Code_Widget *widget;
+ Elm_Code_Widget *widget, *table, *rect;
Elm_Code *code;
+ table = elm_table_add(parent);
+
+ rect = evas_object_rectangle_add(evas_object_evas_get(parent));
+ evas_object_color_set(rect, 0, 0, 0, 0);
+ evas_object_size_hint_min_set(rect, 240 * elm_config_scale_get(), 40 *
elm_config_scale_get());
+ evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_table_pack(table, rect, 0, 0, 1, 1);
+
code = elm_code_create();
elm_code_file_line_append(code->file, FONT_PREVIEW, 35, NULL);
@@ -186,9 +195,11 @@ _edi_settings_font_preview_add(Evas_Object *parent, const
char *font_name, int f
elm_code_widget_policy_set(widget, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_pass_events_set(widget, EINA_TRUE);
+ elm_table_pack(table, widget, 0, 0, 1, 1);
evas_object_show(widget);
- return widget;
+ return table;
}
static void
@@ -269,7 +280,7 @@ _edi_settings_display_create(Evas_Object *parent)
Eina_List *themes, *l;
container = elm_box_add(parent);
- evas_object_size_hint_weight_set(container, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
+ evas_object_size_hint_weight_set(container, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(container, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(container);
@@ -279,7 +290,7 @@ _edi_settings_display_create(Evas_Object *parent)
elm_box_pack_end(container, frame);
table = elm_table_add(parent);
- evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_table_padding_set(table, EDI_SETTINGS_TABLE_PADDING,
EDI_SETTINGS_TABLE_PADDING);
evas_object_show(table);
@@ -360,8 +371,8 @@ _edi_settings_display_create(Evas_Object *parent)
evas_object_show(label);
elm_object_disabled_set(slider, !_edi_project_config->gui.translucent);
+ evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
- evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
elm_slider_min_max_set(slider, 0, 255);
elm_slider_value_set(slider, _edi_project_config->gui.alpha);
elm_slide
[EGIT] [apps/edi] master 02/03: polish up new project dialog - fix layout bugs
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/edi.git/commit/?id=e5e6408592e15f8bd9d34f3679302ed5d77f5ff5
commit e5e6408592e15f8bd9d34f3679302ed5d77f5ff5
Author: Carsten Haitzler (Rasterman)
Date: Mon Apr 5 16:32:51 2021 +0100
polish up new project dialog - fix layout bugs
---
src/bin/screens/edi_welcome.c | 26 +++---
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/bin/screens/edi_welcome.c b/src/bin/screens/edi_welcome.c
index 5a9617f..0018f03 100644
--- a/src/bin/screens/edi_welcome.c
+++ b/src/bin/screens/edi_welcome.c
@@ -556,47 +556,51 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
frame = elm_frame_add(obj);
elm_object_style_set(frame, "pad_medium");
- evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(frame);
box = elm_box_add(obj);
elm_box_horizontal_set(box, EINA_TRUE);
elm_box_align_set(box, 0, 0);
+ elm_object_content_set(frame, box);
+ evas_object_show(box);
lbox = elm_box_add(box);
+ evas_object_size_hint_weight_set(lbox, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(lbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_horizontal_set(lbox, EINA_TRUE);
- evas_object_show(lbox);
-
- elm_object_content_set(frame, box);
image = elm_image_add(box);
- evas_object_size_hint_min_set(image, 96 * elm_config_scale_get(), 96 *
elm_config_scale_get());
+ evas_object_size_hint_weight_set(image, 0.0, 0.0);
+ evas_object_size_hint_align_set(image, 0.5, 0.5);
+ evas_object_size_hint_min_set(image, 80 * elm_config_scale_get(), 80 *
elm_config_scale_get());
elm_image_file_set(image, template->edje_path, template->edje_id);
- evas_object_show(image);
elm_box_pack_end(lbox, image);
+ evas_object_show(image);
rbox = elm_box_add(box);
elm_box_horizontal_set(box, EINA_TRUE);
- evas_object_size_hint_weight_set(rbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_weight_set(rbox, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(rbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_show(rbox);
entry = elm_entry_add(box);
- evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_entry_editable_set(entry, EINA_FALSE);
elm_entry_scrollable_set(entry, EINA_FALSE);
elm_entry_single_line_set(entry, EINA_FALSE);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
- evas_object_show(entry);
content = eina_slstr_printf("%s%s", template->title,
template->desc);
elm_object_text_set(entry, content);
elm_box_pack_end(rbox, entry);
+ evas_object_show(entry);
elm_box_pack_end(box, lbox);
+ evas_object_show(lbox);
elm_box_pack_end(box, rbox);
+ evas_object_show(rbox);
return frame;
}
@@ -683,7 +687,7 @@ _edi_welcome_project_new_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *even
button = elm_button_add(content);
elm_object_text_set(button, _("Choose"));
- evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0.1);
+ evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_data_set(button, "selected", list);
evas_object_smart_callback_add(button, "clicked",
_edi_welcome_button_clicked_cb, naviframe);
--
[EGIT] [apps/edi] master 03/03: polish up searhc and replace
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/edi.git/commit/?id=065d6c0d5d2c1ad0d689b09d323001c964751eab
commit 065d6c0d5d2c1ad0d689b09d323001c964751eab
Author: Carsten Haitzler (Rasterman)
Date: Mon Apr 5 16:38:01 2021 +0100
polish up searhc and replace
---
src/bin/editor/edi_editor_search.c | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/bin/editor/edi_editor_search.c
b/src/bin/editor/edi_editor_search.c
index 2415357..32c58ae 100644
--- a/src/bin/editor/edi_editor_search.c
+++ b/src/bin/editor/edi_editor_search.c
@@ -461,7 +461,7 @@ edi_editor_search_add(Evas_Object *parent, Edi_Editor
*editor)
lbl = elm_label_add(parent);
elm_object_text_set(lbl, _("Search term"));
- evas_object_size_hint_align_set(lbl, EVAS_HINT_FILL, 0.5);
+ evas_object_size_hint_align_set(lbl, 1.0, 0.5);
evas_object_size_hint_weight_set(lbl, 0.0, 0.0);
elm_table_pack(table, lbl, 0, 0, 1, 1);
evas_object_show(lbl);
@@ -476,7 +476,7 @@ edi_editor_search_add(Evas_Object *parent, Edi_Editor
*editor)
replace_lbl = elm_label_add(parent);
elm_object_text_set(replace_lbl, _("Replace term"));
- evas_object_size_hint_align_set(replace_lbl, EVAS_HINT_FILL, 0.5);
+ evas_object_size_hint_align_set(replace_lbl, 1.0, 0.5);
evas_object_size_hint_weight_set(replace_lbl, 0.0, 0.0);
elm_table_pack(table, replace_lbl, 0, 1, 1, 1);
evas_object_show(replace_lbl);
@@ -492,10 +492,9 @@ edi_editor_search_add(Evas_Object *parent, Edi_Editor
*editor)
box = elm_box_add(parent);
elm_box_homogeneous_set(box, EINA_FALSE);
- elm_box_padding_set(box, 15, 0);
elm_box_horizontal_set(box, EINA_TRUE);
- evas_object_size_hint_align_set(box, 1.0, EVAS_HINT_FILL);
- evas_object_size_hint_weight_set(box, 0.0, 0.0);
+ evas_object_size_hint_align_set(box, 1.0, 0.5);
+ evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, 0.0);
evas_object_show(box);
elm_box_pack_end(big_box, box);
@@ -506,7 +505,7 @@ edi_editor_search_add(Evas_Object *parent, Edi_Editor
*editor)
elm_box_pack_end(box, wrapped_text);
checkbox = elm_check_add(parent);
- elm_object_text_set(checkbox, _("Wrap search?"));
+ elm_object_text_set(checkbox, _("Wrap Search"));
elm_check_state_set(checkbox, EINA_TRUE);
evas_object_show(checkbox);
elm_box_pack_end(box, checkbox);
@@ -514,7 +513,7 @@ edi_editor_search_add(Evas_Object *parent, Edi_Editor
*editor)
btn = elm_button_add(parent);
elm_object_text_set(btn, _("Search"));
evas_object_size_hint_align_set(btn, 1.0, 0.0);
- evas_object_size_hint_weight_set(btn, 0.0, 0.0);
+ evas_object_size_hint_weight_set(btn,EVAS_HINT_FILL, 0.0);
evas_object_show(btn);
elm_box_pack_end(box, btn);
evas_object_smart_callback_add(btn, "clicked", _edi_search_clicked, editor);
@@ -522,7 +521,7 @@ edi_editor_search_add(Evas_Object *parent, Edi_Editor
*editor)
replace_btn = elm_button_add(parent);
elm_object_text_set(replace_btn, _("Replace"));
evas_object_size_hint_align_set(replace_btn, 1.0, 0.0);
- evas_object_size_hint_weight_set(replace_btn, 0.0, 0.0);
+ evas_object_size_hint_weight_set(replace_btn, EVAS_HINT_FILL, 0.0);
evas_object_show(replace_btn);
elm_box_pack_end(box, replace_btn);
evas_object_smart_callback_add(replace_btn, "clicked",
_edi_replace_clicked, editor);
@@ -530,7 +529,7 @@ edi_editor_search_add(Evas_Object *parent, Edi_Editor
*editor)
btn = elm_button_add(parent);
elm_object_text_set(btn, _("Cancel"));
evas_object_size_hint_align_set(btn, 1.0, 0.0);
- evas_object_size_hint_weight_set(btn, 0.0, 0.0);
+ evas_object_size_hint_weight_set(btn, EVAS_HINT_FILL, 0.0);
evas_object_show(btn);
elm_box_pack_end(box, btn);
evas_object_smart_callback_add(btn, "clicked", _edi_cancel_clicked, editor);
--
[EGIT] [apps/edi] master 01/01: make the disabling of theme icons better - just return false
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/edi.git/commit/?id=56105f118163c282a95a1559e2ba7962310944bf
commit 56105f118163c282a95a1559e2ba7962310944bf
Author: Carsten Haitzler (Rasterman)
Date: Mon Apr 5 15:17:11 2021 +0100
make the disabling of theme icons better - just return false
---
src/bin/edi_theme.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/bin/edi_theme.c b/src/bin/edi_theme.c
index 37db13f..ffe9eef 100644
--- a/src/bin/edi_theme.c
+++ b/src/bin/edi_theme.c
@@ -155,8 +155,6 @@ edi_theme_themes_get(void)
const char *
edi_theme_icon_path_get(const char *name)
{
- return name;
-/*
char *path;
const char *icon_path, *directory = PACKAGE_DATA_DIR "/icons";
icon_path = name;
@@ -175,7 +173,6 @@ edi_theme_icon_path_get(const char *name)
}
return icon_path;
- */
}
void
@@ -187,5 +184,6 @@ edi_theme_internal_icons_set(Eina_Bool enabled)
Eina_Bool
edi_theme_internal_icons_get(void)
{
- return _edi_theme_internal_icons;
+ return EINA_FALSE;
+// return _edi_theme_internal_icons;
}
--
[EGIT] [apps/edi] master 01/01: icons - use standard icons so they comd from theme or whatever
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/edi.git/commit/?id=61a9a7ff0a1bf9bc9edf7072a0400a3a804364a8
commit 61a9a7ff0a1bf9bc9edf7072a0400a3a804364a8
Author: Carsten Haitzler (Rasterman)
Date: Mon Apr 5 13:35:45 2021 +0100
icons - use standard icons so they comd from theme or whatever
---
src/bin/edi_theme.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/bin/edi_theme.c b/src/bin/edi_theme.c
index 72b63a1..37db13f 100644
--- a/src/bin/edi_theme.c
+++ b/src/bin/edi_theme.c
@@ -155,6 +155,8 @@ edi_theme_themes_get(void)
const char *
edi_theme_icon_path_get(const char *name)
{
+ return name;
+/*
char *path;
const char *icon_path, *directory = PACKAGE_DATA_DIR "/icons";
icon_path = name;
@@ -173,6 +175,7 @@ edi_theme_icon_path_get(const char *name)
}
return icon_path;
+ */
}
void
--
[EGIT] [apps/rage] master 01/01: add util funcs (move from browser to be shared) and use from main too
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=d682faf9b633ef212754807bf1a711b8d8c4e442
commit d682faf9b633ef212754807bf1a711b8d8c4e442
Author: Carsten Haitzler (Rasterman)
Date: Mon Mar 22 17:02:35 2021 +
add util funcs (move from browser to be shared) and use from main too
file recursion/listing will now use the same funcs as browser.c did -
fast extn checks.
---
src/bin/browser.c | 71 +++--
src/bin/main.c | 7 ++
src/bin/meson.build | 3 ++-
src/bin/util.c | 70
src/bin/util.h | 8 ++
5 files changed, 85 insertions(+), 74 deletions(-)
diff --git a/src/bin/browser.c b/src/bin/browser.c
index b278c9e..f7f76ce 100644
--- a/src/bin/browser.c
+++ b/src/bin/browser.c
@@ -6,6 +6,7 @@
#include "videothumb.h"
#include "key.h"
#include "dnd.h"
+#include "util.h"
typedef struct _Message Message;
typedef struct _Entry Entry;
@@ -120,72 +121,6 @@ _item_size_get(Evas_Object *win, Evas_Coord *w, Evas_Coord
*h)
if (*h < sz) *h = sz;
}
-static Eina_Bool
-_video_ok(const char *path)
-{
- const char *exts[] =
- {
-".asf", ".avi", ".bdm", ".bdmv", ".clpi", ".cpi", ".dv", ".fla",
-".flv", ".m1v", ".m2t", ".m2v", ".m4v", ".mkv", ".mov", ".mp2",
-".mp2ts", ".mp4", ".mpe", ".mpeg", ".mpg", ".mpl", ".mpls", ".mts",
-".mxf", ".nut", ".nuv", ".ogg", ".ogm", ".ogv", ".qt", ".rm", ".rmj",
-".rmm", ".rms", ".rmvb", ".rmx", ".rv", ".swf", ".ts", ".weba",
-".webm", ".wmv", ".3g2", ".3gp", ".3gp2", ".3gpp", ".3gpp2", ".3p2",
-".264",
-NULL
- };
- int i;
- const char *ext = strrchr(path, '.');
- if (!ext) return EINA_FALSE;
- for (i = 0; exts[i]; i++)
- {
-if (!strcasecmp(ext, exts[i])) return EINA_TRUE;
- }
- return EINA_FALSE;
-}
-
-static Eina_Bool
-_audio_ok(const char *path)
-{
- const char *exts[] =
- {
-".mp3", ".m4a", ".oga", ".aac", ".flac", ".wav",
-NULL
- };
- int i;
- const char *ext = strrchr(path, '.');
- if (!ext) return EINA_FALSE;
- for (i = 0; exts[i]; i++)
- {
-if (!strcasecmp(ext, exts[i])) return EINA_TRUE;
- }
- return EINA_FALSE;
-}
-
-static char *
-_videos_dir_get(void)
-{
- char buf[PATH_MAX];
- const char *vids, *home;
- char *vidsreal = NULL, *homereal = NULL;
-
- vids = efreet_videos_dir_get();
- if (vids) vidsreal = ecore_file_realpath(vids);
- home = eina_environment_home_get();
- if (home) homereal = ecore_file_realpath(home);
- if ((vidsreal) && (homereal))
- {
-if (!strcmp(vidsreal, homereal)) vids = NULL;
- }
- free(vidsreal);
- free(homereal);
- if (vids)
- snprintf(buf, sizeof(buf), "%s", vids);
- else
- snprintf(buf, sizeof(buf), "%s/Videos", eina_environment_home_get());
- return strdup(buf);
-}
-
static void
_fill_message(Ecore_Thread *th, Type type, Entry *entry)
{
@@ -241,7 +176,7 @@ _fill_scan(Ecore_Thread *th, Entry *parent, const char *dir)
}
else
{
- if (_video_ok(file) || _audio_ok(file))
+ if (util_video_ok(file) || util_audio_ok(file))
{
eina_lock_take(&(entry->lock));
entry->files = eina_list_append
@@ -817,7 +752,7 @@ _fill(Evas_Object *win)
dir_entry = NULL;
fdat = malloc(sizeof(Fill_Data));
if (!fdat) return;
- fdat->videos = _videos_dir_get();
+ fdat->videos = util_videos_dir_get();
fdat->win = win;
eina_semaphore_new(_sema, 0);
fill_thread = ecore_thread_feedback_run(_fill_thread, _fill_feedback,
diff --git a/src/bin/main.c b/src/bin/main.c
index 1cfe68a..9c8a2f1 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -6,6 +6,7 @@
#include "browser.h"
#include "config.h"
#include "mpris.h"
+#include "util.h"
#define DEPTH_DEFAULT 99
@@ -121,7 +122,6 @@ _cb_feedback_recursion(void *data, Ecore_Thread *thread
EINA_UNUSED, void *msg)
{
Recursion_Data *recursion;
Eina_List *list;
- const char *mime;
const char *path;
Eina_Bool update_content = EINA_FAL
[EGIT] [website/www] master 01/01: www - weather - easier debug and maintenance for files
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=27d15794e745d51fff4c4d0f87a1b32a87ad1028
commit 27d15794e745d51fff4c4d0f87a1b32a87ad1028
Author: Carsten Haitzler (Rasterman)
Date: Thu Mar 18 12:16:55 2021 +
www - weather - easier debug and maintenance for files
---
public_html/weather.php | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/public_html/weather.php b/public_html/weather.php
index 48090da2..20ffc770 100644
--- a/public_html/weather.php
+++ b/public_html/weather.php
@@ -11,13 +11,16 @@ function response_code($code, $why)
function weather_cache_path($lat, $lon)
{
$t = time();
-$d = date('Y-m-d h', $t);
+$d = date('Y-m-d_h', $t);
$m = date('i', $t);
// One per coord per 15 mins
-$file = md5(sprintf("%s Q%d:%.4f:%.4f", $d, $m/15, $lat, $lon));
+$ky = sprintf("%s-Q%d:%.4f:%.4f.json", $d, $m/15, $lat, $lon, $m);
+// Use the above filename directly for easier debug.maintenance
+//$fl = md5($ky);
+$fl = $ky;
-$path = $_SERVER["DOCUMENT_ROOT"] .'/'. CACHE_PATH . '/'. $file;
+$path = $_SERVER["DOCUMENT_ROOT"] .'/'. CACHE_PATH . '/'. $fl;
return $path;
}
--
[EGIT] [apps/rage] master 01/01: video + videothumb - fix leak
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=69cab3e815c3891d395533a6d00da842561665fb commit 69cab3e815c3891d395533a6d00da842561665fb Author: Carsten Haitzler (Rasterman) Date: Thu Mar 18 12:12:25 2021 + video + videothumb - fix leak fix leak on delete of obj @fix --- src/bin/video.c | 1 + src/bin/videothumb.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/bin/video.c b/src/bin/video.c index fc6f4f4..dc8fa30 100644 --- a/src/bin/video.c +++ b/src/bin/video.c @@ -441,6 +441,7 @@ _smart_del(Evas_Object *obj) sd->exe_handler = NULL; } _parent_sc.del(obj); + free(sd); emotion_shutdown(); } diff --git a/src/bin/videothumb.c b/src/bin/videothumb.c index 72702b9..47f327c 100644 --- a/src/bin/videothumb.c +++ b/src/bin/videothumb.c @@ -517,6 +517,7 @@ _smart_del(Evas_Object *obj) sd->cycle_timer = NULL; _parent_sc.del(obj); + free(sd); } static void --
[EGIT] [enlightenment/modules/forecasts] master 01/01: allow poll time down to 1 min which is default and limit 1min to 1h
raster pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=63303bb1f863254c1fa37c952c92f882740d5c25
commit 63303bb1f863254c1fa37c952c92f882740d5c25
Author: Carsten Haitzler (Rasterman)
Date: Wed Mar 17 23:37:05 2021 +
allow poll time down to 1 min which is default and limit 1min to 1h
---
src/e_mod_config.c | 4 ++--
src/e_mod_main.c | 23 +--
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/e_mod_config.c b/src/e_mod_config.c
index e13db6f..e810355 100644
--- a/src/e_mod_config.c
+++ b/src/e_mod_config.c
@@ -254,8 +254,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
sl = elm_slider_add(win);
evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_slider_min_max_set(sl, 15.0, 60.0);
- elm_slider_step_set(sl, 1.0 /(60.0 - 15.0));
+ elm_slider_min_max_set(sl, 1.0, 60.0);
+ elm_slider_step_set(sl, 1.0 / (60.0 - 1.0));
elm_slider_unit_format_set(sl, D_("%2.0f minutes"));
elm_object_text_set(sl, D_("Poll Time"));
elm_object_tooltip_text_set(sl, D_("Poll Time"));
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 90433e1..e847d7a 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -10,7 +10,7 @@ char *strptime(const char *s, const char *format, struct tm
*tm);
#define GOLDEN_RATIO 1.618033989
-#define ENABLE_DEBUG 0
+#define ENABLE_DEBUG 1
#define DEBUG(f, ...) if (ENABLE_DEBUG) \
printf("[forecasts] "f "\n", __VA_ARGS__)
@@ -369,6 +369,9 @@ E_API E_Module_Api e_modapi = {
E_API void *
e_modapi_init(E_Module *m)
{
+ Eina_List *l;
+ Config_Item *ci;
+
ecore_con_url_init();
bindtextdomain(PACKAGE, LOCALE_DIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -398,8 +401,6 @@ e_modapi_init(E_Module *m)
forecasts_config = e_config_domain_load("module.forecasts", conf_edd);
if (!forecasts_config)
{
-Config_Item *ci;
-
forecasts_config = E_NEW(Config, 1);
ci = E_NEW(Config_Item, 1);
@@ -412,6 +413,11 @@ e_modapi_init(E_Module *m)
forecasts_config->items = eina_list_append(forecasts_config->items,
ci);
}
+ EINA_LIST_FOREACH(forecasts_config->items, l, ci)
+ {
+if (ci->poll_time < 60.0) ci->poll_time = 60.0;
+else if (ci->poll_time > 3600.0) ci->poll_time = 3600.0;
+ }
forecasts_config->module = m;
e_gadcon_provider_register(&_gadcon_class);
@@ -895,13 +901,10 @@ _forecasts_config_updated(Config_Item *ci)
if (area_changed)
_forecasts_cb_check(inst);
-if (!inst->check_timer)
- inst->check_timer =
-ecore_timer_add(inst->ci->poll_time, _forecasts_cb_check,
-inst);
-else
- ecore_timer_interval_set(inst->check_timer,
- inst->ci->poll_time);
+if (inst->check_timer) ecore_timer_del(inst->check_timer);
+inst->check_timer =
+ ecore_timer_add(inst->ci->poll_time, _forecasts_cb_check,
+ inst);
}
}
--
[EGIT] [apps/evisum] master 01/01: net ui -> clean it up
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=d766ba830b172b810ba81a4bdab588c339965ad1
commit d766ba830b172b810ba81a4bdab588c339965ad1
Author: Carsten Haitzler (Rasterman)
Date: Fri Mar 12 10:27:40 2021 +
net ui -> clean it up
---
src/bin/ui/ui_network.c | 60 +++--
1 file changed, 33 insertions(+), 27 deletions(-)
diff --git a/src/bin/ui/ui_network.c b/src/bin/ui/ui_network.c
index 86d39eb..00928cc 100644
--- a/src/bin/ui/ui_network.c
+++ b/src/bin/ui/ui_network.c
@@ -127,11 +127,7 @@ static Evas_Object *
_lb_add(Evas_Object *obj, const char *txt)
{
Evas_Object *lb = elm_label_add(obj);
- evas_object_size_hint_weight_set(lb, 1.0, 1.0);
- evas_object_size_hint_align_set(lb, FILL, FILL);
elm_object_text_set(lb, txt);
- evas_object_show(lb);
-
return lb;
}
@@ -150,44 +146,54 @@ _text_get(void *data, Evas_Object *obj, const char *part)
static Evas_Object *
_iface_obj_add(void *data, Evas_Object *obj, const char *part)
{
- Evas_Object *bx, *tb, *lb;
+ Evas_Object *tb, *lb, *fr;
Network_Interface *iface;
if (strcmp(part, "elm.swallow.content")) return NULL;
iface = data;
- bx = elm_box_add(obj);
- evas_object_size_hint_weight_set(bx, 1.0, 1.0);
- evas_object_size_hint_align_set(bx, FILL, FILL);
- evas_object_show(bx);
-
iface->obj = tb = elm_table_add(obj);
+ elm_table_padding_set(tb,
+ 8 * elm_config_scale_get(),
+ 4 * elm_config_scale_get());
evas_object_size_hint_weight_set(tb, 1.0, 0);
- evas_object_size_hint_align_set(tb, FILL, FILL);
- evas_object_show(tb);
+ evas_object_size_hint_align_set(tb, FILL, 0.0);
- lb = _lb_add(obj, _("Total In/Out"));
- elm_table_pack(tb, lb, 0, 1, 1, 1);
+ lb = _lb_add(obj, _("Total In/Out"));
+ evas_object_size_hint_align_set(lb, 1.0, 0.5);
+ elm_table_pack(tb, lb, 0, 0, 1, 1);
+ evas_object_show(lb);
lb = _lb_add(obj, "");
+ evas_object_size_hint_weight_set(lb, 1.0, 0.0);
+ evas_object_size_hint_align_set(lb, 0.0, 0.5);
evas_object_data_set(tb, "total", lb);
- elm_table_pack(tb, lb, 1, 1, 1, 1);
+ elm_table_pack(tb, lb, 1, 0, 1, 1);
+ evas_object_show(lb);
- lb = _lb_add(obj, _("Peak In/Out"));
- elm_table_pack(tb, lb, 0, 2, 1, 1);
+ lb = _lb_add(obj, _("Peak In/Out"));
+ evas_object_size_hint_align_set(lb, 1.0, 0.5);
+ elm_table_pack(tb, lb, 0, 1, 1, 1);
+ evas_object_show(lb);
lb = _lb_add(obj, "");
+ evas_object_size_hint_weight_set(lb, 1.0, 0.0);
+ evas_object_size_hint_align_set(lb, 0.0, 0.5);
evas_object_data_set(tb, "peak", lb);
- elm_table_pack(tb, lb, 1, 2, 1, 1);
+ elm_table_pack(tb, lb, 1, 1, 1, 1);
+ evas_object_show(lb);
- lb = _lb_add(obj, _("In/Out"));
- elm_table_pack(tb, lb, 0, 3, 1, 1);
+ lb = _lb_add(obj, _("In/Out"));
+ evas_object_size_hint_align_set(lb, 1.0, 0.5);
+ elm_table_pack(tb, lb, 0, 2, 1, 1);
+ evas_object_show(lb);
lb = _lb_add(obj, "");
+ evas_object_size_hint_weight_set(lb, 1.0, 0.0);
+ evas_object_size_hint_align_set(lb, 0.0, 0.5);
evas_object_data_set(tb, "inout", lb);
- elm_table_pack(tb, lb, 1, 3, 1, 1);
-
- elm_box_pack_end(bx, tb);
+ elm_table_pack(tb, lb, 1, 2, 1, 1);
+ evas_object_show(lb);
- return bx;
+ return tb;
}
static char *
@@ -354,15 +360,14 @@ ui_network_win_add(Evisum_Ui *ui)
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
evas_object_size_hint_align_set(bx, FILL, FILL);
evas_object_event_callback_add(bx, EVAS_CALLBACK_KEY_DOWN,
_win_key_down_cb, pd);
- evas_object_show(bx);
pd->glist = glist = elm_genlist_add(win);
elm_genlist_homogeneous_set(glist, 1);
evas_object_size_hint_weight_set(glist, 1.0, 1.0);
evas_object_size_hint_align_set(glist, FILL, FILL);
elm_genlist_select_mode_set(glist, ELM_OBJECT_SELECT_MODE_NONE);
- evas_object_show(glist);
elm_box_pack_end(bx, glist);
+ evas_object_show(glist);
itc = elm_genlist_item_class_new();
pd->itc = itc;
@@ -382,7 +387,8 @@ ui_network_win_add(Evisum_Ui *ui)
itc->func.state_get = NULL;
itc->func.del = NULL;
- elm_object_content_set(win, bx);
+ elm_win_resize_object_add(win, bx);
+ evas_object_show(bx);
if ((ui->network.width) > 0 && (ui->network.height > 0))
evas_object_resize(win, ui->network.width, ui->network.height);
--
[EGIT] [enlightenment/modules/forecasts] master 01/01: fix meson
raster pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=ea163b7813f4682f16c9f37cbed21f877ebb7c32
commit ea163b7813f4682f16c9f37cbed21f877ebb7c32
Author: Carsten Haitzler (Rasterman)
Date: Sun Feb 21 12:48:47 2021 +
fix meson
---
meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/meson.build b/meson.build
index 4ccce20..4ec2fb0 100644
--- a/meson.build
+++ b/meson.build
@@ -33,7 +33,6 @@ use_translations = false
intl_lib = cc.find_library('intl', required: false)
if intl_lib.found()
config_data.set('ENABLE_NLS', 1)
- terminology_dependencies += [intl_lib]
use_translations = true
else
gettext_code = '''
--
[EGIT] [enlightenment/modules/forecasts] master 01/01: use ecore_on url - nuke warnings and use mouse up for popup
raster pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=d1486a92a0ef29e19c40d1ffcea0f6cafbc13c7d
commit d1486a92a0ef29e19c40d1ffcea0f6cafbc13c7d
Author: Carsten Haitzler (Rasterman)
Date: Sat Feb 20 20:16:38 2021 +
use ecore_on url - nuke warnings and use mouse up for popup
---
src/e_mod_config.c | 14 +--
src/e_mod_main.c | 281 +
src/e_mod_main.h | 1 -
3 files changed, 94 insertions(+), 202 deletions(-)
diff --git a/src/e_mod_config.c b/src/e_mod_config.c
index d84c920..e13db6f 100644
--- a/src/e_mod_config.c
+++ b/src/e_mod_config.c
@@ -77,7 +77,7 @@ _create_data(E_Config_Dialog *cfd)
}
static void
-_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
{
if (!forecasts_config)
return;
@@ -102,7 +102,7 @@ _poll_time_slider_changed_cb(void *data, Evas_Object *obj,
}
static void
-_radio_changed_cb(void *data, Evas_Object *obj,
+_radio_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
E_Config_Dialog *cfd = data;
@@ -123,7 +123,7 @@ _text_location_get(void *data, Evas_Object *obj
EINA_UNUSED, const char *part)
}
static void
-_item_location_del(void *data, Evas_Object *obj)
+_item_location_del(void *data, Evas_Object *obj EINA_UNUSED)
{
Places_Location *location = data;
@@ -131,7 +131,7 @@ _item_location_del(void *data, Evas_Object *obj)
}
static void
-_locations_selected_cb(void *data, Evas_Object *obj,
+_locations_selected_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
E_Config_Dialog_Data *cfdata;
@@ -186,8 +186,8 @@ _locations_fill(E_Config_Dialog_Data *cfdata)
}
static void
-_categories_selected_cb(void *data, Evas_Object *obj,
- void *event_info EINA_UNUSED)
+_categories_selected_cb(void *data, Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
{
E_Config_Dialog_Data *cfdata;
Elm_Object_Item *it;
@@ -206,7 +206,7 @@ _categories_selected_cb(void *data, Evas_Object *obj,
}
static void
-_item_location_id_del(void *data, Evas_Object *obj)
+_item_location_id_del(void *data, Evas_Object *obj EINA_UNUSED)
{
Places_Category *category = data;
free(category);
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index e86493e..3e4bd73 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -2,8 +2,7 @@
#include "e_mod_main.h"
#include
-#define _XOPEN_SOURCE
-#include
+char *strptime(const char *s, const char *format, struct tm *tm);
#define FORECASTS2
#define KM_TO_MI 1.609344
@@ -42,10 +41,9 @@ struct _Instance
Evas_Object *forecasts_obj;
Forecasts *forecasts;
Ecore_Timer *check_timer;
- Ecore_Con_Server*server;
- Ecore_Event_Handler *add_handler;
- Ecore_Event_Handler *del_handler;
- Ecore_Event_Handler *data_handler;
+ Ecore_Con_Url *url;
+ Ecore_Event_Handler *url_data_handler;
+ Ecore_Event_Handler *url_complete_handler;
struct
{
@@ -99,17 +97,9 @@ struct _Forecasts
Evas_Object *icon_obj;
};
-struct
-{
- const char *host;
- int port;
-} proxy = {
- NULL, 0
-};
-
/* Module Function Protos */
-static void _forecasts_cb_mouse_down(void *data, Evas *e, Evas_Object
*obj,
- void *event_info);
+static void _forecasts_cb_mouse_up(void *data, Evas *e, Evas_Object
*obj,
+ void *event_info);
static void _forecasts_menu_cb_configure(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _forecasts_menu_cb_post(void *data, E_Menu *m);
@@ -117,10 +107,8 @@ static Eina_Bool_forecasts_cb_check(void *data);
static Config_Item *_forecasts_config_item_get(const char *id);
static Forecasts *_forecasts_new(Evas *evas);
static void _forecasts_free(Forecasts *w);
-static void _forecasts_get_proxy(void);
-static Eina_Bool_forecasts_server_add(void *data, int type, void *event);
-static Eina_Bool_forecasts_server_del(void *data, int type, void *event);
-static Eina_Bool_forecasts_server_data(void *data, int type, void *event);
+static Eina_Bool_forecasts_url_data(void *data, int type, void *event);
+static Eina_Bool_forecasts_url_complete(void *data, int type, void *event);
static int _forecasts_parse(void *data);
static void _forecasts_converter(Instance *inst);
static void _forecasts_convert_degrees(int *value, int dir);
@@ -128,7 +116,7 @@ static void _forecasts_convert_distances(int
*value, int dir);
static void _forecasts_convert_pressures(float *value, int dir);
static void _forecasts_display_se
[EGIT] [website/www-content] master 03/03: Revert "Wiki page start changed with summary [] by Zia Martinez"
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=fc579d90d4991423d1d01b843baa3faa6bdfeb4f
commit fc579d90d4991423d1d01b843baa3faa6bdfeb4f
Author: Carsten Haitzler (Rasterman)
Date: Wed Jan 6 20:27:33 2021 +
Revert "Wiki page start changed with summary [] by Zia Martinez"
This reverts commit c7b2aecdc21b9dd23a67eceebbd1b70a85483193.
---
pages/start.txt | 75 -
1 file changed, 74 insertions(+), 1 deletion(-)
diff --git a/pages/start.txt b/pages/start.txt
index 15f896d10..2d2f4a9b1 100644
--- a/pages/start.txt
+++ b/pages/start.txt
@@ -1 +1,74 @@
-CBD Capsules is very discreet, easy to use, and very convenient for on the go
usage. You may get odd looks when you carry a dropperful of CBD capsule oil
with you in public, but just pop an empty CBD capsule into your pocket, and no
one will give you a second look. One of the great benefits of CBD Capsules is
that they contain 100% pure CBD and are the most pure and potent natural
supplement available today. [[here's more about
it]]https://goldbee.com/cbd-capsules/
\ No newline at end of file
+~~Title: Enlightenment Main~~
+
+{{page>incl:start-shortcuts}}
+{{page>incl:start-event}}
+{{page>incl:start-release}}
+
+{{ :e-logo-title.svg?nolink |}}
+
+ Window Manager
+
+{{ :shot-enlightenment.png?nolink&320}}
+
+[[:about-enlightenment|Enlightenment]] started out way back in 1996 as a
project to build a Window Manager for X11. It has grown much more since then.
Enlightenment still produces this Window Manager, but it has evolved to also
cover Mobile, Wearable and TV UI requirements for projects such as
[[http://www.tizen.org|Tizen]] as well as the traditional "desktop" UI. We
still push out releases. See our [[:download|download]] page for more details
on this. Visit our [[contrib/|contribute]] p [...]
+
+The project is currently transitioning from [[http://www.x.org|X11]] to
[[http://wayland.freedesktop.org|Wayland]]. We are fully committed to moving to
Wayland eventually, as its the future of graphical display layers on Linux.
+
+We still primarily support Linux for Enlightenment, but there is some effort
(based on help and support from users and some developers) to support BSD too.
+
+
+
+ Libraries
+
+{{ :diagram-block-efl.svg?nolink&320}}
+
+While developing the Window Manager, a set of libraries was also developed.
These libraries are known collectively as [[:about-efl|EFL]]. They cover a
range of functionality from main-loop, to graphics, scene graphs, networking,
widgets, data storage, IPC and much more.
+
+We now are starting to pull in bindings support directly into EFL. We are
working on auto-generated bindings for %%C++%%, Lua and Javascript
(v8/node.js). We hope eventually to pull in our Python bindings too, so we can
support as many languages as possible and keep them up to date.
+
+Our primary development environment is Linux, but we make an effort to support
BSD as much as possible, as well as macOS and Windows.
+
+
+
+ Applications
+
+{{:shot-terminology.png?nolink&240 }}
+
+We use our libraries not only to make [[:about-enlightenment|Enlightenment]]
but other applications for day to day use. We make these applications available
for free.
+
+{{ :shot-rage.png?nolink&240}}
+
+We have included common features such as a [[:about-terminology|terminal
emulator]], [[:about-rage|video player]], an [[:about-ephoto|image viewer]],
and even the makings of [[:about-edi|an IDE]].
+
+[[http://www.tizen.org|Native Tizen applications]] are developed using EFL.
This is because we've focused on remaining lean, yet feature-rich. Unlike many
traditional toolkits, EFL is based around a scene graph from the ground up.
This allows us to seamlessly switch from software rendering to OpenGL or any
other mechanism that can be put in a render engine for Evas the canvas scene
graph engine. This also permits layer widgets and objects with alpha channels
from the ground up without an [...]
+
+{{:shot-edi.png?nolink&240 }}
+
+This is by no means a complete list of applications and more are on the way.
We may not have started the traditional way, but are building our library over
time. Tizen also has a library of its own.
+
+{{ :shot-2017-08-22_07-54-31.jpg?nolink&240|}}
+
+
+
+ Thanks to
+
+We run as an open source project. People contribute because they like to or
because they are paid. The intent is to release everything under liberal open
source licenses with no restrictions on those using such works except the usual
"share alike" clauses found in GPLv2 etc.
+
+We also receive other types of contributions. Our community files bug reports,
as well as simply providing feedback. Other entities also support us.
+
+This entire website runs on a machine bought with donations from develop
[EGIT] [website/www-content] master 01/03: Revert "Wiki page start changed with summary [] by Zia Martinez"
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=9d4ccb2fca91bcfbe120704e58c40564a076dcae commit 9d4ccb2fca91bcfbe120704e58c40564a076dcae Author: Carsten Haitzler (Rasterman) Date: Wed Jan 6 20:27:29 2021 + Revert "Wiki page start changed with summary [] by Zia Martinez" This reverts commit f0b14ea095528010719f6c475cd00b72f303f72b. --- pages/start.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/start.txt b/pages/start.txt index e715f5121..7449a0d00 100644 --- a/pages/start.txt +++ b/pages/start.txt @@ -1 +1 @@ -CBD Capsules is very discreet, easy to use, and very convenient for on the go usage. You may get odd looks when you carry a dropperful of CBD capsule oil with you in public, but just pop an empty CBD capsule into your pocket, and no one will give you a second look. One of the great benefits of CBD Capsules is that they contain 100% pure CBD and are the most pure and potent natural supplement available today. See [[https://goldbee.com/cbd-capsules/|CBD Capsules]] \ No newline at end of file +CBD Capsules is very discreet, easy to use, and very convenient for on the go usage. You may get odd looks when you carry a dropperful of CBD capsule oil with you in public, but just pop an empty CBD capsule into your pocket, and no one will give you a second look. One of the great benefits of CBD Capsules is that they contain 100% pure CBD and are the most pure and potent natural supplement available today. [[here's more about it]] https://goldbee.com/cbd-capsules/ \ No newline at end of file --
[EGIT] [website/www-content] master 02/03: Revert "Wiki page start changed with summary [] by Zia Martinez"
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=d9ab338522a1efa76547f49e18c611ed2c99385f commit d9ab338522a1efa76547f49e18c611ed2c99385f Author: Carsten Haitzler (Rasterman) Date: Wed Jan 6 20:27:32 2021 + Revert "Wiki page start changed with summary [] by Zia Martinez" This reverts commit 5190cd04ca57f1f5312290e156445f12d560eb57. --- pages/start.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/start.txt b/pages/start.txt index 7449a0d00..15f896d10 100644 --- a/pages/start.txt +++ b/pages/start.txt @@ -1 +1 @@ -CBD Capsules is very discreet, easy to use, and very convenient for on the go usage. You may get odd looks when you carry a dropperful of CBD capsule oil with you in public, but just pop an empty CBD capsule into your pocket, and no one will give you a second look. One of the great benefits of CBD Capsules is that they contain 100% pure CBD and are the most pure and potent natural supplement available today. [[here's more about it]] https://goldbee.com/cbd-capsules/ \ No newline at end of file +CBD Capsules is very discreet, easy to use, and very convenient for on the go usage. You may get odd looks when you carry a dropperful of CBD capsule oil with you in public, but just pop an empty CBD capsule into your pocket, and no one will give you a second look. One of the great benefits of CBD Capsules is that they contain 100% pure CBD and are the most pure and potent natural supplement available today. [[here's more about it]]https://goldbee.com/cbd-capsules/ \ No newline at end of file --
[EGIT] [apps/evisum] master 01/01: process list - clear slstr tmp strings in custom thread
raster pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=ae3b8859dcdd65f5722dda9e0eaa8c1556faed1e commit ae3b8859dcdd65f5722dda9e0eaa8c1556faed1e Author: Carsten Haitzler (Rasterman) Date: Sun Jan 3 19:39:12 2021 + process list - clear slstr tmp strings in custom thread --- src/bin/ui/ui_process_list.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c index 69fb949..7e0b864 100644 --- a/src/bin/ui/ui_process_list.c +++ b/src/bin/ui/ui_process_list.c @@ -708,6 +708,7 @@ _process_list(void *data, Ecore_Thread *thread) } delay = ui->proc.poll_delay; +eina_slstr_local_clear(); } } --
[EGIT] [enlightenment/modules/forecasts] master 01/01: use correct E_API for external symbols
raster pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=cfdd7af78c595e831de325721af59a8e2a0a317d
commit cfdd7af78c595e831de325721af59a8e2a0a317d
Author: Carsten Haitzler (Rasterman)
Date: Sat Jan 2 17:08:16 2021 +
use correct E_API for external symbols
---
src/e_mod_main.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 8976a45..d35aa6d 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -384,12 +384,12 @@ _forecasts_config_item_get(const char *id)
}
/* Gadman Module Setup */
-EAPI E_Module_Api e_modapi = {
+E_API E_Module_Api e_modapi = {
E_MODULE_API_VERSION,
"Forecasts"
};
-EAPI void *
+E_API void *
e_modapi_init(E_Module *m)
{
bindtextdomain(PACKAGE, LOCALE_DIR);
@@ -440,7 +440,7 @@ e_modapi_init(E_Module *m)
return m;
}
-EAPI int
+E_API int
e_modapi_shutdown(E_Module *m)
{
forecasts_config->module = NULL;
@@ -478,7 +478,7 @@ e_modapi_shutdown(E_Module *m)
return 1;
}
-EAPI int
+E_API int
e_modapi_save(E_Module *m)
{
e_config_domain_save("module.forecasts", conf_edd, forecasts_config);
--
[EGIT] [website/www-content] master 01/01: clear empty note
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=1285c9e02f7ddd103b08d26b83c116889e5960d6 commit 1285c9e02f7ddd103b08d26b83c116889e5960d6 Author: Carsten Haitzler (Rasterman) Date: Fri Jan 1 18:24:11 2021 + clear empty note --- pages/incl/start-release.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/pages/incl/start-release.txt b/pages/incl/start-release.txt index 907fd05a9..e69de29bb 100644 --- a/pages/incl/start-release.txt +++ b/pages/incl/start-release.txt @@ -1,2 +0,0 @@ - - --
[EGIT] [website/www-content] master 01/01: make page a bit simpler - remove various versions in pages
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=0cb894e816f87773d38c1f18c5cfc2de814ea566 commit 0cb894e816f87773d38c1f18c5cfc2de814ea566 Author: Carsten Haitzler (Rasterman) Date: Fri Jan 1 18:12:44 2021 + make page a bit simpler - remove various versions in pages --- pages/about-enlightenment.md.txt | 2 +- pages/incl/start-release.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pages/about-enlightenment.md.txt b/pages/about-enlightenment.md.txt index 0e7ec0c6f..2c9501567 100644 --- a/pages/about-enlightenment.md.txt +++ b/pages/about-enlightenment.md.txt @@ -7,7 +7,7 @@  -Enlightenment (0.24.2) (a.k.a E24) is the next generation of graphical desktop shell from the Enlightenment project. It resembles a traditional UNIX/X1 style desktop by design but has a range of add-ons, as well as a different core design philosophy. +Enlightenment is the next generation of graphical desktop shell from the Enlightenment project. It resembles a traditional UNIX/X1 style desktop by design but has a range of add-ons, as well as a different core design philosophy. Enlightenment manages windows and files. It's a compositor and is also capable of launching applications, handling the user interface and even system settings. diff --git a/pages/incl/start-release.txt b/pages/incl/start-release.txt index 5b3f5177a..907fd05a9 100644 --- a/pages/incl/start-release.txt +++ b/pages/incl/start-release.txt @@ -1,3 +1,2 @@ -[[https://www.enlightenment.org/news/efl-1.25.1|EFL 1.25.1]] and [[https://www.enlightenment.org/news/e24.2|Enlightenment 0.24.2]] are out - go to our [[/download]] page. --
[EGIT] [apps/rage] master 01/01: meson -> bump to 0.47
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=f13e49f97fd665128fe17af7fd5be497d9474473
commit f13e49f97fd665128fe17af7fd5be497d9474473
Author: Carsten Haitzler (Rasterman)
Date: Tue Dec 1 16:21:42 2020 +
meson -> bump to 0.47
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 5801869..702029f 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('rage', 'c',
version: '0.3.1',
license: 'BSD 2 clause',
default_options: [ 'buildtype=plain', 'c_std=gnu99' ],
-meson_version : '>= 0.40.0')
+meson_version : '>= 0.47.0')
base_url = 'https://www.enlightenment.org/about-'
# convenience variables for later
--
[EGIT] [admin/devs] master 01/01: move more probies that are inactive to inactive
raster pushed a commit to branch master.
http://git.enlightenment.org/admin/devs.git/commit/?id=7a2a47d86e82adbd22719a4ac6bf77e7fd28c6c4
commit 7a2a47d86e82adbd22719a4ac6bf77e7fd28c6c4
Author: Carsten Haitzler (Rasterman)
Date: Tue Nov 17 22:35:57 2020 +
move more probies that are inactive to inactive
---
{probies => inactive}/avilog/id_rsa.pub | 0
{probies => inactive}/avilog/info.txt| 0
{probies => inactive}/b.devichev/id_rsa.pub | 0
{probies => inactive}/b.devichev/info.txt| 0
{probies => inactive}/bluezery/id_rsa.pub| 0
{probies => inactive}/bluezery/id_rsa_home.pub | 0
{probies => inactive}/bluezery/id_rsa_laptop.pub | 0
{probies => inactive}/bluezery/id_rsa_note.pub | 0
{probies => inactive}/bluezery/info.txt | 0
{probies => inactive}/ghalfacree/id_ed25519.pub | 0
{probies => inactive}/ghalfacree/info.txt| 0
{probies => inactive}/iscaro/id_rsa.pub | 0
{probies => inactive}/iscaro/info.txt| 0
{probies => inactive}/larrylira/id_rsa.pub | 0
{probies => inactive}/larrylira/info.txt | 0
{probies => inactive}/nated/id_ed25519.pub | 0
{probies => inactive}/nated/info.txt | 0
{probies => inactive}/sri.hebbar/id_rsa.pub | 0
{probies => inactive}/sri.hebbar/info.txt| 0
{probies => inactive}/taxi2se/id_ed25519.pub | 0
{probies => inactive}/taxi2se/info.txt | 0
{probies => inactive}/vivek.ellur/id_rsa.pub | 0
{probies => inactive}/vivek.ellur/info.txt | 0
23 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/probies/avilog/id_rsa.pub b/inactive/avilog/id_rsa.pub
similarity index 100%
rename from probies/avilog/id_rsa.pub
rename to inactive/avilog/id_rsa.pub
diff --git a/probies/avilog/info.txt b/inactive/avilog/info.txt
similarity index 100%
rename from probies/avilog/info.txt
rename to inactive/avilog/info.txt
diff --git a/probies/b.devichev/id_rsa.pub b/inactive/b.devichev/id_rsa.pub
similarity index 100%
rename from probies/b.devichev/id_rsa.pub
rename to inactive/b.devichev/id_rsa.pub
diff --git a/probies/b.devichev/info.txt b/inactive/b.devichev/info.txt
similarity index 100%
rename from probies/b.devichev/info.txt
rename to inactive/b.devichev/info.txt
diff --git a/probies/bluezery/id_rsa.pub b/inactive/bluezery/id_rsa.pub
similarity index 100%
rename from probies/bluezery/id_rsa.pub
rename to inactive/bluezery/id_rsa.pub
diff --git a/probies/bluezery/id_rsa_home.pub
b/inactive/bluezery/id_rsa_home.pub
similarity index 100%
rename from probies/bluezery/id_rsa_home.pub
rename to inactive/bluezery/id_rsa_home.pub
diff --git a/probies/bluezery/id_rsa_laptop.pub
b/inactive/bluezery/id_rsa_laptop.pub
similarity index 100%
rename from probies/bluezery/id_rsa_laptop.pub
rename to inactive/bluezery/id_rsa_laptop.pub
diff --git a/probies/bluezery/id_rsa_note.pub
b/inactive/bluezery/id_rsa_note.pub
similarity index 100%
rename from probies/bluezery/id_rsa_note.pub
rename to inactive/bluezery/id_rsa_note.pub
diff --git a/probies/bluezery/info.txt b/inactive/bluezery/info.txt
similarity index 100%
rename from probies/bluezery/info.txt
rename to inactive/bluezery/info.txt
diff --git a/probies/ghalfacree/id_ed25519.pub
b/inactive/ghalfacree/id_ed25519.pub
similarity index 100%
rename from probies/ghalfacree/id_ed25519.pub
rename to inactive/ghalfacree/id_ed25519.pub
diff --git a/probies/ghalfacree/info.txt b/inactive/ghalfacree/info.txt
similarity index 100%
rename from probies/ghalfacree/info.txt
rename to inactive/ghalfacree/info.txt
diff --git a/probies/iscaro/id_rsa.pub b/inactive/iscaro/id_rsa.pub
similarity index 100%
rename from probies/iscaro/id_rsa.pub
rename to inactive/iscaro/id_rsa.pub
diff --git a/probies/iscaro/info.txt b/inactive/iscaro/info.txt
similarity index 100%
rename from probies/iscaro/info.txt
rename to inactive/iscaro/info.txt
diff --git a/probies/larrylira/id_rsa.pub b/inactive/larrylira/id_rsa.pub
similarity index 100%
rename from probies/larrylira/id_rsa.pub
rename to inactive/larrylira/id_rsa.pub
diff --git a/probies/larrylira/info.txt b/inactive/larrylira/info.txt
similarity index 100%
rename from probies/larrylira/info.txt
rename to inactive/larrylira/info.txt
diff --git a/probies/nated/id_ed25519.pub b/inactive/nated/id_ed25519.pub
similarity index 100%
rename from probies/nated/id_ed25519.pub
rename to inactive/nated/id_ed25519.pub
diff --git a/probies/nated/info.txt b/inactive/nated/info.txt
similarity index 100%
rename from probies/nated/info.txt
rename to inactive/nated/info.txt
diff --git a/probies/sri.hebbar/id_rsa.pub b/inactive/sri.hebbar/id_rsa.pub
similarity index 100%
rename from probies/sri.hebbar/id_rsa.pub
rename to inactive/sri.hebbar/id_rsa.pub
diff --git a/probies/sri.hebbar/info.txt b/inactive/sri.hebbar/info.txt
similarity index 100%
rename from probies/sri.hebbar/info.txt
rename to inactive/sri.h
[EGIT] [admin/devs] master 02/02: move inactive devs to inactive...
raster pushed a commit to branch master.
http://git.enlightenment.org/admin/devs.git/commit/?id=51b2d9ef88b410a8a9ba0d744d05fb7d88d37113
commit 51b2d9ef88b410a8a9ba0d744d05fb7d88d37113
Author: Carsten Haitzler (Rasterman)
Date: Tue Nov 17 22:07:51 2020 +
move inactive devs to inactive...
---
{developers => inactive}/ajwillia-ms/icon-big.png | Bin
{developers => inactive}/ajwillia-ms/icon-sml.png | Bin
{developers => inactive}/ajwillia-ms/id_rsa.pub | 0
{developers => inactive}/ajwillia-ms/id_rsa_tactus.pub| 0
{developers => inactive}/ajwillia-ms/id_rsa_tower.pub | 0
{developers => inactive}/ajwillia-ms/info.txt | 0
{developers => inactive}/ami/id_ed25519.pub | 0
{developers => inactive}/ami/id_rsa.pub | 0
{developers => inactive}/ami/id_rsa_work.pub | 0
{developers => inactive}/ami/info.txt | 0
{developers => inactive}/andreas/icon-big.png | Bin
{developers => inactive}/andreas/icon-map.png | Bin
{developers => inactive}/andreas/icon-med.png | Bin
{developers => inactive}/andreas/icon-sml.png | Bin
{developers => inactive}/andreas/id_rsa_lenovix.pub | 0
{developers => inactive}/andreas/id_rsa_thor.pub | 0
{developers => inactive}/andreas/info.txt | 0
{developers => inactive}/barbieri/icon-big.png| Bin
{developers => inactive}/barbieri/icon-map.png| Bin
{developers => inactive}/barbieri/icon-med.png| Bin
{developers => inactive}/barbieri/icon-sml.png| Bin
{developers => inactive}/barbieri/id_rsa.pub | 0
{developers => inactive}/barbieri/info.txt| 0
{developers => inactive}/bdilly/id_ed25519.pub| 0
{developers => inactive}/bdilly/id_rsa.pub| 0
{developers => inactive}/bdilly/info.txt | 0
{developers => inactive}/beber/id_ed25519.pub | 0
{developers => inactive}/beber/info.txt | 0
{developers => inactive}/ceolin/id_rsa.pub| 0
{developers => inactive}/ceolin/info.txt | 0
{developers => inactive}/conr2d/icon-big.png | Bin
{developers => inactive}/conr2d/icon-map.png | Bin
{developers => inactive}/conr2d/icon-med.png | Bin
{developers => inactive}/conr2d/icon-sml.png | Bin
{developers => inactive}/conr2d/id_rsa.pub| 0
{developers => inactive}/conr2d/id_rsa_home.pub | 0
{developers => inactive}/conr2d/info.txt | 0
{developers => inactive}/eagleeye/id_rsa.pub | 0
{developers => inactive}/eagleeye/info.txt| 0
{developers => inactive}/etrunko/icon-map.png | Bin
{developers => inactive}/etrunko/icon-med.png | Bin
{developers => inactive}/etrunko/icon-sml.png | Bin
{developers => inactive}/etrunko/id_rsa.pub | 0
{developers => inactive}/etrunko/info.txt | 0
{developers => inactive}/eunue/id_rsa.pub | 0
{developers => inactive}/eunue/info.txt | 0
{developers => inactive}/furrymyad/id_rsa.pub | 0
{developers => inactive}/furrymyad/id_rsa_home.pub| 0
{developers => inactive}/furrymyad/info.txt | 0
{developers => inactive}/herdsman/id_rsa.pub | 0
{developers => inactive}/herdsman/info.txt| 0
{developers => inactive}/illogict/id_ed25519-5P0FG52.pub | 0
{developers => inactive}/illogict/id_ed25519-gaia.pub | 0
{developers => inactive}/illogict/id_ed25519-galaxia.pub | 0
{developers => inactive}/illogict/id_ed25519-revolvia.pub | 0
{developers => inactive}/illogict/id_ed25519.pub | 0
{developers => inactive}/illogict/info.txt| 0
{developers => inactive}/jackdanielz/id_ed25519_z2.pub| 0
{developers => inactive}/jackdanielz/id_ed25519_zen.pub | 0
{developers => inactive}/jackdanielz/id_rsa_work.pub | 0
{developers => inactive}/jackdanielz/id_rsa_yoga.pub | 0
{developers => inactive}/jackdanielz/info.txt | 0
{developers => inactive}/jaehwan/icon-big.png | Bin
{developers => inactive}/jaehwan/icon-map.png | Bin
{developers => inactive}/jaehwan/icon-med.png | Bin
{developers => inactive}/jaehwan/icon-sml.png | Bin
{developers => inactive}/jaehwan/id_ed25519.pub | 0
{developers => inactive}/jaehwan/info.txt | 0
{developers => inactive}/jaquilina/id_rsa.pub
[EGIT] [admin/devs] master 01/02: xxx
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=15f5cf72384d266baf26771165a04ba3d68c3a89 commit 15f5cf72384d266baf26771165a04ba3d68c3a89 Author: Carsten Haitzler (Rasterman) Date: Tue Nov 17 21:03:38 2020 + xxx --- developers/raster/info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developers/raster/info.txt b/developers/raster/info.txt index f007bfb..40cfca7 100644 --- a/developers/raster/info.txt +++ b/developers/raster/info.txt @@ -1,7 +1,7 @@ Login:raster IRC Nick: raster Cloak:developer/raster -Name: Carsten Haitzler +Name: Carsten Haitzler GeoData: 52.2053 0.1218 Location: Cambridge, UK E-Mail: ras...@rasterman.com --
[EGIT] [admin/devs] master 01/01: test
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=38c05c9db2ce970b5d4fe95c0f159b43046b911e commit 38c05c9db2ce970b5d4fe95c0f159b43046b911e Author: Carsten Haitzler (Rasterman) Date: Tue Nov 17 20:45:17 2020 + test --- developers/raster/info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developers/raster/info.txt b/developers/raster/info.txt index 40cfca7..f007bfb 100644 --- a/developers/raster/info.txt +++ b/developers/raster/info.txt @@ -1,7 +1,7 @@ Login:raster IRC Nick: raster Cloak:developer/raster -Name: Carsten Haitzler +Name: Carsten Haitzler GeoData: 52.2053 0.1218 Location: Cambridge, UK E-Mail: ras...@rasterman.com --
[EGIT] [admin/devs] master 01/01: update info location
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=076bc74a27b9bc2b2aae10d538e53fdf0f9cc091 commit 076bc74a27b9bc2b2aae10d538e53fdf0f9cc091 Author: Carsten Haitzler (Rasterman) Date: Tue Nov 17 19:18:36 2020 + update info location --- developers/raster/info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/developers/raster/info.txt b/developers/raster/info.txt index 10a4781..40cfca7 100644 --- a/developers/raster/info.txt +++ b/developers/raster/info.txt @@ -2,8 +2,8 @@ Login:raster IRC Nick: raster Cloak:developer/raster Name: Carsten Haitzler -GeoData: 37.537974 126.967927 -Location: Seoul, Korea +GeoData: 52.2053 0.1218 +Location: Cambridge, UK E-Mail: ras...@rasterman.com WWW: http://www.rasterman.com Managing: eet, evas, embryo, ecore, edje, e, emotion, rage, imlib2, imlib2_loaders, entice, edb, epeg, expedite, exquisite, elementary --
[EGIT] [website/extra-server] master 01/01: extra - update flat
raster pushed a commit to branch master.
http://git.enlightenment.org/website/extra-server.git/commit/?id=5a84e7bc1700740f2feff65c4035f3a8fa49d566
commit 5a84e7bc1700740f2feff65c4035f3a8fa49d566
Author: Carsten Haitzler (Rasterman)
Date: Tue Nov 3 11:38:12 2020 +
extra - update flat
---
public_html/extra/assets/themes/flat-7.edj | Bin 0 -> 45606470 bytes
public_html/extra/data.py | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/extra/assets/themes/flat-7.edj
b/public_html/extra/assets/themes/flat-7.edj
new file mode 100644
index 000..331940f
Binary files /dev/null and b/public_html/extra/assets/themes/flat-7.edj differ
diff --git a/public_html/extra/data.py b/public_html/extra/data.py
index 4f5ca8b..681a13f 100644
--- a/public_html/extra/data.py
+++ b/public_html/extra/data.py
@@ -35,7 +35,7 @@ THEMES = {
'name': 'Flat',
'author': 'raster',
'description': 'A WORK IN PROGRESS flat theme',
-'version': 6,
+'version': 7,
},
'Ice': {
'theme_id': 'Ice',
--
[EGIT] [apps/evisum] master 01/01: mem - add memory usage of up to 8 vid cards
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=a56127a569997b4b9e5f4fff2eca8704bddc5377
commit a56127a569997b4b9e5f4fff2eca8704bddc5377
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 29 12:16:10 2020 +
mem - add memory usage of up to 8 vid cards
max in the code is 8.. will anyone have that many... really?
---
src/bin/system/machine.h| 12 ++
src/bin/system/machine/memory.bogox | 36 +++--
src/bin/ui/ui_memory.c | 46 -
3 files changed, 86 insertions(+), 8 deletions(-)
diff --git a/src/bin/system/machine.h b/src/bin/system/machine.h
index 863b7d9..c8340c3 100644
--- a/src/bin/system/machine.h
+++ b/src/bin/system/machine.h
@@ -17,6 +17,15 @@ typedef struct
float percent;
} cpu_core_t;
+// Will anyone have more than 8 vdrm/video card devices?
+#define MEM_VIDEO_CARD_MAX 8
+
+typedef struct
+{
+ uint64_t total;
+ uint64_t used;
+} meminfo_video_t;
+
typedef struct
{
uint64_t total;
@@ -28,6 +37,9 @@ typedef struct
uint64_t swap_used;
uint64_t zfs_arc_used;
+
+ uint64_tvideo_count;
+ meminfo_video_t video[MEM_VIDEO_CARD_MAX];
} meminfo_t;
typedef struct
diff --git a/src/bin/system/machine/memory.bogox
b/src/bin/system/machine/memory.bogox
index 2ab5c3b..d9983c9 100644
--- a/src/bin/system/machine/memory.bogox
+++ b/src/bin/system/machine/memory.bogox
@@ -25,7 +25,7 @@ _meminfo_parse_line(const char *line)
p++;
tok = strtok(p, " ");
- return atol(tok);
+ return atoll(tok);
}
#endif
@@ -38,7 +38,7 @@ system_memory_usage_get(meminfo_t *memory)
FILE *f;
unsigned long swap_free = 0, tmp_free = 0, tmp_slab = 0;
char line[256];
- int fields = 0;
+ int i, fields = 0;
f = fopen("/proc/meminfo", "r");
if (!f) return;
@@ -103,6 +103,38 @@ system_memory_usage_get(meminfo_t *memory)
memory->swap_used *= 1024;
fclose(f);
+ for (i = 0; i < MEM_VIDEO_CARD_MAX; i++)
+ {
+struct stat st;
+char buf[256];
+
+// if no more drm devices exist - end of card list
+snprintf(buf, sizeof(buf),
+ "/sys/class/drm/card%i/device", i);
+if (stat(buf, ) != 0) break;
+// not all drivers expose this, so video devices with no exposed video
+// ram info will appear as 0 sized... much like swap.
+snprintf(buf, sizeof(buf),
+ "/sys/class/drm/card%i/device/mem_info_vram_total", i);
+f = fopen(buf, "r");
+if (f)
+ {
+ if (fgets(buf, sizeof(buf), f))
+ memory->video[i].total = atoll(buf);
+ fclose(f);
+ }
+snprintf(buf, sizeof(buf),
+ "/sys/class/drm/card%i/device/mem_info_vram_used", i);
+f = fopen(buf, "r");
+if (f)
+ {
+ if (fgets(buf, sizeof(buf), f))
+ memory->video[i].used = atoll(buf);
+ fclose(f);
+ }
+ }
+ memory->video_count = i;
+
#elif defined(__FreeBSD__) || defined(__DragonFly__)
unsigned int free = 0, active = 0, inactive = 0, wired = 0;
unsigned int cached = 0, buffered = 0, zfs_arc = 0;
diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c
index fa4740a..e74474d 100644
--- a/src/bin/ui/ui_memory.c
+++ b/src/bin/ui/ui_memory.c
@@ -7,6 +7,7 @@ typedef struct {
Evas_Object *buffered;
Evas_Object *shared;
Evas_Object *swap;
+ Evas_Object *video[MEM_VIDEO_CARD_MAX];
} Widgets;
static Evas_Object *
@@ -40,6 +41,7 @@ _memory_update(void *data)
Evas_Object *pb;
double ratio, value;
meminfo_t memory;
+ int i;
memset(, 0, sizeof(memory));
system_memory_usage_get();
@@ -88,10 +90,15 @@ _memory_update(void *data)
pb = widgets->swap;
if (memory.swap_total)
{
+elm_object_disabled_set(pb, EINA_FALSE);
ratio = memory.swap_total / 100.0;
value = memory.swap_used / ratio;
}
- else value = 0.0;
+ else
+ {
+elm_object_disabled_set(pb, EINA_TRUE);
+value = 0.0;
+ }
elm_progressbar_value_set(pb, value / 100);
elm_progressbar_unit_format_set(pb,
@@ -99,6 +106,20 @@ _memory_update(void *data)
evisum_size_format(memory.swap_used),
evisum_size_format(memory.swap_total)));
+ for (i = 0; i < memory.video_count; i++)
+ {
+pb = widgets->video[i];
+if (!pb) break;
+if (memory.video[i].total) elm_object_disabled_set(pb, EINA_FALSE);
+else elm_object_disabled_set(pb, EINA_TRUE);
+ratio = memory.video[i].total / 100.0;
+value = memory.video[i].used / ratio;
+elm_progressbar_value_set(pb, value / 100);
+elm_progressbar_unit_format_set(pb,
+
[EGIT] [apps/evisum] master 01/01: split freq and cpu % on 2 rows if cpufreq overlay is on
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=dc4e297024786f8e30c23edc0fa1b4c0c6887d65
commit dc4e297024786f8e30c23edc0fa1b4c0c6887d65
Author: Carsten Haitzler (Rasterman)
Date: Thu Sep 10 13:46:53 2020 +0100
split freq and cpu % on 2 rows if cpufreq overlay is on
---
src/bin/ui/ui_cpu.c | 94 +
1 file changed, 45 insertions(+), 49 deletions(-)
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index 5996944..5eae7c9 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -29,18 +29,22 @@ typedef struct _Color_Point {
} Color_Point;
// config for colors/sizing
+#define COLOR_CPU_NUM 5
static const Color_Point cpu_colormap_in[] = {
{ 0, 0xff202020 }, // 0
- { 33, 0xff2030a0 }, // 1
- { 66, 0xffa040a0 }, // 2
- { 100, 0x9040 }, // 3
- { 256, 0x9040 } // overflow to avoid if's
+ { 25, 0xff2030a0 }, // 1
+ { 50, 0xffa040a0 }, // 2
+ { 75, 0x9040 }, // 3
+ { 100, 0x }, // 4
+ { 256, 0x } // overflow to avoid if's
};
+#define COLOR_FREQ_NUM 4
static const Color_Point freq_colormap_in[] = {
- { 0, 0x }, // 0
- { 50, 0x00105020 }, // 1
- { 100, 0x002060c0 }, // 2
- { 256, 0x002060c0 } // overflow to avoid if's
+ { 0, 0xff202020 }, // 0
+ { 33, 0xff285020 }, // 1
+ { 67, 0xff30a060 }, // 2
+ { 100, 0xffa0ff80 }, // 3
+ { 256, 0xffa0ff80 } // overflow to avoid if's
};
#define BAR_HEIGHT 2
#define COLORS_HEIGHT 20
@@ -153,7 +157,7 @@ _update(Animate *ad, Core *cores)
// new size and mark it for clearing when we fill
if (iw != w)
{
-evas_object_image_size_set(obj, w, ad->cpu_count);
+evas_object_image_size_set(obj, w, ad->cpu_count * 2);
clear = EINA_TRUE;
}
@@ -168,32 +172,31 @@ _update(Animate *ad, Core *cores)
{
Core *core = &(cores[y]);
unsigned int c1, c2;
-unsigned int a, r, g, b;
-unsigned int a2, r2, g2, b2;
// our pix ptr is the pixel row and y is both y pixel coord and core
-pix = &(pixels[y * (stride / 4)]);
if (clear)
{
// clear/fill with 0 value from colormap
+ pix = &(pixels[(y * 2) * (stride / 4)]);
for (x = 0; x < (w - 1); x++) pix[x] = cpu_colormap[0];
+ pix = &(pixels[((y * 2) + 1) * (stride / 4)]);
+ for (x = 0; x < (w - 1); x++) pix[x] = freq_colormap[0];
}
else
{
// scroll pixels 1 to the left
+ pix = &(pixels[(y * 2) * (stride / 4)]);
+ for (x = 0; x < (w - 1); x++) pix[x] = pix[x + 1];
+ pix = &(pixels[((y * 2) + 1) * (stride / 4)]);
for (x = 0; x < (w - 1); x++) pix[x] = pix[x + 1];
}
// final pixel on end of each row... set it to a new value
-// get color from cpu colormap and decompose to rgb
+// get color from cpu colormap
+// last pixel == resulting pixel color
c1 = cpu_colormap[core->percent & 0xff];
-a = AVAL(c1);
-r = RVAL(c1);
-g = GVAL(c1);
-b = BVAL(c1);
-// if we overlay freq, then we will do argb addition of freq color
-// and cpu percent usage color. designed to affect mostly different
-// rgb channels so you can see when freq goes up but not cpu % or
-// vice-versa
+pix = &(pixels[(y * 2) * (stride / 4)]);
+pix[x] = c1;
+// 2nd row of pixles for freq
if ((ad->show_cpufreq) && (ad->cpu_freq))
{
int v = core->freq - ad->freq_min;
@@ -208,30 +211,23 @@ _update(Animate *ad, Core *cores)
// v now is 0->100 as a percentage of possible frequency
// the cpu can do
c2 = freq_colormap[v & 0xff];
- a2 = AVAL(c2);
- r2 = RVAL(c2);
- g2 = GVAL(c2);
- b2 = BVAL(c2);
- // do argb add and then limit arb to max of 0xff since
- // the add can overflow 0xff
- a += a2;
- r += r2;
- g += g2;
- b += b2;
- if (a > 0xff) a = 0xff;
- if (r > 0xff) r = 0xff;
- if (g > 0xff) g = 0xff;
- if (b > 0xff) b = 0xff;
}
+ else c2 = freq_colormap[0];
+ pix = &(pixels[((y * 2) + 1) * (stride / 4)]);
+ pix[x] = c2;
+ }
+else
+ {
+ // no freq show - then just repeat cpu usage color
+ pix = &(pixels[((y * 2) + 1) * (stride / 4)]);
+ pix[x] = c1;
}
-// last pixel == resulting pixel color
-
[EGIT] [apps/evisum] master 01/01: cpu - show core freq as mhz vs ghz to be more human
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=db02f9572739def551f65cd04636768b38231b22
commit db02f9572739def551f65cd04636768b38231b22
Author: Carsten Haitzler (Rasterman)
Date: Thu Sep 10 12:12:36 2020 +0100
cpu - show core freq as mhz vs ghz to be more human
---
src/bin/ui/ui_cpu.c | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index 6db957b..5996944 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -294,7 +294,7 @@ _graph(Ui *ui, Evas_Object *parent)
{
Evas_Object *frame, *tbl, *box, *obj, *ic, *lb, *rec;
Evas_Object *fr, *bx, *colors, *check;
- int i;
+ int i, f;
char buf[128];
Animate *ad = calloc(1, sizeof(Animate));
@@ -411,7 +411,11 @@ _graph(Ui *ui, Evas_Object *parent)
evas_object_show(lb);
lb = elm_label_add(parent);
- snprintf(buf, sizeof(buf), "%iMhz", ad->freq_min / 1000);
+ f = (ad->freq_min + 500) / 1000;
+ if (f < 1000)
+ snprintf(buf, sizeof(buf), "%iMHz", f);
+ else
+ snprintf(buf, sizeof(buf), "%1.1fGHz", ((double)f + 0.05) / 1000.0);
elm_object_text_set(lb, buf);
evas_object_size_hint_align_set(lb, 0.0, 0.5);
evas_object_size_hint_weight_set(lb, EXPAND, EXPAND);
@@ -426,7 +430,11 @@ _graph(Ui *ui, Evas_Object *parent)
evas_object_show(lb);
lb = elm_label_add(parent);
- snprintf(buf, sizeof(buf), "%iMhz", ad->freq_max / 1000);
+ f = (ad->freq_max + 500) / 1000;
+ if (f < 1000)
+ snprintf(buf, sizeof(buf), "%iMHz", f);
+ else
+ snprintf(buf, sizeof(buf), "%1.1fGHz", ((double)f + 0.05) / 1000.0);
elm_object_text_set(lb, buf);
evas_object_size_hint_align_set(lb, 1.0, 0.5);
evas_object_size_hint_weight_set(lb, EXPAND, EXPAND);
--
[EGIT] [apps/evisum] master 01/01: cpu freq display - show overlayed legends for info
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=27ec63e8ebc9eafc8730c9a250c6bd005bd294f2
commit 27ec63e8ebc9eafc8730c9a250c6bd005bd294f2
Author: Carsten Haitzler (Rasterman)
Date: Thu Sep 10 12:00:40 2020 +0100
cpu freq display - show overlayed legends for info
---
src/bin/ui/ui_cpu.c | 107 +---
1 file changed, 86 insertions(+), 21 deletions(-)
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index 8c629b7..6db957b 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -292,9 +292,16 @@ _colors_fill(Evas_Object *colors)
static void
_graph(Ui *ui, Evas_Object *parent)
{
- Evas_Object *frame, *tbl, *box, *obj;
- Evas_Object *fr, *hbx, *bx, *colors, *check;
- int n;
+ Evas_Object *frame, *tbl, *box, *obj, *ic, *lb, *rec;
+ Evas_Object *fr, *bx, *colors, *check;
+ int i;
+ char buf[128];
+
+ Animate *ad = calloc(1, sizeof(Animate));
+ if (!ad) return;
+
+ ad->cpu_count = system_cpu_online_count_get();
+ system_cpu_frequency_min_max_get(>freq_min, >freq_max);
// init colormaps from a small # of points
_color_init(cpu_colormap_in, 4, cpu_colormap);
@@ -302,14 +309,12 @@ _graph(Ui *ui, Evas_Object *parent)
box = parent;
- n = system_cpu_online_count_get();
-
frame = elm_frame_add(box);
evas_object_size_hint_align_set(frame, FILL, FILL);
evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
evas_object_show(frame);
- if (n > 1)
- elm_object_text_set(frame, eina_slstr_printf(_("%d CPU Cores Available"),
n));
+ if (ad->cpu_count > 1)
+ elm_object_text_set(frame, eina_slstr_printf(_("%d CPU Cores"),
ad->cpu_count));
else
elm_object_text_set(frame, _("ONE CPU CORE...MAKE IT COUNT!!!"));
@@ -326,7 +331,43 @@ _graph(Ui *ui, Evas_Object *parent)
evas_object_image_alpha_set(obj, EINA_FALSE);
evas_object_show(obj);
- elm_table_pack(tbl, obj, 0, 0, 1, 1);
+ elm_table_pack(tbl, obj, 0, 0, 5, ad->cpu_count);
+
+ for (i = 0; i < ad->cpu_count; i++)
+ {
+rec = evas_object_rectangle_add(evas_object_evas_get(parent));
+evas_object_color_set(rec, 0, 0, 0, 0);
+evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24),
ELM_SCALE_SIZE(24));
+evas_object_size_hint_weight_set(rec, 0.0, EXPAND);
+elm_table_pack(tbl, rec, 0, i, 1, 1);
+
+rec = evas_object_rectangle_add(evas_object_evas_get(parent));
+evas_object_color_set(rec, 0, 0, 0, 0);
+evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24),
ELM_SCALE_SIZE(24));
+evas_object_size_hint_weight_set(rec, 0.0, EXPAND);
+elm_table_pack(tbl, rec, 1, i, 1, 1);
+
+ic = elm_icon_add(parent);
+elm_icon_standard_set(ic, evisum_icon_path_get("cpu"));
+evas_object_size_hint_align_set(ic, FILL, FILL);
+evas_object_size_hint_weight_set(ic, 0.0, EXPAND);
+elm_table_pack(tbl, ic, 1, i, 1, 1);
+evas_object_show(ic);
+
+rec = evas_object_rectangle_add(evas_object_evas_get(parent));
+evas_object_color_set(rec, 0, 0, 0, 0);
+evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24),
ELM_SCALE_SIZE(24));
+evas_object_size_hint_weight_set(rec, 0.0, EXPAND);
+elm_table_pack(tbl, rec, 2, i, 1, 1);
+
+lb = elm_label_add(parent);
+snprintf(buf, sizeof(buf), "%i", i);
+elm_object_text_set(lb, buf);
+evas_object_size_hint_align_set(lb, 1.0, 0.5);
+evas_object_size_hint_weight_set(lb, 0.0, EXPAND);
+elm_table_pack(tbl, lb, 3, i, 1, 1);
+evas_object_show(lb);
+ }
bx = elm_box_add(box);
evas_object_size_hint_align_set(bx, FILL, FILL);
@@ -338,18 +379,17 @@ _graph(Ui *ui, Evas_Object *parent)
elm_object_content_set(frame, bx);
elm_box_pack_end(box, frame);
- hbx = elm_box_add(box);
- evas_object_size_hint_align_set(hbx, FILL, FILL);
- evas_object_size_hint_weight_set(hbx, EXPAND, 0);
- elm_box_horizontal_set(hbx, 1);
- evas_object_show(hbx);
+ tbl = elm_table_add(box);
+ evas_object_size_hint_align_set(tbl, FILL, FILL);
+ evas_object_size_hint_weight_set(tbl, EXPAND, 0);
+ evas_object_show(tbl);
fr = elm_frame_add(box);
evas_object_size_hint_align_set(fr, FILL, FILL);
evas_object_size_hint_weight_set(fr, EXPAND, 0);
evas_object_show(fr);
- elm_object_text_set(fr, _("Increasing %"));
- elm_object_content_set(fr, hbx);
+ elm_object_text_set(fr, _("Legend"));
+ elm_object_content_set(fr, tbl);
colors = evas_object_image_add(evas_object_evas_get(fr));
evas_object_size_hint_min_set
@@ -360,8 +400,38 @@ _graph(Ui *ui, Evas_Object *parent)
evas_object_image_filled_set(colors, EINA_TRUE);
evas_object_image_alpha_set(colors, EINA_FALSE);
_colors_fill(colors);
+ elm_table_pack(tbl, colors, 0,
[EGIT] [apps/evisum] master 01/01: cpu usage/freq display - fix rendering. clearing, efficiency and more
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=1c737a8a7215f27c3ae11e1144a3f7d465bd3005
commit 1c737a8a7215f27c3ae11e1144a3f7d465bd3005
Author: Carsten Haitzler (Rasterman)
Date: Thu Sep 10 02:45:47 2020 +0100
cpu usage/freq display - fix rendering. clearing, efficiency and more
read commnts as to what the code is doing... otherwise its
siginificantly more efficient now, more correct, cleaner, and simpler
even with more features (like properly interpolated colormaps).
---
src/bin/ui/ui_cpu.c | 521
1 file changed, 235 insertions(+), 286 deletions(-)
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index 5f9de9a..8c629b7 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -1,338 +1,305 @@
#include "ui_cpu.h"
-#define RGB_VALID(x) ((x) < 0) ? 0 : (((x) > 255) ? 255 : (x))
-
-#define BAR_HEIGHT 15
-
-typedef enum {
-COLOR_FG = 0xff2f99ff,
-COLOR_BG = 0xff202020,
-
-COLOR_0 = 0xff57bb8a,
-COLOR_5 = 0xff63b682,
-COLOR_10 = 0xff73b87e,
-COLOR_15 = 0xff84bb7b,
-COLOR_20 = 0xff94bd77,
-COLOR_25 = 0xffa4c073,
-COLOR_30 = 0xffb0be6e,
-COLOR_35 = 0xffc4c56d,
-COLOR_40 = 0xffd4c86a,
-COLOR_45 = 0xffe2c965,
-COLOR_50 = 0xfff5ce62,
-COLOR_55 = 0xfff3c563,
-COLOR_60 = 0xffe9b861,
-COLOR_65 = 0xffe6ad61,
-COLOR_70 = 0xffecac67,
-COLOR_75 = 0xffe9a268,
-COLOR_80 = 0xffe79a69,
-COLOR_85 = 0xffe5926b,
-COLOR_90 = 0xffe2886c,
-COLOR_95 = 0xffe0816d,
-COLOR_100 = 0xffdd776e,
-} Colors;
-
-static int
-_core_color(int percent)
-{
- if (percent >= 100) return COLOR_100;
- if (percent >= 95) return COLOR_95;
- if (percent >= 90) return COLOR_90;
- if (percent >= 85) return COLOR_85;
- if (percent >= 80) return COLOR_80;
- if (percent >= 75) return COLOR_75;
- if (percent >= 70) return COLOR_70;
- if (percent >= 65) return COLOR_65;
- if (percent >= 60) return COLOR_60;
- if (percent >= 55) return COLOR_55;
- if (percent >= 50) return COLOR_50;
- if (percent >= 45) return COLOR_45;
- if (percent >= 40) return COLOR_40;
- if (percent >= 35) return COLOR_35;
- if (percent >= 30) return COLOR_30;
- if (percent >= 25) return COLOR_25;
- if (percent >= 20) return COLOR_20;
- if (percent >= 15) return COLOR_15;
- if (percent >= 10) return COLOR_10;
- if (percent >= 5) return COLOR_5;
-
- return COLOR_0;
-}
+typedef struct {
+ short id;
+ short percent;
+ unsigned int freq;
+} Core;
typedef struct {
Ui *ui;
- Ecore_Animator *animator;
Evas_Object*bg;
- Evas_Object*line;
Evas_Object*obj;
Evas_Object*colors;
- Eina_Bool redraw;
-
int cpu_count;
- Eina_List *cores;
Eina_Bool show_cpufreq;
// Have cpu scaling
Eina_Bool cpu_freq;
int freq_min;
int freq_max;
-
- int pos;
- double step;
} Animate;
-typedef struct
-{
- int id;
- int freq;
- int percent;
-} Core;
+typedef struct _Color_Point {
+ unsigned int val;
+ unsigned int color;
+} Color_Point;
+
+// config for colors/sizing
+static const Color_Point cpu_colormap_in[] = {
+ { 0, 0xff202020 }, // 0
+ { 33, 0xff2030a0 }, // 1
+ { 66, 0xffa040a0 }, // 2
+ { 100, 0x9040 }, // 3
+ { 256, 0x9040 } // overflow to avoid if's
+};
+static const Color_Point freq_colormap_in[] = {
+ { 0, 0x }, // 0
+ { 50, 0x00105020 }, // 1
+ { 100, 0x002060c0 }, // 2
+ { 256, 0x002060c0 } // overflow to avoid if's
+};
+#define BAR_HEIGHT 2
+#define COLORS_HEIGHT 20
+
+// stored colormap tables
+static unsigned int cpu_colormap[256];
+static unsigned int freq_colormap[256];
+
+// handy macros to access argb values from pixels
+#define AVAL(x) (((x) >> 24) & 0xff)
+#define RVAL(x) (((x) >> 16) & 0xff)
+#define GVAL(x) (((x) >> 8) & 0xff)
+#define BVAL(x) (((x) ) & 0xff)
+#define ARGB(a, r, g, b) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
-static int
-_core_alpha(int percent, int fr, int fr_max, int fr_min)
+static void
+_color_init(const Color_Point *col_in, unsigned int n, unsigned int *col)
{
- int r, g, b, a;
- int color;
+ unsigned int pos, interp, val, dist, d;
+ unsigned int a, r, g, b;
+ unsigned int a1, r1, g1, b1, v1;
+ unsigned int a2, r2, g2, b2, v2;
- color = _core_color(percent);
-
- r = (color >> 16) & 0xff;
- g = (color >> 8) & 0xff;
- b = (color & 0xff);
- a = 0xff;
-
- if (fr)
+ // wal colormap_in until colormap table is full
+ for (pos = 0, val = 0; pos < n; pos++)
{
-int rng, n;
-rng = fr_max - fr_min;
-n = fr - fr_m
[EGIT] [apps/rage] master 01/01: remove build warnings to get a clean build
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=af99a9ea5cfa409e4b242f1719eec8e38d42eb85
commit af99a9ea5cfa409e4b242f1719eec8e38d42eb85
Author: Carsten Haitzler (Rasterman)
Date: Tue Aug 25 15:21:02 2020 +0100
remove build warnings to get a clean build
no actual functional changes
---
src/bin/browser.c | 20 ++--
src/bin/main.c| 6 --
src/bin/video.c | 6 --
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/bin/browser.c b/src/bin/browser.c
index 9da726c..b278c9e 100644
--- a/src/bin/browser.c
+++ b/src/bin/browser.c
@@ -611,22 +611,22 @@ _cb_entry_table_move(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *in
}
static void
-_cb_entry_table_resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj, void *info EINA_UNUSED)
+_cb_entry_table_resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED)
{
- Entry *entry = data;
- Evas_Object *win = evas_object_data_get(obj, "win");
- if (initial_update_timer) return;
+// Entry *entry = data;
+// Evas_Object *win = evas_object_data_get(obj, "win");
+// if (initial_update_timer) return;
// _entry_files_redo(win, entry);
}
static void
-_cb_scroller_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *info EINA_UNUSED)
+_cb_scroller_resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *info EINA_UNUSED)
{
- Inf *inf = evas_object_data_get(data, "inf");
- Eina_List *l;
- Entry *entry;
- if ((!inf) || (!bx)) return;
- if (initial_update_timer) return;
+// Inf *inf = evas_object_data_get(data, "inf");
+// Eina_List *l;
+// Entry *entry;
+// if ((!inf) || (!bx)) return;
+// if (initial_update_timer) return;
// printf("_cb_scroller_resize \n");
// EINA_LIST_FOREACH(entries, l, entry)
// {
diff --git a/src/bin/main.c b/src/bin/main.c
index b7a67ec..4481984 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -169,7 +169,8 @@ elm_main(int argc, char **argv)
Evas_Object *win;
char buf[4096];
int i;
- Config *config;
+// XXX: to do later
+// Config *config;
Inf *inf;
Eina_Bool fullscreen = EINA_FALSE;
int rotation = 0;
@@ -180,7 +181,8 @@ elm_main(int argc, char **argv)
elm_need_efreet();
config_init();
- config = config_get();
+// XXX: to do later
+// config = config_get();
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-h")) ||
diff --git a/src/bin/video.c b/src/bin/video.c
index 03744d4..fc6f4f4 100644
--- a/src/bin/video.c
+++ b/src/bin/video.c
@@ -584,7 +584,8 @@ video_add(Evas_Object *parent)
Evas *e;
Evas_Object *obj, *o;
Video *sd;
- Config *config;
+// XXX: to do later
+// Config *config;
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
e = evas_object_evas_get(parent);
@@ -598,7 +599,8 @@ video_add(Evas_Object *parent)
emotion_init();
o = sd->o_vid = emotion_object_add(evas_object_evas_get(obj));
emotion_object_keep_aspect_set(o, EMOTION_ASPECT_KEEP_NONE);
- config = config_get();
+// XXX: to do later
+// config = config_get();
evas_object_smart_callback_add(o, "frame_decode", _cb_vid_frame, obj);
evas_object_smart_callback_add(o, "frame_resize", _cb_vid_resize, obj);
evas_object_smart_callback_add(o, "decode_stop", _cb_vid_stop, obj);
--
[EGIT] [apps/rage] master 01/01: rage dir scan - include files of no mime in case mime db is not there
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=d8d4b76a69db0478c1ca50fb5b606bb31e73376e
commit d8d4b76a69db0478c1ca50fb5b606bb31e73376e
Author: Carsten Haitzler (Rasterman)
Date: Sat Aug 22 18:05:18 2020 +0100
rage dir scan - include files of no mime in case mime db is not there
---
src/bin/main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 3313a7c..b7a67ec 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -125,7 +125,9 @@ _cb_feedback_recursion(void *data, Ecore_Thread *thread
EINA_UNUSED, void *msg)
EINA_LIST_FREE(list, path)
{
mime = efreet_mime_type_get(path);
-if (!strncmp(mime, "audio/", 6) || !strncmp(mime, "video/", 6))
+if ((!mime) ||
+(!strncmp(mime, "audio/", 6)) ||
+(!strncmp(mime, "video/", 6)))
{
update_content = EINA_TRUE;
win_list_hide(recursion->win);
--
[EGIT] [website/www-content] master 01/01: fix link for pinned notes
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=21ca84617c7dd1367440bf547eab9c10ff156a86 commit 21ca84617c7dd1367440bf547eab9c10ff156a86 Author: Carsten Haitzler (Rasterman) Date: Sun Jul 26 19:03:26 2020 +0100 fix link for pinned notes --- pages/incl/start-release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/incl/start-release.txt b/pages/incl/start-release.txt index 2b2a6eaed..8a01fe03c 100644 --- a/pages/incl/start-release.txt +++ b/pages/incl/start-release.txt @@ -1,3 +1,3 @@ -[[https://www.enlightenment.org/news/efl-1.24.3|EFL 1.24.3]] and [[https://www.enlightenment.org/news/e24.1|Enlightenment 0.24.2]] are out - go to our [[/download]] page. +[[https://www.enlightenment.org/news/efl-1.24.3|EFL 1.24.3]] and [[https://www.enlightenment.org/news/e24.2|Enlightenment 0.24.2]] are out - go to our [[/download]] page. --
[EGIT] [website/www-content] master 01/01: e0.24.2 release announce
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=d7669415cd7ca8bee1d25407ca33766a0f79f8f8
commit d7669415cd7ca8bee1d25407ca33766a0f79f8f8
Author: Carsten Haitzler (Rasterman)
Date: Sun Jul 26 18:03:46 2020 +0100
e0.24.2 release announce
---
pages/news/e24.2.txt | 54
1 file changed, 54 insertions(+)
diff --git a/pages/news/e24.2.txt b/pages/news/e24.2.txt
new file mode 100644
index 0..f0f061e72
--- /dev/null
+++ b/pages/news/e24.2.txt
@@ -0,0 +1,54 @@
+=== Enlightenment DR 0.24.2 Release ===
+ * //2020-07-26 - by Carsten Haitzler//
+
+{{ :e-flat-sample.jpg?640 | Sample cropped screenshot of Enlightenment
}}
+
+Hilights:
+ * Fixed null exec command running
+ * Fixed handling of screen with no edid
+ * Fixed signal.h, execinfo.h include for some libc's
+ * Sped up pager thumb loading significant;y
+ * Handle zone changes during startup
+ * Longer efreetd timeout for update event
+ * Fixed e's xsettings support on 64bit to use the right types
+ * Fixed preloading of icon
+ * Fixed e's wl backlight/dimming logic to be correct and reliable
+ * Fixed noisy logging on invalid exec handle found
+ * Fixed shot blurriness if size didn't quite match
+ * Fixed battery on openbsd to use right constants
+ * Fixed cpu freq setting on freebsd etc.
+ * Handle error exits from dependency libs as an error and bring up alert
+ * E system - isolate stdio so it doesn't affect ipc on stdin/out
+ * Polkit & Askpass password - handle escaping right
+ * Fix tiling issue with float/unfloat
+ * Fixed shell autohide when clock data up
+ * Handle x io error with proper exit code and exit
+
+== Download ==
+
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[
+http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.2.tar.xz
| Enlightenment DR 0.24.2 XZ]] |
be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1 |
+
+== Building and Dependencies ==
+
+ - [[https://git.enlightenment.org/core/efl.git/tree/README
| EFL]]
+ - libpam (Linux only)
+
+Highly recommended to ensure proper functionality (though you can live
+without these):
+
+ - connman (For network configuration support)
+ - bluez5 (For bluetooth configuration and control)
+ - bc (For the evrything module calculator mode)
+ - pulseaudio (For proper audio device control and redirection)
+ - acpid (For systems with ACPI for lid events, AC/Battery plug in/out etc.)
+ - packagekit (For the built in system updates monitoring and updater)
+ - udisks2 (For removable storage mounting/unmounting)
+ - ddcutil (specifically libddcutil.so.2 for backlight control)
+ - gdb (If you want automatic backtraces on a crash in ~/.e-crashdump.txt -
don't forget to build EFL and E with gdb debugging to make this useful)
+
+**Note:** Enlightenment 0.24.2 depends on EFL **v1.24.1** or newer.
+
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
--
[EGIT] [website/www-content] master 01/01: e 0.24.2 release
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f2c64462a6ab47408582527774ea1acdbb482eb2 commit f2c64462a6ab47408582527774ea1acdbb482eb2 Author: Carsten Haitzler (Rasterman) Date: Sun Jul 26 17:58:05 2020 +0100 e 0.24.2 release --- pages/about-enlightenment.md.txt | 2 +- pages/download-latest.txt| 2 +- pages/incl/start-release.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/about-enlightenment.md.txt b/pages/about-enlightenment.md.txt index 9fb88c17b..0e7ec0c6f 100644 --- a/pages/about-enlightenment.md.txt +++ b/pages/about-enlightenment.md.txt @@ -7,7 +7,7 @@  -Enlightenment (0.24.1) (a.k.a E24) is the next generation of graphical desktop shell from the Enlightenment project. It resembles a traditional UNIX/X1 style desktop by design but has a range of add-ons, as well as a different core design philosophy. +Enlightenment (0.24.2) (a.k.a E24) is the next generation of graphical desktop shell from the Enlightenment project. It resembles a traditional UNIX/X1 style desktop by design but has a range of add-ons, as well as a different core design philosophy. Enlightenment manages windows and files. It's a compositor and is also capable of launching applications, handling the user interface and even system settings. diff --git a/pages/download-latest.txt b/pages/download-latest.txt index d10fe8605..b4a6ed998 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -2,7 +2,7 @@ efl_v = 1.24.3 python_efl_v = 1.24.0 -enlightenment_v = 0.24.1 +enlightenment_v = 0.24.2 terminology_v = 1.8.0 rage_v= 0.3.1 econnman_v= 1.1 diff --git a/pages/incl/start-release.txt b/pages/incl/start-release.txt index 4425a278d..2b2a6eaed 100644 --- a/pages/incl/start-release.txt +++ b/pages/incl/start-release.txt @@ -1,3 +1,3 @@ -[[https://www.enlightenment.org/news/efl-1.24.3|EFL 1.24.3]] and [[https://www.enlightenment.org/news/e24.1|Enlightenment 0.24.1]] are out - go to our [[/download]] page. +[[https://www.enlightenment.org/news/efl-1.24.3|EFL 1.24.3]] and [[https://www.enlightenment.org/news/e24.1|Enlightenment 0.24.2]] are out - go to our [[/download]] page. --
[EGIT] [website/extra-server] master 01/01: flat v5
raster pushed a commit to branch master.
http://git.enlightenment.org/website/extra-server.git/commit/?id=e796489bf8785e0e0ce3d06b0b742baef124c9b4
commit e796489bf8785e0e0ce3d06b0b742baef124c9b4
Author: Carsten Haitzler (Rasterman)
Date: Tue Jun 30 21:32:40 2020 +0100
flat v5
---
public_html/extra/assets/themes/flat-5.edj | Bin 0 -> 45775272 bytes
public_html/extra/data.py | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/extra/assets/themes/flat-5.edj
b/public_html/extra/assets/themes/flat-5.edj
new file mode 100644
index 000..5e80a2f
Binary files /dev/null and b/public_html/extra/assets/themes/flat-5.edj differ
diff --git a/public_html/extra/data.py b/public_html/extra/data.py
index e7aebe1..70f3f2c 100644
--- a/public_html/extra/data.py
+++ b/public_html/extra/data.py
@@ -35,7 +35,7 @@ THEMES = {
'name': 'Flat',
'author': 'raster',
'description': 'A WORK IN PROGRESS flat theme',
-'version': 4,
+'version': 5,
},
'Ice': {
'theme_id': 'Ice',
--
[EGIT] [website/www-content] master 01/01: news - fix link for e24.1
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=282cdba299438b746d433b0f240a6a7bb78703b3 commit 282cdba299438b746d433b0f240a6a7bb78703b3 Author: Carsten Haitzler (Rasterman) Date: Thu Jun 25 14:13:04 2020 +0100 news - fix link for e24.1 --- pages/news/e24.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pages/news/e24.1.txt b/pages/news/e24.1.txt index 3b16fc3f6..7b55c7a00 100644 --- a/pages/news/e24.1.txt +++ b/pages/news/e24.1.txt @@ -14,8 +14,7 @@ Hilights: == Download == ^ ** LINK ** ^ ** SHA256 ** ^ -| [[ -http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.0.tar.xz | Enlightenment DR 0.24.1 XZ]] | aee2b6178c918d71ebe661129f4008d773e70e5784651dadbcf56eec0a6d4a09 | +| [[ http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.1.tar.xz | Enlightenment DR 0.24.1 XZ]] | aee2b6178c918d71ebe661129f4008d773e70e5784651dadbcf56eec0a6d4a09 | == Building and Dependencies == --
[EGIT] [website/www-content] master 01/02: update versions for e 0.24.1
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=69ea9a20716abf64e04bb7d4ad8eb60e90652e26 commit 69ea9a20716abf64e04bb7d4ad8eb60e90652e26 Author: Carsten Haitzler (Rasterman) Date: Sun May 31 19:43:02 2020 +0100 update versions for e 0.24.1 --- pages/about-enlightenment.md.txt | 2 +- pages/download-latest.txt| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/about-enlightenment.md.txt b/pages/about-enlightenment.md.txt index 0f6e2d578..9fb88c17b 100644 --- a/pages/about-enlightenment.md.txt +++ b/pages/about-enlightenment.md.txt @@ -7,7 +7,7 @@  -Enlightenment (0.24.0) (a.k.a E24) is the next generation of graphical desktop shell from the Enlightenment project. It resembles a traditional UNIX/X1 style desktop by design but has a range of add-ons, as well as a different core design philosophy. +Enlightenment (0.24.1) (a.k.a E24) is the next generation of graphical desktop shell from the Enlightenment project. It resembles a traditional UNIX/X1 style desktop by design but has a range of add-ons, as well as a different core design philosophy. Enlightenment manages windows and files. It's a compositor and is also capable of launching applications, handling the user interface and even system settings. diff --git a/pages/download-latest.txt b/pages/download-latest.txt index 9de64bc29..3a46f6d97 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -2,7 +2,7 @@ efl_v = 1.24.2 python_efl_v = 1.24.0 -enlightenment_v = 0.24.0 +enlightenment_v = 0.24.1 terminology_v = 1.7.0 rage_v= 0.3.1 econnman_v= 1.1 --
[EGIT] [website/www-content] master 02/02: update more versions for e 0.24.1
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=c63b0211388be8759ce54d34dd550b59b0d846a8 commit c63b0211388be8759ce54d34dd550b59b0d846a8 Author: Carsten Haitzler (Rasterman) Date: Sun May 31 19:44:03 2020 +0100 update more versions for e 0.24.1 --- pages/incl/start-release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/incl/start-release.txt b/pages/incl/start-release.txt index c84f13ec1..feec79c27 100644 --- a/pages/incl/start-release.txt +++ b/pages/incl/start-release.txt @@ -1,3 +1,3 @@ -[[https://www.enlightenment.org/news/efl-1.24.2|EFL 1.24.2]] and [[https://www.enlightenment.org/news/e24.0|Enlightenment 0.24.0]] are out - go to our [[/download]] page. +[[https://www.enlightenment.org/news/efl-1.24.2|EFL 1.24.2]] and [[https://www.enlightenment.org/news/e24.1|Enlightenment 0.24.1]] are out - go to our [[/download]] page. --
[EGIT] [website/www-content] master 01/01: remove g+ link - it's dead...
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=7658cf18636a2d2ca6c802aebaf090ab6f150cef
commit 7658cf18636a2d2ca6c802aebaf090ab6f150cef
Author: Carsten Haitzler (Rasterman)
Date: Sun May 31 19:41:45 2020 +0100
remove g+ link - it's dead...
---
pages/incl/start-shortcuts.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/pages/incl/start-shortcuts.txt b/pages/incl/start-shortcuts.txt
index 2eebcd7cd..d47d6d2cd 100644
--- a/pages/incl/start-shortcuts.txt
+++ b/pages/incl/start-shortcuts.txt
@@ -1,7 +1,5 @@
[[http://twitter.com/_Enlightenment_|{{:scut-twitter.svg|Twitter}}]]
{{:scut-pad-sml.svg?nolink}}
-[[http://plus.google.com/118426816251488376359|{{:scut-gplus.svg|G+}}]]
-{{:scut-pad-sml.svg?nolink}}
[[http://www.facebook.com/enlightenment.org|{{:scut-facebook.svg|Facebook}}]]
{{:scut-pad-sml.svg?nolink}}
[[http://www.youtube.com/channel/UCs9Xcw4TwJ1_A8QI8PxCNNA|{{:scut-youtube.svg|YouTube}}]]
--
[EGIT] [website/www-content] master 01/01: e24.1 release
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=3ef472dc1c42a9079bc5a101d9a9cd1c16fb3119
commit 3ef472dc1c42a9079bc5a101d9a9cd1c16fb3119
Author: Carsten Haitzler (Rasterman)
Date: Sun May 31 19:34:37 2020 +0100
e24.1 release
---
pages/news/e24.1.txt | 41 +
1 file changed, 41 insertions(+)
diff --git a/pages/news/e24.1.txt b/pages/news/e24.1.txt
new file mode 100644
index 0..3b16fc3f6
--- /dev/null
+++ b/pages/news/e24.1.txt
@@ -0,0 +1,41 @@
+=== Enlightenment DR 0.24.1 Release ===
+ * //2020-05-31 - by Carsten Haitzler//
+
+{{ :e-flat-sample.jpg?640 | Sample cropped screenshot of Enlightenment
}}
+
+Hilights:
+ * Optimized keymap response handling to not stall on startup
+ * Fixed wayland frame request timestamp to be the 0 base same as others
+ * Fix polkit auth handling when having to auth for non-user UID
+ * Randr fix to move pointer on-screen if off screen after reconfigure
+ * Fix non-systemd system suport for resume to not think it's suspended
+ * Add delay to allow any pending frames to display before suspend
+
+== Download ==
+
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[
+http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.0.tar.xz
| Enlightenment DR 0.24.1 XZ]] |
aee2b6178c918d71ebe661129f4008d773e70e5784651dadbcf56eec0a6d4a09 |
+
+== Building and Dependencies ==
+
+ - [[https://git.enlightenment.org/core/efl.git/tree/README
| EFL]]
+ - libpam (Linux only)
+
+Highly recommended to ensure proper functionality (though you can live
+without these):
+
+ - connman (For network configuration support)
+ - bluez5 (For bluetooth configuration and control)
+ - bc (For the evrything module calculator mode)
+ - pulseaudio (For proper audio device control and redirection)
+ - acpid (For systems with ACPI for lid events, AC/Battery plug in/out etc.)
+ - packagekit (For the built in system updates monitoring and updater)
+ - udisks2 (For removable storage mounting/unmounting)
+ - ddcutil (specifically libddcutil.so.2 for backlight control)
+ - gdb (If you want automatic backtraces on a crash in ~/.e-crashdump.txt -
don't forget to build EFL and E with gdb debugging to make this useful)
+
+**Note:** Enlightenment 0.24.1 depends on EFL **v1.24.1** or newer.
+
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
--
[EGIT] [apps/ecrire] master 01/01: wrap- use mixed mode by default like other editors
raster pushed a commit to branch master. http://git.enlightenment.org/apps/ecrire.git/commit/?id=2f3d28d1bfa33634343413fa5a74c54bbe369d61 commit 2f3d28d1bfa33634343413fa5a74c54bbe369d61 Author: Carsten Haitzler (Rasterman) Date: Fri May 29 10:41:46 2020 +0100 wrap- use mixed mode by default like other editors --- src/bin/cfg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/cfg.c b/src/bin/cfg.c index 594d558..1480626 100644 --- a/src/bin/cfg.c +++ b/src/bin/cfg.c @@ -81,6 +81,7 @@ _ecrire_cfg_new(void) ret = calloc(1, sizeof(*ret)); ret->version = _ENTITLED_CFG_VERSION; + ret->wrap_type = ELM_WRAP_MIXED; return ret; } --
[EGIT] [apps/rage] master 01/01: rage - add -lm linking when needed
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=6875aabc27bb7ddb67c19dafc6ea9c9e314253d8
commit 6875aabc27bb7ddb67c19dafc6ea9c9e314253d8
Author: Carsten Haitzler (Rasterman)
Date: Wed May 27 11:53:29 2020 +0100
rage - add -lm linking when needed
---
meson.build | 4 +++-
src/bin/gesture.c | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 63922d5..5801869 100644
--- a/meson.build
+++ b/meson.build
@@ -11,8 +11,10 @@ proj = meson.project_name()
ver = meson.project_version()
# dependencies
+cc = meson.get_compiler('c')
+m_dep = cc.find_library('m', required : false)
efl_version = '>= 1.22.3'
-deps = dependency('elementary', version: efl_version)
+deps = [ dependency('elementary', version: efl_version), m_dep ]
edje = dependency('edje', version: efl_version)
# edje_cc binary compiler tool
diff --git a/src/bin/gesture.c b/src/bin/gesture.c
index 21aae27..c98058f 100644
--- a/src/bin/gesture.c
+++ b/src/bin/gesture.c
@@ -1,4 +1,5 @@
#include
+#include
#include "main.h"
#include "win.h"
#include "winvid.h"
--
[EGIT] [website/www-content] master 01/01: fix link
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=e33566d6bc8ef88ba80db55081b403c4ac7c1e8b commit e33566d6bc8ef88ba80db55081b403c4ac7c1e8b Author: Carsten Haitzler (Rasterman) Date: Sun May 17 20:57:43 2020 +0100 fix link --- pages/incl/start-release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/incl/start-release.txt b/pages/incl/start-release.txt index 116c8628b..2e834102e 100644 --- a/pages/incl/start-release.txt +++ b/pages/incl/start-release.txt @@ -1,3 +1,3 @@ -[[https://www.enlightenment.org/news/efl-1.24.1|EFL 1.24.1]] and [[https://www.enlightenment.org/news/e0.24.0|Enlightenment 0.24.0]] are out - go to our [[/download]] page. +[[https://www.enlightenment.org/news/efl-1.24.1|EFL 1.24.1]] and [[https://www.enlightenment.org/news/e24.0|Enlightenment 0.24.0]] are out - go to our [[/download]] page. --
[EGIT] [website/www-content] master 01/01: fix latest release versions pin
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=929fb90bf813980b70f524f5bce0a36a0f531048 commit 929fb90bf813980b70f524f5bce0a36a0f531048 Author: Carsten Haitzler (Rasterman) Date: Sun May 17 20:53:21 2020 +0100 fix latest release versions pin --- pages/incl/start-release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/incl/start-release.txt b/pages/incl/start-release.txt index 8e8b26d61..116c8628b 100644 --- a/pages/incl/start-release.txt +++ b/pages/incl/start-release.txt @@ -1,3 +1,3 @@ -[[https://www.enlightenment.org/news/efl-1.24.1|EFL 1.24.1]] and [[https://www.enlightenment.org/news/e0.23.1_release|Enlightenment 0.23.1]] are out - go to our [[/download]] page. +[[https://www.enlightenment.org/news/efl-1.24.1|EFL 1.24.1]] and [[https://www.enlightenment.org/news/e0.24.0|Enlightenment 0.24.0]] are out - go to our [[/download]] page. --
[EGIT] [website/www-content] master 01/01: e24 release news, links and version update
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=cd382c57b71a11d49e2a6a028aa907b982b9
commit cd382c57b71a11d49e2a6a028aa907b982b9
Author: Carsten Haitzler (Rasterman)
Date: Sun May 17 20:47:10 2020 +0100
e24 release news, links and version update
---
pages/about-enlightenment.md.txt | 2 +-
pages/download-latest.txt| 2 +-
pages/news/e24.0.txt | 55
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/pages/about-enlightenment.md.txt b/pages/about-enlightenment.md.txt
index cf0428ef0..0f6e2d578 100644
--- a/pages/about-enlightenment.md.txt
+++ b/pages/about-enlightenment.md.txt
@@ -7,7 +7,7 @@
-Enlightenment (0.23.1) (a.k.a E23) is the next generation of graphical desktop
shell from the Enlightenment project. It resembles a traditional UNIX/X1 style
desktop by design but has a range of add-ons, as well as a different core
design philosophy.
+Enlightenment (0.24.0) (a.k.a E24) is the next generation of graphical desktop
shell from the Enlightenment project. It resembles a traditional UNIX/X1 style
desktop by design but has a range of add-ons, as well as a different core
design philosophy.
Enlightenment manages windows and files. It's a compositor and is also capable
of launching applications, handling the user interface and even system settings.
diff --git a/pages/download-latest.txt b/pages/download-latest.txt
index 170ab3a88..330bb5bcc 100644
--- a/pages/download-latest.txt
+++ b/pages/download-latest.txt
@@ -2,7 +2,7 @@
efl_v = 1.24.1
python_efl_v = 1.24.0
-enlightenment_v = 0.23.1
+enlightenment_v = 0.24.0
terminology_v = 1.7.0
rage_v= 0.3.1
econnman_v= 1.1
diff --git a/pages/news/e24.0.txt b/pages/news/e24.0.txt
new file mode 100644
index 0..8eb4ca293
--- /dev/null
+++ b/pages/news/e24.0.txt
@@ -0,0 +1,55 @@
+=== Enlightenment DR 0.24.0 Release ===
+ * //2020-05-17 - by Carsten Haitzler//
+
+{{ :e-flat-sample.jpg?640 | Sample cropped screenshot of Enlightenment
}}
+
+Hilights:
+ * New and improved shot module with editor and cropper
+ * Reduced number of setuid tools (merged many into single system tool)
+ * External monitor backlight and brightness controls via (lib)ddctil
+ * Improved resolution of EFM thumbnails to 256x256 by default
+ * New and improved crash handling guru meditation
+ * Restarts are now seamless with fade in and out and zero glitches
+ * Wallpaper import generates multiple resolutions for better efficiency
+ * Regularly malloc_trim if available to keep mem down
+ * All restarts are now handled by enlightenment_start, not e itself
+ * Enforce pointer lock to screen in X to stop pointer out-of-bounds
+ * Pager plain is gone - use the regular "miniature preview" pager
+ * Music control auto-runs your selected media player if not there
+ * Handle exception for steam games to find the right desktop file
+ * Polkit auth agent support as new core module - no extra daemons
+ * Drop comp fast effects - Should be edje transition factor + theme tags
+ * Easier config of specific desktop wallpaper straight from pager
+ * Startup should be smoother with IO prefetch thread
+ * New special blanking timeout for when locked that can be shorter
+ * Bluez4 gone now as Bluez5 is done and working fine
+ * Down to zero outstanding coverity issues
+ * The usual batches of bug fixes and minor improvements
+
+== Download ==
+
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[
http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.0.tar.xz
| Enlightenment DR 0.24.0 XZ]] |
e7bb0d6b2a9661bd0b2ca15c6bca20ec654a01aff8865f9f594efada3a1c0504 |
+
+== Building and Dependencies ==
+
+ - [[https://git.enlightenment.org/core/efl.git/tree/README
| EFL]]
+ - libpam (Linux only)
+
+Highly recommended to ensure proper functionality (though you can live
+without these):
+
+ - connman (For network configuration support)
+ - bluez5 (For bluetooth configuration and control)
+ - bc (For the evrything module calculator mode)
+ - pulseaudio (For proper audio device control and redirection)
+ - acpid (For systems with ACPI for lid events, AC/Battery plug in/out etc.)
+ - packagekit (For the built in system updates monitoring and updater)
+ - udisks2 (For removable storage mounting/unmounting)
+ - ddcutil (specifically libddcutil.so.2 for backlight control)
+ - gdb (If you want automatic backtraces on a crash in ~/.e-crashdump.txt -
don't forget to build EFL and E with gdb debugging to make this useful)
+
+**Note:** Enlightenment 0.24.0 depends on EFL **v1.24.1** or newer.
+
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
--
[EGIT] [website/www-content] master 01/01: hello tut - get args correct
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=2ba8ec6cc1865ff591d1686dde03e2994e69dfad
commit 2ba8ec6cc1865ff591d1686dde03e2994e69dfad
Author: Carsten Haitzler (Rasterman)
Date: Fri May 15 16:26:41 2020 +0100
hello tut - get args correct
---
pages/develop/tutorials/c/hello-world.md.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/develop/tutorials/c/hello-world.md.txt
b/pages/develop/tutorials/c/hello-world.md.txt
index 48f4fdc08..90a122fa3 100644
--- a/pages/develop/tutorials/c/hello-world.md.txt
+++ b/pages/develop/tutorials/c/hello-world.md.txt
@@ -124,13 +124,13 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
{
Efl_Loop_Arguments *args = ev->info;
- if (eina_array_count(args->argv) == 0)
+ if (eina_array_count(args->argv) <= 1)
{
printf("Hello World!\n");
}
else
{
-printf("Hello %s!\n", (char *) eina_array_data_get(args->argv, 0));
+printf("Hello %s!\n", (char *) eina_array_data_get(args->argv, 1));
}
efl_exit(0);
--
[EGIT] [website/extra-server] master 01/01: flat - just overwrite v4 as v5 updates dont seem to work
raster pushed a commit to branch master.
http://git.enlightenment.org/website/extra-server.git/commit/?id=74e9ebb8a72a05f4eeddb1d1c9a07a4bffebe52c
commit 74e9ebb8a72a05f4eeddb1d1c9a07a4bffebe52c
Author: Carsten Haitzler (Rasterman)
Date: Sat May 9 12:17:22 2020 +0100
flat - just overwrite v4 as v5 updates dont seem to work
---
public_html/extra/assets/themes/flat-4.edj | Bin 45671872 -> 45637064 bytes
public_html/extra/assets/themes/flat-5.edj | Bin 45637064 -> 0 bytes
public_html/extra/data.py | 2 +-
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/extra/assets/themes/flat-4.edj
b/public_html/extra/assets/themes/flat-4.edj
index 385018e..0447c93 100644
Binary files a/public_html/extra/assets/themes/flat-4.edj and
b/public_html/extra/assets/themes/flat-4.edj differ
diff --git a/public_html/extra/assets/themes/flat-5.edj
b/public_html/extra/assets/themes/flat-5.edj
deleted file mode 100644
index 0447c93..000
Binary files a/public_html/extra/assets/themes/flat-5.edj and /dev/null differ
diff --git a/public_html/extra/data.py b/public_html/extra/data.py
index 70f3f2c..e7aebe1 100644
--- a/public_html/extra/data.py
+++ b/public_html/extra/data.py
@@ -35,7 +35,7 @@ THEMES = {
'name': 'Flat',
'author': 'raster',
'description': 'A WORK IN PROGRESS flat theme',
-'version': 5,
+'version': 4,
},
'Ice': {
'theme_id': 'Ice',
--
[EGIT] [website/extra-server] master 01/01: flat - go to v5
raster pushed a commit to branch master.
http://git.enlightenment.org/website/extra-server.git/commit/?id=fa17f1e144512d8a8aeb25ddb8da4f9ed6214fa4
commit fa17f1e144512d8a8aeb25ddb8da4f9ed6214fa4
Author: Carsten Haitzler (Rasterman)
Date: Sat May 9 12:12:34 2020 +0100
flat - go to v5
---
public_html/extra/data.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/extra/data.py b/public_html/extra/data.py
index e7aebe1..70f3f2c 100644
--- a/public_html/extra/data.py
+++ b/public_html/extra/data.py
@@ -35,7 +35,7 @@ THEMES = {
'name': 'Flat',
'author': 'raster',
'description': 'A WORK IN PROGRESS flat theme',
-'version': 4,
+'version': 5,
},
'Ice': {
'theme_id': 'Ice',
--
[EGIT] [website/extra-server] master 01/01: update flat preview
raster pushed a commit to branch master. http://git.enlightenment.org/website/extra-server.git/commit/?id=f050224487a526c8f92fd6f32ecadec4b6d44487 commit f050224487a526c8f92fd6f32ecadec4b6d44487 Author: Carsten Haitzler (Rasterman) Date: Sat May 9 12:11:47 2020 +0100 update flat preview --- public_html/extra/assets/themes/preview/flat.png | Bin 614984 -> 1766828 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public_html/extra/assets/themes/preview/flat.png b/public_html/extra/assets/themes/preview/flat.png index 050697a..ab14f45 100644 Binary files a/public_html/extra/assets/themes/preview/flat.png and b/public_html/extra/assets/themes/preview/flat.png differ --
[EGIT] [website/extra-server] master 01/01: add new flat 5
raster pushed a commit to branch master. http://git.enlightenment.org/website/extra-server.git/commit/?id=fbe07c1c7009eba4fe8318fc9bdef5a1b2325fe1 commit fbe07c1c7009eba4fe8318fc9bdef5a1b2325fe1 Author: Carsten Haitzler (Rasterman) Date: Sat May 9 12:08:21 2020 +0100 add new flat 5 --- public_html/extra/assets/themes/flat-5.edj | Bin 0 -> 45637064 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public_html/extra/assets/themes/flat-5.edj b/public_html/extra/assets/themes/flat-5.edj new file mode 100644 index 000..0447c93 Binary files /dev/null and b/public_html/extra/assets/themes/flat-5.edj differ --
[EGIT] [website/www-content] master 01/01: crop flat sample image a bit
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=aab1490dc839fd7ec38d0ca21a10d0826f702fe9 commit aab1490dc839fd7ec38d0ca21a10d0826f702fe9 Author: Carsten Haitzler (Rasterman) Date: Thu May 7 17:36:06 2020 +0100 crop flat sample image a bit --- media/e-flat-sample.jpg | Bin 271164 -> 208327 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/e-flat-sample.jpg b/media/e-flat-sample.jpg index 81e13340c..341b4cf92 100644 Binary files a/media/e-flat-sample.jpg and b/media/e-flat-sample.jpg differ --
[EGIT] [website/www-content] master 01/01: make image 640 wide - better with format
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=fc4df02685f6b09222bc76b4651612c2fcc1c504
commit fc4df02685f6b09222bc76b4651612c2fcc1c504
Author: Carsten Haitzler (Rasterman)
Date: Thu May 7 17:29:09 2020 +0100
make image 640 wide - better with format
---
pages/news/e24.0-beta1.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/news/e24.0-beta1.txt b/pages/news/e24.0-beta1.txt
index 99c9dfef8..7a814179e 100644
--- a/pages/news/e24.0-beta1.txt
+++ b/pages/news/e24.0-beta1.txt
@@ -1,7 +1,7 @@
=== Enlightenment DR 0.24.0-beta1 Release ===
* //2020-05-07 - by Carsten Haitzler//
-{{ :e-flat-sample.jpg?800 | Sample cropped screenshot of Enlightenment
}}
+{{ :e-flat-sample.jpg?640 | Sample cropped screenshot of Enlightenment
}}
Hilights:
* New and improved shot module with editor and cropper
--
[EGIT] [website/www-content] master 02/02: e news 0.24 beta use e flat screenie
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=d2e82aaa256ada708ad9916cb402c3f497ed5c43
commit d2e82aaa256ada708ad9916cb402c3f497ed5c43
Author: Carsten Haitzler (Rasterman)
Date: Thu May 7 17:23:51 2020 +0100
e news 0.24 beta use e flat screenie
---
pages/news/e24.0-beta1.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pages/news/e24.0-beta1.txt b/pages/news/e24.0-beta1.txt
index 6028d32f0..99c9dfef8 100644
--- a/pages/news/e24.0-beta1.txt
+++ b/pages/news/e24.0-beta1.txt
@@ -1,6 +1,8 @@
=== Enlightenment DR 0.24.0-beta1 Release ===
* //2020-05-07 - by Carsten Haitzler//
+{{ :e-flat-sample.jpg?800 | Sample cropped screenshot of Enlightenment
}}
+
Hilights:
* New and improved shot module with editor and cropper
* Reduced number of setuid tools (merged many into single system tool)
--
[EGIT] [website/www-content] master 01/02: add sample flat screenie
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=dc81440fcde4c4133053c9fc5a8c909e5f62b4e3 commit dc81440fcde4c4133053c9fc5a8c909e5f62b4e3 Author: Carsten Haitzler (Rasterman) Date: Thu May 7 17:23:40 2020 +0100 add sample flat screenie --- media/e-flat-sample.jpg | Bin 0 -> 271164 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/e-flat-sample.jpg b/media/e-flat-sample.jpg new file mode 100644 index 0..81e13340c Binary files /dev/null and b/media/e-flat-sample.jpg differ --
[EGIT] [website/www-content] master 01/01: e24 beta news
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=0051cb90975b826838c2a7a050462f2511179588
commit 0051cb90975b826838c2a7a050462f2511179588
Author: Carsten Haitzler (Rasterman)
Date: Thu May 7 16:54:50 2020 +0100
e24 beta news
---
pages/news/e24.0-beta1.txt | 54 ++
1 file changed, 54 insertions(+)
diff --git a/pages/news/e24.0-beta1.txt b/pages/news/e24.0-beta1.txt
new file mode 100644
index 0..6028d32f0
--- /dev/null
+++ b/pages/news/e24.0-beta1.txt
@@ -0,0 +1,54 @@
+=== Enlightenment DR 0.24.0-beta1 Release ===
+ * //2020-05-07 - by Carsten Haitzler//
+
+Hilights:
+ * New and improved shot module with editor and cropper
+ * Reduced number of setuid tools (merged many into single system tool)
+ * External monitor backlight and brightness controls via (lib)ddctil
+ * Improved resolution of EFM thumbnails to 256x256 by default
+ * New and improved crash handling guru meditation
+ * Restarts are now seamless with fade in and out and zero glitches
+ * Wallpaper import generates multiple resolutions for better efficiency
+ * Regularly malloc_trim if available to keep mem down
+ * All restarts are now handled by enlightenment_start, not e itself
+ * Enforce pointer lock to screen in X to stop pointer out-of-bounds
+ * Pager plain is gone - use the regular "miniature preview" pager
+ * Music control auto-runs your selected media player if not there
+ * Handle exception for steam games to find the right desktop file
+ * Polkit auth agent support as new core module - no extra daemons
+ * Drop comp fast effects - Should be edje transition factor + theme tags
+ * Easier config of specific desktop wallpaper straight from pager
+ * Startup should be smoother with IO prefetch thread
+ * New special blanking timeout for when locked that can be shorter
+ * Bluez4 gone now as Bluez5 is done and working fine
+ * Down to zero outstanding coverity issues
+ * The usual batches of bug fixes and minor improvements
+
+== Download ==
+
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[
http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.0-beta1.tar.xz
| Enlightenment DR 0.24.0 XZ]] |
e514989bdde66e7481d368def5e95c92e4482dcb0f2b651d6cee457ddfddbc8b |
+
+
+== Building and Dependencies ==
+
+ - [[https://git.enlightenment.org/core/efl.git/tree/README
| EFL]]
+ - libpam (Linux only)
+
+Highly recommended to ensure proper functionality (though you can live
+without these):
+
+ - connman (For network configuration support)
+ - bluez5 (For bluetooth configuration and control)
+ - bc (For the evrything module calculator mode)
+ - pulseaudio (For proper audio device control and redirection)
+ - acpid (For systems with ACPI for lid events, AC/Battery plug in/out etc.)
+ - packagekit (For the built in system updates monitoring and updater)
+ - udisks2 (For removable storage mounting/unmounting)
+ - ddcutil (specifically libddcutil.so.2 for backlight control)
+ - gdb (If you want automatic backtraces on a crash in ~/.e-crashdump.txt -
don't forget to build EFL and E with gdb debugging to make this useful)
+
+**Note:** Enlightenment 0.24.0-beta1 depends on EFL **v1.24.0** or newer.
+
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
--
[EGIT] [website/www-content] master 01/01: fix typo in description line
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=6c732e2231ebfaa8ee8b484c0d67215580105205 commit 6c732e2231ebfaa8ee8b484c0d67215580105205 Author: Carsten Haitzler (Rasterman) Date: Tue May 5 12:47:50 2020 +0100 fix typo in description line --- pages/news/e24.0-alpha1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/news/e24.0-alpha1.txt b/pages/news/e24.0-alpha1.txt index 86762c395..6573ef532 100644 --- a/pages/news/e24.0-alpha1.txt +++ b/pages/news/e24.0-alpha1.txt @@ -27,7 +27,8 @@ Hilights: == Download == ^ ** LINK ** ^ ** SHA256 ** ^ -| [[ http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.0-alpha1.tar.xz | Enlightenment DR 0.23.0 XZ]] | aae4d22261736efd9b8fceae3d00f3ddd583b8711135f9f6f20d2b9c2e885ea4 | +| [[ +http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.0-alpha1.tar.xz | Enlightenment DR 0.24.0 XZ]] | aae4d22261736efd9b8fceae3d00f3ddd583b8711135f9f6f20d2b9c2e885ea4 | == Building and Dependencies == --
[EGIT] [apps/rage] master 01/01: remove printf debugs...
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=11373da80bb445dc649199fabd1e281693b945cf
commit 11373da80bb445dc649199fabd1e281693b945cf
Author: Carsten Haitzler (Rasterman)
Date: Sun May 3 15:39:03 2020 +0100
remove printf debugs...
---
src/bin/browser.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/bin/browser.c b/src/bin/browser.c
index ade1e50..9da726c 100644
--- a/src/bin/browser.c
+++ b/src/bin/browser.c
@@ -643,7 +643,6 @@ _cb_initial_update_timer(void *data)
initial_update_timer = NULL;
if ((!inf) || (!bx)) return EINA_FALSE;
- printf("_cb_initial_update_timer \n");
EINA_LIST_FOREACH(entries, l, entry)
{
_entry_files_redo(data, entry);
@@ -1253,7 +1252,6 @@ browser_size_update(Evas_Object *win)
if (!inf) return;
if (!bx) return;
if (initial_update_timer) return;
- printf("browser_size_update...\n");
EINA_LIST_FOREACH(entries, l, entry)
{
_entry_files_redo(win, entry);
--
[EGIT] [website/www-content] master 02/02: e24 alpha 1 news announce
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=28efe6d0b1119cf78d6761a5867b9768fa5e37ec
commit 28efe6d0b1119cf78d6761a5867b9768fa5e37ec
Author: Carsten Haitzler (Rasterman)
Date: Sat May 2 16:39:07 2020 +0100
e24 alpha 1 news announce
---
pages/news/e24.0-alpha1.txt | 54 +
1 file changed, 54 insertions(+)
diff --git a/pages/news/e24.0-alpha1.txt b/pages/news/e24.0-alpha1.txt
new file mode 100644
index 0..86762c395
--- /dev/null
+++ b/pages/news/e24.0-alpha1.txt
@@ -0,0 +1,54 @@
+=== Enlightenment DR 0.24.0-alpha1 Release ===
+ * //2020-05-02 - by Carsten Haitzler//
+
+Hilights:
+ * New and improved shot module with editor and cropper
+ * Reduced number of setuid tools (merged many into single system tool)
+ * External monitor backlight and brightness controls via (lib)ddctil
+ * Improved resolution of EFM thumbnails to 256x256 by default
+ * New and improved crash handling guru meditation
+ * Restarts are now seamless with fade in and out and zero glitches
+ * Wallpaper import generates multiple resolutions for better efficiency
+ * Regularly malloc_trim if available to keep mem down
+ * All restarts are now handled by enlightenment_start, not e itself
+ * Enforce pointer lock to screen in X to stop pointer out-of-bounds
+ * Pager plain is gone - use the regular "miniature preview" pager
+ * Music control auto-runs your selected media player if not there
+ * Handle exception for steam games to find the right desktop file
+ * Polkit auth agent support as new core module - no extra daemons
+ * Drop comp fast effects - Should be edje transition factor + theme tags
+ * Easier config of specific desktop wallpaper straight from pager
+ * Startup should be smoother with IO prefetch thread
+ * New special blanking timeout for when locked that can be shorter
+ * Bluez4 gone now as Bluez5 is done and working fine
+ * Down to zero outstanding coverity issues
+ * The usual batches of bug fixes and minor improvements
+
+== Download ==
+
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[
http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.0-alpha1.tar.xz
| Enlightenment DR 0.23.0 XZ]] |
aae4d22261736efd9b8fceae3d00f3ddd583b8711135f9f6f20d2b9c2e885ea4 |
+
+
+== Building and Dependencies ==
+
+ - [[https://git.enlightenment.org/core/efl.git/tree/README
| EFL]]
+ - libpam (Linux only)
+
+Highly recommended to ensure proper functionality (though you can live
+without these):
+
+ - connman (For network configuration support)
+ - bluez5 (For bluetooth configuration and control)
+ - bc (For the evrything module calculator mode)
+ - pulseaudio (For proper audio device control and redirection)
+ - acpid (For systems with ACPI for lid events, AC/Battery plug in/out etc.)
+ - packagekit (For the built in system updates monitoring and updater)
+ - udisks2 (For removable storage mounting/unmounting)
+ - ddcutil (specifically libddcutil.so.2 for backlight control)
+ - gdb (If you want automatic backtraces on a crash in ~/.e-crashdump.txt -
don't forget to build EFL and E with gdb debugging to make this useful)
+
+**Note:** Enlightenment 0.24.0-alpha depends on EFL **v1.24.0** or newer.
+
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
--
[EGIT] [website/www-content] master 01/02: remove user page empty junk from wiki
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=279bffa62a92b5e046c388ca72928a653c96eb5f commit 279bffa62a92b5e046c388ca72928a653c96eb5f Author: Carsten Haitzler (Rasterman) Date: Thu Apr 2 12:27:37 2020 +0100 remove user page empty junk from wiki --- pages/User/beber.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/User/beber.txt b/pages/User/beber.txt deleted file mode 100644 index 6ef347f61..0 --- a/pages/User/beber.txt +++ /dev/null @@ -1 +0,0 @@ -? \ No newline at end of file --
[EGIT] [apps/rage] master 01/01: fix somw browser badness on resize
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=c9a15ab2e8a9820d80fb93246261f4524c935824
commit c9a15ab2e8a9820d80fb93246261f4524c935824
Author: Carsten Haitzler (Rasterman)
Date: Thu Apr 23 18:13:02 2020 +0100
fix somw browser badness on resize
some undeleted objects... fix
---
src/bin/browser.c | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/bin/browser.c b/src/bin/browser.c
index d742c03..ade1e50 100644
--- a/src/bin/browser.c
+++ b/src/bin/browser.c
@@ -329,11 +329,11 @@ _entry_files_pop_clear(Entry *entry)
{
if (entry->file_obj[i])
{
- entry->sels = eina_list_remove(entry->sels,
entry->file_obj[i]);
- evas_object_del(entry->file_obj[i]);
+ Evas_Object *o = entry->file_obj[i];
entry->file_obj[i] = NULL;
+ entry->sels = eina_list_remove(entry->sels, o);
destroyed++;
- if (destroyed >= DESTROYED_MAX) break;
+ evas_object_del(o);
}
}
_pop_eval_delay(win, 0, destroyed);
@@ -616,7 +616,7 @@ _cb_entry_table_resize(void *data EINA_UNUSED, Evas *e
EINA_UNUSED, Evas_Object
Entry *entry = data;
Evas_Object *win = evas_object_data_get(obj, "win");
if (initial_update_timer) return;
- _entry_files_redo(win, entry);
+// _entry_files_redo(win, entry);
}
static void
@@ -627,10 +627,11 @@ _cb_scroller_resize(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSE
Entry *entry;
if ((!inf) || (!bx)) return;
if (initial_update_timer) return;
- EINA_LIST_FOREACH(entries, l, entry)
- {
-_entry_files_redo(data, entry);
- }
+// printf("_cb_scroller_resize \n");
+// EINA_LIST_FOREACH(entries, l, entry)
+// {
+//_entry_files_redo(data, entry);
+// }
}
static Eina_Bool
@@ -642,6 +643,7 @@ _cb_initial_update_timer(void *data)
initial_update_timer = NULL;
if ((!inf) || (!bx)) return EINA_FALSE;
+ printf("_cb_initial_update_timer \n");
EINA_LIST_FOREACH(entries, l, entry)
{
_entry_files_redo(data, entry);
@@ -1251,6 +1253,7 @@ browser_size_update(Evas_Object *win)
if (!inf) return;
if (!bx) return;
if (initial_update_timer) return;
+ printf("browser_size_update...\n");
EINA_LIST_FOREACH(entries, l, entry)
{
_entry_files_redo(win, entry);
--
[EGIT] [apps/ecrire] master 01/01: fix minor focus and key handling issues
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=c775617dd658345b4e07037d3443a381fbc2492e
commit c775617dd658345b4e07037d3443a381fbc2492e
Author: Carsten Haitzler (Rasterman)
Date: Tue Apr 21 10:47:24 2020 +0100
fix minor focus and key handling issues
---
src/bin/cfg.c | 3 +--
src/bin/main.c | 34 +++---
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/bin/cfg.c b/src/bin/cfg.c
index 1c2204e..594d558 100644
--- a/src/bin/cfg.c
+++ b/src/bin/cfg.c
@@ -102,14 +102,13 @@ ecrire_cfg_load(void)
}
_ent_cfg = eet_data_read(ef, _ent_cfg_descriptor, _CONFIG_ENTRY);
+ eet_close(ef);
end:
if (!_ent_cfg)
{
_ent_cfg = _ecrire_cfg_new();
}
-
- eet_close(ef);
return EINA_TRUE;
}
diff --git a/src/bin/main.c b/src/bin/main.c
index 04053d3..d374112 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -513,6 +513,16 @@ my_win_del(void *data, Evas_Object *obj, void *event_info)
_alert_if_need_saving(_win_del_do, ent);
}
+static void
+my_win_focused(void *data, Evas_Object *obj, void *event_info)
+{
+ Ecrire_Entry *ent = data;
+ (void) data;
+ (void) obj;
+ (void) event_info;
+ elm_object_focus_set(main_ec_ent->entry, EINA_TRUE);
+}
+
static void
editor_font_set(Ecrire_Entry *ent, const char *font, int font_size)
{
@@ -597,19 +607,14 @@ _key_cb(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj, void *event)
ctrl = evas_key_modifier_is_set(ev->modifiers, "Control");
alt = evas_key_modifier_is_set(ev->modifiers, "Alt");
shift = evas_key_modifier_is_set(ev->modifiers, "Shift");
- if ((alt) || (!ctrl) || (shift))
- return;
-
- if (!strcmp(ev->key, "a"))
- elm_entry_select_all(ent->entry);
- else if (!strcmp(ev->key, "f"))
- _find(data, obj, event);
- else if (!strcmp(ev->key, "g"))
- _goto_line(data, obj, event);
- else if (!strcmp(ev->key, "n"))
- _new(data, obj, event);
- else if (!strcmp(ev->key, "s"))
- _save(data, obj, event);
+ if ((ctrl) && (!alt) && (!shift))
+ {
+if (!strcmp(ev->keyname, "a")) elm_entry_select_all(ent->entry);
+else if (!strcmp(ev->keyname, "f")) _find(data, obj, event);
+else if (!strcmp(ev->keyname, "g")) _goto_line(data, obj, event);
+else if (!strcmp(ev->keyname, "n")) _new(data, obj, event);
+else if (!strcmp(ev->keyname, "s")) _save(data, obj, event);
+ }
}
EAPI_MAIN int
@@ -777,12 +782,11 @@ elm_main(int argc, char **argv)
evas_object_resize(main_ec_ent->win, w, h);
evas_object_smart_callback_add(main_ec_ent->win, "delete,request",
my_win_del, main_ec_ent);
+ evas_object_smart_callback_add(main_ec_ent->win, "focus,in",
my_win_focused, main_ec_ent);
evas_object_show(main_ec_ent->win);
_load_to_entry(main_ec_ent, main_ec_ent->filename);
- elm_object_focus_set(main_ec_ent->entry, EINA_TRUE);
-
elm_run();
ecrire_cfg_shutdown();
--
[EGIT] [admin/devs] master 01/01: devs - add special www user for dokuwiki
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=976bd205cf87f4933a62d8dc67e8bc296cd81e44 commit 976bd205cf87f4933a62d8dc67e8bc296cd81e44 Author: Carsten Haitzler (Rasterman) Date: Thu Apr 16 10:48:19 2020 +0100 devs - add special www user for dokuwiki --- developers/WWW-www.enlightenment.org/id_ed25519.pub | 1 + developers/WWW-www.enlightenment.org/info.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/developers/WWW-www.enlightenment.org/id_ed25519.pub b/developers/WWW-www.enlightenment.org/id_ed25519.pub new file mode 100644 index 000..1b334bb --- /dev/null +++ b/developers/WWW-www.enlightenment.org/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 C3NzaC1lZDI1NTE5IFMuz2MXHuue+uGDdHCNjVlKnnLykfq3zPt3ICyX28Oy www.enlightenment.org diff --git a/developers/WWW-www.enlightenment.org/info.txt b/developers/WWW-www.enlightenment.org/info.txt new file mode 100644 index 000..ae49d9e --- /dev/null +++ b/developers/WWW-www.enlightenment.org/info.txt @@ -0,0 +1 @@ +XXX: Special user for dokuwiki --
[EGIT] [apps/ecrire] master 01/01: move menu init code to later next to where items are disabled
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=5b1f5a8d255844f887ca5eb7bcb421268ed59d3f
commit 5b1f5a8d255844f887ca5eb7bcb421268ed59d3f
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 15 13:29:33 2020 +0100
move menu init code to later next to where items are disabled
---
src/bin/main.c | 56
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 6f99074..04053d3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -682,34 +682,6 @@ elm_main(int argc, char **argv)
main_ec_ent->win = elm_win_util_standard_add("erire", "Ecrire");
elm_win_autodel_set(main_ec_ent->win, EINA_FALSE);
- menu = elm_win_main_menu_get(main_ec_ent->win);
- mit = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL);
- elm_menu_item_add(menu, mit, "document-new", _("New"), _new, main_ec_ent);
- elm_menu_item_add(menu, mit, "document-open", _("Open"), _open,
main_ec_ent);
- main_ec_ent->save_item =
- elm_menu_item_add(menu, mit, "document-save", _("Save"), _save,
main_ec_ent);
- elm_menu_item_add(menu, mit, "document-save-as", _("Save As"), _save_as,
main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- elm_menu_item_add(menu, mit, "application-exit", _("Exit"), _app_exit,
main_ec_ent);
-
- mit = elm_menu_item_add(menu, NULL, NULL, _("Edit"), NULL, NULL);
- main_ec_ent->cut_item =
- elm_menu_item_add(menu, mit, "edit-cut", _("Cut"), _cut, main_ec_ent);
- main_ec_ent->copy_item =
- elm_menu_item_add(menu, mit, "edit-copy", _("Copy"), _copy, main_ec_ent);
- main_ec_ent->paste_item =
- elm_menu_item_add(menu, mit, "edit-paste", _("Paste"), _paste, main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- main_ec_ent->undo_item =
- elm_menu_item_add(menu, mit, "edit-undo", _("Undo"), _undo, main_ec_ent);
- main_ec_ent->redo_item =
- elm_menu_item_add(menu, mit, "edit-redo", _("Redo"), _redo, main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- elm_menu_item_add(menu, mit, "edit-find-replace", _("Find"), _find,
main_ec_ent);
- elm_menu_item_add(menu, mit, "go-jump", _("Go to line.."), _goto_line,
main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- elm_menu_item_add(menu, mit, "preferences-system", _("Settings"),
_font_settings, main_ec_ent);
-
bx = elm_box_add(main_ec_ent->win);
elm_win_resize_object_add(main_ec_ent->win, bx);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -756,6 +728,34 @@ elm_main(int argc, char **argv)
evas_object_smart_callback_add(main_ec_ent->entry, "selection,cleared",
_sel_clear, main_ec_ent);
evas_object_event_callback_add(main_ec_ent->entry, EVAS_CALLBACK_KEY_DOWN,
_key_cb, main_ec_ent);
+ menu = elm_win_main_menu_get(main_ec_ent->win);
+ mit = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL);
+ elm_menu_item_add(menu, mit, "document-new", _("New"), _new, main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-open", _("Open"), _open,
main_ec_ent);
+ main_ec_ent->save_item =
+ elm_menu_item_add(menu, mit, "document-save", _("Save"), _save,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-save-as", _("Save As"), _save_as,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "application-exit", _("Exit"), _app_exit,
main_ec_ent);
+
+ mit = elm_menu_item_add(menu, NULL, NULL, _("Edit"), NULL, NULL);
+ main_ec_ent->cut_item =
+ elm_menu_item_add(menu, mit, "edit-cut", _("Cut"), _cut, main_ec_ent);
+ main_ec_ent->copy_item =
+ elm_menu_item_add(menu, mit, "edit-copy", _("Copy"), _copy, main_ec_ent);
+ main_ec_ent->paste_item =
+ elm_menu_item_add(menu, mit, "edit-paste", _("Paste"), _paste, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ main_ec_ent->undo_item =
+ elm_menu_item_add(menu, mit, "edit-undo", _("Undo"), _undo, main_ec_ent);
+ main_ec_ent->redo_item =
+ elm_menu_item_add(menu, mit, "edit-redo", _("Redo"), _redo, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "edit-find-replace", _("Find"), _find,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "go-jump", _("Go to line.."), _goto_line,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "preferences-system", _("Settings"),
_font_settings, main_ec_ent);
+
/*
#ifdef HAVE_ECORE_X
if (!ecore_x_selection_owner_get(ECORE_X_ATOM_SELECTION_CLIPBOARD))
--
[EGIT] [apps/ecrire] master 01/01: ui - move to menu bar from toolbar - a bit more basic and simple
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=5a0b895521e3527ec3d2b85f69e88c7ccd74c737
commit 5a0b895521e3527ec3d2b85f69e88c7ccd74c737
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 15 13:14:19 2020 +0100
ui - move to menu bar from toolbar - a bit more basic and simple
---
src/bin/main.c | 114 ---
src/bin/ui/font_dialog.c | 1 +
2 files changed, 60 insertions(+), 55 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index dc8589f..6f99074 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -437,6 +437,12 @@ _save_as(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
ui_file_open_save_dialog_open(ent->win, _fs_save_done, EINA_TRUE);
}
+static void
+_win_del_do(void *data EINA_UNUSED)
+{
+ elm_exit();
+}
+
static void
_new_do(void *data)
{
@@ -454,6 +460,13 @@ _new(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
_alert_if_need_saving(_new_do, ent);
}
+static void
+_app_exit(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Ecrire_Entry *ent = data;
+ _alert_if_need_saving(_win_del_do, ent);
+}
+
static void
_cut(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
@@ -490,12 +503,6 @@ _font_settings(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_U
}
-static void
-_win_del_do(void *data EINA_UNUSED)
-{
- elm_exit();
-}
-
static void
my_win_del(void *data, Evas_Object *obj, void *event_info)
{
@@ -608,8 +615,9 @@ _key_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *bg, *tbar, *bx, *cur_info;
+ Evas_Object *pad, *bx, *cur_info, *menu, *bx2;
Evas_Coord w = 600, h = 600;
+ Elm_Widget_Item *mit;
int c;
opterr = 0;
@@ -671,30 +679,42 @@ elm_main(int argc, char **argv)
DBG("Opening filename: '%s'", main_ec_ent->filename);
- main_ec_ent->win = elm_win_add(NULL, "Ecrire", ELM_WIN_BASIC);
+ main_ec_ent->win = elm_win_util_standard_add("erire", "Ecrire");
elm_win_autodel_set(main_ec_ent->win, EINA_FALSE);
- bg = elm_bg_add(main_ec_ent->win);
- elm_win_resize_object_add(main_ec_ent->win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
+ menu = elm_win_main_menu_get(main_ec_ent->win);
+ mit = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL);
+ elm_menu_item_add(menu, mit, "document-new", _("New"), _new, main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-open", _("Open"), _open,
main_ec_ent);
+ main_ec_ent->save_item =
+ elm_menu_item_add(menu, mit, "document-save", _("Save"), _save,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-save-as", _("Save As"), _save_as,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "application-exit", _("Exit"), _app_exit,
main_ec_ent);
+
+ mit = elm_menu_item_add(menu, NULL, NULL, _("Edit"), NULL, NULL);
+ main_ec_ent->cut_item =
+ elm_menu_item_add(menu, mit, "edit-cut", _("Cut"), _cut, main_ec_ent);
+ main_ec_ent->copy_item =
+ elm_menu_item_add(menu, mit, "edit-copy", _("Copy"), _copy, main_ec_ent);
+ main_ec_ent->paste_item =
+ elm_menu_item_add(menu, mit, "edit-paste", _("Paste"), _paste, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ main_ec_ent->undo_item =
+ elm_menu_item_add(menu, mit, "edit-undo", _("Undo"), _undo, main_ec_ent);
+ main_ec_ent->redo_item =
+ elm_menu_item_add(menu, mit, "edit-redo", _("Redo"), _redo, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "edit-find-replace", _("Find"), _find,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "go-jump", _("Go to line.."), _goto_line,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "preferences-system", _("Settings"),
_font_settings, main_ec_ent);
bx = elm_box_add(main_ec_ent->win);
elm_win_resize_object_add(main_ec_ent->win, bx);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(bx);
- tbar = elm_toolbar_add(main_ec_ent->win);
- elm_toolbar_homogeneous_set(tbar, 0);
- elm_toolbar_shrink_mode_set(tbar, ELM_TOOLBAR_SHRINK_SCROLL);
- elm_toolbar_select_mode_set(tbar, ELM_OBJECT_SELECT_MODE_NONE);
- elm_toolbar_align_set(tbar, 0.0);
- evas_object_size_hint_weight_set(tbar, 0.0, 0.0);
- evas_object_size_hint_align_set(tbar, E
[EGIT] [apps/rage] master 01/01: add blurred filter for album art when paused
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=0c1fe57057501f127d94855620fc85716ff56215
commit 0c1fe57057501f127d94855620fc85716ff56215
Author: Carsten Haitzler (Rasterman)
Date: Thu Apr 9 14:41:46 2020 +0100
add blurred filter for album art when paused
---
data/themes/default.edc | 24
1 file changed, 24 insertions(+)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 29facce..f2aa99b 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -489,6 +489,30 @@ collections {
target: "art_clip3";
}
+ snapshot { "art_filter";
+clip_to: "art_clip";
+desc { state: "default" 0.0;
+ rel.to: "art_clip";
+ filter.code: "padding_set { 0 } blur { state.pos * 50, color =
'#' }";
+ visible: 0;
+}
+desc { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ filter.code: "padding_set { 0 } blur { (1.0 - state.pos) * 50,
color = '#' }";
+ visible: 1;
+}
+ }
+ program { signal: "action,play"; source: "rage";
+action: STATE_SET "default" 0.0;
+transition: SINUSOIDAL 0.2;
+target: "art_filter";
+ }
+ program { signal: "action,pause"; source: "rage";
+action: STATE_SET "visible" 0.0;
+transition: SINUSOIDAL 0.4;
+target: "art_filter";
+ }
+
part { name: "rage.gesture"; type: SWALLOW;
description { state: "default" 0.0;
rel2.to_y: "controlbar";
--
[EGIT] [apps/rage] master 01/04: fix initial sizing of audio tracks to fill albumart
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=610fcf66b4ce34675523041e246f699bb70f3282
commit 610fcf66b4ce34675523041e246f699bb70f3282
Author: Carsten Haitzler (Rasterman)
Date: Fri Apr 3 19:03:20 2020 +0100
fix initial sizing of audio tracks to fill albumart
---
data/themes/default.edc | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 386c9e5..ac1028c 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -147,6 +147,7 @@ collections {
image.normal: "shadow_circle_horiz.png";
min: 0 32;
color: 255 255 255 128;
+ fixed: 1 1;
}
}
part { name: "sh_b"; nomouse;
@@ -158,6 +159,7 @@ collections {
image.normal: "shadow_circle_horiz.png";
min: 0 32;
color: 255 255 255 128;
+ fixed: 1 1;
}
}
part { name: "sh_l"; nomouse;
@@ -169,6 +171,7 @@ collections {
image.normal: "shadow_circle_vert.png";
min: 32 0;
color: 255 255 255 128;
+ fixed: 1 1;
}
}
part { name: "sh_r"; nomouse;
@@ -180,6 +183,7 @@ collections {
image.normal: "shadow_circle_vert.png";
min: 32 0;
color: 255 255 255 128;
+ fixed: 1 1;
}
}
@@ -301,7 +305,7 @@ collections {
}
description { state: "pref" 0.0;
inherit: "default" 0.0;
- min: 290 290;
+ min: 290 238;
}
}
program { signal: "pref,size,on"; source: "rage";
@@ -343,9 +347,9 @@ collections {
color: 255 255 255 0;
rel1.relative: -0.5 -0.5;
rel2.relative: 1.5 1.5;
- fixed: 1 1;
aspect: 1.0 1.0; aspect_preference: NONE;
- max: 560 560;
+ max: 580 580;
+ fixed: 1 1;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -353,7 +357,7 @@ collections {
rel2.relative: 1.0 1.0;
visible: 1;
color: 255 255 255 255;
- max: 280 280;
+ max: 290 290;
}
}
part { name: "art_clip2"; type: RECT;
@@ -379,7 +383,6 @@ collections {
part { name: "artshadow"; mouse_events: 0;
clip_to: "art_clip3";
description { state: "default" 0.0;
- fixed: 1 1;
rel.to: "art_clip";
color: 255 255 255 128;
image.normal: "win_shadow.png";
@@ -388,6 +391,7 @@ collections {
rel1.offset: -7 -3;
rel2.offset: 6 11;
fill.smooth: 0;
+ fixed: 1 1;
}
}
part { name: "rage.art"; type: SWALLOW; mouse_events: 0;
--
[EGIT] [apps/rage] master 03/04: add black box inside/vehind video by default before vid starts
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=ca538f6f8ca559d8c1d5d239153d63c5986c0c98
commit ca538f6f8ca559d8c1d5d239153d63c5986c0c98
Author: Carsten Haitzler (Rasterman)
Date: Fri Apr 3 21:40:32 2020 +0100
add black box inside/vehind video by default before vid starts
---
data/themes/default.edc | 18 ++
1 file changed, 18 insertions(+)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index ac1028c..29facce 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -265,6 +265,21 @@ collections {
target: "base";
}
+ part { name: "content_black"; type: RECT; mouse_events: 0;
+description { state: "default" 0.0;
+ rel.to: "rage.content";
+ color: 0 0 0 255;
+ visible: 0;
+}
+description { state: "novideo" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+}
+description { state: "video" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+}
+ }
part { name: "rage.content"; type: SWALLOW;
description { state: "default" 0.0;
visible: 0;
@@ -405,6 +420,7 @@ collections {
target: "speaker_clip";
target: "shadow";
target: "statusloc";
+target: "content_black";
target: "rage.content";
}
program { signal: "state,default"; source: "rage";
@@ -412,6 +428,7 @@ collections {
target: "speaker_clip";
target: "shadow";
target: "statusloc";
+target: "content_black";
target: "rage.content";
}
program { signal: "state,video"; source: "rage";
@@ -419,6 +436,7 @@ collections {
target: "speaker_clip";
target: "shadow";
target: "statusloc";
+target: "content_black";
target: "rage.content";
}
program { signal: "state,novideo"; source: "rage";
--
[EGIT] [apps/rage] master 04/04: fix up album art if it's in the music file itself and not fetched
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=cf2b383f0cba9fb2a84bbe5fabf3da454f8dc2d5
commit cf2b383f0cba9fb2a84bbe5fabf3da454f8dc2d5
Author: Carsten Haitzler (Rasterman)
Date: Fri Apr 3 23:36:23 2020 +0100
fix up album art if it's in the music file itself and not fetched
---
src/bin/video.c | 1 -
src/bin/win.c | 36 +++-
src/bin/win.h | 2 ++
3 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/bin/video.c b/src/bin/video.c
index 581a1a2..03744d4 100644
--- a/src/bin/video.c
+++ b/src/bin/video.c
@@ -666,7 +666,6 @@ video_file_set(Evas_Object *obj, const char *file)
eina_stringshare_replace(&(sd->artfile), NULL);
emotion_object_file_set(sd->o_vid, sd->file);
video_position_set(obj, 0.0);
-printf("set %p %s %i\n", obj, file, sd->doart);
if (sd->doart)
{
const char *extn = strchr(sd->file, '.');
diff --git a/src/bin/win.c b/src/bin/win.c
index ba4c8cf..5086ec9 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -235,13 +235,13 @@ _local_artwork_get(void *data)
{
Evas_Object *win = data;
Inf *inf = evas_object_data_get(win, "inf");
-
+
if (!inf) return EINA_FALSE;
if (!inf->vid) return EINA_FALSE;
-
+
const char *file = NULL;
const char *filename = video_file_get(inf->vid);
-
+
Efreet_Uri *uri = efreet_uri_decode(filename);
if (uri)
{
@@ -267,7 +267,7 @@ _local_artwork_get(void *data)
Evas_Object *artwork = video_meta_artwork_get(inf->vid, file,
EMOTION_ARTWORK_PREVIEW_IMAGE);
if (!artwork) artwork = video_meta_artwork_get(inf->vid, file,
EMOTION_ARTWORK_IMAGE);
-
+
if (artwork)
{
evas_object_image_save(artwork, path, NULL, NULL);
@@ -281,7 +281,6 @@ _local_artwork_get(void *data)
}
}
}
-
return EINA_TRUE;
}
@@ -420,6 +419,7 @@ static void
_restart_vid(Evas_Object *win, Evas_Object *lay, Evas_Object *vid, const char
*file, const char *sub)
{
const char *extn = strchr(file, '.');
+ win_newfile(win);
if ((extn) &&
((!strcasecmp(extn, ".mp3")) ||
(!strcasecmp(extn, ".m4a")) ||
@@ -766,6 +766,13 @@ win_art(Evas_Object *win, const char *path)
}
}
+void
+win_newfile(Evas_Object *win)
+{
+ Inf *inf = evas_object_data_get(win, "inf");
+ inf->newfile = EINA_TRUE;
+}
+
void
win_show(Evas_Object *win, int w, int h)
{
@@ -789,13 +796,24 @@ win_show(Evas_Object *win, int w, int h)
}
if (!video_has_video_get(inf->vid))
- elm_layout_signal_emit(inf->lay, "state,novideo", "rage");
+ {
+if (inf->newfile)
+ elm_layout_signal_emit(inf->lay, "state,novideo", "rage");
+ }
else
- elm_layout_signal_emit(inf->lay, "state,video", "rage");
+ {
+elm_layout_signal_emit(inf->lay, "state,video", "rage");
+ }
if (!video_has_audio_get(inf->vid))
- elm_layout_signal_emit(inf->lay, "state,noaudio", "rage");
+ {
+if (inf->newfile)
+ elm_layout_signal_emit(inf->lay, "state,noaudio", "rage");
+ }
else
- elm_layout_signal_emit(inf->lay, "state,audio", "rage");
+ {
+elm_layout_signal_emit(inf->lay, "state,audio", "rage");
+ }
+ inf->newfile = EINA_FALSE;
}
void
diff --git a/src/bin/win.h b/src/bin/win.h
index c41ee0e..68a2deb 100644
--- a/src/bin/win.h
+++ b/src/bin/win.h
@@ -27,6 +27,7 @@ struct _Inf
Eina_Bool dragging : 1;
Eina_Bool browse_mode : 1;
Eina_Bool down : 1;
+ Eina_Bool newfile : 1;
};
// ui high level controls
@@ -49,6 +50,7 @@ Eina_Bool win_video_have_prev(Evas_Object *win);
Evas_Object *win_add(void);
void win_focus(Evas_Object *win);
void win_title_update(Evas_Object *win);
+void win_newfile(Evas_Object *win);
void win_show(Evas_Object *win, int w, int h);
void win_art(Evas_Object *win, const char *path);
void win_aspect_adjust(Evas_Object *win);
--
[EGIT] [apps/rage] master 02/04: fix album art gen/fetch for vido list to update as found
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=34ba280149412121d958093c7e4dd44cb51fbb72
commit 34ba280149412121d958093c7e4dd44cb51fbb72
Author: Carsten Haitzler (Rasterman)
Date: Fri Apr 3 21:26:09 2020 +0100
fix album art gen/fetch for vido list to update as found
---
src/bin/video.c | 27 +++
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/bin/video.c b/src/bin/video.c
index d56f31e..581a1a2 100644
--- a/src/bin/video.c
+++ b/src/bin/video.c
@@ -52,9 +52,23 @@ _cb_thumb_exe(void *data, int type EINA_UNUSED, void *event)
sd->exe = NULL;
if (ev->exit_code == 0)
{
+ Evas_Coord ox, oy, ow, oh;
+
path = albumart_file_get(sd->realfile);
- eina_stringshare_replace(&(sd->artfile), path);
- mpris_metadata_change();
+ if (path)
+ {
+ if (ecore_file_exists(path))
+{
+ eina_stringshare_replace(&(sd->artfile), path);
+ evas_object_image_file_set(sd->o_img, path, NULL);
+ evas_object_image_size_get(sd->o_img, &(sd->tw),
&(sd->th));
+ evas_object_geometry_get(data, , , , );
+ evas_object_show(sd->o_img);
+ _ob_resize(data, ox, oy, ow, oh);
+ mpris_metadata_change();
+}
+ free(path);
+ }
}
}
return EINA_TRUE;
@@ -90,9 +104,12 @@ _art_check(Evas_Object *obj)
evas_object_image_size_get(sd->o_img, &(sd->tw), &(sd->th));
evas_object_geometry_get(obj, , , , );
_ob_resize(obj, ox, oy, ow, oh);
+ if (sd->tw > 0)
+{
+ eina_stringshare_replace(&(sd->artfile), thumb);
+ mpris_metadata_change();
+}
}
- eina_stringshare_replace(&(sd->artfile), thumb);
- mpris_metadata_change();
free(thumb);
}
}
@@ -100,6 +117,7 @@ _art_check(Evas_Object *obj)
{
evas_object_hide(sd->o_img);
}
+
if (!sd->artfile)
{
char buf[PATH_MAX];
@@ -648,6 +666,7 @@ video_file_set(Evas_Object *obj, const char *file)
eina_stringshare_replace(&(sd->artfile), NULL);
emotion_object_file_set(sd->o_vid, sd->file);
video_position_set(obj, 0.0);
+printf("set %p %s %i\n", obj, file, sd->doart);
if (sd->doart)
{
const char *extn = strchr(sd->file, '.');
--
[EGIT] [website/www-content] master 01/01: efl debug - add section on Asan
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f9f8611cfe059b5a59586c6568d3574d23eca2dd commit f9f8611cfe059b5a59586c6568d3574d23eca2dd Author: Carsten Haitzler (Rasterman) Date: Tue Mar 31 15:13:51 2020 +0100 efl debug - add section on Asan --- pages/contrib/efl-debug.txt | 64 + 1 file changed, 64 insertions(+) diff --git a/pages/contrib/efl-debug.txt b/pages/contrib/efl-debug.txt index 493c3f96e..b7e637758 100644 --- a/pages/contrib/efl-debug.txt +++ b/pages/contrib/efl-debug.txt @@ -293,6 +293,70 @@ Nevermind. That's xlib's display struct. It's private and you don't know what's In general it's a good idea to spend some quality time with GDB and do all this. If you want others to help with the issue, then mail all the output of GDB during one of these "debugging sessions" and then it can be sifted through by developers for nuggets of information. It may not mean a lot to you, but it means a world developers who sling code around all day long. Sometimes the stack is garbage and there is nothing you can do. Often this means you need to resort to Valgrind to catch [...] +=== Asan === + +This is almost as good as Valgrind below, but drastically faster. +It's atually usable to build thing with Asan enabled and use them all +day long. You'll probably find it ueses about 2-3x the CPU and seems to +use a lot of RAM (virtual size will be huge but overall footprint will +be fine if you have *Gb or more of RAM). For a decently powerful desktop +you should be able to use this as a daily driver especially when you are +hunting bugs. As an would definitely be the preferred deep-debugging +method and you should build at least EFL and the app9s) (Enlightenment, +Terminology etc.) with Asan enabled to make it work correctly. + +To use Asan you will need to compile libraries and binaries with it +enabled and have a compiler capable of asan. Given the move to meson, +this is quite easy now. You will need this in your environmnet before +you compile and for when you run the application (it needs to be set +before the process executes): + + +export ASAN_OPTIONS=detect_leaks=0:abort_on_error=1::new_delete_type_mismatch=0 + + +Ensure this is also in your ~/.xinitrc or ~/.xsession or otherwise +global environment for your user before anything runs. We only are +interested in invalid memory accesses (e.g. use after free or +out-of-bounds accesses etc.). Leaks are a different matter and not +going to generally be a fatal issue we need Asan to go find. + +When youcompile EFL or Enlightenment or Terminology or anything using +meson add the following option when configuring meson +(-Db_sanitize=address) and ensure we don't optimize the code so we get +proper backtraces and symbols and have GDB debugging enabled: + + +export CFLAGS="-O0 -g3" +meson -Db_sanitize=address [other meson options here] . build + + +So just add -Db_sanitize=address as an option in addition to any other +options you may pass and that build will enable asan for what is being +built. What this does is instruct the compiler to add extra checking +code when compiling that does much of what valgrind does at runtime. +The added instructions generated by the compiler sanitize addresses +before they are used and adds pointer tracking logic as well. That's +why this needs to be done at compile time, but since it is done at +compile time, the resulting binaries are relatively fast (compared to +using valgrind). + +Once you did the above just compile as normal: + + +ninja -C build +ninja -C build install + + +Note that with Asan, debugging any app is just like using gdb but with +the added extra that Asan will spew out some debug information and +traces to stderr before aborting (which can be caught in GDB as +normal). Ylou canuse GD?b to poke around the variables and backtrace +to see what happened just with the added benefit of the address +mis-use benig caught immediately and not indirectly "some time later +after the bug actually happened many hundreds, thousands or millions +of instructions before". + === Valgrind === To debug using Valgrind, enlightenment must be run through Valgrind itself. valgrind cannot be attached like GDB. This can be done by executing Valgrind in a console as shown below. --
[EGIT] [apps/rage] master 02/02: clean/fix art show if same art img 2 times in a row and limit size
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=cddd47c9b7a40f62038e7c95573e4eebea816d8f
commit cddd47c9b7a40f62038e7c95573e4eebea816d8f
Author: Carsten Haitzler (Rasterman)
Date: Thu Mar 12 14:11:28 2020 +
clean/fix art show if same art img 2 times in a row and limit size
now ary images are limited to a 280x280 box which looks so much nicer
than it being badly scaled
---
data/themes/default.edc | 52 +
src/bin/win.c | 2 ++
2 files changed, 54 insertions(+)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 466e1db..386c9e5 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -337,6 +337,7 @@ collections {
}
part { name: "art_clip"; type: RECT;
clip_to: "speaker_clip";
+scale: 1;
description { state: "default" 0.0;
visible: 0;
color: 255 255 255 0;
@@ -344,6 +345,7 @@ collections {
rel2.relative: 1.5 1.5;
fixed: 1 1;
aspect: 1.0 1.0; aspect_preference: NONE;
+ max: 560 560;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -351,6 +353,7 @@ collections {
rel2.relative: 1.0 1.0;
visible: 1;
color: 255 255 255 255;
+ max: 280 280;
}
}
part { name: "art_clip2"; type: RECT;
@@ -359,6 +362,34 @@ collections {
fixed: 1 1;
}
}
+ part { name: "art_clip3"; type: RECT;
+description { state: "default" 0.0;
+ visible: 0;
+ color: 255 255 255 0;
+ fixed: 1 1;
+}
+description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 1.0;
+ visible: 1;
+ color: 255 255 255 255;
+}
+ }
+ part { name: "artshadow"; mouse_events: 0;
+clip_to: "art_clip3";
+description { state: "default" 0.0;
+ fixed: 1 1;
+ rel.to: "art_clip";
+ color: 255 255 255 128;
+ image.normal: "win_shadow.png";
+ image.border: 14 14 14 14;
+ image.middle: 0;
+ rel1.offset: -7 -3;
+ rel2.offset: 6 11;
+ fill.smooth: 0;
+}
+ }
part { name: "rage.art"; type: SWALLOW; mouse_events: 0;
clip_to: "art_clip2";
description { state: "default" 0.0;
@@ -399,20 +430,41 @@ collections {
}
}
+ program { signal: "state,novideo"; source: "rage";
+action: STATE_SET "default" 0.0;
+transition: ACCELERATE 0.2;
+target: "art_clip";
+target: "art_clip3";
+ }
+ program { signal: "state,default"; source: "rage";
+action: STATE_SET "default" 0.0;
+transition: ACCELERATE 0.2;
+target: "art_clip";
+target: "art_clip3";
+ }
+ program { signal: "state,video"; source: "rage";
+action: STATE_SET "default" 0.0;
+transition: ACCELERATE 0.2;
+target: "art_clip";
+target: "art_clip3";
+ }
program { signal: "action,newvid"; source: "rage";
action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.2;
target: "art_clip";
+target: "art_clip3";
}
program { signal: "state,noart"; source: "rage";
action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.3;
target: "art_clip";
+target: "art_clip3";
}
program { signal: "state,art"; source: "rage";
action: STATE_SET "visible" 0.0;
transition: DECELERATE 0.3;
target: "art_clip";
+target: "art_clip3";
}
part { name: "rage.gesture"; type: SWALLOW;
diff --git a/src/bin/win.c b/src/bin/win.c
index 589d0fc..ba4c8cf 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -741,6 +741,8 @@ win_art(Evas_Object *win, const char *path)
evas_object_del(inf->artimg);
inf->artimg = NULL;
}
+ else
+ elm_layout_signal_emit(inf->lay, "state,art", "rage");
}
if (!inf->artimg)
{
--
[EGIT] [apps/rage] master 01/02: remove emotion obj init as its pretty pointless these days
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=65a614e5e2100cc53d7146d0341ad9218e74f3de
commit 65a614e5e2100cc53d7146d0341ad9218e74f3de
Author: Carsten Haitzler (Rasterman)
Date: Tue Mar 3 20:18:34 2020 +
remove emotion obj init as its pretty pointless these days
---
src/bin/config.c | 6 ++
src/bin/config.h | 2 +-
src/bin/main.c | 12
src/bin/thumb.c | 13 +
src/bin/video.c | 6 --
5 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index 1fb9280..082ce60 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -19,7 +19,7 @@ config_init(void)
(, sizeof(eddc), "Config", sizeof(Config));
edd_base = eet_data_descriptor_stream_new();
EET_DATA_DESCRIPTOR_ADD_BASIC
- (edd_base, Config, "emotion_engine", emotion_engine, EET_T_STRING);
+ (edd_base, Config, "version", version, EET_T_INT);
snprintf(buf, sizeof(buf), "%s/rage/config/standard/base.cfg",
efreet_config_home_get());
ef = eet_open(buf, EET_FILE_MODE_READ);
if (ef)
@@ -31,8 +31,7 @@ config_init(void)
{
config = calloc(1, sizeof(Config));
if (!config) abort();
-// xine vlc gstreamer1
-config->emotion_engine = eina_stringshare_add("gstreamer1");
+config->version = 1;
config_save();
}
}
@@ -40,7 +39,6 @@ config_init(void)
void
config_shutdown(void)
{
- if (config->emotion_engine) eina_stringshare_del(config->emotion_engine);
free(config);
if (edd_base)
{
diff --git a/src/bin/config.h b/src/bin/config.h
index 3e4f51e..510292e 100644
--- a/src/bin/config.h
+++ b/src/bin/config.h
@@ -5,7 +5,7 @@ typedef struct _Config Config;
struct _Config
{
- const char *emotion_engine;
+ int version; // dummy - unused atm
};
void config_init(void);
diff --git a/src/bin/main.c b/src/bin/main.c
index e1a4fc3..3313a7c 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -192,9 +192,6 @@ elm_main(int argc, char **argv)
"\n"
"-f\n"
" Enable fullscreen mode at start\n"
-"-e ENGINE\n"
-" ENGINE is one of gstreamer1, xine or vlc\n"
-" The default is gstreamer1\n"
"\n"
"-sub SUBTITLE_FILE\n"
" This sets the subtitle file to use for the\n"
@@ -209,15 +206,6 @@ elm_main(int argc, char **argv)
, DEPTH_DEFAULT);
exit(0);
}
-else if (!strcmp(argv[i], "-e"))
- {
- if (i < (argc - 1))
- {
- i++;
- eina_stringshare_del(config->emotion_engine);
- config->emotion_engine = eina_stringshare_add(argv[i]);
- }
- }
else if (!strcmp(argv[i], "-f"))
{
fullscreen = EINA_TRUE;
diff --git a/src/bin/thumb.c b/src/bin/thumb.c
index b7f33d6..ce0012d 100644
--- a/src/bin/thumb.c
+++ b/src/bin/thumb.c
@@ -196,7 +196,6 @@ _local_artwork_poster(Evas_Object *win, const char
*path_to_file)
{
Evas_Object *em = emotion_object_add(evas_object_evas_get(win));
- emotion_object_init(em, NULL);
emotion_object_file_set(em, path_to_file);
char *path = albumart_file_get(path_to_file);
@@ -277,13 +276,11 @@ elm_main(int argc, char **argv)
goto out;
}
- if (emotion_object_init(vid, NULL))
- {
-evas_object_smart_callback_add(vid, "open_done", _cb_loaded, file);
-emotion_object_file_set(vid, file);
-vid_timeout = ecore_timer_add(360.0, _cb_timeout, NULL);
-elm_run();
- }
+ evas_object_smart_callback_add(vid, "open_done", _cb_loaded, file);
+ emotion_object_file_set(vid, file);
+ vid_timeout = ecore_timer_add(360.0, _cb_timeout, NULL);
+ elm_run();
+
out:
elm_shutdown();
diff --git a/src/bin/video.c b/src/bin/video.c
index d90770a..d56f31e 100644
--- a/src/bin/video.c
+++ b/src/bin/video.c
@@ -581,12 +581,6 @@ video_add(Evas_Object *parent)
o = sd->o_vid = emotion_object_add(evas_object_evas_get(obj));
emotion_object_keep_aspect_set(o, EMOTION_ASPECT_KEEP_NONE);
config = config_get();
- if (!emotion_object_init(o, config->emotion_engine))
- {
-evas_object_del(sd->o_vid);
-sd->o_vid = NULL;
-return obj;
- }
evas_object_smart_callback_add(o, "frame_decode", _cb_vid_frame, obj);
evas_object_smart_callback_add(o, "frame_resize", _cb_vid_resize, obj);
evas_object_smart_callback_add(o, "decode_stop", _cb_vid_stop, obj);
--
[EGIT] [apps/rage] master 02/02: streamline theme a bit
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=8d8a2107988f4aef777c2062cdcafd120a62ac1b
commit 8d8a2107988f4aef777c2062cdcafd120a62ac1b
Author: Carsten Haitzler (Rasterman)
Date: Fri Feb 28 20:48:25 2020 +
streamline theme a bit
---
data/themes/default.edc | 444
1 file changed, 150 insertions(+), 294 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 4ef45a5..466e1db 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -116,13 +116,11 @@ collections {
color: 32 32 32 255;
}
}
- program {
-signal: "state,win,focused"; source: "rage";
+ program { signal: "state,win,focused"; source: "rage";
action: STATE_SET "focused" 0.0;
target: "vg1";
}
- program {
-signal: "state,win,unfocused"; source: "rage";
+ program { signal: "state,win,unfocused"; source: "rage";
action: STATE_SET "default" 0.0;
target: "vg1";
}
@@ -144,8 +142,7 @@ collections {
scale: 1;
clip_to: "shadow";
description { state: "default" 0.0;
- rel1.to: "rage.content";
- rel2.to: "rage.content";
+ rel.to: "rage.content";
rel2.relative: 1.0 0.0;
image.normal: "shadow_circle_horiz.png";
min: 0 32;
@@ -156,8 +153,7 @@ collections {
scale: 1;
clip_to: "shadow";
description { state: "default" 0.0;
- rel1.to: "rage.content";
- rel2.to: "rage.content";
+ rel.to: "rage.content";
rel1.relative: 0.0 1.0;
image.normal: "shadow_circle_horiz.png";
min: 0 32;
@@ -168,8 +164,7 @@ collections {
scale: 1;
clip_to: "shadow";
description { state: "default" 0.0;
- rel1.to: "rage.content";
- rel2.to: "rage.content";
+ rel.to: "rage.content";
rel2.relative: 0.0 1.0;
image.normal: "shadow_circle_vert.png";
min: 32 0;
@@ -180,8 +175,7 @@ collections {
scale: 1;
clip_to: "shadow";
description { state: "default" 0.0;
- rel1.to: "rage.content";
- rel2.to: "rage.content";
+ rel.to: "rage.content";
rel1.relative: 1.0 0.0;
image.normal: "shadow_circle_vert.png";
min: 32 0;
@@ -200,14 +194,12 @@ collections {
visible: 1;
}
}
- program {
-signal: "state,win,fullscreen"; source: "rage";
+ program { signal: "state,win,fullscreen"; source: "rage";
action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 0.2;
target: "black";
}
- program {
-signal: "state,win,normal"; source: "rage";
+ program { signal: "state,win,normal"; source: "rage";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0;
target: "black";
@@ -215,8 +207,7 @@ collections {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "rage.content";
- rel2.to: "rage.content";
+ rel.to: "rage.content";
color: 0 0 0 255;
visible: 0;
}
@@ -233,8 +224,7 @@ collections {
scale: 1;
clip_to: "novid_clip";
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
+ rel.to: "base";
fixed: 1 1;
image.normal: "icon_exclamation.png";
max: 24 24;
@@ -252,8 +242,7 @@ collections {
visible: 0;
}
}
- program {
-signal: "action,newvid"; source: "rage";
+ program { signal: "action,newvid"; source: "rage";
action: STATE_SET "default" 0.0;
target: "exclam";
target: "base&qu
[EGIT] [apps/rage] master 01/02: remove noisy printfs
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=c7bb445f1a28e737ad0dbc5565e2c866df8ef6a7
commit c7bb445f1a28e737ad0dbc5565e2c866df8ef6a7
Author: Carsten Haitzler (Rasterman)
Date: Fri Feb 28 18:46:45 2020 +
remove noisy printfs
---
src/bin/albumart.c | 2 --
src/bin/winvid.c | 1 -
2 files changed, 3 deletions(-)
diff --git a/src/bin/albumart.c b/src/bin/albumart.c
index 3deaccb..7f031f5 100644
--- a/src/bin/albumart.c
+++ b/src/bin/albumart.c
@@ -161,7 +161,6 @@ _cb_http_complete(void *data EINA_UNUSED, int type
EINA_UNUSED, void *event)
if (pe)
{
eina_strbuf_append_length(sb, p, pe - p);
-printf("FOUND IMG\n");
ok = EINA_TRUE;
}
}
@@ -175,7 +174,6 @@ _cb_http_complete(void *data EINA_UNUSED, int type
EINA_UNUSED, void *event)
if (pe)
{
eina_strbuf_append_length(sb, p, pe - p);
- printf("FOUND IMG2\n");
ok = EINA_TRUE;
}
}
diff --git a/src/bin/winvid.c b/src/bin/winvid.c
index 939856a..b70bbc6 100644
--- a/src/bin/winvid.c
+++ b/src/bin/winvid.c
@@ -93,7 +93,6 @@ _cb_audio(void *data, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
Inf *inf = evas_object_data_get(data, "inf");
Evas_Object *sl = elm_object_part_content_get(inf->lay, "rage.vol.swallow");
double vol = video_volume_get(inf->vid);
- printf("%1.2f\n", vol);
elm_slider_value_set(sl, vol * 100);
win_title_update(data);
}
--
[EGIT] [website/www] master 01/01: fix lexer regex -ugly hack to fix pcre strictness with ranges
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=4aec8d62fd6f16330ccc9a8aa56e35752223e046
commit 4aec8d62fd6f16330ccc9a8aa56e35752223e046
Author: Carsten Haitzler (Rasterman)
Date: Sat Feb 29 17:00:06 2020 +
fix lexer regex -ugly hack to fix pcre strictness with ranges
an upgrade to php7.3/libpcre and ... this breaks. this is an ugly
hack, but it gets wiki content back.
---
public_html/inc/parser/lexer.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/public_html/inc/parser/lexer.php b/public_html/inc/parser/lexer.php
index b46a5f50..c8981d48 100644
--- a/public_html/inc/parser/lexer.php
+++ b/public_html/inc/parser/lexer.php
@@ -160,6 +160,8 @@ class Doku_LexerParallelRegex {
$cnt = count($this->_patterns);
for ($i = 0; $i < $cnt; $i++) {
+if ($this->_patterns[$i] == '\\w+?(?:[\\w-$]+)+')
+ $this->_patterns[$i] = '\\w+?(?:[\\$-w]+)+';
/*
* decompose the input pattern into "(", "(?", ")",
* "[...]", "[]..]", "[^]..]", "[...[:...:]..]", "\x"...
--
[EGIT] [apps/rage] master 01/01: parameterize cover images and add capital start of word versions
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=ab549eb064636c9f0def41c237b5c45a55ca31ea
commit ab549eb064636c9f0def41c237b5c45a55ca31ea
Author: Carsten Haitzler (Rasterman)
Date: Mon Feb 17 18:42:17 2020 +
parameterize cover images and add capital start of word versions
---
src/bin/albumart.c | 53 ++---
1 file changed, 22 insertions(+), 31 deletions(-)
diff --git a/src/bin/albumart.c b/src/bin/albumart.c
index dc62a7f..3deaccb 100644
--- a/src/bin/albumart.c
+++ b/src/bin/albumart.c
@@ -350,9 +350,22 @@ albumart_file_get(const char *file)
{
char *tmp = alloca(strlen(file) + 1 + 100);
char *dir, *fraw, *s;
- const char *fname, *e;
- const char *ext[] = { "png", "PNG", "jpg", "JPG", "jpeg", "JPEG", "jpe",
"JPE", NULL };
- int i;
+ const char *fname, *e, *c;
+ const char *ext[] = {
+ "png", "PNG",
+ "jpg", "JPG",
+ "jpeg", "JPEG",
+ "jpe", "JPE",
+ NULL };
+ const char *cover[] = {
+ "cover", "Cover", "COVER",
+ "front", "Front", "FRONT",
+ "folder", "Folder", "FOLDER",
+ ".cover", ".Cover", ".COVER",
+ ".front", ".Front", ".FRONT",
+ ".folder", ".Folder", ".FOLDER",
+ NULL };
+ int i, j;
for (i = 0; (e = ext[i]) && e; i++)
{
@@ -403,35 +416,13 @@ albumart_file_get(const char *file)
if (ecore_file_exists(tmp)) goto found;
}
- for (i = 0; (e = ext[i]) && e; i++)
- {
-sprintf(tmp, "%s/cover.%s", dir, e);
-if (ecore_file_exists(tmp)) goto found;
- }
- for (i = 0; (e = ext[i]) && e; i++)
- {
-sprintf(tmp, "%s/front.%s", dir, e);
-if (ecore_file_exists(tmp)) goto found;
- }
- for (i = 0; (e = ext[i]) && e; i++)
- {
-sprintf(tmp, "%s/folder.%s", dir, e);
-if (ecore_file_exists(tmp)) goto found;
- }
- for (i = 0; (e = ext[i]) && e; i++)
- {
-sprintf(tmp, "%s/.cover.%s", dir, e);
-if (ecore_file_exists(tmp)) goto found;
- }
- for (i = 0; (e = ext[i]) && e; i++)
- {
-sprintf(tmp, "%s/.front.%s", dir, e);
-if (ecore_file_exists(tmp)) goto found;
- }
- for (i = 0; (e = ext[i]) && e; i++)
+ for (j = 0; (c = cover[j]) && c; j++)
{
-sprintf(tmp, "%s/.folder.%s", dir, e);
-if (ecore_file_exists(tmp)) goto found;
+for (i = 0; (e = ext[i]) && e; i++)
+ {
+ sprintf(tmp, "%s/%s.%s", dir, c, e);
+ if (ecore_file_exists(tmp)) goto found;
+ }
}
free(dir);
--
[EGIT] [apps/ecrire] master 01/01: move ecrire to meson ... just so we have a more consistent build story
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=261e4cb7b7b78fd5288e3c16c71b84acd0f5add5
commit 261e4cb7b7b78fd5288e3c16c71b84acd0f5add5
Author: Carsten Haitzler (Rasterman)
Date: Mon Feb 17 14:29:22 2020 +
move ecrire to meson ... just so we have a more consistent build story
---
CMakeLists.txt| 84 -
cmake/Modules/GettextTranslate.cmake | 271 --
cmake/Modules/MakeDistcheck.cmake | 122 --
cmake/Modules/legacy/FindEcore.cmake | 63 ---
cmake/Modules/legacy/FindEdje.cmake | 32
cmake/Modules/legacy/FindEet.cmake| 32
cmake/Modules/legacy/FindEfreet.cmake | 32
cmake/Modules/legacy/FindEina.cmake | 32
cmake/Modules/legacy/FindElementary.cmake | 32
cmake/Modules/legacy/FindEvas.cmake | 32
cmakeconfig.h.in | 22 ---
data/CMakeLists.txt | 5 -
data/{ => desktop}/ecrire.desktop | 0
data/desktop/meson.build | 2 +
data/{ => icons}/ecrire.png | Bin
data/icons/meson.build| 2 +
data/meson.build | 2 +
meson.build | 54 ++
meson_options.txt | 4 +
po/CMakeLists.txt | 1 -
po/meson.build| 19 +++
src/bin/CMakeLists.txt| 35
src/bin/main.c| 90 +-
src/bin/meson.build | 17 ++
src/bin/ui/alerts.c | 13 +-
src/bin/ui/file_related.c | 5 +-
src/bin/ui/font_dialog.c | 11 +-
src/bin/ui/goto_dialog.c | 9 +-
src/bin/ui/search_dialog.c| 11 +-
src/meson.build | 1 +
30 files changed, 156 insertions(+), 879 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index b8b8251..000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(ecrire)
-set(VMAJ 0)
-set(VMIN 1)
-set(VMIC 0)
-set(PACKAGE_VERSION ${VMAJ}.${VMIN}.${VMIC})
-
-set(PACKAGE ${CMAKE_PROJECT_NAME})
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_SOURCE_DIR}/cmake/Modules/")
-
-include_directories ("${PROJECT_BINARY_DIR}")
-
-# FIXME: add version checking!
-find_package(Eina REQUIRED)
-find_package(Eet REQUIRED)
-find_package(Evas REQUIRED)
-find_package(Ecore REQUIRED)
-find_package(Ecore COMPONENTS X)
-find_package(Edje REQUIRED)
-find_package(Efreet REQUIRED)
-find_package(Elementary REQUIRED)
-
-if(DEFINED ECORE_X_FOUND)
- set(HAVE_ECORE_X 1)
-endif(DEFINED ECORE_X_FOUND)
-
-
-INCLUDE(CheckIncludeFiles)
-CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
-
-# likely put this into an FindCompilerAttribute.cmake:
-INCLUDE(CheckCSourceCompiles)
-SET(HAVE___ATTRIBUTE__)
-CHECK_C_SOURCE_COMPILES(
- "void foo (int bar __attribute__((unused)) ) { }
- static void baz (void) __attribute__((unused));
- static void baz (void) { }
- int main(){}
- " HAVE___ATTRIBUTE__
- )
-
-ADD_DEFINITIONS(-DPACKAGE_BIN_DIR="${CMAKE_INSTALL_PREFIX}/bin"
- -DPACKAGE_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}"
- -DPACKAGE_LIB_DIR="${CMAKE_INSTALL_PREFIX}/lib")
-
-set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
-
-ADD_DEFINITIONS(
- -DLOCALE_DIR="${LOCALEDIR}"
- )
-
-ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-
-find_package(Gettext)
-if (GETTEXT_FOUND)
- set(GettextTranslate_ALL true)
- set(GettextTranslate_GMO_BINARY true)
- include(GettextTranslate)
- set(ENABLE_NLS 1)
-endif (GETTEXT_FOUND)
-
-configure_file (
- "${PROJECT_SOURCE_DIR}/cmakeconfig.h.in"
- "${PROJECT_BINARY_DIR}/config.h"
- )
-
-add_subdirectory(src/bin)
-add_subdirectory(data)
-add_subdirectory(po)
-
-# Make dist
-set(CPACK_PACKAGE_VERSION_MAJOR ${VMAJ})
-set(CPACK_PACKAGE_VERSION_MINOR ${VMIN})
-set(CPACK_PACKAGE_VERSION_PATCH ${VMIC})
-set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME
-
"${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_SOURCE_IGNORE_FILES
- "${CMAKE_BINARY_DIR};/.git/;.svn/;.swp$;~$;${CPACK_SOURCE_IGNORE_FILES}")
-include(CPack)
-add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
-
-include(MakeDistcheck)
-add_distcheck()
diff --git a/cmake/Modules/GettextTranslate.cmake
b/cmake/Modules/GettextTranslate.cmake
deleted file mode 100644
index 93bdacc..000
--- a/cmake/Modules/GettextTranslate.cmake
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright (c) 2012, Jarryd Beck
-# All rights reserved.
-#
-# Redistribution and use in sourc
