enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

patches patches... 

SVN revision: 15760
This commit is contained in:
Carsten Haitzler 2005-07-13 02:59:31 +00:00
parent 1e8d63c073
commit 1a6b7d07b6
16 changed files with 193 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/themes/default_border.edc
View File

@ -226,6 +226,17 @@ images {
image: "e17_button_detail_minimize.png" COMP;
image: "e17_button_detail_shade.png" COMP;
image: "e17_button_detail_stick.png" COMP;
image: "e17_button_detail_locks.png" COMP;
image: "e17_button_detail_borderless.png" COMP;
image: "e17_button_detail_remember.png" COMP;
image: "e17_button_detail_skip_winlist.png" COMP;
image: "e17_button_detail_fullscreen.png" COMP;
image: "e17_button_detail_sendto.png" COMP;
image: "e17_button_detail_kill.png" COMP;
image: "e17_button_detail_stacking.png" COMP;
image: "e17_button_detail_stack_below.png" COMP;
image: "e17_button_detail_stack_normal.png" COMP;
image: "e17_button_detail_stack_on_top.png" COMP;
image: "e17_mini_button.png" COMP;
image: "e17_mini_button_shadow1.png" COMP;
image: "e17_mini_button_shadow2.png" COMP;
@ -1664,4 +1675,15 @@ FULL_SIZE_BORDER_BUTTON("minimize")
FULL_SIZE_BORDER_BUTTON("maximize")
FULL_SIZE_BORDER_BUTTON("shade")
FULL_SIZE_BORDER_BUTTON("stick")
FULL_SIZE_BORDER_BUTTON("kill")
FULL_SIZE_BORDER_BUTTON("locks")
FULL_SIZE_BORDER_BUTTON("borderless")
FULL_SIZE_BORDER_BUTTON("fullscreen")
FULL_SIZE_BORDER_BUTTON("remember")
FULL_SIZE_BORDER_BUTTON("skip_winlist")
FULL_SIZE_BORDER_BUTTON("sendto")
FULL_SIZE_BORDER_BUTTON("stacking")
FULL_SIZE_BORDER_BUTTON("stack_on_top")
FULL_SIZE_BORDER_BUTTON("stack_normal")
FULL_SIZE_BORDER_BUTTON("stack_below")

121
data/themes/default_clock.edc
View File

@ -1,7 +1,8 @@
images {
image: "e17_clock_bg.png" COMP;
image: "e17_clock_fg.png" COMP;
image: "e17_button.png" COMP;
image: "e17_ibar_over_h.png" COMP;
image: "e17_ibar_bg_h.png" COMP;
image: "e17_clock_seconds_00.png" COMP;
image: "e17_clock_seconds_01.png" COMP;
image: "e17_clock_seconds_02.png" COMP;
@ -196,11 +197,11 @@ group {
new isAfternoon;
new digiBuf[2];
new digitalStyle;
new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_MILITARY;
new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_24HOUR;
DIGITAL_STYLE_NONE = 0;
DIGITAL_STYLE_NORMAL = 1;
DIGITAL_STYLE_MILITARY = 2;
DIGITAL_STYLE_24HOUR = 2;
get_text(PART:"digitalStyle", digiBuf, 2);
@ -248,13 +249,17 @@ group {
isAfternoon = 0;
v = hour;
if (hour >= 12 && hour < 24) { isAfternoon = 1; }
if (digitalStyle == DIGITAL_STYLE_MILITARY) {
if (digitalStyle == DIGITAL_STYLE_24HOUR) {
if (v == 0) { v = 24; }
} else {
v = (v % 12);
if (v == 0) { v = 12; }
}
snprintf(buf, 10, "%i", v);
if (digitalStyle == DIGITAL_STYLE_24HOUR && v < 10) {
snprintf(buf, 10, "0%i", v);
} else {
snprintf(buf, 10, "%i", v);
}
snprintf(hourStr, 3, "%s", buf);
buf[0] = 0;
@ -268,17 +273,19 @@ group {
if (digitalStyle != DIGITAL_STYLE_NONE) {
if (digitalStyle == DIGITAL_STYLE_NORMAL) {
snprintf(digitalVal, 14, "%s:%s:%s %s", hourStr, minuteStr, secondStr, buf);
} else if (digitalStyle == DIGITAL_STYLE_MILITARY) {
snprintf(digitalVal, 14, "%s:%s:%s", hourStr, minuteStr, secondStr);
} else if (digitalStyle == DIGITAL_STYLE_24HOUR) {
snprintf(digitalVal, 14, " %s:%s:%s ", hourStr, minuteStr, secondStr);
}
set_text(PART:"digital", digitalVal);
set_state(PART:"digital", "digital", 0.0);
set_state(PART:"digital_bg", "digital", 0.0);
set_state(PART:"digital_bg_overlay", "digital", 0.0);
} else {
set_text(PART:"digital", "");
set_state(PART:"digital", "hidden", 0.0);
set_state(PART:"digital_bg", "hidden", 0.0);
set_state(PART:"digital_bg_overlay", "hidden", 0.0);
}
}
}
@ -588,30 +595,82 @@ group {
}
}
part {
name: "digital_bg";
name: "digital_bg_area";
type: "RECT";
mouse_events: 0;
description {
state: "digital" 0.0;
image {
normal: "e17_button.png";
}
state: "default" 0.0;
min: 16 16;
rel1 {
relative: 0.0 1.0;
relative: 0.0 0.8;
}
rel2 {
relative: 1.0 1.2;
relative: 1.0 1.0;
}
visible: 0;
}
}
part {
name: "digital_bg_overlay";
mouse_events: 0;
description {
state: "default" 0.0;
rel1 {
to: "digital_bg_area";
relative: 0.0 0.0;
}
rel2 {
to: "digital_bg_area";
relative: 1.0 1.0;
}
image {
normal: "e17_ibar_over_h.png";
border: 13 13 13 13;
}
fill {
smooth: 0;
}
color: 255 255 255 192;
}
description {
state: "hidden" 0.0;
visible: 0;
image {
normal: "e17_button.png";
normal: "e17_ibar_over_h.png";
border: 13 13 13 13;
middle: 0;
}
}
}
part {
name: "digital_bg";
mouse_events: 0;
description {
state: "default" 0.0;
rel1 {
to: "digital_bg_area";
relative: 0.0 0.0;
}
rel2 {
relative: 0.0 0.0;
to: "digital_bg_area";
relative: 1.0 1.0;
}
image {
normal: "e17_ibar_bg_h.png";
border: 6 6 6 6;
}
fill {
smooth: 0;
}
color: 255 255 255 128;
}
description {
state: "hidden" 0.0;
visible: 0;
image {
normal: "e17_ibar_bg_h.png";
border: 6 6 6 6;
middle: 0;
}
}
}
@ -620,34 +679,28 @@ group {
type: TEXT;
effect: SOFT_SHADOW;
description {
state: "digital" 0.0;
min: 0 11;
state: "default" 0.0;
rel1 {
relative: 0.0 0.9;
to: "digital_bg_area";
offset: 3 4;
}
rel2 {
relative: 1.0 1.0;
to: "digital_bg_area";
offset: -2 -2;
}
color: 255 255 255 255;
color3: 0 0 0 32;
text {
text: "00:00:00 AM";
font: "Edje Vera";
size: 7;
min: 1 0;
size: 15;
fit: 0 1;
align: 0.5 1.0;
align: 0.0 0.5;
}
}
description {
state: "hidden" 0.0;
aspect: 0.0 0.0;
rel1 {
relative: 0.0 0.0;
}
rel2 {
relative: 0.0 0.0;
}
visible: 0;
}
}
part {
@ -655,13 +708,7 @@ group {
type: TEXT;
description {
state: "hidden" 0.0;
aspect: 0.0 0.0;
rel1 {
relative: 0.0 0.0;
}
rel2 {
relative: 0.0 0.0;
}
visible: 0;
}
}
}

BIN
data/themes/images/e17_button_detail_borderless.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 B

BIN
data/themes/images/e17_button_detail_fullscreen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 237 B

BIN
data/themes/images/e17_button_detail_kill.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 185 B

BIN
data/themes/images/e17_button_detail_locks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 192 B

BIN
data/themes/images/e17_button_detail_remember.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 B

BIN
data/themes/images/e17_button_detail_sendto.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 225 B

BIN
data/themes/images/e17_button_detail_skip_winlist.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 218 B

BIN
data/themes/images/e17_button_detail_stack_below.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 222 B

BIN
data/themes/images/e17_button_detail_stack_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 221 B

BIN
data/themes/images/e17_button_detail_stack_on_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 214 B

BIN
data/themes/images/e17_button_detail_stacking.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 216 B

113
src/bin/e_border.c
View File

@ -85,6 +85,7 @@ static void _e_border_menu_cb_shade(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_on_top(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_normal(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_fullscreen(void *data, E_Menu *m, E_Menu_Item *mi);
@ -1979,6 +1980,11 @@ _e_border_free(E_Border *bd)
e_object_del(E_OBJECT(bd->border_remember_menu));
bd->border_remember_menu = NULL;
}
if (bd->border_stacking_menu)
{
e_object_del(E_OBJECT(bd->border_stacking_menu));
bd->border_stacking_menu = NULL;
}
if (focused == bd)
{
// ecore_x_window_focus(bd->zone->container->manager->root);
@ -5081,6 +5087,11 @@ _e_border_cb_border_menu_end(void *data, E_Menu *m)
e_object_del(E_OBJECT(bd->border_remember_menu));
bd->border_remember_menu = NULL;
}
if (bd->border_stacking_menu)
{
e_object_del(E_OBJECT(bd->border_stacking_menu));
bd->border_stacking_menu = NULL;
}
bd->border_menu = NULL;
}
e_object_del(E_OBJECT(m));
@ -5656,6 +5667,43 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key)
e_menu_item_separator_set(mi, 1);
NEW_REMEMBER_MI(_("Run this porgram on login"), apply, E_REMEMBER_APPLY_RUN, _e_border_menu_cb_remember_apply_run);
*/
m = e_menu_new();
bd->border_stacking_menu = m;
if (!bd->lock_user_stacking)
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always On Top"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 2);
e_menu_item_toggle_set(mi, (bd->layer == 150 ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd);
e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_on_top"),
"widgets/border/default/stack_on_top");
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Normal"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 2);
e_menu_item_toggle_set(mi, (bd->layer == 100 ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_normal, bd);
e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_normal"),
"widgets/border/default/stack_normal");
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always Below"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 2);
e_menu_item_toggle_set(mi, (bd->layer == 50 ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_below, bd);
e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_below"),
"widgets/border/default/stack_below");
}
m = e_menu_new();
e_object_data_set(E_OBJECT(m), bd);
bd->border_menu = m;
@ -5737,32 +5785,14 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key)
"widgets/border/default/stick"),
"widgets/border/default/stick");
}
if (!bd->lock_user_stacking)
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always On Top"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, (bd->layer == 150 ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd);
e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/on_top"),
"widgets/border/default/on_top");
}
if (!bd->lock_user_stacking)
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always Below"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, (bd->layer == 50 ? 1 : 0));
e_menu_item_callback_set(mi, _e_border_menu_cb_below, bd);
e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/below"),
"widgets/border/default/below");
}
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Stacking"));
e_menu_item_submenu_set(mi, bd->border_stacking_menu);
e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stacking"),
"widgets/border/default/stacking");
if (!bd->lock_border)
{
@ -5989,12 +6019,7 @@ _e_border_menu_cb_on_top(void *data, E_Menu *m, E_Menu_Item *mi)
E_Border *bd;
bd = data;
if (bd->layer == 150)
{
bd->layer = 100;
e_hints_window_stacking_set(bd, E_STACKING_NONE);
}
else
if (bd->layer != 150)
{
bd->layer = 150;
e_hints_window_stacking_set(bd, E_STACKING_ABOVE);
@ -6011,12 +6036,7 @@ _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi)
E_Border *bd;
bd = data;
if (bd->layer == 50)
{
bd->layer = 100;
e_hints_window_stacking_set(bd, E_STACKING_NONE);
}
else
if (bd->layer != 50)
{
bd->layer = 50;
e_hints_window_stacking_set(bd, E_STACKING_BELOW);
@ -6024,6 +6044,23 @@ _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi)
e_container_border_raise(bd);
}
static void
_e_border_menu_cb_normal(void *data, E_Menu *m, E_Menu_Item *mi)
{
/* FIXME:
* - Remember old layer
*/
E_Border *bd;
bd = data;
if (bd->layer != 100)
{
bd->layer = 100;
e_hints_window_stacking_set(bd, E_STACKING_NONE);
}
e_container_border_raise(bd);
}
static void
_e_border_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item *mi)
{

1
src/bin/e_border.h
View File

@ -337,6 +337,7 @@ struct _E_Border
E_Menu *border_menu;
E_Menu *border_locks_menu;
E_Menu *border_remember_menu;
E_Menu *border_stacking_menu;
Evas_List *pending_move_resize;
struct {

22
src/modules/clock/e_mod_main.c
View File

@ -24,7 +24,7 @@ static void _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *m
static void _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi);
static void _clock_face_cb_digital_24hour(void *data, E_Menu *m, E_Menu_Item *mi);
static int _clock_count;
@ -34,7 +34,7 @@ static E_Config_DD *conf_face_edd;
const int
DIGITAL_STYLE_NONE = 0,
DIGITAL_STYLE_NORMAL = 1,
DIGITAL_STYLE_MILITARY = 2
DIGITAL_STYLE_24HOUR = 2
;
/* public module routines. all modules must have these */
@ -338,7 +338,7 @@ _clock_face_menu_new(Clock_Face *face)
/* Show normal time */
mi = e_menu_item_new(smn);
e_menu_item_label_set(mi, _("Normal Time"));
e_menu_item_label_set(mi, _("Normal"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (face->conf->digitalStyle == DIGITAL_STYLE_NORMAL) {
@ -347,16 +347,16 @@ _clock_face_menu_new(Clock_Face *face)
}
e_menu_item_callback_set(mi, _clock_face_cb_digital_normal, face);
/* Show military time */
/* Show 24hour time */
mi = e_menu_item_new(smn);
e_menu_item_label_set(mi, _("Military Time"));
e_menu_item_label_set(mi, _("24 Hour"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (face->conf->digitalStyle == DIGITAL_STYLE_MILITARY) {
if (face->conf->digitalStyle == DIGITAL_STYLE_24HOUR) {
e_menu_item_toggle_set(mi, 1);
_clock_face_cb_digital_military(face, smn, mi);
_clock_face_cb_digital_24hour(face, smn, mi);
}
e_menu_item_callback_set(mi, _clock_face_cb_digital_military, face);
e_menu_item_callback_set(mi, _clock_face_cb_digital_24hour, face);
face->digital_menu = smn;
@ -470,7 +470,7 @@ _clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi)
}
static void
_clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi)
_clock_face_cb_digital_24hour(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
char buf[2];
@ -479,11 +479,11 @@ _clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi)
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_MILITARY);
snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_24HOUR);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
face->conf->digitalStyle = DIGITAL_STYLE_MILITARY;
face->conf->digitalStyle = DIGITAL_STYLE_24HOUR;
e_config_save_queue();
}