X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-interface.c;h=f10b134ab8180946d306a064421f12fb8a65fdd4;hb=dcbb0ab8521a5e166f257d86884407eb98ef63f0;hp=df0049ea1c84a4cd09cee6a8ca02c2c2108594da;hpb=78c2f8fa93f7adcb9157699c92b1498d878f66b2;p=xournal.git diff --git a/src/xo-interface.c b/src/xo-interface.c index df0049e..f10b134 100644 --- a/src/xo-interface.c +++ b/src/xo-interface.c @@ -36,7 +36,7 @@ create_winMain (void) GtkWidget *menuFile_menu; GtkWidget *fileNew; GtkWidget *fileNewBackground; - GtkWidget *image599; + GtkWidget *image623; GtkWidget *fileOpen; GtkWidget *fileSave; GtkWidget *fileSaveAs; @@ -53,7 +53,7 @@ create_winMain (void) GtkWidget *mru7; GtkWidget *separator22; GtkWidget *filePrintOptions; - GtkWidget *image600; + GtkWidget *image624; GtkWidget *filePrint; GtkWidget *filePrintPDF; GtkWidget *separator2; @@ -81,22 +81,22 @@ create_winMain (void) GtkWidget *viewZoomOut; GtkWidget *viewNormalSize; GtkWidget *viewPageWidth; - GtkWidget *image601; + GtkWidget *image625; GtkWidget *viewSetZoom; GtkWidget *separator5; GtkWidget *viewFirstPage; - GtkWidget *image602; + GtkWidget *image626; GtkWidget *viewPreviousPage; - GtkWidget *image603; + GtkWidget *image627; GtkWidget *viewNextPage; - GtkWidget *image604; + GtkWidget *image628; GtkWidget *viewLastPage; - GtkWidget *image605; + GtkWidget *image629; GtkWidget *separator6; GtkWidget *viewShowLayer; - GtkWidget *image606; + GtkWidget *image630; GtkWidget *viewHideLayer; - GtkWidget *image607; + GtkWidget *image631; GtkWidget *menuJournal; GtkWidget *menuJournal_menu; GtkWidget *journalNewPageBefore; @@ -131,7 +131,7 @@ create_winMain (void) GtkWidget *journalApplyAllPages; GtkWidget *separator23; GtkWidget *journalLoadBackground; - GtkWidget *image608; + GtkWidget *image632; GtkWidget *journalScreenshot; GtkWidget *separator19; GtkWidget *journalDefaultBackground; @@ -143,13 +143,17 @@ create_winMain (void) GtkWidget *toolsEraser; GtkWidget *toolsHighlighter; GtkWidget *toolsText; + GtkWidget *separator15; + GtkWidget *toolsReco; + GtkWidget *toolsRuler; GtkWidget *separator9; GtkWidget *toolsSelectRegion; GtkWidget *toolsSelectRectangle; GtkWidget *toolsVerticalSpace; + GtkWidget *toolsHand; GtkWidget *separator16; GtkWidget *toolsColor; - GtkWidget *image609; + GtkWidget *image633; GtkWidget *toolsColor_menu; GSList *colorBlack_group = NULL; GtkWidget *colorBlack; @@ -192,19 +196,19 @@ create_winMain (void) GtkWidget *highlighterMedium; GtkWidget *highlighterThick; GtkWidget *toolsTextFont; - GtkWidget *image610; + GtkWidget *image634; GtkWidget *separator10; GtkWidget *toolsDefaultPen; GtkWidget *toolsDefaultEraser; GtkWidget *toolsDefaultHighlighter; GtkWidget *toolsDefaultText; GtkWidget *toolsSetAsDefault; - GtkWidget *separator15; - GtkWidget *toolsRuler; GtkWidget *menuOptions; GtkWidget *menuOptions_menu; GtkWidget *optionsUseXInput; + GtkWidget *optionsDiscardCoreEvents; GtkWidget *optionsButtonMappings; + GtkWidget *optionsPressureSensitive; GtkWidget *button2_mapping; GtkWidget *button2_mapping_menu; GSList *button2Pen_group = NULL; @@ -215,6 +219,7 @@ create_winMain (void) GtkWidget *button2SelectRegion; GtkWidget *button2SelectRectangle; GtkWidget *button2VerticalSpace; + GtkWidget *button2Hand; GtkWidget *separator24; GSList *button2LinkBrush_group = NULL; GtkWidget *button2LinkBrush; @@ -230,6 +235,7 @@ create_winMain (void) GtkWidget *button3SelectRegion; GtkWidget *button3SelectRectangle; GtkWidget *button3VerticalSpace; + GtkWidget *button3Hand; GtkWidget *separator25; GSList *button3LinkBrush_group = NULL; GtkWidget *button3LinkBrush; @@ -238,17 +244,21 @@ create_winMain (void) GtkWidget *separator18; GtkWidget *optionsAntialiasBG; GtkWidget *optionsProgressiveBG; + GtkWidget *optionsPrintRuling; + GtkWidget *optionsLeftHanded; + GtkWidget *optionsShortenMenus; GtkWidget *separator21; + GtkWidget *optionsAutoSavePrefs; GtkWidget *optionsSavePreferences; GtkWidget *menuHelp; GtkWidget *menuHelp_menu; GtkWidget *helpIndex; GtkWidget *helpAbout; GtkWidget *toolbarMain; - GtkWidget *newButton; - GtkWidget *openButton; GtkIconSize tmp_toolbar_icon_size; GtkWidget *saveButton; + GtkWidget *newButton; + GtkWidget *openButton; GtkWidget *toolitem11; GtkWidget *vseparator1; GtkWidget *buttonCut; @@ -279,12 +289,14 @@ create_winMain (void) GtkWidget *buttonEraser; GtkWidget *buttonHighlighter; GtkWidget *buttonText; + GtkWidget *buttonReco; GtkWidget *buttonRuler; GtkWidget *toolitem15; GtkWidget *vseparator5; GtkWidget *buttonSelectRegion; GtkWidget *buttonSelectRectangle; GtkWidget *buttonVerticalSpace; + GtkWidget *buttonHand; GtkWidget *toolitem16; GtkWidget *vseparator6; GtkWidget *buttonToolDefault; @@ -311,6 +323,10 @@ create_winMain (void) GtkWidget *buttonYellow; GtkWidget *buttonWhite; GtkWidget *buttonColorOther; + GtkWidget *toolitem21; + GtkWidget *vseparator10; + GtkWidget *toolitem20; + GtkWidget *fontButton; GtkWidget *scrolledwindowMain; GtkWidget *hbox1; GtkWidget *labelPage; @@ -350,13 +366,13 @@ create_winMain (void) gtk_widget_show (fileNew); gtk_container_add (GTK_CONTAINER (menuFile_menu), fileNew); - fileNewBackground = gtk_image_menu_item_new_with_mnemonic ("Annotate PDF"); + fileNewBackground = gtk_image_menu_item_new_with_mnemonic ("Annotate PD_F"); gtk_widget_show (fileNewBackground); gtk_container_add (GTK_CONTAINER (menuFile_menu), fileNewBackground); - image599 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image599); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (fileNewBackground), image599); + image623 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image623); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (fileNewBackground), image623); fileOpen = gtk_image_menu_item_new_from_stock ("gtk-open", accel_group); gtk_widget_show (fileOpen); @@ -375,7 +391,7 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1); gtk_widget_set_sensitive (separator1, FALSE); - fileRecentFiles = gtk_menu_item_new_with_mnemonic ("Recent Files"); + fileRecentFiles = gtk_menu_item_new_with_mnemonic ("Recent Doc_uments"); gtk_widget_show (fileRecentFiles); gtk_container_add (GTK_CONTAINER (menuFile_menu), fileRecentFiles); @@ -423,17 +439,23 @@ create_winMain (void) gtk_widget_show (filePrintOptions); gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions); - image600 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image600); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (filePrintOptions), image600); + image624 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image624); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (filePrintOptions), image624); filePrint = gtk_image_menu_item_new_from_stock ("gtk-print", accel_group); gtk_widget_show (filePrint); gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrint); + gtk_widget_add_accelerator (filePrint, "activate", accel_group, + GDK_P, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); - filePrintPDF = gtk_menu_item_new_with_mnemonic ("Export to PDF"); + filePrintPDF = gtk_menu_item_new_with_mnemonic ("_Export to PDF"); gtk_widget_show (filePrintPDF); gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintPDF); + gtk_widget_add_accelerator (filePrintPDF, "activate", accel_group, + GDK_E, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); separator2 = gtk_separator_menu_item_new (); gtk_widget_show (separator2); @@ -454,10 +476,16 @@ create_winMain (void) editUndo = gtk_image_menu_item_new_from_stock ("gtk-undo", accel_group); gtk_widget_show (editUndo); gtk_container_add (GTK_CONTAINER (menuEdit_menu), editUndo); + gtk_widget_add_accelerator (editUndo, "activate", accel_group, + GDK_Z, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); editRedo = gtk_image_menu_item_new_from_stock ("gtk-redo", accel_group); gtk_widget_show (editRedo); gtk_container_add (GTK_CONTAINER (menuEdit_menu), editRedo); + gtk_widget_add_accelerator (editRedo, "activate", accel_group, + GDK_Y, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); separator3 = gtk_separator_menu_item_new (); gtk_widget_show (separator3); @@ -479,6 +507,9 @@ create_winMain (void) editDelete = gtk_image_menu_item_new_from_stock ("gtk-delete", accel_group); gtk_widget_show (editDelete); gtk_container_add (GTK_CONTAINER (menuEdit_menu), editDelete); + gtk_widget_add_accelerator (editDelete, "activate", accel_group, + GDK_Delete, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); menuView = gtk_menu_item_new_with_mnemonic ("_View"); gtk_widget_show (menuView); @@ -487,13 +518,13 @@ create_winMain (void) menuView_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuView), menuView_menu); - viewContinuous = gtk_radio_menu_item_new_with_mnemonic (viewContinuous_group, "Continuous"); + viewContinuous = gtk_radio_menu_item_new_with_mnemonic (viewContinuous_group, "_Continuous"); viewContinuous_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (viewContinuous)); gtk_widget_show (viewContinuous); gtk_container_add (GTK_CONTAINER (menuView_menu), viewContinuous); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (viewContinuous), TRUE); - viewOnePage = gtk_radio_menu_item_new_with_mnemonic (viewContinuous_group, "One Page"); + viewOnePage = gtk_radio_menu_item_new_with_mnemonic (viewContinuous_group, "_One Page"); viewContinuous_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (viewOnePage)); gtk_widget_show (viewOnePage); gtk_container_add (GTK_CONTAINER (menuView_menu), viewOnePage); @@ -507,6 +538,9 @@ create_winMain (void) viewFullscreen = gtk_check_menu_item_new_with_mnemonic ("Full Screen"); gtk_widget_show (viewFullscreen); gtk_container_add (GTK_CONTAINER (menuView_menu), viewFullscreen); + gtk_widget_add_accelerator (viewFullscreen, "activate", accel_group, + GDK_F11, (GdkModifierType) 0, + GTK_ACCEL_VISIBLE); separator4 = gtk_separator_menu_item_new (); gtk_widget_show (separator4); @@ -519,28 +553,40 @@ create_winMain (void) 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 (menuViewZoom_menu), viewZoomIn); + gtk_widget_add_accelerator (viewZoomIn, "activate", accel_group, + GDK_plus, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); viewZoomOut = gtk_image_menu_item_new_from_stock ("gtk-zoom-out", accel_group); gtk_widget_show (viewZoomOut); gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewZoomOut); + gtk_widget_add_accelerator (viewZoomOut, "activate", accel_group, + GDK_minus, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); viewNormalSize = gtk_image_menu_item_new_from_stock ("gtk-zoom-100", accel_group); gtk_widget_show (viewNormalSize); gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewNormalSize); + gtk_widget_add_accelerator (viewNormalSize, "activate", accel_group, + GDK_0, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); - viewPageWidth = gtk_image_menu_item_new_with_mnemonic ("Page Width"); + viewPageWidth = gtk_image_menu_item_new_with_mnemonic ("Page _Width"); gtk_widget_show (viewPageWidth); gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewPageWidth); + gtk_widget_add_accelerator (viewPageWidth, "activate", accel_group, + GDK_equal, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); - image601 = gtk_image_new_from_stock ("gtk-zoom-fit", GTK_ICON_SIZE_MENU); - gtk_widget_show (image601); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewPageWidth), image601); + image625 = gtk_image_new_from_stock ("gtk-zoom-fit", GTK_ICON_SIZE_MENU); + gtk_widget_show (image625); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewPageWidth), image625); - viewSetZoom = gtk_menu_item_new_with_mnemonic ("Set Zoom"); + viewSetZoom = gtk_menu_item_new_with_mnemonic ("_Set Zoom"); gtk_widget_show (viewSetZoom); gtk_container_add (GTK_CONTAINER (menuViewZoom_menu), viewSetZoom); @@ -549,58 +595,70 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (menuView_menu), separator5); gtk_widget_set_sensitive (separator5, FALSE); - viewFirstPage = gtk_image_menu_item_new_with_mnemonic ("First Page"); + viewFirstPage = gtk_image_menu_item_new_with_mnemonic ("_First Page"); gtk_widget_show (viewFirstPage); gtk_container_add (GTK_CONTAINER (menuView_menu), viewFirstPage); + gtk_widget_add_accelerator (viewFirstPage, "activate", accel_group, + GDK_Home, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); - image602 = gtk_image_new_from_stock ("gtk-goto-first", GTK_ICON_SIZE_MENU); - gtk_widget_show (image602); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewFirstPage), image602); + image626 = gtk_image_new_from_stock ("gtk-goto-first", GTK_ICON_SIZE_MENU); + gtk_widget_show (image626); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewFirstPage), image626); - viewPreviousPage = gtk_image_menu_item_new_with_mnemonic ("Previous Page"); + viewPreviousPage = gtk_image_menu_item_new_with_mnemonic ("_Previous Page"); gtk_widget_show (viewPreviousPage); gtk_container_add (GTK_CONTAINER (menuView_menu), viewPreviousPage); + gtk_widget_add_accelerator (viewPreviousPage, "activate", accel_group, + GDK_Left, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); - image603 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU); - gtk_widget_show (image603); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewPreviousPage), image603); + image627 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU); + gtk_widget_show (image627); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewPreviousPage), image627); - viewNextPage = gtk_image_menu_item_new_with_mnemonic ("Next Page"); + viewNextPage = gtk_image_menu_item_new_with_mnemonic ("_Next Page"); gtk_widget_show (viewNextPage); gtk_container_add (GTK_CONTAINER (menuView_menu), viewNextPage); + gtk_widget_add_accelerator (viewNextPage, "activate", accel_group, + GDK_Right, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); - image604 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_MENU); - gtk_widget_show (image604); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewNextPage), image604); + image628 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_MENU); + gtk_widget_show (image628); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewNextPage), image628); - viewLastPage = gtk_image_menu_item_new_with_mnemonic ("Last Page"); + viewLastPage = gtk_image_menu_item_new_with_mnemonic ("_Last Page"); gtk_widget_show (viewLastPage); gtk_container_add (GTK_CONTAINER (menuView_menu), viewLastPage); + gtk_widget_add_accelerator (viewLastPage, "activate", accel_group, + GDK_End, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); - image605 = gtk_image_new_from_stock ("gtk-goto-last", GTK_ICON_SIZE_MENU); - gtk_widget_show (image605); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewLastPage), image605); + image629 = gtk_image_new_from_stock ("gtk-goto-last", GTK_ICON_SIZE_MENU); + gtk_widget_show (image629); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewLastPage), image629); separator6 = gtk_separator_menu_item_new (); gtk_widget_show (separator6); gtk_container_add (GTK_CONTAINER (menuView_menu), separator6); gtk_widget_set_sensitive (separator6, FALSE); - viewShowLayer = gtk_image_menu_item_new_with_mnemonic ("Show Layer"); + viewShowLayer = gtk_image_menu_item_new_with_mnemonic ("_Show Layer"); gtk_widget_show (viewShowLayer); gtk_container_add (GTK_CONTAINER (menuView_menu), viewShowLayer); - image606 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image606); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewShowLayer), image606); + image630 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image630); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewShowLayer), image630); - viewHideLayer = gtk_image_menu_item_new_with_mnemonic ("Hide Layer"); + viewHideLayer = gtk_image_menu_item_new_with_mnemonic ("_Hide Layer"); gtk_widget_show (viewHideLayer); gtk_container_add (GTK_CONTAINER (menuView_menu), viewHideLayer); - image607 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); - gtk_widget_show (image607); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewHideLayer), image607); + image631 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); + gtk_widget_show (image631); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (viewHideLayer), image631); menuJournal = gtk_menu_item_new_with_mnemonic ("_Journal"); gtk_widget_show (menuJournal); @@ -609,19 +667,19 @@ create_winMain (void) menuJournal_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuJournal), menuJournal_menu); - journalNewPageBefore = gtk_menu_item_new_with_mnemonic ("New Page Before"); + journalNewPageBefore = gtk_menu_item_new_with_mnemonic ("New Page _Before"); gtk_widget_show (journalNewPageBefore); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalNewPageBefore); - journalNewPageAfter = gtk_menu_item_new_with_mnemonic ("New Page After"); + journalNewPageAfter = gtk_menu_item_new_with_mnemonic ("New Page _After"); gtk_widget_show (journalNewPageAfter); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalNewPageAfter); - journalNewPageEnd = gtk_menu_item_new_with_mnemonic ("New Page At End"); + journalNewPageEnd = gtk_menu_item_new_with_mnemonic ("New Page At _End"); gtk_widget_show (journalNewPageEnd); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalNewPageEnd); - journalDeletePage = gtk_menu_item_new_with_mnemonic ("Delete Page"); + journalDeletePage = gtk_menu_item_new_with_mnemonic ("_Delete Page"); gtk_widget_show (journalDeletePage); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalDeletePage); @@ -630,15 +688,15 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (menuJournal_menu), separator7); gtk_widget_set_sensitive (separator7, FALSE); - journalNewLayer = gtk_menu_item_new_with_mnemonic ("New Layer"); + journalNewLayer = gtk_menu_item_new_with_mnemonic ("_New Layer"); gtk_widget_show (journalNewLayer); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalNewLayer); - journalDeleteLayer = gtk_menu_item_new_with_mnemonic ("Delete Layer"); + journalDeleteLayer = gtk_menu_item_new_with_mnemonic ("Delete La_yer"); gtk_widget_show (journalDeleteLayer); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalDeleteLayer); - journalFlatten = gtk_menu_item_new_with_mnemonic ("Flatten"); + journalFlatten = gtk_menu_item_new_with_mnemonic ("_Flatten"); gtk_widget_show (journalFlatten); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalFlatten); @@ -647,48 +705,48 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (menuJournal_menu), separator8); gtk_widget_set_sensitive (separator8, FALSE); - journalPaperSize = gtk_menu_item_new_with_mnemonic ("Paper Size"); + journalPaperSize = gtk_menu_item_new_with_mnemonic ("Paper Si_ze"); gtk_widget_show (journalPaperSize); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalPaperSize); - journalPaperColor = gtk_menu_item_new_with_mnemonic ("Paper Color"); + journalPaperColor = gtk_menu_item_new_with_mnemonic ("Paper _Color"); gtk_widget_show (journalPaperColor); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalPaperColor); journalPaperColor_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (journalPaperColor), journalPaperColor_menu); - papercolorWhite = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "white paper"); + papercolorWhite = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_white paper"); papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorWhite)); gtk_widget_show (papercolorWhite); gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorWhite); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorWhite), TRUE); - papercolorYellow = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "yellow paper"); + papercolorYellow = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_yellow paper"); papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorYellow)); gtk_widget_show (papercolorYellow); gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorYellow); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorYellow), TRUE); - papercolorPink = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "pink paper"); + papercolorPink = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_pink paper"); papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorPink)); gtk_widget_show (papercolorPink); gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorPink); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorPink), TRUE); - papercolorOrange = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "orange paper"); + papercolorOrange = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_orange paper"); papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorOrange)); gtk_widget_show (papercolorOrange); gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorOrange); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorOrange), TRUE); - papercolorBlue = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "blue paper"); + papercolorBlue = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_blue paper"); papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorBlue)); gtk_widget_show (papercolorBlue); gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorBlue); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorBlue), TRUE); - papercolorGreen = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "green paper"); + papercolorGreen = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, "_green paper"); papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorGreen)); gtk_widget_show (papercolorGreen); gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorGreen); @@ -705,32 +763,32 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorNA); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorNA), TRUE); - journalPaperStyle = gtk_menu_item_new_with_mnemonic ("Paper Style"); + journalPaperStyle = gtk_menu_item_new_with_mnemonic ("Paper _Style"); gtk_widget_show (journalPaperStyle); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalPaperStyle); journalPaperStyle_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (journalPaperStyle), journalPaperStyle_menu); - paperstylePlain = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "plain"); + paperstylePlain = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "_plain"); paperstylePlain_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (paperstylePlain)); gtk_widget_show (paperstylePlain); gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstylePlain); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (paperstylePlain), TRUE); - paperstyleLined = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "lined"); + paperstyleLined = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "_lined"); paperstylePlain_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (paperstyleLined)); gtk_widget_show (paperstyleLined); gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstyleLined); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (paperstyleLined), TRUE); - paperstyleRuled = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "ruled"); + paperstyleRuled = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "_ruled"); paperstylePlain_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (paperstyleRuled)); gtk_widget_show (paperstyleRuled); gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstyleRuled); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (paperstyleRuled), TRUE); - paperstyleGraph = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "graph"); + paperstyleGraph = gtk_radio_menu_item_new_with_mnemonic (paperstylePlain_group, "_graph"); paperstylePlain_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (paperstyleGraph)); gtk_widget_show (paperstyleGraph); gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstyleGraph); @@ -741,7 +799,7 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (journalPaperStyle_menu), paperstyleNA); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (paperstyleNA), TRUE); - journalApplyAllPages = gtk_check_menu_item_new_with_mnemonic ("Apply To All Pages"); + journalApplyAllPages = gtk_check_menu_item_new_with_mnemonic ("Apply _To All Pages"); gtk_widget_show (journalApplyAllPages); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalApplyAllPages); @@ -750,15 +808,15 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (menuJournal_menu), separator23); gtk_widget_set_sensitive (separator23, FALSE); - journalLoadBackground = gtk_image_menu_item_new_with_mnemonic ("Load Background"); + journalLoadBackground = gtk_image_menu_item_new_with_mnemonic ("_Load Background"); gtk_widget_show (journalLoadBackground); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalLoadBackground); - image608 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image608); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (journalLoadBackground), image608); + image632 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image632); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (journalLoadBackground), image632); - journalScreenshot = gtk_menu_item_new_with_mnemonic ("Background Screenshot"); + journalScreenshot = gtk_menu_item_new_with_mnemonic ("Background Screens_hot"); gtk_widget_show (journalScreenshot); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalScreenshot); @@ -767,11 +825,11 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (menuJournal_menu), separator19); gtk_widget_set_sensitive (separator19, FALSE); - journalDefaultBackground = gtk_menu_item_new_with_mnemonic ("Default Paper"); + journalDefaultBackground = gtk_menu_item_new_with_mnemonic ("Default _Paper"); gtk_widget_show (journalDefaultBackground); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalDefaultBackground); - journalSetAsDefault = gtk_menu_item_new_with_mnemonic ("Set As Default"); + journalSetAsDefault = gtk_menu_item_new_with_mnemonic ("Set As De_fault"); gtk_widget_show (journalSetAsDefault); gtk_container_add (GTK_CONTAINER (menuJournal_menu), journalSetAsDefault); @@ -786,49 +844,97 @@ create_winMain (void) toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsPen)); gtk_widget_show (toolsPen); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsPen); + gtk_widget_add_accelerator (toolsPen, "activate", accel_group, + GDK_P, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsPen), TRUE); toolsEraser = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Eraser"); toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsEraser)); gtk_widget_show (toolsEraser); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsEraser); + gtk_widget_add_accelerator (toolsEraser, "activate", accel_group, + GDK_E, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsEraser), TRUE); toolsHighlighter = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Highlighter"); toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsHighlighter)); gtk_widget_show (toolsHighlighter); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsHighlighter); + gtk_widget_add_accelerator (toolsHighlighter, "activate", accel_group, + GDK_H, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsHighlighter), TRUE); toolsText = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Text"); toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsText)); gtk_widget_show (toolsText); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsText); + gtk_widget_add_accelerator (toolsText, "activate", accel_group, + GDK_T, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsText), TRUE); + separator15 = gtk_separator_menu_item_new (); + gtk_widget_show (separator15); + gtk_container_add (GTK_CONTAINER (menuTools_menu), separator15); + gtk_widget_set_sensitive (separator15, FALSE); + + toolsReco = gtk_check_menu_item_new_with_mnemonic ("_Shape Recognizer"); + gtk_widget_show (toolsReco); + gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsReco); + gtk_widget_add_accelerator (toolsReco, "activate", accel_group, + GDK_S, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + + toolsRuler = gtk_check_menu_item_new_with_mnemonic ("Ru_ler"); + gtk_widget_show (toolsRuler); + gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsRuler); + gtk_widget_add_accelerator (toolsRuler, "activate", accel_group, + GDK_L, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + separator9 = gtk_separator_menu_item_new (); gtk_widget_show (separator9); gtk_container_add (GTK_CONTAINER (menuTools_menu), separator9); gtk_widget_set_sensitive (separator9, FALSE); - toolsSelectRegion = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Select Region"); + toolsSelectRegion = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "Select Re_gion"); toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsSelectRegion)); gtk_widget_show (toolsSelectRegion); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsSelectRegion); + gtk_widget_add_accelerator (toolsSelectRegion, "activate", accel_group, + GDK_G, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsSelectRegion), TRUE); - toolsSelectRectangle = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "Select Rectangle"); + toolsSelectRectangle = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "Select _Rectangle"); toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsSelectRectangle)); gtk_widget_show (toolsSelectRectangle); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsSelectRectangle); + gtk_widget_add_accelerator (toolsSelectRectangle, "activate", accel_group, + GDK_R, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsSelectRectangle), TRUE); - toolsVerticalSpace = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "Vertical Space"); + toolsVerticalSpace = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "_Vertical Space"); toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsVerticalSpace)); gtk_widget_show (toolsVerticalSpace); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsVerticalSpace); + gtk_widget_add_accelerator (toolsVerticalSpace, "activate", accel_group, + GDK_V, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolsVerticalSpace), TRUE); + toolsHand = gtk_radio_menu_item_new_with_mnemonic (toolsPen_group, "H_and Tool"); + toolsPen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (toolsHand)); + gtk_widget_show (toolsHand); + gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsHand); + gtk_widget_add_accelerator (toolsHand, "activate", accel_group, + GDK_A, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); + separator16 = gtk_separator_menu_item_new (); gtk_widget_show (separator16); gtk_container_add (GTK_CONTAINER (menuTools_menu), separator16); @@ -838,38 +944,38 @@ create_winMain (void) gtk_widget_show (toolsColor); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsColor); - image609 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image609); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (toolsColor), image609); + image633 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image633); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (toolsColor), image633); toolsColor_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (toolsColor), toolsColor_menu); - colorBlack = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "black"); + colorBlack = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "blac_k"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorBlack)); gtk_widget_show (colorBlack); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorBlack); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorBlack), TRUE); - colorBlue = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "blue"); + colorBlue = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_blue"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorBlue)); gtk_widget_show (colorBlue); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorBlue); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorBlue), TRUE); - colorRed = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "red"); + colorRed = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_red"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorRed)); gtk_widget_show (colorRed); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorRed); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorRed), TRUE); - colorGreen = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "green"); + colorGreen = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_green"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorGreen)); gtk_widget_show (colorGreen); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorGreen); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorGreen), TRUE); - colorGray = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "gray"); + colorGray = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "gr_ay"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorGray)); gtk_widget_show (colorGray); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorGray); @@ -880,37 +986,37 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (toolsColor_menu), separator17); gtk_widget_set_sensitive (separator17, FALSE); - colorLightBlue = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "light blue"); + colorLightBlue = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "light bl_ue"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorLightBlue)); gtk_widget_show (colorLightBlue); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorLightBlue); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorLightBlue), TRUE); - colorLightGreen = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "light green"); + colorLightGreen = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "light gr_een"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorLightGreen)); gtk_widget_show (colorLightGreen); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorLightGreen); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorLightGreen), TRUE); - colorMagenta = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "magenta"); + colorMagenta = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_magenta"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorMagenta)); gtk_widget_show (colorMagenta); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorMagenta); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorMagenta), TRUE); - colorOrange = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "orange"); + colorOrange = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_orange"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorOrange)); gtk_widget_show (colorOrange); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorOrange); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorOrange), TRUE); - colorYellow = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "yellow"); + colorYellow = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_yellow"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorYellow)); gtk_widget_show (colorYellow); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorYellow); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (colorYellow), TRUE); - colorWhite = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "white"); + colorWhite = gtk_radio_menu_item_new_with_mnemonic (colorBlack_group, "_white"); colorBlack_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (colorWhite)); gtk_widget_show (colorWhite); gtk_container_add (GTK_CONTAINER (toolsColor_menu), colorWhite); @@ -934,56 +1040,56 @@ create_winMain (void) toolsPenOptions_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (toolsPenOptions), toolsPenOptions_menu); - penthicknessVeryFine = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "very fine"); + penthicknessVeryFine = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "_very fine"); penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessVeryFine)); gtk_widget_show (penthicknessVeryFine); gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessVeryFine); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessVeryFine), TRUE); - penthicknessFine = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "fine"); + penthicknessFine = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "_fine"); penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessFine)); gtk_widget_show (penthicknessFine); gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessFine); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessFine), TRUE); - penthicknessMedium = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "medium"); + penthicknessMedium = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "_medium"); penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessMedium)); gtk_widget_show (penthicknessMedium); gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessMedium); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessMedium), TRUE); - penthicknessThick = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "thick"); + penthicknessThick = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "_thick"); penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessThick)); gtk_widget_show (penthicknessThick); gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessThick); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessThick), TRUE); - penthicknessVeryThick = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "very thick"); + penthicknessVeryThick = gtk_radio_menu_item_new_with_mnemonic (penthicknessVeryFine_group, "ver_y thick"); penthicknessVeryFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (penthicknessVeryThick)); gtk_widget_show (penthicknessVeryThick); gtk_container_add (GTK_CONTAINER (toolsPenOptions_menu), penthicknessVeryThick); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (penthicknessVeryThick), TRUE); - toolsEraserOptions = gtk_menu_item_new_with_mnemonic ("Eraser Options"); + toolsEraserOptions = gtk_menu_item_new_with_mnemonic ("Eraser Optio_ns"); gtk_widget_show (toolsEraserOptions); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsEraserOptions); toolsEraserOptions_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (toolsEraserOptions), toolsEraserOptions_menu); - eraserFine = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, "fine"); + eraserFine = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, "_fine"); eraserFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserFine)); gtk_widget_show (eraserFine); gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserFine); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserFine), TRUE); - eraserMedium = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, "medium"); + eraserMedium = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, "_medium"); eraserFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserMedium)); gtk_widget_show (eraserMedium); gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserMedium); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserMedium), TRUE); - eraserThick = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, "thick"); + eraserThick = gtk_radio_menu_item_new_with_mnemonic (eraserFine_group, "_thick"); eraserFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserThick)); gtk_widget_show (eraserThick); gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserThick); @@ -994,63 +1100,66 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), separator14); gtk_widget_set_sensitive (separator14, FALSE); - eraserStandard = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, "standard"); + eraserStandard = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, "_standard"); eraserStandard_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserStandard)); gtk_widget_show (eraserStandard); gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserStandard); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserStandard), TRUE); - eraserWhiteout = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, "whiteout"); + eraserWhiteout = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, "_whiteout"); eraserStandard_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserWhiteout)); gtk_widget_show (eraserWhiteout); gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserWhiteout); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserWhiteout), TRUE); - eraserDeleteStrokes = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, "delete strokes"); + eraserDeleteStrokes = gtk_radio_menu_item_new_with_mnemonic (eraserStandard_group, "_delete strokes"); eraserStandard_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (eraserDeleteStrokes)); gtk_widget_show (eraserDeleteStrokes); gtk_container_add (GTK_CONTAINER (toolsEraserOptions_menu), eraserDeleteStrokes); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (eraserDeleteStrokes), TRUE); - toolsHighlighterOptions = gtk_menu_item_new_with_mnemonic ("Highlighter Options"); + toolsHighlighterOptions = gtk_menu_item_new_with_mnemonic ("Highlighter Opt_ions"); gtk_widget_show (toolsHighlighterOptions); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsHighlighterOptions); toolsHighlighterOptions_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (toolsHighlighterOptions), toolsHighlighterOptions_menu); - highlighterFine = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, "fine"); + highlighterFine = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, "_fine"); highlighterFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (highlighterFine)); gtk_widget_show (highlighterFine); gtk_container_add (GTK_CONTAINER (toolsHighlighterOptions_menu), highlighterFine); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (highlighterFine), TRUE); - highlighterMedium = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, "medium"); + highlighterMedium = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, "_medium"); highlighterFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (highlighterMedium)); gtk_widget_show (highlighterMedium); gtk_container_add (GTK_CONTAINER (toolsHighlighterOptions_menu), highlighterMedium); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (highlighterMedium), TRUE); - highlighterThick = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, "thick"); + highlighterThick = gtk_radio_menu_item_new_with_mnemonic (highlighterFine_group, "_thick"); highlighterFine_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (highlighterThick)); gtk_widget_show (highlighterThick); gtk_container_add (GTK_CONTAINER (toolsHighlighterOptions_menu), highlighterThick); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (highlighterThick), TRUE); - toolsTextFont = gtk_image_menu_item_new_with_mnemonic ("Text Font"); + toolsTextFont = gtk_image_menu_item_new_with_mnemonic ("Text _Font..."); gtk_widget_show (toolsTextFont); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsTextFont); + gtk_widget_add_accelerator (toolsTextFont, "activate", accel_group, + GDK_F, (GdkModifierType) GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GTK_ACCEL_VISIBLE); - image610 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image610); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (toolsTextFont), image610); + image634 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image634); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (toolsTextFont), image634); separator10 = gtk_separator_menu_item_new (); gtk_widget_show (separator10); gtk_container_add (GTK_CONTAINER (menuTools_menu), separator10); gtk_widget_set_sensitive (separator10, FALSE); - toolsDefaultPen = gtk_menu_item_new_with_mnemonic ("Default Pen"); + toolsDefaultPen = gtk_menu_item_new_with_mnemonic ("_Default Pen"); gtk_widget_show (toolsDefaultPen); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsDefaultPen); @@ -1062,7 +1171,7 @@ create_winMain (void) gtk_widget_show (toolsDefaultHighlighter); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsDefaultHighlighter); - toolsDefaultText = gtk_menu_item_new_with_mnemonic ("Default Text"); + toolsDefaultText = gtk_menu_item_new_with_mnemonic ("Default Te_xt"); gtk_widget_show (toolsDefaultText); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsDefaultText); @@ -1070,15 +1179,6 @@ create_winMain (void) gtk_widget_show (toolsSetAsDefault); gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsSetAsDefault); - separator15 = gtk_separator_menu_item_new (); - gtk_widget_show (separator15); - gtk_container_add (GTK_CONTAINER (menuTools_menu), separator15); - gtk_widget_set_sensitive (separator15, FALSE); - - toolsRuler = gtk_check_menu_item_new_with_mnemonic ("Ruler"); - gtk_widget_show (toolsRuler); - gtk_container_add (GTK_CONTAINER (menuTools_menu), toolsRuler); - menuOptions = gtk_menu_item_new_with_mnemonic ("_Options"); gtk_widget_show (menuOptions); gtk_container_add (GTK_CONTAINER (menubar), menuOptions); @@ -1086,75 +1186,88 @@ create_winMain (void) menuOptions_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuOptions), menuOptions_menu); - optionsUseXInput = gtk_check_menu_item_new_with_mnemonic ("Use XInput"); + optionsUseXInput = gtk_check_menu_item_new_with_mnemonic ("Use _XInput"); gtk_widget_show (optionsUseXInput); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsUseXInput); - optionsButtonMappings = gtk_check_menu_item_new_with_mnemonic ("Eraser Tip"); + optionsDiscardCoreEvents = gtk_check_menu_item_new_with_mnemonic ("Discard _Core Events"); + gtk_widget_show (optionsDiscardCoreEvents); + gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsDiscardCoreEvents); + + optionsButtonMappings = gtk_check_menu_item_new_with_mnemonic ("_Eraser Tip"); gtk_widget_show (optionsButtonMappings); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsButtonMappings); - button2_mapping = gtk_menu_item_new_with_mnemonic ("Button 2 Mapping"); + optionsPressureSensitive = gtk_check_menu_item_new_with_mnemonic ("_Pressure sensitivity"); + gtk_widget_show (optionsPressureSensitive); + gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsPressureSensitive); + + button2_mapping = gtk_menu_item_new_with_mnemonic ("Button _2 Mapping"); gtk_widget_show (button2_mapping); gtk_container_add (GTK_CONTAINER (menuOptions_menu), button2_mapping); button2_mapping_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (button2_mapping), button2_mapping_menu); - button2Pen = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Pen"); + button2Pen = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Pen"); button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Pen)); gtk_widget_show (button2Pen); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Pen); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Pen), TRUE); - button2Eraser = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Eraser"); + button2Eraser = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Eraser"); button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Eraser)); gtk_widget_show (button2Eraser); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Eraser); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Eraser), TRUE); - button2Highlighter = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Highlighter"); + button2Highlighter = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Highlighter"); button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Highlighter)); gtk_widget_show (button2Highlighter); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Highlighter); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Highlighter), TRUE); - button2Text = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Text"); + button2Text = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Text"); button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Text)); gtk_widget_show (button2Text); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Text); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2Text), TRUE); - button2SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Select Region"); + button2SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Select Re_gion"); button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2SelectRegion)); gtk_widget_show (button2SelectRegion); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2SelectRegion); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2SelectRegion), TRUE); - button2SelectRectangle = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Select Rectangle"); + button2SelectRectangle = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Select _Rectangle"); button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2SelectRectangle)); gtk_widget_show (button2SelectRectangle); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2SelectRectangle); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2SelectRectangle), TRUE); - button2VerticalSpace = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "Vertical Space"); + button2VerticalSpace = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "_Vertical Space"); button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2VerticalSpace)); gtk_widget_show (button2VerticalSpace); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2VerticalSpace); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2VerticalSpace), TRUE); + button2Hand = gtk_radio_menu_item_new_with_mnemonic (button2Pen_group, "H_and Tool"); + button2Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2Hand)); + gtk_widget_show (button2Hand); + gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2Hand); + separator24 = gtk_separator_menu_item_new (); gtk_widget_show (separator24); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), separator24); gtk_widget_set_sensitive (separator24, FALSE); - button2LinkBrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, "Link to Primary Brush"); + button2LinkBrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, "_Link to Primary Brush"); button2LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2LinkBrush)); gtk_widget_show (button2LinkBrush); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2LinkBrush); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2LinkBrush), TRUE); - button2CopyBrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, "Copy of Current Brush"); + button2CopyBrush = gtk_radio_menu_item_new_with_mnemonic (button2LinkBrush_group, "_Copy of Current Brush"); button2LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button2CopyBrush)); gtk_widget_show (button2CopyBrush); gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2CopyBrush); @@ -1165,67 +1278,72 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (button2_mapping_menu), button2NABrush); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button2NABrush), TRUE); - button3_mapping = gtk_menu_item_new_with_mnemonic ("Button 3 Mapping"); + button3_mapping = gtk_menu_item_new_with_mnemonic ("Button _3 Mapping"); gtk_widget_show (button3_mapping); gtk_container_add (GTK_CONTAINER (menuOptions_menu), button3_mapping); button3_mapping_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (button3_mapping), button3_mapping_menu); - button3Pen = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Pen"); + button3Pen = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Pen"); button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Pen)); gtk_widget_show (button3Pen); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Pen); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Pen), TRUE); - button3Eraser = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Eraser"); + button3Eraser = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Eraser"); button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Eraser)); gtk_widget_show (button3Eraser); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Eraser); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Eraser), TRUE); - button3Highlighter = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Highlighter"); + button3Highlighter = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Highlighter"); button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Highlighter)); gtk_widget_show (button3Highlighter); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Highlighter); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Highlighter), TRUE); - button3Text = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Text"); + button3Text = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Text"); button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Text)); gtk_widget_show (button3Text); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Text); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3Text), TRUE); - button3SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Select Region"); + button3SelectRegion = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Select Re_gion"); button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3SelectRegion)); gtk_widget_show (button3SelectRegion); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3SelectRegion); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3SelectRegion), TRUE); - button3SelectRectangle = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Select Rectangle"); + button3SelectRectangle = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Select _Rectangle"); button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3SelectRectangle)); gtk_widget_show (button3SelectRectangle); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3SelectRectangle); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3SelectRectangle), TRUE); - button3VerticalSpace = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "Vertical Space"); + button3VerticalSpace = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "_Vertical Space"); button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3VerticalSpace)); gtk_widget_show (button3VerticalSpace); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3VerticalSpace); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3VerticalSpace), TRUE); + button3Hand = gtk_radio_menu_item_new_with_mnemonic (button3Pen_group, "H_and Tool"); + button3Pen_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3Hand)); + gtk_widget_show (button3Hand); + gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3Hand); + separator25 = gtk_separator_menu_item_new (); gtk_widget_show (separator25); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), separator25); gtk_widget_set_sensitive (separator25, FALSE); - button3LinkBrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, "Link to Primary Brush"); + button3LinkBrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, "_Link to Primary Brush"); button3LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3LinkBrush)); gtk_widget_show (button3LinkBrush); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3LinkBrush); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (button3LinkBrush), TRUE); - button3CopyBrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, "Copy of Current Brush"); + button3CopyBrush = gtk_radio_menu_item_new_with_mnemonic (button3LinkBrush_group, "_Copy of Current Brush"); button3LinkBrush_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (button3CopyBrush)); gtk_widget_show (button3CopyBrush); gtk_container_add (GTK_CONTAINER (button3_mapping_menu), button3CopyBrush); @@ -1241,20 +1359,36 @@ create_winMain (void) gtk_container_add (GTK_CONTAINER (menuOptions_menu), separator18); gtk_widget_set_sensitive (separator18, FALSE); - optionsAntialiasBG = gtk_check_menu_item_new_with_mnemonic ("Antialiased Bitmaps"); + optionsAntialiasBG = gtk_check_menu_item_new_with_mnemonic ("_Antialiased Bitmaps"); gtk_widget_show (optionsAntialiasBG); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsAntialiasBG); - optionsProgressiveBG = gtk_check_menu_item_new_with_mnemonic ("Progressive Backgrounds"); + optionsProgressiveBG = gtk_check_menu_item_new_with_mnemonic ("_Progressive Backgrounds"); gtk_widget_show (optionsProgressiveBG); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsProgressiveBG); + optionsPrintRuling = gtk_check_menu_item_new_with_mnemonic ("Print Paper _Ruling"); + gtk_widget_show (optionsPrintRuling); + gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsPrintRuling); + + optionsLeftHanded = gtk_check_menu_item_new_with_mnemonic ("Left-Handed Scrollbar"); + gtk_widget_show (optionsLeftHanded); + gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsLeftHanded); + + optionsShortenMenus = gtk_check_menu_item_new_with_mnemonic ("Shorten _Menus"); + gtk_widget_show (optionsShortenMenus); + gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsShortenMenus); + separator21 = gtk_separator_menu_item_new (); gtk_widget_show (separator21); gtk_container_add (GTK_CONTAINER (menuOptions_menu), separator21); gtk_widget_set_sensitive (separator21, FALSE); - optionsSavePreferences = gtk_menu_item_new_with_mnemonic ("Save Preferences"); + optionsAutoSavePrefs = gtk_check_menu_item_new_with_mnemonic ("A_uto-Save Preferences"); + gtk_widget_show (optionsAutoSavePrefs); + gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsAutoSavePrefs); + + optionsSavePreferences = gtk_menu_item_new_with_mnemonic ("_Save Preferences"); gtk_widget_show (optionsSavePreferences); gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsSavePreferences); @@ -1279,21 +1413,21 @@ 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"); + saveButton = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-save"); + gtk_widget_show (saveButton); + gtk_container_add (GTK_CONTAINER (toolbarMain), saveButton); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (saveButton), tooltips, "Save", NULL); + + 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); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (saveButton), tooltips, "Save", NULL); - toolitem11 = (GtkWidget*) gtk_tool_item_new (); gtk_widget_show (toolitem11); gtk_container_add (GTK_CONTAINER (toolbarMain), toolitem11); @@ -1456,6 +1590,15 @@ create_winMain (void) gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonText), buttonPen_group); buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonText)); + buttonReco = (GtkWidget*) gtk_toggle_tool_button_new (); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonReco), "Shape Recognizer"); + tmp_image = create_pixmap (winMain, "shapes.png"); + gtk_widget_show (tmp_image); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonReco), tmp_image); + gtk_widget_show (buttonReco); + gtk_container_add (GTK_CONTAINER (toolbarPen), buttonReco); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (buttonReco), tooltips, "Shape Recognizer", NULL); + buttonRuler = (GtkWidget*) gtk_toggle_tool_button_new (); gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonRuler), "Ruler"); tmp_image = create_pixmap (winMain, "ruler.png"); @@ -1506,6 +1649,16 @@ create_winMain (void) gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonVerticalSpace), buttonPen_group); buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonVerticalSpace)); + buttonHand = (GtkWidget*) gtk_radio_tool_button_new (NULL); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (buttonHand), "Hand Tool"); + tmp_image = create_pixmap (winMain, "hand.png"); + gtk_widget_show (tmp_image); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (buttonHand), tmp_image); + gtk_widget_show (buttonHand); + gtk_container_add (GTK_CONTAINER (toolbarPen), buttonHand); + gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonHand), buttonPen_group); + buttonPen_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonHand)); + toolitem16 = (GtkWidget*) gtk_tool_item_new (); gtk_widget_show (toolitem16); gtk_container_add (GTK_CONTAINER (toolbarPen), toolitem16); @@ -1728,6 +1881,24 @@ create_winMain (void) gtk_radio_tool_button_set_group (GTK_RADIO_TOOL_BUTTON (buttonColorOther), buttonBlack_group); buttonBlack_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (buttonColorOther)); + toolitem21 = (GtkWidget*) gtk_tool_item_new (); + gtk_widget_show (toolitem21); + gtk_container_add (GTK_CONTAINER (toolbarPen), toolitem21); + + vseparator10 = gtk_vseparator_new (); + gtk_widget_show (vseparator10); + gtk_container_add (GTK_CONTAINER (toolitem21), vseparator10); + + toolitem20 = (GtkWidget*) gtk_tool_item_new (); + gtk_widget_show (toolitem20); + gtk_container_add (GTK_CONTAINER (toolbarPen), toolitem20); + + fontButton = gtk_font_button_new (); + gtk_widget_show (fontButton); + gtk_container_add (GTK_CONTAINER (toolitem20), fontButton); + gtk_font_button_set_use_font (GTK_FONT_BUTTON (fontButton), TRUE); + gtk_button_set_focus_on_click (GTK_BUTTON (fontButton), FALSE); + scrolledwindowMain = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindowMain); gtk_box_pack_start (GTK_BOX (vboxMain), scrolledwindowMain, TRUE, TRUE, 0); @@ -1967,6 +2138,12 @@ create_winMain (void) g_signal_connect ((gpointer) toolsText, "toggled", G_CALLBACK (on_toolsText_activate), NULL); + g_signal_connect ((gpointer) toolsReco, "toggled", + G_CALLBACK (on_toolsReco_activate), + NULL); + g_signal_connect ((gpointer) toolsRuler, "toggled", + G_CALLBACK (on_toolsRuler_activate), + NULL); g_signal_connect ((gpointer) toolsSelectRegion, "toggled", G_CALLBACK (on_toolsSelectRegion_activate), NULL); @@ -1976,6 +2153,9 @@ create_winMain (void) g_signal_connect ((gpointer) toolsVerticalSpace, "toggled", G_CALLBACK (on_toolsVerticalSpace_activate), NULL); + g_signal_connect ((gpointer) toolsHand, "activate", + G_CALLBACK (on_toolsHand_activate), + NULL); g_signal_connect ((gpointer) colorBlack, "toggled", G_CALLBACK (on_colorBlack_activate), NULL); @@ -2072,15 +2252,18 @@ create_winMain (void) g_signal_connect ((gpointer) toolsSetAsDefault, "activate", G_CALLBACK (on_toolsSetAsDefault_activate), NULL); - g_signal_connect ((gpointer) toolsRuler, "toggled", - G_CALLBACK (on_toolsRuler_activate), - NULL); g_signal_connect ((gpointer) optionsUseXInput, "toggled", G_CALLBACK (on_optionsUseXInput_activate), NULL); + g_signal_connect ((gpointer) optionsDiscardCoreEvents, "toggled", + G_CALLBACK (on_optionsDiscardCore_activate), + NULL); g_signal_connect ((gpointer) optionsButtonMappings, "activate", G_CALLBACK (on_optionsButtonMappings_activate), NULL); + g_signal_connect ((gpointer) optionsPressureSensitive, "activate", + G_CALLBACK (on_optionsPressureSensitive_activate), + NULL); g_signal_connect ((gpointer) button2Pen, "activate", G_CALLBACK (on_button2Pen_activate), NULL); @@ -2102,6 +2285,9 @@ create_winMain (void) g_signal_connect ((gpointer) button2VerticalSpace, "activate", G_CALLBACK (on_button2VerticalSpace_activate), NULL); + g_signal_connect ((gpointer) button2Hand, "activate", + G_CALLBACK (on_button2Hand_activate), + NULL); g_signal_connect ((gpointer) button2LinkBrush, "activate", G_CALLBACK (on_button2LinkBrush_activate), NULL); @@ -2129,6 +2315,9 @@ create_winMain (void) g_signal_connect ((gpointer) button3VerticalSpace, "activate", G_CALLBACK (on_button3VerticalSpace_activate), NULL); + g_signal_connect ((gpointer) button3Hand, "activate", + G_CALLBACK (on_button3Hand_activate), + NULL); g_signal_connect ((gpointer) button3LinkBrush, "activate", G_CALLBACK (on_button3LinkBrush_activate), NULL); @@ -2141,6 +2330,18 @@ create_winMain (void) g_signal_connect ((gpointer) optionsProgressiveBG, "activate", G_CALLBACK (on_optionsProgressiveBG_activate), NULL); + g_signal_connect ((gpointer) optionsPrintRuling, "activate", + G_CALLBACK (on_optionsPrintRuling_activate), + NULL); + g_signal_connect ((gpointer) optionsLeftHanded, "toggled", + G_CALLBACK (on_optionsLeftHanded_activate), + NULL); + g_signal_connect ((gpointer) optionsShortenMenus, "toggled", + G_CALLBACK (on_optionsShortenMenus_activate), + NULL); + g_signal_connect ((gpointer) optionsAutoSavePrefs, "toggled", + G_CALLBACK (on_optionsAutoSavePrefs_activate), + NULL); g_signal_connect ((gpointer) optionsSavePreferences, "activate", G_CALLBACK (on_optionsSavePreferences_activate), NULL); @@ -2150,15 +2351,15 @@ create_winMain (void) g_signal_connect ((gpointer) helpAbout, "activate", G_CALLBACK (on_helpAbout_activate), NULL); + g_signal_connect ((gpointer) saveButton, "clicked", + G_CALLBACK (on_fileSave_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); g_signal_connect ((gpointer) buttonCut, "clicked", G_CALLBACK (on_editCut_activate), NULL); @@ -2216,6 +2417,9 @@ create_winMain (void) g_signal_connect ((gpointer) buttonText, "toggled", G_CALLBACK (on_toolsText_activate), NULL); + g_signal_connect ((gpointer) buttonReco, "toggled", + G_CALLBACK (on_toolsReco_activate), + NULL); g_signal_connect ((gpointer) buttonRuler, "toggled", G_CALLBACK (on_toolsRuler_activate), NULL); @@ -2228,6 +2432,9 @@ create_winMain (void) g_signal_connect ((gpointer) buttonVerticalSpace, "toggled", G_CALLBACK (on_toolsVerticalSpace_activate), NULL); + g_signal_connect ((gpointer) buttonHand, "toggled", + G_CALLBACK (on_toolsHand_activate), + NULL); g_signal_connect ((gpointer) buttonToolDefault, "clicked", G_CALLBACK (on_buttonToolDefault_clicked), NULL); @@ -2276,6 +2483,9 @@ create_winMain (void) g_signal_connect ((gpointer) buttonWhite, "toggled", G_CALLBACK (on_colorWhite_activate), NULL); + g_signal_connect ((gpointer) fontButton, "font_set", + G_CALLBACK (on_fontButton_font_set), + NULL); g_signal_connect ((gpointer) spinPageNo, "value_changed", G_CALLBACK (on_spinPageNo_value_changed), NULL); @@ -2291,7 +2501,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, menuFile_menu, "menuFile_menu"); GLADE_HOOKUP_OBJECT (winMain, fileNew, "fileNew"); GLADE_HOOKUP_OBJECT (winMain, fileNewBackground, "fileNewBackground"); - GLADE_HOOKUP_OBJECT (winMain, image599, "image599"); + GLADE_HOOKUP_OBJECT (winMain, image623, "image623"); GLADE_HOOKUP_OBJECT (winMain, fileOpen, "fileOpen"); GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave"); GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs"); @@ -2308,7 +2518,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, mru7, "mru7"); GLADE_HOOKUP_OBJECT (winMain, separator22, "separator22"); GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions"); - GLADE_HOOKUP_OBJECT (winMain, image600, "image600"); + GLADE_HOOKUP_OBJECT (winMain, image624, "image624"); GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint"); GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF"); GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2"); @@ -2329,26 +2539,28 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, separator20, "separator20"); GLADE_HOOKUP_OBJECT (winMain, viewFullscreen, "viewFullscreen"); GLADE_HOOKUP_OBJECT (winMain, separator4, "separator4"); + GLADE_HOOKUP_OBJECT (winMain, menuViewZoom, "menuViewZoom"); + GLADE_HOOKUP_OBJECT (winMain, menuViewZoom_menu, "menuViewZoom_menu"); GLADE_HOOKUP_OBJECT (winMain, viewZoomIn, "viewZoomIn"); GLADE_HOOKUP_OBJECT (winMain, viewZoomOut, "viewZoomOut"); GLADE_HOOKUP_OBJECT (winMain, viewNormalSize, "viewNormalSize"); GLADE_HOOKUP_OBJECT (winMain, viewPageWidth, "viewPageWidth"); - GLADE_HOOKUP_OBJECT (winMain, image601, "image601"); + GLADE_HOOKUP_OBJECT (winMain, image625, "image625"); GLADE_HOOKUP_OBJECT (winMain, viewSetZoom, "viewSetZoom"); GLADE_HOOKUP_OBJECT (winMain, separator5, "separator5"); GLADE_HOOKUP_OBJECT (winMain, viewFirstPage, "viewFirstPage"); - GLADE_HOOKUP_OBJECT (winMain, image602, "image602"); + GLADE_HOOKUP_OBJECT (winMain, image626, "image626"); GLADE_HOOKUP_OBJECT (winMain, viewPreviousPage, "viewPreviousPage"); - GLADE_HOOKUP_OBJECT (winMain, image603, "image603"); + GLADE_HOOKUP_OBJECT (winMain, image627, "image627"); GLADE_HOOKUP_OBJECT (winMain, viewNextPage, "viewNextPage"); - GLADE_HOOKUP_OBJECT (winMain, image604, "image604"); + GLADE_HOOKUP_OBJECT (winMain, image628, "image628"); GLADE_HOOKUP_OBJECT (winMain, viewLastPage, "viewLastPage"); - GLADE_HOOKUP_OBJECT (winMain, image605, "image605"); + GLADE_HOOKUP_OBJECT (winMain, image629, "image629"); GLADE_HOOKUP_OBJECT (winMain, separator6, "separator6"); GLADE_HOOKUP_OBJECT (winMain, viewShowLayer, "viewShowLayer"); - GLADE_HOOKUP_OBJECT (winMain, image606, "image606"); + GLADE_HOOKUP_OBJECT (winMain, image630, "image630"); GLADE_HOOKUP_OBJECT (winMain, viewHideLayer, "viewHideLayer"); - GLADE_HOOKUP_OBJECT (winMain, image607, "image607"); + GLADE_HOOKUP_OBJECT (winMain, image631, "image631"); GLADE_HOOKUP_OBJECT (winMain, menuJournal, "menuJournal"); GLADE_HOOKUP_OBJECT (winMain, menuJournal_menu, "menuJournal_menu"); GLADE_HOOKUP_OBJECT (winMain, journalNewPageBefore, "journalNewPageBefore"); @@ -2381,7 +2593,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, journalApplyAllPages, "journalApplyAllPages"); GLADE_HOOKUP_OBJECT (winMain, separator23, "separator23"); GLADE_HOOKUP_OBJECT (winMain, journalLoadBackground, "journalLoadBackground"); - GLADE_HOOKUP_OBJECT (winMain, image608, "image608"); + GLADE_HOOKUP_OBJECT (winMain, image632, "image632"); GLADE_HOOKUP_OBJECT (winMain, journalScreenshot, "journalScreenshot"); GLADE_HOOKUP_OBJECT (winMain, separator19, "separator19"); GLADE_HOOKUP_OBJECT (winMain, journalDefaultBackground, "journalDefaultBackground"); @@ -2392,13 +2604,17 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, toolsEraser, "toolsEraser"); GLADE_HOOKUP_OBJECT (winMain, toolsHighlighter, "toolsHighlighter"); GLADE_HOOKUP_OBJECT (winMain, toolsText, "toolsText"); + GLADE_HOOKUP_OBJECT (winMain, separator15, "separator15"); + GLADE_HOOKUP_OBJECT (winMain, toolsReco, "toolsReco"); + GLADE_HOOKUP_OBJECT (winMain, toolsRuler, "toolsRuler"); GLADE_HOOKUP_OBJECT (winMain, separator9, "separator9"); GLADE_HOOKUP_OBJECT (winMain, toolsSelectRegion, "toolsSelectRegion"); GLADE_HOOKUP_OBJECT (winMain, toolsSelectRectangle, "toolsSelectRectangle"); GLADE_HOOKUP_OBJECT (winMain, toolsVerticalSpace, "toolsVerticalSpace"); + GLADE_HOOKUP_OBJECT (winMain, toolsHand, "toolsHand"); GLADE_HOOKUP_OBJECT (winMain, separator16, "separator16"); GLADE_HOOKUP_OBJECT (winMain, toolsColor, "toolsColor"); - GLADE_HOOKUP_OBJECT (winMain, image609, "image609"); + GLADE_HOOKUP_OBJECT (winMain, image633, "image633"); GLADE_HOOKUP_OBJECT (winMain, toolsColor_menu, "toolsColor_menu"); GLADE_HOOKUP_OBJECT (winMain, colorBlack, "colorBlack"); GLADE_HOOKUP_OBJECT (winMain, colorBlue, "colorBlue"); @@ -2436,19 +2652,19 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, highlighterMedium, "highlighterMedium"); GLADE_HOOKUP_OBJECT (winMain, highlighterThick, "highlighterThick"); GLADE_HOOKUP_OBJECT (winMain, toolsTextFont, "toolsTextFont"); - GLADE_HOOKUP_OBJECT (winMain, image610, "image610"); + GLADE_HOOKUP_OBJECT (winMain, image634, "image634"); GLADE_HOOKUP_OBJECT (winMain, separator10, "separator10"); GLADE_HOOKUP_OBJECT (winMain, toolsDefaultPen, "toolsDefaultPen"); GLADE_HOOKUP_OBJECT (winMain, toolsDefaultEraser, "toolsDefaultEraser"); GLADE_HOOKUP_OBJECT (winMain, toolsDefaultHighlighter, "toolsDefaultHighlighter"); GLADE_HOOKUP_OBJECT (winMain, toolsDefaultText, "toolsDefaultText"); GLADE_HOOKUP_OBJECT (winMain, toolsSetAsDefault, "toolsSetAsDefault"); - GLADE_HOOKUP_OBJECT (winMain, separator15, "separator15"); - GLADE_HOOKUP_OBJECT (winMain, toolsRuler, "toolsRuler"); GLADE_HOOKUP_OBJECT (winMain, menuOptions, "menuOptions"); GLADE_HOOKUP_OBJECT (winMain, menuOptions_menu, "menuOptions_menu"); GLADE_HOOKUP_OBJECT (winMain, optionsUseXInput, "optionsUseXInput"); + GLADE_HOOKUP_OBJECT (winMain, optionsDiscardCoreEvents, "optionsDiscardCoreEvents"); GLADE_HOOKUP_OBJECT (winMain, optionsButtonMappings, "optionsButtonMappings"); + GLADE_HOOKUP_OBJECT (winMain, optionsPressureSensitive, "optionsPressureSensitive"); GLADE_HOOKUP_OBJECT (winMain, button2_mapping, "button2_mapping"); GLADE_HOOKUP_OBJECT (winMain, button2_mapping_menu, "button2_mapping_menu"); GLADE_HOOKUP_OBJECT (winMain, button2Pen, "button2Pen"); @@ -2458,6 +2674,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, button2SelectRegion, "button2SelectRegion"); GLADE_HOOKUP_OBJECT (winMain, button2SelectRectangle, "button2SelectRectangle"); GLADE_HOOKUP_OBJECT (winMain, button2VerticalSpace, "button2VerticalSpace"); + GLADE_HOOKUP_OBJECT (winMain, button2Hand, "button2Hand"); GLADE_HOOKUP_OBJECT (winMain, separator24, "separator24"); GLADE_HOOKUP_OBJECT (winMain, button2LinkBrush, "button2LinkBrush"); GLADE_HOOKUP_OBJECT (winMain, button2CopyBrush, "button2CopyBrush"); @@ -2471,6 +2688,7 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, button3SelectRegion, "button3SelectRegion"); GLADE_HOOKUP_OBJECT (winMain, button3SelectRectangle, "button3SelectRectangle"); GLADE_HOOKUP_OBJECT (winMain, button3VerticalSpace, "button3VerticalSpace"); + GLADE_HOOKUP_OBJECT (winMain, button3Hand, "button3Hand"); GLADE_HOOKUP_OBJECT (winMain, separator25, "separator25"); GLADE_HOOKUP_OBJECT (winMain, button3LinkBrush, "button3LinkBrush"); GLADE_HOOKUP_OBJECT (winMain, button3CopyBrush, "button3CopyBrush"); @@ -2478,16 +2696,20 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, separator18, "separator18"); GLADE_HOOKUP_OBJECT (winMain, optionsAntialiasBG, "optionsAntialiasBG"); GLADE_HOOKUP_OBJECT (winMain, optionsProgressiveBG, "optionsProgressiveBG"); + GLADE_HOOKUP_OBJECT (winMain, optionsPrintRuling, "optionsPrintRuling"); + GLADE_HOOKUP_OBJECT (winMain, optionsLeftHanded, "optionsLeftHanded"); + GLADE_HOOKUP_OBJECT (winMain, optionsShortenMenus, "optionsShortenMenus"); GLADE_HOOKUP_OBJECT (winMain, separator21, "separator21"); + GLADE_HOOKUP_OBJECT (winMain, optionsAutoSavePrefs, "optionsAutoSavePrefs"); GLADE_HOOKUP_OBJECT (winMain, optionsSavePreferences, "optionsSavePreferences"); GLADE_HOOKUP_OBJECT (winMain, menuHelp, "menuHelp"); GLADE_HOOKUP_OBJECT (winMain, menuHelp_menu, "menuHelp_menu"); GLADE_HOOKUP_OBJECT (winMain, helpIndex, "helpIndex"); GLADE_HOOKUP_OBJECT (winMain, helpAbout, "helpAbout"); GLADE_HOOKUP_OBJECT (winMain, toolbarMain, "toolbarMain"); + GLADE_HOOKUP_OBJECT (winMain, saveButton, "saveButton"); 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"); GLADE_HOOKUP_OBJECT (winMain, buttonCut, "buttonCut"); @@ -2516,12 +2738,14 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, buttonEraser, "buttonEraser"); GLADE_HOOKUP_OBJECT (winMain, buttonHighlighter, "buttonHighlighter"); GLADE_HOOKUP_OBJECT (winMain, buttonText, "buttonText"); + GLADE_HOOKUP_OBJECT (winMain, buttonReco, "buttonReco"); GLADE_HOOKUP_OBJECT (winMain, buttonRuler, "buttonRuler"); GLADE_HOOKUP_OBJECT (winMain, toolitem15, "toolitem15"); GLADE_HOOKUP_OBJECT (winMain, vseparator5, "vseparator5"); GLADE_HOOKUP_OBJECT (winMain, buttonSelectRegion, "buttonSelectRegion"); GLADE_HOOKUP_OBJECT (winMain, buttonSelectRectangle, "buttonSelectRectangle"); GLADE_HOOKUP_OBJECT (winMain, buttonVerticalSpace, "buttonVerticalSpace"); + GLADE_HOOKUP_OBJECT (winMain, buttonHand, "buttonHand"); GLADE_HOOKUP_OBJECT (winMain, toolitem16, "toolitem16"); GLADE_HOOKUP_OBJECT (winMain, vseparator6, "vseparator6"); GLADE_HOOKUP_OBJECT (winMain, buttonToolDefault, "buttonToolDefault"); @@ -2546,6 +2770,10 @@ create_winMain (void) GLADE_HOOKUP_OBJECT (winMain, buttonYellow, "buttonYellow"); GLADE_HOOKUP_OBJECT (winMain, buttonWhite, "buttonWhite"); GLADE_HOOKUP_OBJECT (winMain, buttonColorOther, "buttonColorOther"); + GLADE_HOOKUP_OBJECT (winMain, toolitem21, "toolitem21"); + GLADE_HOOKUP_OBJECT (winMain, vseparator10, "vseparator10"); + GLADE_HOOKUP_OBJECT (winMain, toolitem20, "toolitem20"); + GLADE_HOOKUP_OBJECT (winMain, fontButton, "fontButton"); GLADE_HOOKUP_OBJECT (winMain, scrolledwindowMain, "scrolledwindowMain"); GLADE_HOOKUP_OBJECT (winMain, hbox1, "hbox1"); GLADE_HOOKUP_OBJECT (winMain, labelPage, "labelPage"); @@ -2562,84 +2790,6 @@ create_winMain (void) return winMain; } -GtkWidget* -create_fontDialog (void) -{ - GtkWidget *fontDialog; - GtkWidget *ok_button1; - GtkWidget *cancel_button1; - GtkWidget *apply_button1; - GtkWidget *font_selection1; - - fontDialog = gtk_font_selection_dialog_new ("Select Font"); - gtk_container_set_border_width (GTK_CONTAINER (fontDialog), 4); - gtk_window_set_type_hint (GTK_WINDOW (fontDialog), GDK_WINDOW_TYPE_HINT_DIALOG); - - ok_button1 = GTK_FONT_SELECTION_DIALOG (fontDialog)->ok_button; - gtk_widget_show (ok_button1); - GTK_WIDGET_SET_FLAGS (ok_button1, GTK_CAN_DEFAULT); - - cancel_button1 = GTK_FONT_SELECTION_DIALOG (fontDialog)->cancel_button; - gtk_widget_show (cancel_button1); - GTK_WIDGET_SET_FLAGS (cancel_button1, GTK_CAN_DEFAULT); - - apply_button1 = GTK_FONT_SELECTION_DIALOG (fontDialog)->apply_button; - gtk_widget_show (apply_button1); - GTK_WIDGET_SET_FLAGS (apply_button1, GTK_CAN_DEFAULT); - - font_selection1 = GTK_FONT_SELECTION_DIALOG (fontDialog)->fontsel; - gtk_widget_show (font_selection1); - gtk_container_set_border_width (GTK_CONTAINER (font_selection1), 4); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (fontDialog, fontDialog, "fontDialog"); - GLADE_HOOKUP_OBJECT_NO_REF (fontDialog, ok_button1, "ok_button1"); - GLADE_HOOKUP_OBJECT_NO_REF (fontDialog, cancel_button1, "cancel_button1"); - GLADE_HOOKUP_OBJECT_NO_REF (fontDialog, apply_button1, "apply_button1"); - GLADE_HOOKUP_OBJECT_NO_REF (fontDialog, font_selection1, "font_selection1"); - - return fontDialog; -} - -GtkWidget* -create_colorChooserDialog (void) -{ - GtkWidget *colorChooserDialog; - GtkWidget *ok_button2; - GtkWidget *cancel_button2; - GtkWidget *help_button1; - GtkWidget *color_selection1; - - colorChooserDialog = gtk_color_selection_dialog_new ("Select Color"); - gtk_window_set_resizable (GTK_WINDOW (colorChooserDialog), FALSE); - gtk_window_set_type_hint (GTK_WINDOW (colorChooserDialog), GDK_WINDOW_TYPE_HINT_DIALOG); - - ok_button2 = GTK_COLOR_SELECTION_DIALOG (colorChooserDialog)->ok_button; - gtk_widget_show (ok_button2); - GTK_WIDGET_SET_FLAGS (ok_button2, GTK_CAN_DEFAULT); - - cancel_button2 = GTK_COLOR_SELECTION_DIALOG (colorChooserDialog)->cancel_button; - gtk_widget_show (cancel_button2); - GTK_WIDGET_SET_FLAGS (cancel_button2, GTK_CAN_DEFAULT); - - help_button1 = GTK_COLOR_SELECTION_DIALOG (colorChooserDialog)->help_button; - gtk_widget_show (help_button1); - GTK_WIDGET_SET_FLAGS (help_button1, GTK_CAN_DEFAULT); - - color_selection1 = GTK_COLOR_SELECTION_DIALOG (colorChooserDialog)->colorsel; - gtk_widget_show (color_selection1); - gtk_color_selection_set_has_opacity_control (GTK_COLOR_SELECTION (color_selection1), FALSE); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (colorChooserDialog, colorChooserDialog, "colorChooserDialog"); - GLADE_HOOKUP_OBJECT_NO_REF (colorChooserDialog, ok_button2, "ok_button2"); - GLADE_HOOKUP_OBJECT_NO_REF (colorChooserDialog, cancel_button2, "cancel_button2"); - GLADE_HOOKUP_OBJECT_NO_REF (colorChooserDialog, help_button1, "help_button1"); - GLADE_HOOKUP_OBJECT_NO_REF (colorChooserDialog, color_selection1, "color_selection1"); - - return colorChooserDialog; -} - GtkWidget* create_papersizeDialog (void) { @@ -2780,7 +2930,7 @@ create_aboutDialog (void) dialog_vbox2 = GTK_DIALOG (aboutDialog)->vbox; gtk_widget_show (dialog_vbox2); - image387 = create_pixmap (aboutDialog, "notepad.png"); + image387 = create_pixmap (aboutDialog, "xournal.png"); gtk_widget_show (image387); gtk_box_pack_start (GTK_BOX (dialog_vbox2), image387, FALSE, TRUE, 12); @@ -2789,7 +2939,7 @@ create_aboutDialog (void) gtk_box_pack_start (GTK_BOX (dialog_vbox2), labelTitle, FALSE, FALSE, 3); gtk_label_set_justify (GTK_LABEL (labelTitle), GTK_JUSTIFY_CENTER); - labelInfo = gtk_label_new ("Written by Denis Auroux\nhttp://math.mit.edu/~auroux/software/xournal/"); + labelInfo = gtk_label_new ("Written by Denis Auroux\n http://xournal.sourceforge.net/ "); gtk_widget_show (labelInfo); gtk_box_pack_start (GTK_BOX (dialog_vbox2), labelInfo, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (labelInfo), GTK_JUSTIFY_CENTER);