aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/camorama.glade24
-rw-r--r--src/camorama-window.c32
2 files changed, 28 insertions, 28 deletions
diff --git a/data/camorama.glade b/data/camorama.glade
index 196d5d7..317757d 100644
--- a/data/camorama.glade
+++ b/data/camorama.glade
@@ -1878,29 +1878,7 @@
<property name="label" translatable="yes">Small</property>
<property name="use_underline">True</property>
<property name="active">False</property>
- <signal name="activate" handler="on_small_activate" last_modification_time="Tue, 26 Aug 2003 03:09:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="medium">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Medium</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="group">small</property>
- <signal name="activate" handler="on_medium_activate" last_modification_time="Tue, 26 Aug 2003 03:09:42 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="large">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Large</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <property name="group">small</property>
- <signal name="activate" handler="on_large_activate" last_modification_time="Tue, 26 Aug 2003 03:09:55 GMT"/>
+ <signal name="activate" handler="activate" last_modification_time="Tue, 26 Aug 2003 03:09:34 GMT"/>
</widget>
</child>
</widget>
diff --git a/src/camorama-window.c b/src/camorama-window.c
index 44cdfc0..d08e29c 100644
--- a/src/camorama-window.c
+++ b/src/camorama-window.c
@@ -183,12 +183,16 @@ tray_clicked_callback (GtkStatusIcon* status, guint button, guint activate_time,
}
}
+static guint resolution_signals[8] = { 0 };
+
+
void
load_interface(cam* cam) {
gchar *title;
GdkPixbuf *logo = NULL;
GtkTreeView* treeview = GTK_TREE_VIEW(glade_xml_get_widget(cam->xml, "treeview_effects"));
GtkCellRenderer* cell;
+ GtkWidget *small_res, *new_res;
menu_item_filter_type = g_quark_from_static_string("camorama-menu-item-filter-type");
@@ -269,13 +273,31 @@ load_interface(cam* cam) {
G_CALLBACK
(on_show_adjustments_activate), cam);
- glade_xml_signal_connect_data (cam->xml, "on_large_activate",
- G_CALLBACK (on_change_size_activate), cam);
- glade_xml_signal_connect_data (cam->xml, "on_medium_activate",
- G_CALLBACK (on_change_size_activate), cam);
- glade_xml_signal_connect_data (cam->xml, "on_small_activate",
+
+ /*
+ * Just one resolution is at the XML files. The other ones are
+ * dynamically-created
+ */
+
+ glade_xml_signal_connect_data (cam->xml, "activate",
G_CALLBACK (on_change_size_activate), cam);
+ small_res = glade_xml_get_widget (cam->xml, "small");
+
+ new_res = gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(small_res), "Medium");
+ gtk_menu_append(GTK_MENU(glade_xml_get_widget (cam->xml, "menuitem4_menu")), new_res);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_res), FALSE);
+ gtk_widget_show (new_res);
+ g_signal_connect(new_res, "activate", G_CALLBACK (on_change_size_activate), cam);
+ gtk_widget_set_name(new_res, "medium");
+
+ new_res = gtk_radio_menu_item_new_with_label_from_widget(GTK_RADIO_MENU_ITEM(small_res), "Large");
+ gtk_menu_append(GTK_MENU(glade_xml_get_widget (cam->xml, "menuitem4_menu")), new_res);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_res), FALSE);
+ gtk_widget_show (new_res);
+ g_signal_connect(new_res, "activate", G_CALLBACK (on_change_size_activate), cam);
+ gtk_widget_set_name(new_res, "large");
+
//glade_xml_signal_connect_data(cam->xml, "capture_func", G_CALLBACK(on_change_size_activate), cam);
glade_xml_signal_connect_data (cam->xml, "capture_func",
G_CALLBACK (capture_func), cam);

Privacy Policy