+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
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");
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;
}
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");
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;
}
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);
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;
}
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")) {
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;
}
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");
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;
}
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");
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;
}
GtkWidget *separator20;
GtkWidget *viewFullscreen;
GtkWidget *separator4;
+ GtkWidget *menuViewZoom;
+ GtkWidget *menuViewZoom_menu;
GtkWidget *viewZoomIn;
GtkWidget *viewZoomOut;
GtkWidget *viewNormalSize;
GtkWidget *helpIndex;
GtkWidget *helpAbout;
GtkWidget *toolbarMain;
+ GtkWidget *newButton;
+ GtkWidget *openButton;
GtkIconSize tmp_toolbar_icon_size;
GtkWidget *saveButton;
GtkWidget *toolitem11;
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);
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);
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);
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);
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");
</child>
<child>
- <widget class="GtkImageMenuItem" id="viewZoomIn">
+ <widget class="GtkMenuItem" id="menuViewZoom">
<property name="visible">True</property>
- <property name="label">gtk-zoom-in</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_viewZoomIn_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
- </widget>
- </child>
+ <property name="label" translatable="yes">_Zoom</property>
+ <property name="use_underline">True</property>
- <child>
- <widget class="GtkImageMenuItem" id="viewZoomOut">
- <property name="visible">True</property>
- <property name="label">gtk-zoom-out</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_viewZoomOut_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenu" id="menuViewZoom_menu">
- <child>
- <widget class="GtkImageMenuItem" id="viewNormalSize">
- <property name="visible">True</property>
- <property name="label">gtk-zoom-100</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_viewNormalSize_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
- </widget>
- </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="viewZoomIn">
+ <property name="visible">True</property>
+ <property name="label">gtk-zoom-in</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_viewZoomIn_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
+ </widget>
+ </child>
- <child>
- <widget class="GtkImageMenuItem" id="viewPageWidth">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Page Width</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_viewPageWidth_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
+ <child>
+ <widget class="GtkImageMenuItem" id="viewZoomOut">
+ <property name="visible">True</property>
+ <property name="label">gtk-zoom-out</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_viewZoomOut_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
+ </widget>
+ </child>
- <child internal-child="image">
- <widget class="GtkImage" id="image601">
- <property name="visible">True</property>
- <property name="stock">gtk-zoom-fit</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <child>
+ <widget class="GtkImageMenuItem" id="viewNormalSize">
+ <property name="visible">True</property>
+ <property name="label">gtk-zoom-100</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_viewNormalSize_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="viewPageWidth">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Page Width</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_viewPageWidth_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image612">
+ <property name="visible">True</property>
+ <property name="stock">gtk-zoom-fit</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="viewSetZoom">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Set Zoom</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_viewSetZoom_activate" last_modification_time="Sat, 22 Jul 2006 21:30:29 GMT"/>
+ </widget>
+ </child>
</widget>
</child>
</widget>
</child>
- <child>
- <widget class="GtkMenuItem" id="viewSetZoom">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Set Zoom</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_viewSetZoom_activate" last_modification_time="Sat, 22 Jul 2006 21:30:29 GMT"/>
- </widget>
- </child>
-
<child>
<widget class="GtkSeparatorMenuItem" id="separator5">
<property name="visible">True</property>
<property name="tooltips">True</property>
<property name="show_arrow">True</property>
+ <child>
+ <widget class="GtkToolButton" id="newButton">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">New</property>
+ <property name="stock_id">gtk-new</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="on_fileNew_activate" last_modification_time="Thu, 10 Aug 2006 15:14:10 GMT"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolButton" id="openButton">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Open</property>
+ <property name="stock_id">gtk-open</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="on_fileOpen_activate" last_modification_time="Thu, 10 Aug 2006 15:14:42 GMT"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
<child>
<widget class="GtkToolButton" id="saveButton">
<property name="visible">True</property>