From: <si...@us...> - 2010-03-21 22:56:09
|
Revision: 872 http://osmo-pim.svn.sourceforge.net/osmo-pim/?rev=872&view=rev Author: silloz Date: 2010-03-21 22:56:03 +0000 (Sun, 21 Mar 2010) Log Message: ----------- * Fixed bug Modified Paths: -------------- trunk/src/notes_items.c Modified: trunk/src/notes_items.c =================================================================== --- trunk/src/notes_items.c 2010-03-19 17:50:50 UTC (rev 871) +++ trunk/src/notes_items.c 2010-03-21 22:56:03 UTC (rev 872) @@ -186,180 +186,161 @@ /*------------------------------------------------------------------------------*/ void -notes_edit_dialog_show (GtkWidget *list, GtkTreeModel *model, GUI *appGUI) { +notes_edit_dialog_show (GtkWidget *list, GtkTreeModel *model, GUI *appGUI) +{ + GtkWidget *vbox1; + GtkWidget *hseparator; + GtkWidget *hbuttonbox; + GtkWidget *cancel_button; + GtkWidget *label; + GtkWidget *frame; + GtkWidget *table; + GtkWidget *alignment; -GtkWidget *vbox1; -GtkWidget *hseparator; -GtkWidget *hbuttonbox; -GtkWidget *cancel_button; -GtkWidget *label; -GtkWidget *frame; -GtkWidget *table; -GtkWidget *alignment; + GtkTreePath *sort_path, *filter_path, *path; + GtkTreeIter iter; + gchar *c_category, *category, *name; + gchar tmpbuf[BUFFER_SIZE]; + gboolean remember_cursor; + gint i, n; -gchar tmpbuf[BUFFER_SIZE]; -gint i, n; -gboolean remember_cursor; -gchar *c_category, *category, *name; -GtkTreeIter iter; -GtkTreePath *sort_path, *filter_path, *path; + gtk_tree_view_get_cursor (GTK_TREE_VIEW (list), &sort_path, NULL); + if (sort_path == NULL) return; - gtk_tree_view_get_cursor (GTK_TREE_VIEW (list), &sort_path, NULL); + filter_path = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (appGUI->nte->notes_sort), sort_path); + gtk_tree_path_free (sort_path); + if (filter_path == NULL) return; - if (sort_path != NULL) { + path = gtk_tree_model_filter_convert_path_to_child_path (GTK_TREE_MODEL_FILTER (appGUI->nte->notes_filter), filter_path); + gtk_tree_path_free (filter_path); + if (path == NULL) return; - filter_path = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT(appGUI->nte->notes_sort), sort_path); - gtk_tree_path_free (sort_path); + appGUI->nte->edit_entry_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_container_set_border_width (GTK_CONTAINER (appGUI->nte->edit_entry_window), 4); + gtk_window_set_title (GTK_WINDOW (appGUI->nte->edit_entry_window), _("Edit entry")); + gtk_window_set_default_size (GTK_WINDOW (appGUI->nte->edit_entry_window), 400, -1); + gtk_window_set_transient_for (GTK_WINDOW (appGUI->nte->edit_entry_window), GTK_WINDOW (appGUI->main_window)); + gtk_window_set_position (GTK_WINDOW (appGUI->nte->edit_entry_window), GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_modal (GTK_WINDOW (appGUI->nte->edit_entry_window), TRUE); + g_signal_connect (G_OBJECT (appGUI->nte->edit_entry_window), "delete_event", + G_CALLBACK (notes_edit_close_cb), appGUI); + g_signal_connect (G_OBJECT (appGUI->nte->edit_entry_window), "key_press_event", + G_CALLBACK (notes_edit_key_press_cb), appGUI); - if (filter_path == NULL) return; + vbox1 = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (appGUI->nte->edit_entry_window), vbox1); - path = gtk_tree_model_filter_convert_path_to_child_path (GTK_TREE_MODEL_FILTER(appGUI->nte->notes_filter), filter_path); - gtk_tree_path_free (filter_path); + table = gtk_table_new (1, 2, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), table, FALSE, TRUE, 0); - appGUI->nte->edit_entry_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (appGUI->nte->edit_entry_window), 4); - gtk_window_set_title (GTK_WINDOW (appGUI->nte->edit_entry_window), _("Edit entry")); - gtk_window_set_default_size (GTK_WINDOW(appGUI->nte->edit_entry_window), 400, -1); - gtk_window_set_transient_for(GTK_WINDOW(appGUI->nte->edit_entry_window), GTK_WINDOW(appGUI->main_window)); - gtk_window_set_position(GTK_WINDOW(appGUI->nte->edit_entry_window), GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_modal(GTK_WINDOW(appGUI->nte->edit_entry_window), TRUE); - g_signal_connect (G_OBJECT (appGUI->nte->edit_entry_window), "delete_event", - G_CALLBACK(notes_edit_close_cb), appGUI); - g_signal_connect (G_OBJECT (appGUI->nte->edit_entry_window), "key_press_event", - G_CALLBACK (notes_edit_key_press_cb), appGUI); + frame = gtk_frame_new (NULL); + gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); - vbox1 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox1); - gtk_container_add (GTK_CONTAINER (appGUI->nte->edit_entry_window), vbox1); + alignment = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_container_add (GTK_CONTAINER (frame), alignment); + gtk_container_set_border_width (GTK_CONTAINER (alignment), 4); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); - table = gtk_table_new (1, 2, FALSE); - gtk_widget_show (table); - gtk_box_pack_start (GTK_BOX (vbox1), table, FALSE, TRUE, 0); + appGUI->nte->note_name_entry = gtk_entry_new (); + gtk_container_add (GTK_CONTAINER (alignment), appGUI->nte->note_name_entry); + gtk_entry_set_invisible_char (GTK_ENTRY (appGUI->nte->note_name_entry), 8226); + g_signal_connect (G_OBJECT (appGUI->nte->note_name_entry), "key_release_event", + G_CALLBACK (notes_add_entry_key_release_cb), appGUI); - frame = gtk_frame_new (NULL); - gtk_widget_show (frame); - gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + gtk_tree_view_get_cursor (GTK_TREE_VIEW (appGUI->nte->notes_list), &sort_path, NULL); + filter_path = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (appGUI->nte->notes_sort), sort_path); + gtk_tree_model_get_iter (GTK_TREE_MODEL (appGUI->nte->notes_filter), &iter, filter_path); + gtk_tree_path_free (filter_path); + gtk_tree_model_get (GTK_TREE_MODEL (appGUI->nte->notes_filter), &iter, + N_COLUMN_NAME, &name, + N_COLUMN_CATEGORY, &c_category, + N_COLUMN_REMEMBER_EDITOR_LINE, &remember_cursor, + -1); - alignment = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment); - gtk_container_add (GTK_CONTAINER (frame), alignment); - gtk_container_set_border_width (GTK_CONTAINER (alignment), 4); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); + gtk_entry_set_text (GTK_ENTRY (appGUI->nte->note_name_entry), name); + g_free (name); - appGUI->nte->note_name_entry = gtk_entry_new (); - gtk_widget_show (appGUI->nte->note_name_entry); - gtk_container_add (GTK_CONTAINER (alignment), appGUI->nte->note_name_entry); - gtk_entry_set_invisible_char (GTK_ENTRY (appGUI->nte->note_name_entry), 8226); - g_signal_connect (G_OBJECT (appGUI->nte->note_name_entry), "key_release_event", - G_CALLBACK (notes_add_entry_key_release_cb), appGUI); - - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, N_COLUMN_NAME, &name, -1); - gtk_entry_set_text (GTK_ENTRY(appGUI->nte->note_name_entry), name); - g_free (name); + sprintf (tmpbuf, "<b>%s:</b>", _("Note name")); + label = gtk_label_new (tmpbuf); + gtk_frame_set_label_widget (GTK_FRAME (frame), label); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - sprintf (tmpbuf, "<b>%s:</b>", _("Note name")); - label = gtk_label_new (tmpbuf); - gtk_widget_show (label); - gtk_frame_set_label_widget (GTK_FRAME (frame), label); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + frame = gtk_frame_new (NULL); + gtk_table_attach (GTK_TABLE (table), frame, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); - frame = gtk_frame_new (NULL); - gtk_widget_show (frame); - gtk_table_attach (GTK_TABLE (table), frame, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + alignment = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_container_add (GTK_CONTAINER (frame), alignment); + gtk_container_set_border_width (GTK_CONTAINER (alignment), 4); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); - alignment = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment); - gtk_container_add (GTK_CONTAINER (frame), alignment); - gtk_container_set_border_width (GTK_CONTAINER (alignment), 4); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); + appGUI->nte->category_combobox = gtk_combo_box_new_text (); + gtk_container_add (GTK_CONTAINER (alignment), appGUI->nte->category_combobox); + gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->nte->category_combobox), _("None")); - appGUI->nte->category_combobox = gtk_combo_box_new_text (); - gtk_widget_show (appGUI->nte->category_combobox); - gtk_container_add (GTK_CONTAINER (alignment), appGUI->nte->category_combobox); - gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->nte->category_combobox), _("None")); + i = n = 0; - gtk_tree_view_get_cursor (GTK_TREE_VIEW (appGUI->nte->notes_list), &sort_path, NULL); - filter_path = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT(appGUI->nte->notes_sort), sort_path); - gtk_tree_model_get_iter (GTK_TREE_MODEL(appGUI->nte->notes_filter), &iter, filter_path); - gtk_tree_path_free (filter_path); - gtk_tree_model_get (GTK_TREE_MODEL(appGUI->nte->notes_filter), &iter, - N_COLUMN_CATEGORY, &c_category, N_COLUMN_REMEMBER_EDITOR_LINE, &remember_cursor, -1); + while (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (appGUI->opt->notes_category_store), &iter, NULL, i++)) { + gtk_tree_model_get (GTK_TREE_MODEL (appGUI->opt->notes_category_store), &iter, 0, &category, -1); + gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->nte->category_combobox), category); + if (!strcmp (category, c_category)) n = i; + g_free (category); + } - i = n = 0; + g_free (c_category); - while (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(appGUI->opt->notes_category_store), &iter, NULL, i++)) { - gtk_tree_model_get(GTK_TREE_MODEL(appGUI->opt->notes_category_store), &iter, 0, &category, -1); - gtk_combo_box_append_text (GTK_COMBO_BOX (appGUI->nte->category_combobox), category); - if (!strcmp(category, c_category)) n = i; - g_free(category); - } + gtk_combo_box_set_active (GTK_COMBO_BOX (appGUI->nte->category_combobox), n); - g_free(c_category); + sprintf (tmpbuf, "<b>%s:</b>", _("Category")); + label = gtk_label_new (tmpbuf); + gtk_frame_set_label_widget (GTK_FRAME (frame), label); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_combo_box_set_active (GTK_COMBO_BOX(appGUI->nte->category_combobox), n); + frame = gtk_frame_new (NULL); + gtk_box_pack_start (GTK_BOX (vbox1), frame, FALSE, FALSE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); - sprintf (tmpbuf, "<b>%s:</b>", _("Category")); - label = gtk_label_new (tmpbuf); - gtk_widget_show (label); - gtk_frame_set_label_widget (GTK_FRAME (frame), label); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + alignment = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_container_add (GTK_CONTAINER (frame), alignment); + gtk_container_set_border_width (GTK_CONTAINER (alignment), 4); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); - frame = gtk_frame_new (NULL); - gtk_widget_show (frame); - gtk_box_pack_start (GTK_BOX (vbox1), frame, FALSE, FALSE, 0); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + appGUI->nte->remember_cursor_checkbutton = gtk_check_button_new_with_mnemonic (_("Remember cursor position")); + GTK_WIDGET_UNSET_FLAGS (appGUI->nte->remember_cursor_checkbutton, GTK_CAN_FOCUS); + gtk_container_add (GTK_CONTAINER (alignment), appGUI->nte->remember_cursor_checkbutton); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (appGUI->nte->remember_cursor_checkbutton), remember_cursor); - alignment = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment); - gtk_container_add (GTK_CONTAINER (frame), alignment); - gtk_container_set_border_width (GTK_CONTAINER (alignment), 4); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); + sprintf (tmpbuf, "<b>%s:</b>", _("Options")); + label = gtk_label_new (tmpbuf); + gtk_frame_set_label_widget (GTK_FRAME (frame), label); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - appGUI->nte->remember_cursor_checkbutton = gtk_check_button_new_with_mnemonic (_("Remember cursor position")); - GTK_WIDGET_UNSET_FLAGS(appGUI->nte->remember_cursor_checkbutton, GTK_CAN_FOCUS); - gtk_widget_show (appGUI->nte->remember_cursor_checkbutton); - gtk_container_add (GTK_CONTAINER (alignment), appGUI->nte->remember_cursor_checkbutton); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(appGUI->nte->remember_cursor_checkbutton), remember_cursor); + hseparator = gtk_hseparator_new (); + gtk_box_pack_start (GTK_BOX (vbox1), hseparator, FALSE, TRUE, 4); - sprintf (tmpbuf, "<b>%s:</b>", _("Options")); - label = gtk_label_new (tmpbuf); - gtk_widget_show (label); - gtk_frame_set_label_widget (GTK_FRAME (frame), label); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + hbuttonbox = gtk_hbutton_box_new (); + gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox, FALSE, FALSE, 0); + gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END); + gtk_box_set_spacing (GTK_BOX (hbuttonbox), 4); - hseparator = gtk_hseparator_new (); - gtk_widget_show (hseparator); - gtk_box_pack_start (GTK_BOX (vbox1), hseparator, FALSE, TRUE, 4); + cancel_button = utl_gui_create_button (GTK_STOCK_CANCEL, OSMO_STOCK_BUTTON_CANCEL, _("Cancel")); + GTK_WIDGET_UNSET_FLAGS (cancel_button, GTK_CAN_FOCUS); + gtk_container_add (GTK_CONTAINER (hbuttonbox), cancel_button); + g_signal_connect (G_OBJECT (cancel_button), "clicked", + G_CALLBACK (button_notes_edit_close_cb), appGUI); - hbuttonbox = gtk_hbutton_box_new (); - gtk_widget_show (hbuttonbox); - gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox, FALSE, FALSE, 0); - gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END); - gtk_box_set_spacing (GTK_BOX (hbuttonbox), 4); + appGUI->nte->add_entry_ok_button = utl_gui_create_button (GTK_STOCK_OK, OSMO_STOCK_BUTTON_OK, _("OK")); + GTK_WIDGET_UNSET_FLAGS (appGUI->nte->add_entry_ok_button, GTK_CAN_FOCUS); + gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->nte->add_entry_ok_button); + g_signal_connect (G_OBJECT (appGUI->nte->add_entry_ok_button), "clicked", + G_CALLBACK (notes_edit_action_cb), appGUI); - cancel_button = utl_gui_create_button (GTK_STOCK_CANCEL, OSMO_STOCK_BUTTON_CANCEL, _("Cancel")); - GTK_WIDGET_UNSET_FLAGS(cancel_button, GTK_CAN_FOCUS); - gtk_widget_show (cancel_button); - gtk_container_add (GTK_CONTAINER (hbuttonbox), cancel_button); - g_signal_connect (G_OBJECT (cancel_button), "clicked", - G_CALLBACK (button_notes_edit_close_cb), appGUI); - - appGUI->nte->add_entry_ok_button = utl_gui_create_button (GTK_STOCK_OK, OSMO_STOCK_BUTTON_OK, _("OK")); - GTK_WIDGET_UNSET_FLAGS(appGUI->nte->add_entry_ok_button, GTK_CAN_FOCUS); - gtk_widget_show (appGUI->nte->add_entry_ok_button); - gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->nte->add_entry_ok_button); - g_signal_connect (G_OBJECT (appGUI->nte->add_entry_ok_button), "clicked", - G_CALLBACK (notes_edit_action_cb), appGUI); - - gtk_widget_show (appGUI->nte->edit_entry_window); - } + gtk_widget_show_all (appGUI->nte->edit_entry_window); } /*------------------------------------------------------------------------------*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |