diff --git a/src/control/Control.cpp b/src/control/Control.cpp index 05eeaf8c..eb27eff8 100644 --- a/src/control/Control.cpp +++ b/src/control/Control.cpp @@ -2926,7 +2926,7 @@ bool Control::close(bool destroy, bool allowCancel) "%s", _("Document file was removed.")); - gtk_dialog_add_button(GTK_DIALOG(dialog), _("Save As"), 1); + gtk_dialog_add_button(GTK_DIALOG(dialog), _("Save As..."), 1); gtk_dialog_add_button(GTK_DIALOG(dialog), _("Discard"), 2); gtk_dialog_add_button(GTK_DIALOG(dialog), _("Cancel"), 3); gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(this->getWindow()->getWindow())); diff --git a/ui/main.glade b/ui/main.glade index cd7194eb..f34bd48d 100644 --- a/ui/main.glade +++ b/ui/main.glade @@ -13,7 +13,6 @@ 10 - floatingToolbox floatingToolbox True False @@ -107,12 +106,9 @@ showIfEmpty True False - 15 - 6 + 30 <b>Empty Toolbox</b> -<i>Menu: View/Toolbars</i> - - +<i>Menu: View/Toolbars</i> True center @@ -164,8 +160,8 @@ False - menuFileNew gtk-new + menuFileNew True False True @@ -176,8 +172,8 @@ - menuFileOpen gtk-open + menuFileOpen True False True @@ -207,8 +203,8 @@ - menuFileSave gtk-save + menuFileSave True False True @@ -219,15 +215,15 @@ - menuFileSaveAs gtk-save-as + menuFileSaveAs True False True True - + @@ -265,8 +261,8 @@ - menuFilePrint gtk-print + menuFilePrint True False True @@ -277,8 +273,8 @@ - menuFileQuit gtk-quit + menuFileQuit True False True @@ -304,8 +300,8 @@ False - menuEditUndo gtk-undo + menuEditUndo True False True @@ -316,8 +312,8 @@ - menuEditRedo gtk-redo + menuEditRedo True False True @@ -334,8 +330,8 @@ - menuEditCut gtk-cut + menuEditCut True False True @@ -346,8 +342,8 @@ - menuEditCopy gtk-copy + menuEditCopy True False True @@ -358,8 +354,8 @@ - menuEditPaste gtk-paste + menuEditPaste True False True @@ -376,8 +372,8 @@ - menuEditSearch gtk-find + menuEditSearch True False True @@ -394,8 +390,8 @@ - menuEditDelete gtk-delete + menuEditDelete True False True @@ -412,8 +408,8 @@ - menuSnapRotation False + menuSnapRotation True False Rotation Snapping @@ -422,8 +418,8 @@ - menuSnapGrid False + menuSnapGrid True False Grid Snapping @@ -902,34 +898,34 @@ - menuViewZoomIn gtk-zoom-in + menuViewZoomIn True False True True - + - menuViewZoomOut gtk-zoom-out + menuViewZoomOut True False True True - + - menuViewZoom100 gtk-zoom-100 + menuViewZoom100 True False True @@ -939,8 +935,8 @@ - menuViewZoomFit gtk-zoom-fit + menuViewZoomFit True False True @@ -1427,8 +1423,8 @@ - menuToolsPlayObject False + menuToolsPlayObject True False Play Object @@ -1775,8 +1771,8 @@ - menuAudioRecord False + menuAudioRecord True False Record / Stop @@ -1785,8 +1781,8 @@ - menuAudioPausePlayback False + menuAudioPausePlayback True False Pause @@ -1856,8 +1852,8 @@ False - menuHelpHelp gtk-help + menuHelpHelp True False True @@ -1867,8 +1863,8 @@ - menuHelpAbout gtk-about + menuHelpAbout True False True diff --git a/ui/settings.glade b/ui/settings.glade index 38ebb843..f2576d88 100644 --- a/ui/settings.glade +++ b/ui/settings.glade @@ -125,8 +125,8 @@ end - btSettingsCancel gtk-cancel + btSettingsCancel True True True @@ -140,8 +140,8 @@ - btSettingsOk gtk-ok + btSettingsOk True True True @@ -232,8 +232,8 @@ If the file was not yet saved you can find it in your home directory, in ~/.xour False - cbAutosave Enable Autosaving + cbAutosave True True False @@ -534,8 +534,8 @@ If the file was not yet saved you can find it in your home directory, in ~/.xour - cbAutoloadXoj Enable Autoloading of Journals + cbAutoloadXoj True True False @@ -618,7 +618,7 @@ If the file was not yet saved you can find it in your home directory, in ~/.xour True False - This is an experimental feature! Use it with care. + This is an experimental feature! Use it with care. 0 @@ -633,8 +633,8 @@ If the file was not yet saved you can find it in your home directory, in ~/.xour False - cbNewInputSystem Enable new input system (Requires restart) + cbNewInputSystem True True False @@ -1104,8 +1104,8 @@ Determination Radius: Radius at which modifiers will lock in until finished draw - cbSettingPresureSensitivity Enable Pressure Sensitivity + cbSettingPresureSensitivity True True False @@ -1456,8 +1456,8 @@ Determination Radius: Radius at which modifiers will lock in until finished draw - cbDisableTouchOnPenNear Enable internal Hand Recognition + cbDisableTouchOnPenNear True True False @@ -1626,7 +1626,7 @@ Determination Radius: Radius at which modifiers will lock in until finished draw - txtEnableTouchCommand + txtEnableTouchCommand True True True @@ -1638,7 +1638,7 @@ Determination Radius: Radius at which modifiers will lock in until finished draw - txtDisableTouchCommand + txtDisableTouchCommand True True True @@ -1650,8 +1650,8 @@ Determination Radius: Radius at which modifiers will lock in until finished draw - btTestEnable Test + btTestEnable True True True @@ -1663,8 +1663,8 @@ Determination Radius: Radius at which modifiers will lock in until finished draw - btTestDisable Test + btTestDisable True True True @@ -1757,8 +1757,8 @@ Determination Radius: Radius at which modifiers will lock in until finished draw - cbEnableZoomGestures Enable zoom gestures (requires restart) + cbEnableZoomGestures True True False @@ -1826,8 +1826,8 @@ This also enables touch drawing.</i> - cbTouchWorkaround Enable GTK Touch / Scrolling workaround (requires restart) + cbTouchWorkaround True True False @@ -1933,8 +1933,8 @@ This also enables touch drawing.</i> start - cbHideMenubarStartup Show Menubar on Startup + cbHideMenubarStartup True True False @@ -2064,8 +2064,8 @@ This also enables touch drawing.</i> - cbDarkTheme Dark Theme (requires restart) + cbDarkTheme True True False @@ -2134,8 +2134,8 @@ This also enables touch drawing.</i> vertical - cbHighlightPosition Highlight cursor position + cbHighlightPosition True True False @@ -2150,8 +2150,8 @@ This also enables touch drawing.</i> - cbBigCursor Big cursor for pen + cbBigCursor True True False @@ -2201,8 +2201,8 @@ This also enables touch drawing.</i> vertical - cbShowSidebarRight Show sidebar on the right side + cbShowSidebarRight True True False @@ -2217,8 +2217,8 @@ This also enables touch drawing.</i> - cbShowScrollbarLeft Show vertical scrollbar on the left side + cbShowScrollbarLeft True True False @@ -2268,8 +2268,8 @@ This also enables touch drawing.</i> vertical - cbHideHorizontalScrollbar Hide the horizontal scrollbar + cbHideHorizontalScrollbar True True False @@ -2284,8 +2284,8 @@ This also enables touch drawing.</i> - cbHideVerticalScrollbar Hide the vertical scrollbar + cbHideVerticalScrollbar True True False @@ -2335,8 +2335,8 @@ This also enables touch drawing.</i> vertical - cbHideFullscreenMenubar Hide Menubar + cbHideFullscreenMenubar True True False @@ -2351,8 +2351,8 @@ This also enables touch drawing.</i> - cbHideFullscreenSidebar Hide Sidebar + cbHideFullscreenSidebar True True False @@ -2402,8 +2402,8 @@ This also enables touch drawing.</i> vertical - cbHidePresentationMenubar Hide Menubar + cbHidePresentationMenubar True True False @@ -2418,8 +2418,8 @@ This also enables touch drawing.</i> - cbHidePresentationSidebar Hide Sidebar + cbHidePresentationSidebar True True False @@ -3157,8 +3157,8 @@ This also enables touch drawing.</i> 5 - cbDrawDirModsEnabled Enable with determination radius of + cbDrawDirModsEnabled True True False @@ -3244,8 +3244,8 @@ Determination Radius: Radius at which modifiers will lock in until finished draw 5 - cbStrokeFilterEnabled Enable Tap action + cbStrokeFilterEnabled True True False @@ -3355,8 +3355,8 @@ Determination Radius: Radius at which modifiers will lock in until finished draw - cbTrySelectOnStrokeFiltered Try to select object first. + cbTrySelectOnStrokeFiltered True True False @@ -3376,7 +3376,7 @@ Determination Radius: Radius at which modifiers will lock in until finished draw False All three conditions must be met before stroke is ignored. It must be short in time and length and we can't have ignored another stroke recently. - Settings: + Settings: 1 @@ -3385,8 +3385,8 @@ It must be short in time and length and we can't have ignored another stroke rec - cbDoActionOnStrokeFiltered Show Floating Toolbox + cbDoActionOnStrokeFiltered True True False