From 78c2f8fa93f7adcb9157699c92b1498d878f66b2 Mon Sep 17 00:00:00 2001 From: auroux Date: Fri, 18 Aug 2006 05:50:28 +0000 Subject: [PATCH] UI patch contributed by Eduardo de Barros Lima. --- ChangeLog | 3 + src/xo-callbacks.c | 24 ++++---- src/xo-file.c | 4 +- src/xo-interface.c | 39 +++++++++++-- xournal.glade | 137 ++++++++++++++++++++++++++++++--------------- 5 files changed, 142 insertions(+), 65 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77b7739..909fb37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Version ?: + - minor UI changes (patch contributed by Eduardo de Barros Lima) + Version 0.3.1 (Aug 3, 2006): - fixed a file format bug on systems with non-standard numeric locale diff --git a/src/xo-callbacks.c b/src/xo-callbacks.c index 06e30e5..96683b3 100644 --- a/src/xo-callbacks.c +++ b/src/xo-callbacks.c @@ -47,7 +47,7 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new("Open PDF", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, "All files"); @@ -62,7 +62,7 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem, gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(attach_opt), FALSE); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER (dialog), attach_opt); - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return; } @@ -113,7 +113,7 @@ on_fileOpen_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new("Open Journal", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, "All files"); @@ -124,7 +124,7 @@ on_fileOpen_activate (GtkMenuItem *menuitem, gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_xoj); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return; } @@ -185,7 +185,7 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new("Save Journal", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); if (ui.filename!=NULL) { gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), ui.filename); @@ -215,10 +215,10 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem, gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); // somehow this doesn't seem to be set by default - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); do { - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return; } @@ -365,7 +365,7 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new("Export to PDF", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); if (ui.filename!=NULL) { if (g_str_has_suffix(ui.filename, ".xoj")) { @@ -391,11 +391,11 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, gtk_file_filter_add_pattern(filt_pdf, "*.pdf"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); g_free(in_fn); do { - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return; } @@ -1343,7 +1343,7 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new("Open Background", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, "All files"); @@ -1371,7 +1371,7 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(attach_opt), FALSE); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER (dialog), attach_opt); - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return; } diff --git a/src/xo-file.c b/src/xo-file.c index 04992f9..a241df3 100644 --- a/src/xo-file.c +++ b/src/xo-file.c @@ -543,7 +543,7 @@ gboolean user_wants_second_chance(char **filename) if (response != GTK_RESPONSE_YES) return FALSE; dialog = gtk_file_chooser_dialog_new("Open PDF", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, "All files"); @@ -554,7 +554,7 @@ gboolean user_wants_second_chance(char **filename) gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return FALSE; } diff --git a/src/xo-interface.c b/src/xo-interface.c index 3f3e62c..df0049e 100644 --- a/src/xo-interface.c +++ b/src/xo-interface.c @@ -75,6 +75,8 @@ create_winMain (void) GtkWidget *separator20; GtkWidget *viewFullscreen; GtkWidget *separator4; + GtkWidget *menuViewZoom; + GtkWidget *menuViewZoom_menu; GtkWidget *viewZoomIn; GtkWidget *viewZoomOut; GtkWidget *viewNormalSize; @@ -243,6 +245,8 @@ create_winMain (void) GtkWidget *helpIndex; GtkWidget *helpAbout; GtkWidget *toolbarMain; + GtkWidget *newButton; + GtkWidget *openButton; GtkIconSize tmp_toolbar_icon_size; GtkWidget *saveButton; GtkWidget *toolitem11; @@ -509,21 +513,28 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (menuView_menu), separator4); gtk_widget_set_sensitive (separator4, FALSE); + menuViewZoom = gtk_menu_item_new_with_mnemonic ("_Zoom"); + gtk_widget_show (menuViewZoom); + gtk_container_add (GTK_CONTAINER (menuView_menu), menuViewZoom); + + menuViewZoom_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuViewZoom), menuViewZoom_menu); + viewZoomIn = gtk_image_menu_item_new_from_stock ("gtk-zoom-in", accel_group); gtk_widget_show (viewZoomIn); - gtk_container_add (GTK_CONTAINER (menuView_menu), viewZoomIn); + gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewZoomIn); viewZoomOut = gtk_image_menu_item_new_from_stock ("gtk-zoom-out", accel_group); gtk_widget_show (viewZoomOut); - gtk_container_add (GTK_CONTAINER (menuView_menu), viewZoomOut); + gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewZoomOut); viewNormalSize = gtk_image_menu_item_new_from_stock ("gtk-zoom-100", accel_group); gtk_widget_show (viewNormalSize); - gtk_container_add (GTK_CONTAINER (menuView_menu), viewNormalSize); + gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewNormalSize); viewPageWidth = gtk_image_menu_item_new_with_mnemonic ("Page Width"); gtk_widget_show (viewPageWidth); - gtk_container_add (GTK_CONTAINER (menuView_menu), viewPageWidth); + gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewPageWidth); image601 = gtk_image_new_from_stock ("gtk-zoom-fit", GTK_ICON_SIZE_MENU); gtk_widget_show (image601); @@ -531,7 +542,7 @@ create_winMain (void) viewSetZoom = gtk_menu_item_new_with_mnemonic ("Set Zoom"); gtk_widget_show (viewSetZoom); - gtk_container_add (GTK_CONTAINER (menuView_menu), viewSetZoom); + gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewSetZoom); separator5 = gtk_separator_menu_item_new (); gtk_widget_show (separator5); @@ -1268,6 +1279,16 @@ create_winMain (void) gtk_toolbar_set_style (GTK_TOOLBAR (toolbarMain), GTK_TOOLBAR_ICONS); tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbarMain)); + newButton = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-new"); + gtk_widget_show (newButton); + gtk_container_add (GTK_CONTAINER (toolbarMain), newButton); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (newButton), tooltips, "New", NULL); + + openButton = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-open"); + gtk_widget_show (openButton); + gtk_container_add (GTK_CONTAINER (toolbarMain), openButton); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (openButton), tooltips, "Open", NULL); + saveButton = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-save"); gtk_widget_show (saveButton); gtk_container_add (GTK_CONTAINER (toolbarMain), saveButton); @@ -2129,6 +2150,12 @@ create_winMain (void) g_signal_connect ((gpointer) helpAbout, "activate", G_CALLBACK (on_helpAbout_activate), NULL); + g_signal_connect ((gpointer) newButton, "clicked", + G_CALLBACK (on_fileNew_activate), + NULL); + g_signal_connect ((gpointer) openButton, "clicked", + G_CALLBACK (on_fileOpen_activate), + NULL); g_signal_connect ((gpointer) saveButton, "clicked", G_CALLBACK (on_fileSave_activate), NULL); @@ -2458,6 +2485,8 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, helpIndex, "helpIndex"); GLADE_HOOKUP_OBJECT (winMain, helpAbout, "helpAbout"); GLADE_HOOKUP_OBJECT (winMain, toolbarMain, "toolbarMain"); + GLADE_HOOKUP_OBJECT (winMain, newButton, "newButton"); + GLADE_HOOKUP_OBJECT (winMain, openButton, "openButton"); GLADE_HOOKUP_OBJECT (winMain, saveButton, "saveButton"); GLADE_HOOKUP_OBJECT (winMain, toolitem11, "toolitem11"); GLADE_HOOKUP_OBJECT (winMain, vseparator1, "vseparator1"); diff --git a/xournal.glade b/xournal.glade index af6c0d4..45b5d67 100644 --- a/xournal.glade +++ b/xournal.glade @@ -376,62 +376,75 @@ - + True - gtk-zoom-in - True - - - + _Zoom + True - - - True - gtk-zoom-out - True - - - + + - - - True - gtk-zoom-100 - True - - - + + + True + gtk-zoom-in + True + + + - - - True - Page Width - True - + + + True + gtk-zoom-out + True + + + - - - True - gtk-zoom-fit - 1 - 0.5 - 0.5 - 0 - 0 + + + True + gtk-zoom-100 + True + + + + + + + True + Page Width + True + + + + + True + gtk-zoom-fit + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Set Zoom + True + + + - - - True - Set Zoom - True - - - - True @@ -1829,6 +1842,38 @@ True True + + + True + New + gtk-new + True + True + False + + + + False + True + + + + + + True + Open + gtk-open + True + True + False + + + + False + True + + + True -- 2.39.2