rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=9134e64d49e47e23ba184ec72c678a816aaf25e8
commit 9134e64d49e47e23ba184ec72c678a816aaf25e8
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Wed Mar 16 10:44:55 2016 +0200
move about dialog to main window
Change-Id: I2d76bb67425853769e1681dd92004119be28d91d
---
data/themes/default/widgets/label.edc | 1 +
po/POTFILES.in | 1 -
src/bin/Makefile.am | 2 -
src/bin/ui/dialogs/about_window.c | 89 -----------------------------------
src/bin/ui/dialogs/about_window.h | 45 ------------------
src/bin/ui/main_window.c | 38 +++++++++++++++
src/bin/ui/main_window.h | 11 +++++
src/bin/ui/menu.c | 1 -
8 files changed, 50 insertions(+), 138 deletions(-)
diff --git a/data/themes/default/widgets/label.edc
b/data/themes/default/widgets/label.edc
index 10e3dc9..cd87c0d 100644
--- a/data/themes/default/widgets/label.edc
+++ b/data/themes/default/widgets/label.edc
@@ -53,6 +53,7 @@ group { name: "elm/label/base/slide_about";
part { name: "label.text.clip";
type: RECT;
description { state: "default" 0.0;
+ min: 0 300;
}
}
part { name: "elm.text";
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5e8366b..330d177 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ src/bin/logger/logger.c
src/bin/project_manager/group_manager.c
src/bin/project_manager/project_manager.c
src/bin/ui/cursor.c
-src/bin/ui/dialogs/about_window.c
src/bin/ui/dialogs/colorsel.c
src/bin/ui/editors/animator.c
src/bin/ui/editors/animator_program_editor.c
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1ca873f..9548764 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -36,7 +36,6 @@ includesub_HEADERS = \
ui/property_private.h \
ui/tabs.h \
ui/tabs_private.h \
- ui/dialogs/about_window.h \
ui/dialogs/colorsel.h \
ui/live_view/demo.h \
ui/live_view/live_widget.h \
@@ -87,7 +86,6 @@ libete_a_SOURCES = \
../../src/bin/ui/shortcuts/shortcuts.c \
../../src/bin/ui/style_manager.c \
../../src/bin/ui/sound_manager.c \
-../../src/bin/ui/dialogs/about_window.c \
../../src/bin/ui/dialogs/colorsel.c \
../../src/bin/ui/modal_window/modal_window.c \
../../src/bin/ui/project_navigator.c \
diff --git a/src/bin/ui/dialogs/about_window.c
b/src/bin/ui/dialogs/about_window.c
deleted file mode 100644
index 7995ccd..0000000
--- a/src/bin/ui/dialogs/about_window.c
+++ /dev/null
@@ -1,89 +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 "main_window.h"
-#include "modal_window.h"
-
-static void
-_on_mwin_del(void *data __UNUSED__,
- Evas *e __UNUSED__,
- Evas_Object *obj __UNUSED__,
- void *event_info __UNUSED__)
-{
- ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, false);
-}
-
-static void
-_on_button_close_clicked_cb(void *data,
- Evas_Object *obj __UNUSED__,
- void *event_info __UNUSED__)
-{
- assert(data != NULL);
- evas_object_del(data);
-}
-
-Evas_Object *
-about_window_add()
-{
- Evas_Object *button;
- Evas_Object *mwin = mw_add("about_window", NULL, NULL);
-
- assert(mwin != NULL);
-
- mw_title_set(mwin, _("About"));
- Evas_Object *label;
-
- label = elm_label_add(mwin);
- elm_object_text_set(label,
- "<color=#b6b6b6>"
- "<b><align=center>"PACKAGE_NAME" v."VERSION"</align></b><br>"
- "This application was written for Enlightenment project.<br>"
- "It is designed to create and modify styles of Elementary widgets.<br>"
- "<br>"
- "Copyright (C) 2013 - 2015 Samsung Electronics.<br>"
- "<br>"
- "<align=center><b>Authors:</b><br>"
- "Vyacheslav \"rimmed\" Reutskiy (v.reuts...@samsung.com)<br>"
- "Mykyta Biliavskyi (m.biliavs...@samsung.com)<br>"
- "Vitalii Vorobiov (vi.vorob...@samsung.com)<br>"
- "Andrii Kroitor (an.kroi...@samsung.com)<br>"
- "Kateryna Fesyna (fesy...@gmail.com)<br>"
- "Maksym Volodin (mac9...@gmail.com)<br>"
- "Igor Gala (igor.gal...@gmail.com)<br>"
- "<br>"
- "Olga Kolesnik (o.koles...@samsung.com)<br>"
- "<br>"
- "Oleg Dotsenko (o.dotse...@samsung.com)<br>"
- "Yurii Tsivun (y.tsi...@samsung.com)<br>"
- "Dmitriy Samoylov (dm.samoy...@samsung.com)<br>"
- "</align>");
-
- elm_object_style_set(label, "slide_about");
- elm_win_inwin_content_set(mwin, label);
- elm_layout_signal_emit(label, "elm,state,slide,start", "elm");
- ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, true);
- evas_object_event_callback_add(mwin, EVAS_CALLBACK_DEL, _on_mwin_del, NULL);
-
- BUTTON_ADD(mwin, button, _("Close"));
- evas_object_smart_callback_add(button, "clicked",
_on_button_close_clicked_cb, mwin);
- elm_object_part_content_set(mwin, "eflete.swallow.btn_close", button);
-
- evas_object_show(mwin);
- return mwin;
-}
diff --git a/src/bin/ui/dialogs/about_window.h
b/src/bin/ui/dialogs/about_window.h
deleted file mode 100644
index 4687b77..0000000
--- a/src/bin/ui/dialogs/about_window.h
+++ /dev/null
@@ -1,45 +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 ABOUT_DIALOG_H
-#define ABOUT_DIALOG_H
-
-/**
- * @defgroup AboutDialog About Dialog
- *
- * This widget emits the following signals:
- *
- * TextStyle is a Inwin that contain information
- * of the widgets text styles.
- */
-
-#include "eflete.h"
-
-/**
- * Show the whole inwin window by using some data
- * about loaded project (edj file)
- *
- * @return the inwin object that contain style viewer
- *
- * @ingroup AboutDialog
- */
-Evas_Object *
-about_window_add();
-
-#endif /* ABOUT_DIALOG_H */
diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index 96b91d5..98fea95 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -220,3 +220,41 @@ ui_main_window_add(void)
elm_config_window_auto_focus_enable_set(false);
return true;
}
+
+Evas_Object *
+about_window_add(void)
+{
+ Evas_Object *label;
+
+ label = elm_label_add(ap.win);
+ elm_object_text_set(label,
+ "<color=#b6b6b6>"
+ "<b><align=center>"PACKAGE_NAME" v."VERSION"</align></b><br>"
+ "This application was written for Enlightenment project.<br>"
+ "It is designed to create and modify styles of Elementary widgets.<br>"
+ "<br>"
+ "Copyright (C) 2013 - 2015 Samsung Electronics.<br>"
+ "<br>"
+ "<align=center><b>Authors:</b><br>"
+ "Vyacheslav \"rimmed\" Reutskiy (v.reuts...@samsung.com)<br>"
+ "Mykyta Biliavskyi (m.biliavs...@samsung.com)<br>"
+ "Vitalii Vorobiov (vi.vorob...@samsung.com)<br>"
+ "Andrii Kroitor (an.kroi...@samsung.com)<br>"
+ "Kateryna Fesyna (fesy...@gmail.com)<br>"
+ "Maksym Volodin (mac9...@gmail.com)<br>"
+ "Igor Gala (igor.gal...@gmail.com)<br>"
+ "<br>"
+ "Olga Kolesnik (o.koles...@samsung.com)<br>"
+ "<br>"
+ "Oleg Dotsenko (o.dotse...@samsung.com)<br>"
+ "Yurii Tsivun (y.tsi...@samsung.com)<br>"
+ "Dmitriy Samoylov (dm.samoy...@samsung.com)<br>"
+ "</align>");
+
+ elm_object_style_set(label, "slide_about");
+ elm_layout_signal_emit(label, "elm,state,slide,start", "elm");
+
+ popup_want_action(_("About"), NULL, label, NULL, BTN_CANCEL, NULL, NULL);
+ evas_object_del(label);
+ return NULL;
+}
diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h
index 97548b4..7d7e898 100644
--- a/src/bin/ui/main_window.h
+++ b/src/bin/ui/main_window.h
@@ -498,4 +498,15 @@ typedef struct _Sound_Data Sound_Data;
Evas_Object *
sound_manager_add(void);
+/**
+ * Show the whole inwin window by using some data
+ * about loaded project (edj file)
+ *
+ * @return the inwin object that contain style viewer
+ *
+ * @ingroup Window
+ */
+Evas_Object *
+about_window_add(void);
+
#endif /* UI_MAIN_WINDOW_H */
diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c
index c62adeb..8574561 100644
--- a/src/bin/ui/menu.c
+++ b/src/bin/ui/menu.c
@@ -19,7 +19,6 @@
#include "main_window.h"
#include "preference.h"
-#include "about_window.h"
#include "tabs.h"
#include "workspace.h"
--
