rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=f3c3473dc3aaed514a8cd1dbec54337cdc7ab646
commit f3c3473dc3aaed514a8cd1dbec54337cdc7ab646
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Thu Dec 24 15:14:36 2015 +0200
refactor: remove ui_block
---
po/POTFILES.in | 1 -
src/bin/Makefile.am | 1 -
src/bin/ui/blocks/ui_block.c | 158 -----------------------------
src/bin/ui/blocks/ui_block.h | 235 -------------------------------------------
src/bin/ui/main_window.c | 2 -
src/bin/ui/main_window.h | 1 -
6 files changed, 398 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1336c29..b2823a6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,6 @@ src/bin/external/syntax_color.c
src/bin/logger/logger.c
src/bin/project_manager/group_manager.c
src/bin/project_manager/project_manager.c
-src/bin/ui/blocks/ui_block.c
src/bin/ui/blocks/ui_signal_list.c
src/bin/ui/blocks/ui_states_list.c
src/bin/ui/container/container.c
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ca4b683..215e4e6 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -56,7 +56,6 @@ libete_a_SOURCES = \
../../src/bin/ui/tab_home_import_edj.c \
../../src/bin/ui/tab_home_import_edc.c \
../../src/bin/ui/tab_home_info.c \
-../../src/bin/ui/blocks/ui_block.c \
../../src/bin/ui/property.c \
../../src/bin/ui/property_group.c \
../../src/bin/ui/property_image.c \
diff --git a/src/bin/ui/blocks/ui_block.c b/src/bin/ui/blocks/ui_block.c
deleted file mode 100644
index f00f90c..0000000
--- a/src/bin/ui/blocks/ui_block.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Edje Theme Editor
- * Copyright (C) 2013-2014 Samsung Electronics.
- *
- * This file is part of Edje Theme Editor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
- */
-
-#include "ui_block.h"
-
-static Eina_Bool
-ui_block_content_set(Evas_Object *block, Evas_Object *content)
-{
- assert(block != NULL);
- assert(content != NULL);
-
- elm_object_part_content_set(block, "elm.swallow.content", content);
- return EINA_TRUE;
-
-}
-
-static Evas_Object *
-ui_block_content_get(Evas_Object *block)
-{
- assert(block != NULL);
-
- return elm_object_part_content_get(block, "elm.swallow.content");
-}
-
-Evas_Object *
-ui_block_add(Evas_Object *parent)
-{
- Evas_Object *block;
-
- assert(parent != NULL);
-
- block = elm_layout_add(parent);
- elm_layout_theme_set(block, "layout", "block", "default");
-
- return block;
-}
-
-Eina_Bool
-ui_block_title_visible(Evas_Object *block, Eina_Bool vis)
-{
- assert(block != NULL);
-
- if (vis) elm_object_signal_emit(block, "title,show", "eflete");
- else elm_object_signal_emit(block, "title,hide", "eflete");
- return true;
-}
-
-Eina_Bool
-ui_block_content_visible(Evas_Object *block, Eina_Bool vis)
-{
- assert(block != NULL);
-
- if (vis) elm_object_signal_emit(block, "content,show", "eflete");
- else elm_object_signal_emit(block, "content,hide", "eflete");
- return true;
-}
-
-Evas_Object *
-ui_block_widget_list_get(void)
-{
-
- return ui_block_content_get(ap.block.left_top);
-}
-
-Evas_Object *
-ui_block_ws_get(void)
-{
-
- return ui_block_content_get(ap.block.canvas);
-}
-
-Evas_Object *
-ui_block_signal_list_get(void)
-{
-
- return ui_block_content_get(ap.block.left_bottom);
-}
-
-Evas_Object *
-ui_block_property_get(void)
-{
-
- //return ui_block_content_get(ap.block.right_bottom);
- return NULL;
-}
-
-Evas_Object *
-ui_block_history_get(void)
-{
-
- return ui_block_content_get(ap.block.right_top);
-}
-
-Evas_Object *
-ui_block_live_view_get(void)
-{
-
- return ui_block_content_get(ap.block.bottom_right);
-}
-
-Eina_Bool
-ui_block_widget_list_set(Evas_Object *content)
-{
-
- return ui_block_content_set(ap.block.left_top, content);
-}
-
-Eina_Bool
-ui_block_ws_set(Evas_Object *content)
-{
-
- return ui_block_content_set(ap.block.canvas, content);
-}
-
-Eina_Bool
-ui_block_signal_list_set(Evas_Object *content)
-{
-
- return ui_block_content_set(ap.block.left_bottom, content);
-}
-
-Eina_Bool
-ui_block_property_set(Evas_Object *content __UNUSED__)
-{
-
- //return ui_block_content_set(ap.block.right_bottom, content);
- return true;
-}
-
-Eina_Bool
-ui_block_history_set(Evas_Object *content)
-{
-
- return ui_block_content_set(ap.block.right_top, content);
-}
-
-Eina_Bool
-ui_block_live_view_set(Evas_Object *content)
-{
-
- return ui_block_content_set(ap.block.bottom_right, content);
-}
diff --git a/src/bin/ui/blocks/ui_block.h b/src/bin/ui/blocks/ui_block.h
deleted file mode 100644
index be86652..0000000
--- a/src/bin/ui/blocks/ui_block.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Edje Theme Editor
- * Copyright (C) 2013-2014 Samsung Electronics.
- *
- * This file is part of Edje Theme Editor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
- */
-
-#ifndef UI_BLOCK_HEADER_H
-#define UI_BLOCK_HEADER_H
-
-/**
- * @defgroup Block Block
- *
- * A Block is a container for part of application UI
- * It item has a title.
- */
-
-#include "eflete.h"
-
-/**
- * Add a new block to the parent
- *
- * @param parent The parent object
- * @return The new object or NULL if it cannot be created
- *
- * @ingroup Block
- */
-Evas_Object *
-ui_block_add(Evas_Object *parent);
-
-/**
- * Show/Hide a title of block
- *
- * @param block the block object
- * @param vis if EINA_TRUE - title show, EINA_FALSE - title hide
- * @return EINA_TRUE if succesfull, EINA_FALSE - otherwise
- *
- * @ingroup Block
- */
-Eina_Bool
-ui_block_title_visible(Evas_Object *block, Eina_Bool vis);
-
-/**
- * Show/Hide a content of block
- *
- * @param block the block object
- * @param vis if EINA_TRUE - content show, EINA_FALSE - content hide
- * @return EINA_TRUE if succesfull, EINA_FALSE - otherwise
- *
- * @ingroup Block
- */
-Eina_Bool
-ui_block_content_visible(Evas_Object *block, Eina_Bool vis);
-
-/**
- * Get the widget list object
- *
- * @param ap the application data
- * @return the widget list object
- *
- * @ingroup Block
- */
-Evas_Object *
-ui_block_widget_list_get(void);
-
-/**
- * Get the workspace object
- *
- * @param ap the application data
- * @return workspace object
- *
- * @ingroup Block
- */
-Evas_Object *
-ui_block_ws_get(void);
-
-/**
- * Get the part signal list object
- *
- * @param ap the application data
- * @return the signal list object
- *
- * @ingroup Block
- */
-Evas_Object *
-ui_block_signal_list_get(void);
-
-/**
- * Get the part state list object
- *
- * @param ap the application data
- * @return the state list object
- *
- * @ingroup Block
- */
-Evas_Object *
-ui_block_state_list_get(void);
-
-/**
- * Get the property object
- *
- * @param ap the application data
- * @return the Property object
- *
- * @ingroup Block
- */
-Evas_Object *
-ui_block_property_get(void);
-
-/**
- * Get the history object
- *
- * @param ap the application data
- * @return the graph history object
- *
- * @ingroup Block
- */
-Evas_Object *
-ui_block_history_get(void);
-
-/**
- * Get the live view object
- *
- * @param ap the application data
- * @return the demo object
- *
- * @ingroup Block
- */
-Evas_Object *
-ui_block_live_view_get(void);
-
-/**
- * Set the content in to the widget list block
- *
- * @param ap the application data
- * @param content the content object
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- *
- * @ingroup Block
- */
-Eina_Bool
-ui_block_widget_list_set(Evas_Object *content);
-
-/**
- * Set the content in to the signal list block
- *
- * @param ap the application data
- * @param content the content object
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- *
- * @ingroup Block
- */
-Eina_Bool
-ui_block_signal_list_set(Evas_Object *content);
-
-/**
- * Set the content in to the state list block
- *
- * @param ap the application data
- * @param content the content object
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- *
- * @ingroup Block
- */
-Eina_Bool
-ui_block_state_list_set(Evas_Object *content);
-
-/**
- * Set the content in to the state workspace block
- *
- * @param ap the application data
- * @param content the content object
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- *
- * @ingroup Block
- */
-Eina_Bool
-ui_block_ws_set(Evas_Object *content);
-
-/**
- * Set the content in to the property block
- *
- * @param ap the application data
- * @param content the content object
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- *
- * @ingroup Block
- */
-Eina_Bool
-ui_block_property_set(Evas_Object *content);
-
-/**
- * Set the content in to the history block
- *
- * @param ap the application data
- * @param content the content object
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- *
- * @ingroup Block
- */
-Eina_Bool
-ui_block_history_set(Evas_Object *content);
-
-/**
- * Set the content in to the live view block
- *
- * @param ap the application data
- * @param content the content object
- *
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- *
- * @ingroup Block
- */
-Eina_Bool
-ui_block_live_view_set(Evas_Object *content);
-
-#endif /* UI_BLOCK_HEADER_H */
diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index 2f27e62..cc1c8f9 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -198,10 +198,8 @@ ui_main_window_add(void)
//ui_panes_add();
//ap.workspace = workspace_add(ap.block.canvas);
- //ui_block_ws_set(ap.workspace);
//evas_object_show(ap.workspace);
//ap.live_view = live_view_add(ap.block.bottom_right, false);
- //ui_block_live_view_set(ap.live_view->layout);
//ap.colorsel = colorselector_add(ap.win);
#ifdef HAVE_ENVENTOR
ap.enventor= enventor_object_init(ap.win);
diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h
index 806fe16..7a6b13e 100644
--- a/src/bin/ui/main_window.h
+++ b/src/bin/ui/main_window.h
@@ -35,7 +35,6 @@
#include "common_macro.h"
#include "ui_widget_list.h"
#include "ui_signal_list.h"
-#include "ui_block.h"
#include "notify.h"
#include "string_common.h"
--
