projects
/
espeaktime
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
985bbc6
)
applet: move build_ui() function into execute(), for easier access to widgets
author
Alex Badea
<vamposdecampos@gmail.com>
Sat, 19 Jun 2010 11:55:54 +0000
(14:55 +0300)
committer
Alex Badea
<vamposdecampos@gmail.com>
Sat, 19 Jun 2010 11:55:54 +0000
(14:55 +0300)
src/applet.c
patch
|
blob
|
history
diff --git
a/src/applet.c
b/src/applet.c
index
f9426df
..
6f74490
100644
(file)
--- a/
src/applet.c
+++ b/
src/applet.c
@@
-76,8
+76,19
@@
static void add_scale(GtkVBox *vbox, GtkSizeGroup *size_group, const char *capti
FALSE, FALSE, 0);
}
FALSE, FALSE, 0);
}
-static GtkWidget *build_ui(void)
+osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activated)
{
{
+ GtkWidget *dialog;
+
+ dialog = gtk_dialog_new_with_buttons(
+ "eSpeakTime Settings",
+ GTK_WINDOW(data),
+ GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
+ "Test", 1,
+ GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NULL);
+
int k;
GtkVBox *vbox = GTK_VBOX(gtk_vbox_new(FALSE, 0));
GtkSizeGroup *title_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
int k;
GtkVBox *vbox = GTK_VBOX(gtk_vbox_new(FALSE, 0));
GtkSizeGroup *title_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@
-129,23
+140,8
@@
static GtkWidget *build_ui(void)
GtkWidget *panarea = hildon_pannable_area_new();
gtk_widget_set_size_request(panarea, -1, 800);
hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(panarea), GTK_WIDGET(vbox));
GtkWidget *panarea = hildon_pannable_area_new();
gtk_widget_set_size_request(panarea, -1, 800);
hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(panarea), GTK_WIDGET(vbox));
- return panarea;
-}
-
-osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activated)
-{
- GtkWidget *dialog;
-
- dialog = gtk_dialog_new_with_buttons(
- "eSpeakTime Settings",
- GTK_WINDOW(data),
- GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
- "Test", 1,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- NULL);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), build_ui());
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), panarea);
gtk_widget_show_all(dialog);
while (1) {
int result = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_show_all(dialog);
while (1) {
int result = gtk_dialog_run(GTK_DIALOG(dialog));