Re: [E-devel] [EGIT] [misc/entrance] master 01/01: entrance: Changed the Settingspane
what did you want to display in this conf log panel ?
Split your patch !!!
2014-04-06 21:23 GMT+02:00 Marcel Hollerbach marcel.hollerb...@stzedn.de:
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=1539a34296d9bf04a4d17a54ce0060c9f6bba380
commit 1539a34296d9bf04a4d17a54ce0060c9f6bba380
Author: Marcel Hollerbach marcel.hollerb...@stzedn.de
Date: Sun Apr 6 21:21:08 2014 +0200
entrance: Changed the Settingspane
- Themeselector Log is a new place in the segment control. It is less
confusing if there is just one place where you can click throuw the
settings!
- Moved background and general Settings back into one pane.
---
src/bin/Makefile.am | 4 +
src/bin/entrance_client.h | 2 +
src/bin/entrance_conf.c | 4 +
src/bin/entrance_conf_log.c | 62 ++
src/bin/entrance_conf_log.h | 7 ++
src/bin/entrance_conf_main.c | 190
++
src/bin/entrance_conf_theme.c | 74
src/bin/entrance_conf_theme.h | 7 ++
8 files changed, 221 insertions(+), 129 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1124e5a..a47667b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -20,6 +20,10 @@ entrance_conf.h \
entrance_conf.c \
entrance_conf_main.h \
entrance_conf_main.c \
+entrance_conf_theme.h \
+entrance_conf_theme.c \
+entrance_conf_log.h \
+entrance_conf_log.c \
entrance_conf_user.h \
entrance_conf_user.c \
entrance_connect.h\
diff --git a/src/bin/entrance_client.h b/src/bin/entrance_client.h
index ed2113a..d0728b7 100644
--- a/src/bin/entrance_client.h
+++ b/src/bin/entrance_client.h
@@ -14,6 +14,8 @@
#include entrance_fill.h
#include entrance_conf.h
#include entrance_conf_main.h
+#include entrance_conf_log.h
+#include entrance_conf_theme.h
#include entrance_conf_user.h
#include entrance_connect.h
#include entrance_client.h
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index 37a1a9d..41427ba 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -209,6 +209,8 @@ entrance_conf_init(void)
entrance_conf_main_init();
entrance_conf_user_init();
+ entrance_conf_theme_init();
+ entrance_conf_log_init();
}
void
@@ -219,6 +221,8 @@ entrance_conf_shutdown(void)
PT(conf shutdown\n);
entrance_conf_user_shutdown();
entrance_conf_main_shutdown();
+ entrance_conf_theme_shutdown();
+ entrance_conf_log_shutdown();
EINA_LIST_FREE(_entrance_conf-modules, conf)
{
eina_stringshare_del(conf-label);
diff --git a/src/bin/entrance_conf_log.c b/src/bin/entrance_conf_log.c
new file mode 100644
index 000..ab4a569
--- /dev/null
+++ b/src/bin/entrance_conf_log.c
@@ -0,0 +1,62 @@
+#include entrance_client.h
+
+static void _entrance_conf_log_begin(void);
+static void _entrance_conf_log_end(void);
+static Evas_Object *_entrance_conf_log_build(Evas_Object *obj);
+static Eina_Bool _entrance_conf_log_check(void);
+static void _entrance_conf_log_apply(void);
+
+static void
+_entrance_conf_log_begin(void)
+{
+
+}
+
+static void
+_entrance_conf_log_end(void)
+{
+
+}
+
+static Evas_Object *
+_entrance_conf_log_build(Evas_Object *obj)
+{
+ Evas_Object *o;
+ /* Graphical Log */
+ o = elm_label_add(obj);
+ elm_object_text_set(o, TODO Implement graphical Log !);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ return o;
+}
+
+static Eina_Bool
+_entrance_conf_log_check(void)
+{
+ return 0;
+}
+
+static void
+_entrance_conf_log_apply(void)
+{
+}
+
+
+void
+entrance_conf_log_init(void)
+{
+ PT(conf grapical log init\n);
+ entrance_conf_module_register(Log,
+ _entrance_conf_log_begin,
+ _entrance_conf_log_end,
+ _entrance_conf_log_build,
+ _entrance_conf_log_check,
+ _entrance_conf_log_apply);
+}
+
+void
+entrance_conf_log_shutdown(void)
+{
+ PT(conf log shutdown\n);
+}
+
diff --git a/src/bin/entrance_conf_log.h b/src/bin/entrance_conf_log.h
new file mode 100644
index 000..d1ead6b
--- /dev/null
+++ b/src/bin/entrance_conf_log.h
@@ -0,0 +1,7 @@
+#ifndef ENTRANCE_CONF_LOG_H_
+#define ENTRANCE_CONF_LOG_H_
+
+void entrance_conf_log_init(void);
+void entrance_conf_log_shutdown(void);
+
+#endif /* ENTRANCE_CONF_MAIN_H_ */
diff --git a/src/bin/entrance_conf_main.c b/src/bin/entrance_conf_main.c
index 9cf2efb..3f0c086 100644
--- a/src/bin/entrance_conf_main.c
+++ b/src/bin/entrance_conf_main.c
@@ -102,31 +102,78 @@ _entrance_conf_scale_changed(void *data EINA_UNUSED,
Evas_Object
Re: [E-devel] [EGIT] [misc/entrance] master 01/01: entrance: Changed the Settingspane
Idea is to display the log file and a few labels where the log files are
located!
On Mon, Apr 07, 2014 at 11:03:40AM +0200, Michaël Bouchaud wrote:
what did you want to display in this conf log panel ?
Split your patch !!!
2014-04-06 21:23 GMT+02:00 Marcel Hollerbach marcel.hollerb...@stzedn.de:
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=1539a34296d9bf04a4d17a54ce0060c9f6bba380
commit 1539a34296d9bf04a4d17a54ce0060c9f6bba380
Author: Marcel Hollerbach marcel.hollerb...@stzedn.de
Date: Sun Apr 6 21:21:08 2014 +0200
entrance: Changed the Settingspane
- Themeselector Log is a new place in the segment control. It is less
confusing if there is just one place where you can click throuw the
settings!
- Moved background and general Settings back into one pane.
---
src/bin/Makefile.am | 4 +
src/bin/entrance_client.h | 2 +
src/bin/entrance_conf.c | 4 +
src/bin/entrance_conf_log.c | 62 ++
src/bin/entrance_conf_log.h | 7 ++
src/bin/entrance_conf_main.c | 190
++
src/bin/entrance_conf_theme.c | 74
src/bin/entrance_conf_theme.h | 7 ++
8 files changed, 221 insertions(+), 129 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1124e5a..a47667b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -20,6 +20,10 @@ entrance_conf.h \
entrance_conf.c \
entrance_conf_main.h \
entrance_conf_main.c \
+entrance_conf_theme.h \
+entrance_conf_theme.c \
+entrance_conf_log.h \
+entrance_conf_log.c \
entrance_conf_user.h \
entrance_conf_user.c \
entrance_connect.h\
diff --git a/src/bin/entrance_client.h b/src/bin/entrance_client.h
index ed2113a..d0728b7 100644
--- a/src/bin/entrance_client.h
+++ b/src/bin/entrance_client.h
@@ -14,6 +14,8 @@
#include entrance_fill.h
#include entrance_conf.h
#include entrance_conf_main.h
+#include entrance_conf_log.h
+#include entrance_conf_theme.h
#include entrance_conf_user.h
#include entrance_connect.h
#include entrance_client.h
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index 37a1a9d..41427ba 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -209,6 +209,8 @@ entrance_conf_init(void)
entrance_conf_main_init();
entrance_conf_user_init();
+ entrance_conf_theme_init();
+ entrance_conf_log_init();
}
void
@@ -219,6 +221,8 @@ entrance_conf_shutdown(void)
PT(conf shutdown\n);
entrance_conf_user_shutdown();
entrance_conf_main_shutdown();
+ entrance_conf_theme_shutdown();
+ entrance_conf_log_shutdown();
EINA_LIST_FREE(_entrance_conf-modules, conf)
{
eina_stringshare_del(conf-label);
diff --git a/src/bin/entrance_conf_log.c b/src/bin/entrance_conf_log.c
new file mode 100644
index 000..ab4a569
--- /dev/null
+++ b/src/bin/entrance_conf_log.c
@@ -0,0 +1,62 @@
+#include entrance_client.h
+
+static void _entrance_conf_log_begin(void);
+static void _entrance_conf_log_end(void);
+static Evas_Object *_entrance_conf_log_build(Evas_Object *obj);
+static Eina_Bool _entrance_conf_log_check(void);
+static void _entrance_conf_log_apply(void);
+
+static void
+_entrance_conf_log_begin(void)
+{
+
+}
+
+static void
+_entrance_conf_log_end(void)
+{
+
+}
+
+static Evas_Object *
+_entrance_conf_log_build(Evas_Object *obj)
+{
+ Evas_Object *o;
+ /* Graphical Log */
+ o = elm_label_add(obj);
+ elm_object_text_set(o, TODO Implement graphical Log !);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ return o;
+}
+
+static Eina_Bool
+_entrance_conf_log_check(void)
+{
+ return 0;
+}
+
+static void
+_entrance_conf_log_apply(void)
+{
+}
+
+
+void
+entrance_conf_log_init(void)
+{
+ PT(conf grapical log init\n);
+ entrance_conf_module_register(Log,
+ _entrance_conf_log_begin,
+ _entrance_conf_log_end,
+ _entrance_conf_log_build,
+ _entrance_conf_log_check,
+ _entrance_conf_log_apply);
+}
+
+void
+entrance_conf_log_shutdown(void)
+{
+ PT(conf log shutdown\n);
+}
+
diff --git a/src/bin/entrance_conf_log.h b/src/bin/entrance_conf_log.h
new file mode 100644
index 000..d1ead6b
--- /dev/null
+++ b/src/bin/entrance_conf_log.h
@@ -0,0 +1,7 @@
+#ifndef ENTRANCE_CONF_LOG_H_
+#define ENTRANCE_CONF_LOG_H_
+
+void entrance_conf_log_init(void);
+void
Re: [E-devel] [EGIT] [misc/entrance] master 01/01: entrance: Changed the Settingspane
Settings in entrance_client must just to be related to ui not to system. So
this panel is just uneeded.
2014-04-07 13:15 GMT+02:00 Marcel Hollerbach marcel-hollerb...@t-online.de
:
Idea is to display the log file and a few labels where the log files are
located!
On Mon, Apr 07, 2014 at 11:03:40AM +0200, Michaël Bouchaud wrote:
what did you want to display in this conf log panel ?
Split your patch !!!
2014-04-06 21:23 GMT+02:00 Marcel Hollerbach
marcel.hollerb...@stzedn.de:
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=1539a34296d9bf04a4d17a54ce0060c9f6bba380
commit 1539a34296d9bf04a4d17a54ce0060c9f6bba380
Author: Marcel Hollerbach marcel.hollerb...@stzedn.de
Date: Sun Apr 6 21:21:08 2014 +0200
entrance: Changed the Settingspane
- Themeselector Log is a new place in the segment control. It is
less
confusing if there is just one place where you can click throuw
the
settings!
- Moved background and general Settings back into one pane.
---
src/bin/Makefile.am | 4 +
src/bin/entrance_client.h | 2 +
src/bin/entrance_conf.c | 4 +
src/bin/entrance_conf_log.c | 62 ++
src/bin/entrance_conf_log.h | 7 ++
src/bin/entrance_conf_main.c | 190
++
src/bin/entrance_conf_theme.c | 74
src/bin/entrance_conf_theme.h | 7 ++
8 files changed, 221 insertions(+), 129 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1124e5a..a47667b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -20,6 +20,10 @@ entrance_conf.h \
entrance_conf.c \
entrance_conf_main.h \
entrance_conf_main.c \
+entrance_conf_theme.h \
+entrance_conf_theme.c \
+entrance_conf_log.h \
+entrance_conf_log.c \
entrance_conf_user.h \
entrance_conf_user.c \
entrance_connect.h\
diff --git a/src/bin/entrance_client.h b/src/bin/entrance_client.h
index ed2113a..d0728b7 100644
--- a/src/bin/entrance_client.h
+++ b/src/bin/entrance_client.h
@@ -14,6 +14,8 @@
#include entrance_fill.h
#include entrance_conf.h
#include entrance_conf_main.h
+#include entrance_conf_log.h
+#include entrance_conf_theme.h
#include entrance_conf_user.h
#include entrance_connect.h
#include entrance_client.h
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index 37a1a9d..41427ba 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -209,6 +209,8 @@ entrance_conf_init(void)
entrance_conf_main_init();
entrance_conf_user_init();
+ entrance_conf_theme_init();
+ entrance_conf_log_init();
}
void
@@ -219,6 +221,8 @@ entrance_conf_shutdown(void)
PT(conf shutdown\n);
entrance_conf_user_shutdown();
entrance_conf_main_shutdown();
+ entrance_conf_theme_shutdown();
+ entrance_conf_log_shutdown();
EINA_LIST_FREE(_entrance_conf-modules, conf)
{
eina_stringshare_del(conf-label);
diff --git a/src/bin/entrance_conf_log.c b/src/bin/entrance_conf_log.c
new file mode 100644
index 000..ab4a569
--- /dev/null
+++ b/src/bin/entrance_conf_log.c
@@ -0,0 +1,62 @@
+#include entrance_client.h
+
+static void _entrance_conf_log_begin(void);
+static void _entrance_conf_log_end(void);
+static Evas_Object *_entrance_conf_log_build(Evas_Object *obj);
+static Eina_Bool _entrance_conf_log_check(void);
+static void _entrance_conf_log_apply(void);
+
+static void
+_entrance_conf_log_begin(void)
+{
+
+}
+
+static void
+_entrance_conf_log_end(void)
+{
+
+}
+
+static Evas_Object *
+_entrance_conf_log_build(Evas_Object *obj)
+{
+ Evas_Object *o;
+ /* Graphical Log */
+ o = elm_label_add(obj);
+ elm_object_text_set(o, TODO Implement graphical Log !);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ return o;
+}
+
+static Eina_Bool
+_entrance_conf_log_check(void)
+{
+ return 0;
+}
+
+static void
+_entrance_conf_log_apply(void)
+{
+}
+
+
+void
+entrance_conf_log_init(void)
+{
+ PT(conf grapical log init\n);
+ entrance_conf_module_register(Log,
+ _entrance_conf_log_begin,
+ _entrance_conf_log_end,
+ _entrance_conf_log_build,
+ _entrance_conf_log_check,
+ _entrance_conf_log_apply);
+}
+
+void
+entrance_conf_log_shutdown(void)
+{
+ PT(conf log shutdown\n);
Re: [E-devel] [EGIT] [misc/entrance] master 01/01: entrance: Changed the Settingspane
And REALLY SPLIT YOUR PATCH NEXT TIMES. Or I couldn't review it correctly.
Next time, I don't read them. I will just do a revert.
2014-04-07 14:30 GMT+02:00 Michaël Bouchaud y...@efl.so:
Settings in entrance_client must just to be related to ui not to system.
So this panel is just uneeded.
2014-04-07 13:15 GMT+02:00 Marcel Hollerbach
marcel-hollerb...@t-online.de:
Idea is to display the log file and a few labels where the log files are
located!
On Mon, Apr 07, 2014 at 11:03:40AM +0200, Michaël Bouchaud wrote:
what did you want to display in this conf log panel ?
Split your patch !!!
2014-04-06 21:23 GMT+02:00 Marcel Hollerbach
marcel.hollerb...@stzedn.de:
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=1539a34296d9bf04a4d17a54ce0060c9f6bba380
commit 1539a34296d9bf04a4d17a54ce0060c9f6bba380
Author: Marcel Hollerbach marcel.hollerb...@stzedn.de
Date: Sun Apr 6 21:21:08 2014 +0200
entrance: Changed the Settingspane
- Themeselector Log is a new place in the segment control. It
is less
confusing if there is just one place where you can click throuw
the
settings!
- Moved background and general Settings back into one pane.
---
src/bin/Makefile.am | 4 +
src/bin/entrance_client.h | 2 +
src/bin/entrance_conf.c | 4 +
src/bin/entrance_conf_log.c | 62 ++
src/bin/entrance_conf_log.h | 7 ++
src/bin/entrance_conf_main.c | 190
++
src/bin/entrance_conf_theme.c | 74
src/bin/entrance_conf_theme.h | 7 ++
8 files changed, 221 insertions(+), 129 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1124e5a..a47667b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -20,6 +20,10 @@ entrance_conf.h \
entrance_conf.c \
entrance_conf_main.h \
entrance_conf_main.c \
+entrance_conf_theme.h \
+entrance_conf_theme.c \
+entrance_conf_log.h \
+entrance_conf_log.c \
entrance_conf_user.h \
entrance_conf_user.c \
entrance_connect.h\
diff --git a/src/bin/entrance_client.h b/src/bin/entrance_client.h
index ed2113a..d0728b7 100644
--- a/src/bin/entrance_client.h
+++ b/src/bin/entrance_client.h
@@ -14,6 +14,8 @@
#include entrance_fill.h
#include entrance_conf.h
#include entrance_conf_main.h
+#include entrance_conf_log.h
+#include entrance_conf_theme.h
#include entrance_conf_user.h
#include entrance_connect.h
#include entrance_client.h
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index 37a1a9d..41427ba 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -209,6 +209,8 @@ entrance_conf_init(void)
entrance_conf_main_init();
entrance_conf_user_init();
+ entrance_conf_theme_init();
+ entrance_conf_log_init();
}
void
@@ -219,6 +221,8 @@ entrance_conf_shutdown(void)
PT(conf shutdown\n);
entrance_conf_user_shutdown();
entrance_conf_main_shutdown();
+ entrance_conf_theme_shutdown();
+ entrance_conf_log_shutdown();
EINA_LIST_FREE(_entrance_conf-modules, conf)
{
eina_stringshare_del(conf-label);
diff --git a/src/bin/entrance_conf_log.c b/src/bin/entrance_conf_log.c
new file mode 100644
index 000..ab4a569
--- /dev/null
+++ b/src/bin/entrance_conf_log.c
@@ -0,0 +1,62 @@
+#include entrance_client.h
+
+static void _entrance_conf_log_begin(void);
+static void _entrance_conf_log_end(void);
+static Evas_Object *_entrance_conf_log_build(Evas_Object *obj);
+static Eina_Bool _entrance_conf_log_check(void);
+static void _entrance_conf_log_apply(void);
+
+static void
+_entrance_conf_log_begin(void)
+{
+
+}
+
+static void
+_entrance_conf_log_end(void)
+{
+
+}
+
+static Evas_Object *
+_entrance_conf_log_build(Evas_Object *obj)
+{
+ Evas_Object *o;
+ /* Graphical Log */
+ o = elm_label_add(obj);
+ elm_object_text_set(o, TODO Implement graphical Log !);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL,
EVAS_HINT_FILL);
+ return o;
+}
+
+static Eina_Bool
+_entrance_conf_log_check(void)
+{
+ return 0;
+}
+
+static void
+_entrance_conf_log_apply(void)
+{
+}
+
+
+void
+entrance_conf_log_init(void)
+{
+ PT(conf grapical log init\n);
+ entrance_conf_module_register(Log,
+ _entrance_conf_log_begin,
+ _entrance_conf_log_end,
+ _entrance_conf_log_build,
+
Re: [E-devel] [EGIT] [misc/entrance] master 01/01: entrance: Changed the Settingspane
mhmm a few users asked me where to find the logs etc. so I thought if
would be a good idea to display them there. Where so you think should we
place them ??
On Mon, Apr 07, 2014 at 02:30:20PM +0200, Michaël Bouchaud wrote:
Settings in entrance_client must just to be related to ui not to system. So
this panel is just uneeded.
2014-04-07 13:15 GMT+02:00 Marcel Hollerbach marcel-hollerb...@t-online.de
:
Idea is to display the log file and a few labels where the log files are
located!
On Mon, Apr 07, 2014 at 11:03:40AM +0200, Michaël Bouchaud wrote:
what did you want to display in this conf log panel ?
Split your patch !!!
2014-04-06 21:23 GMT+02:00 Marcel Hollerbach
marcel.hollerb...@stzedn.de:
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=1539a34296d9bf04a4d17a54ce0060c9f6bba380
commit 1539a34296d9bf04a4d17a54ce0060c9f6bba380
Author: Marcel Hollerbach marcel.hollerb...@stzedn.de
Date: Sun Apr 6 21:21:08 2014 +0200
entrance: Changed the Settingspane
- Themeselector Log is a new place in the segment control. It is
less
confusing if there is just one place where you can click throuw
the
settings!
- Moved background and general Settings back into one pane.
---
src/bin/Makefile.am | 4 +
src/bin/entrance_client.h | 2 +
src/bin/entrance_conf.c | 4 +
src/bin/entrance_conf_log.c | 62 ++
src/bin/entrance_conf_log.h | 7 ++
src/bin/entrance_conf_main.c | 190
++
src/bin/entrance_conf_theme.c | 74
src/bin/entrance_conf_theme.h | 7 ++
8 files changed, 221 insertions(+), 129 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1124e5a..a47667b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -20,6 +20,10 @@ entrance_conf.h \
entrance_conf.c \
entrance_conf_main.h \
entrance_conf_main.c \
+entrance_conf_theme.h \
+entrance_conf_theme.c \
+entrance_conf_log.h \
+entrance_conf_log.c \
entrance_conf_user.h \
entrance_conf_user.c \
entrance_connect.h\
diff --git a/src/bin/entrance_client.h b/src/bin/entrance_client.h
index ed2113a..d0728b7 100644
--- a/src/bin/entrance_client.h
+++ b/src/bin/entrance_client.h
@@ -14,6 +14,8 @@
#include entrance_fill.h
#include entrance_conf.h
#include entrance_conf_main.h
+#include entrance_conf_log.h
+#include entrance_conf_theme.h
#include entrance_conf_user.h
#include entrance_connect.h
#include entrance_client.h
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index 37a1a9d..41427ba 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -209,6 +209,8 @@ entrance_conf_init(void)
entrance_conf_main_init();
entrance_conf_user_init();
+ entrance_conf_theme_init();
+ entrance_conf_log_init();
}
void
@@ -219,6 +221,8 @@ entrance_conf_shutdown(void)
PT(conf shutdown\n);
entrance_conf_user_shutdown();
entrance_conf_main_shutdown();
+ entrance_conf_theme_shutdown();
+ entrance_conf_log_shutdown();
EINA_LIST_FREE(_entrance_conf-modules, conf)
{
eina_stringshare_del(conf-label);
diff --git a/src/bin/entrance_conf_log.c b/src/bin/entrance_conf_log.c
new file mode 100644
index 000..ab4a569
--- /dev/null
+++ b/src/bin/entrance_conf_log.c
@@ -0,0 +1,62 @@
+#include entrance_client.h
+
+static void _entrance_conf_log_begin(void);
+static void _entrance_conf_log_end(void);
+static Evas_Object *_entrance_conf_log_build(Evas_Object *obj);
+static Eina_Bool _entrance_conf_log_check(void);
+static void _entrance_conf_log_apply(void);
+
+static void
+_entrance_conf_log_begin(void)
+{
+
+}
+
+static void
+_entrance_conf_log_end(void)
+{
+
+}
+
+static Evas_Object *
+_entrance_conf_log_build(Evas_Object *obj)
+{
+ Evas_Object *o;
+ /* Graphical Log */
+ o = elm_label_add(obj);
+ elm_object_text_set(o, TODO Implement graphical Log !);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ return o;
+}
+
+static Eina_Bool
+_entrance_conf_log_check(void)
+{
+ return 0;
+}
+
+static void
+_entrance_conf_log_apply(void)
+{
+}
+
+
+void
+entrance_conf_log_init(void)
+{
+ PT(conf grapical log init\n);
+ entrance_conf_module_register(Log,
+
Re: [E-devel] [EGIT] [misc/entrance] master 01/01: entrance: Changed the Settingspane
No we don't have to place them anywhere. It's already in configuration of
entrance. /etc/entrance.conf. It's a system feature not ui feature.
2014-04-07 14:35 GMT+02:00 Marcel Hollerbach marcel-hollerb...@t-online.de
:
mhmm a few users asked me where to find the logs etc. so I thought if
would be a good idea to display them there. Where so you think should we
place them ??
On Mon, Apr 07, 2014 at 02:30:20PM +0200, Michaël Bouchaud wrote:
Settings in entrance_client must just to be related to ui not to system.
So
this panel is just uneeded.
2014-04-07 13:15 GMT+02:00 Marcel Hollerbach
marcel-hollerb...@t-online.de
:
Idea is to display the log file and a few labels where the log files
are
located!
On Mon, Apr 07, 2014 at 11:03:40AM +0200, Michaël Bouchaud wrote:
what did you want to display in this conf log panel ?
Split your patch !!!
2014-04-06 21:23 GMT+02:00 Marcel Hollerbach
marcel.hollerb...@stzedn.de:
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=1539a34296d9bf04a4d17a54ce0060c9f6bba380
commit 1539a34296d9bf04a4d17a54ce0060c9f6bba380
Author: Marcel Hollerbach marcel.hollerb...@stzedn.de
Date: Sun Apr 6 21:21:08 2014 +0200
entrance: Changed the Settingspane
- Themeselector Log is a new place in the segment control.
It is
less
confusing if there is just one place where you can click
throuw
the
settings!
- Moved background and general Settings back into one pane.
---
src/bin/Makefile.am | 4 +
src/bin/entrance_client.h | 2 +
src/bin/entrance_conf.c | 4 +
src/bin/entrance_conf_log.c | 62 ++
src/bin/entrance_conf_log.h | 7 ++
src/bin/entrance_conf_main.c | 190
++
src/bin/entrance_conf_theme.c | 74
src/bin/entrance_conf_theme.h | 7 ++
8 files changed, 221 insertions(+), 129 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1124e5a..a47667b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -20,6 +20,10 @@ entrance_conf.h \
entrance_conf.c \
entrance_conf_main.h \
entrance_conf_main.c \
+entrance_conf_theme.h \
+entrance_conf_theme.c \
+entrance_conf_log.h \
+entrance_conf_log.c \
entrance_conf_user.h \
entrance_conf_user.c \
entrance_connect.h\
diff --git a/src/bin/entrance_client.h b/src/bin/entrance_client.h
index ed2113a..d0728b7 100644
--- a/src/bin/entrance_client.h
+++ b/src/bin/entrance_client.h
@@ -14,6 +14,8 @@
#include entrance_fill.h
#include entrance_conf.h
#include entrance_conf_main.h
+#include entrance_conf_log.h
+#include entrance_conf_theme.h
#include entrance_conf_user.h
#include entrance_connect.h
#include entrance_client.h
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index 37a1a9d..41427ba 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -209,6 +209,8 @@ entrance_conf_init(void)
entrance_conf_main_init();
entrance_conf_user_init();
+ entrance_conf_theme_init();
+ entrance_conf_log_init();
}
void
@@ -219,6 +221,8 @@ entrance_conf_shutdown(void)
PT(conf shutdown\n);
entrance_conf_user_shutdown();
entrance_conf_main_shutdown();
+ entrance_conf_theme_shutdown();
+ entrance_conf_log_shutdown();
EINA_LIST_FREE(_entrance_conf-modules, conf)
{
eina_stringshare_del(conf-label);
diff --git a/src/bin/entrance_conf_log.c
b/src/bin/entrance_conf_log.c
new file mode 100644
index 000..ab4a569
--- /dev/null
+++ b/src/bin/entrance_conf_log.c
@@ -0,0 +1,62 @@
+#include entrance_client.h
+
+static void _entrance_conf_log_begin(void);
+static void _entrance_conf_log_end(void);
+static Evas_Object *_entrance_conf_log_build(Evas_Object *obj);
+static Eina_Bool _entrance_conf_log_check(void);
+static void _entrance_conf_log_apply(void);
+
+static void
+_entrance_conf_log_begin(void)
+{
+
+}
+
+static void
+_entrance_conf_log_end(void)
+{
+
+}
+
+static Evas_Object *
+_entrance_conf_log_build(Evas_Object *obj)
+{
+ Evas_Object *o;
+ /* Graphical Log */
+ o = elm_label_add(obj);
+ elm_object_text_set(o, TODO Implement graphical Log !);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
+ evas_object_size_hint_align_set(o, EVAS_HINT_FILL,
EVAS_HINT_FILL);
