wilderjds
/
xournalpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #620 from andreasb242/settings-cleanup

Browse Source 
Settings cleanup
presentation
andreasb242 7 years ago committed by GitHub
parent c269920aa9 e2808a3468
commit 2960f03c78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1858 additions and 1886 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      po/de.mo
  2. 3218
      po/de.po
  3. 208
      po/xournalpp.pot
  4. 60
      src/gui/dialog/ButtonConfigGui.cpp
  5. 258
      ui/settingsButtonConfig.glade

BIN
po/de.mo
View File

Binary file not shown.

3218
po/de.po
View File

File diff suppressed because it is too large Load Diff

208
po/xournalpp.pot
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xournalpp 1.0.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-26 17:36+0100\n"
"POT-Creation-Date: 2018-12-27 09:53+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,7 +107,7 @@ msgstr ""
msgid "Back"
msgstr ""
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:23
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:24
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:272
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:326
msgid "Background"
@ -123,8 +123,8 @@ msgstr ""
msgid "Blue"
msgstr ""
#: ../src/control/Control.cpp:1967 ../src/control/Control.cpp:2475
#: ../src/control/Control.cpp:2512 ../src/control/XournalMain.cpp:117
#: ../src/control/Control.cpp:1978 ../src/control/Control.cpp:2486
#: ../src/control/Control.cpp:2523 ../src/control/XournalMain.cpp:117
msgid "Cancel"
msgstr ""
@ -148,7 +148,7 @@ msgstr ""
msgid "Contents"
msgstr ""
#: ../src/control/Control.cpp:1004 ../src/control/Control.cpp:1012
#: ../src/control/Control.cpp:1005 ../src/control/Control.cpp:1013
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:322
msgid "Copy"
msgstr ""
@ -248,7 +248,7 @@ msgstr ""
msgid "Cut"
msgstr ""
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:441
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:443
msgid "Default Tool"
msgstr ""
@ -268,11 +268,11 @@ msgstr ""
msgid "Delete layer"
msgstr ""
#: ../src/control/Control.cpp:2474 ../src/control/Control.cpp:2511
#: ../src/control/Control.cpp:2485 ../src/control/Control.cpp:2522
msgid "Discard"
msgstr ""
#: ../src/control/Control.cpp:1897
#: ../src/control/Control.cpp:1908
msgid ""
"Do not open Autosave files. They may will be overwritten!\n"
"Copy the files to another folder.\n"
@ -283,7 +283,7 @@ msgstr ""
msgid "Do not overwrite the background PDF! This will cause errors!"
msgstr ""
#: ../src/control/Control.cpp:2508
#: ../src/control/Control.cpp:2519
msgid "Document file was removed."
msgstr ""
@ -295,12 +295,6 @@ msgstr ""
msgid "Document not loaded! ({1}), {2}"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:54
#: ../src/gui/dialog/ButtonConfigGui.cpp:81
#: ../src/gui/dialog/ButtonConfigGui.cpp:91
msgid "Don't change"
msgstr ""
#: ../src/control/XournalMain.cpp:232
msgid "Don't compress PDF files (for debugging)"
msgstr ""
@ -309,36 +303,46 @@ msgstr ""
msgid "Dotted"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:101
#: ../src/gui/dialog/ButtonConfigGui.cpp:99
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:40
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:421
msgid "Draw Arrow"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:99
#: ../src/gui/dialog/ButtonConfigGui.cpp:97
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:39
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:417
msgid "Draw Circle"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:95
#: ../src/gui/dialog/ButtonConfigGui.cpp:93
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:41
msgid "Draw Line"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:97
#: ../src/gui/dialog/ButtonConfigGui.cpp:95
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:29
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:38
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:119
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:122
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:120
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:123
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:419
msgid "Draw Rectangle"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:101
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:42
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:423
msgid "Draw coordinate system"
msgstr ""
#: ../src/undo/InsertUndoAction.cpp:39
msgid "Draw stroke"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:89
msgid "Drawing Type - don't change"
msgstr ""
#: ../src/undo/TextBoxUndoAction.cpp:52
msgid "Edit text"
msgstr ""
@ -353,7 +357,7 @@ msgstr ""
msgid "Eraser"
msgstr ""
#: ../src/control/Control.cpp:2175
#: ../src/control/Control.cpp:2186
msgid ""
"Error annotate PDF file \"{1}\"\n"
"{2}"
@ -367,7 +371,7 @@ msgstr ""
msgid "Error loading glade file \"{1}\" (try to load \"{2}\")"
msgstr ""
#: ../src/control/Control.cpp:1992
#: ../src/control/Control.cpp:2003
msgid "Error opening file \"{1}\""
msgstr ""
@ -407,7 +411,7 @@ msgid ""
"URL: {1}"
msgstr ""
#: ../src/control/Control.cpp:1927
#: ../src/control/Control.cpp:1938
msgid "Filename: {1}"
msgstr ""
@ -457,8 +461,8 @@ msgstr ""
msgid "Grid Snapping"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:65
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:425
#: ../src/gui/dialog/ButtonConfigGui.cpp:63
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:427
msgid "Hand"
msgstr ""
@ -508,7 +512,7 @@ msgstr ""
msgid "Layer"
msgstr ""
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:35
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:39
msgid "Layer Preview"
msgstr ""
@ -516,7 +520,7 @@ msgstr ""
msgid "Layer selection"
msgstr ""
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:27
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:28
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:262
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:322
msgid "Layer {1}"
@ -536,7 +540,7 @@ msgstr ""
msgid "Lined"
msgstr ""
#: ../src/gui/PageView.cpp:733
#: ../src/gui/PageView.cpp:738
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:106
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:20
msgid "Loading..."
@ -547,8 +551,8 @@ msgstr ""
msgid "Mangenta"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:83
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:436
#: ../src/gui/dialog/ButtonConfigGui.cpp:81
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:438
msgid "Medium"
msgstr ""
@ -597,7 +601,7 @@ msgstr ""
msgid "No pages to export!"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:93
#: ../src/gui/dialog/ButtonConfigGui.cpp:91
msgid "Normal drawing"
msgstr ""
@ -724,7 +728,7 @@ msgstr ""
msgid "Predefined"
msgstr ""
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:457
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:459
msgid "Presentation mode"
msgstr ""
@ -746,7 +750,7 @@ msgstr ""
msgid "Redo: "
msgstr ""
#: ../src/control/Control.cpp:1966
#: ../src/control/Control.cpp:1977
msgid "Remove PDF Background"
msgstr ""
@ -774,20 +778,20 @@ msgstr ""
msgid "Ruled"
msgstr ""
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:431
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:433
msgid "Ruler"
msgstr ""
#: ../src/control/jobs/SaveJob.cpp:18 ../src/control/Control.cpp:2473
#: ../src/control/jobs/SaveJob.cpp:18 ../src/control/Control.cpp:2484
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:316
msgid "Save"
msgstr ""
#: ../src/control/Control.cpp:2510
#: ../src/control/Control.cpp:2521
msgid "Save As"
msgstr ""
#: ../src/control/Control.cpp:2295 ../src/gui/dialog/PageTemplateDialog.cpp:111
#: ../src/control/Control.cpp:2306 ../src/gui/dialog/PageTemplateDialog.cpp:111
msgid "Save File"
msgstr ""
@ -804,7 +808,7 @@ msgstr ""
msgid "Search"
msgstr ""
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:443
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:445
msgid "Select Font"
msgstr ""
@ -828,7 +832,7 @@ msgstr ""
msgid "Select Region"
msgstr ""
#: ../src/control/Control.cpp:1965
#: ../src/control/Control.cpp:1976
msgid "Select another PDF"
msgstr ""
@ -861,7 +865,7 @@ msgstr ""
msgid "Separator"
msgstr ""
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:429
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:431
msgid "Shape Recognizer"
msgstr ""
@ -891,7 +895,7 @@ msgstr ""
#: ../src/undo/RecognizerUndoAction.cpp:101
#: ../src/gui/dialog/ButtonConfigGui.cpp:103
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:42
#: ../src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp:43
msgid "Stroke recognizer"
msgstr ""
@ -937,17 +941,17 @@ msgstr ""
msgid "Text not found, searched on all pages"
msgstr ""
#: ../src/control/Control.cpp:974
#: ../src/control/Control.cpp:975
msgid ""
"The Toolbarconfiguration \"{1}\" is predefined, would you create a copy to "
"edit?"
msgstr ""
#: ../src/control/Control.cpp:1962
#: ../src/control/Control.cpp:1973
msgid "The attached background PDF could not be found."
msgstr ""
#: ../src/control/Control.cpp:1963
#: ../src/control/Control.cpp:1974
msgid "The background PDF could not be found."
msgstr ""
@ -971,17 +975,21 @@ msgstr ""
msgid "There was an error displaying help: {1}"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:84
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:438
#: ../src/gui/dialog/ButtonConfigGui.cpp:82
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:440
msgid "Thick"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:82
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:434
#: ../src/gui/dialog/ButtonConfigGui.cpp:79
msgid "Thickness - don't change"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:80
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:436
msgid "Thin"
msgstr ""
#: ../src/control/Control.cpp:2471
#: ../src/control/Control.cpp:2482
msgid "This document is not saved yet."
msgstr ""
@ -994,6 +1002,10 @@ msgstr ""
msgid "Toggle fullscreen"
msgstr ""
#: ../src/gui/dialog/ButtonConfigGui.cpp:54
msgid "Tool - don't change"
msgstr ""
#: ../src/gui/toolbarMenubar/model/ToolbarData.cpp:157
msgid "Toolbar found: {1}"
msgstr ""
@ -1006,7 +1018,7 @@ msgstr ""
msgid "Trying to emergency save the current open document…"
msgstr ""
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:454
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:456
msgid "Two pages"
msgstr ""
@ -1051,11 +1063,11 @@ msgstr ""
msgid "Unknown stroke type: \"{1}\", assuming pen"
msgstr ""
#: ../src/control/Control.cpp:2365
#: ../src/control/Control.cpp:2376
msgid "Unsaved Document"
msgstr ""
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:424
#: ../src/gui/toolbarMenubar/ToolMenuHandler.cpp:426
msgid "Vertical Space"
msgstr ""
@ -1096,7 +1108,7 @@ msgstr ""
msgid "Xournal files"
msgstr ""
#: ../src/control/stockdlg/XojOpenDlg.cpp:81 ../src/control/Control.cpp:2302
#: ../src/control/stockdlg/XojOpenDlg.cpp:81 ../src/control/Control.cpp:2313
msgid "Xournal++ files"
msgstr ""
@ -1154,7 +1166,7 @@ msgstr ""
#: ../src/control/stockdlg/ImageOpenDlg.cpp:12
#: ../src/control/stockdlg/XojOpenDlg.cpp:19
#: ../src/control/jobs/BaseExportJob.cpp:31 ../src/control/Control.cpp:2296
#: ../src/control/jobs/BaseExportJob.cpp:31 ../src/control/Control.cpp:2307
#: ../src/gui/dialog/PageTemplateDialog.cpp:112
msgid "_Cancel"
msgstr ""
@ -1164,7 +1176,7 @@ msgstr ""
msgid "_Open"
msgstr ""
#: ../src/control/jobs/BaseExportJob.cpp:32 ../src/control/Control.cpp:2297
#: ../src/control/jobs/BaseExportJob.cpp:32 ../src/control/Control.cpp:2308
#: ../src/gui/dialog/PageTemplateDialog.cpp:113
msgid "_Save"
msgstr ""
@ -1512,7 +1524,7 @@ msgstr ""
msgid "About Xournal++"
msgstr ""
#: ../ui/main.glade:1063
#: ../ui/main.glade:1071
msgid "Add/Edit Tex"
msgstr ""
@ -1556,10 +1568,6 @@ msgstr ""
msgid "Built on:"
msgstr ""
#: ../ui/settingsButtonConfig.glade:104
msgid "Color"
msgstr ""
#: ../ui/main.glade:573
msgid "Configure Page Template"
msgstr ""
@ -1584,19 +1592,19 @@ msgstr ""
msgid "Delete Layer"
msgstr ""
#: ../ui/settingsButtonConfig.glade:155
#: ../ui/settingsButtonConfig.glade:122
msgid "Delete stroke"
msgstr ""
#: ../ui/main.glade:1274
#: ../ui/main.glade:1282
msgid "Delete this page"
msgstr ""
#: ../ui/settingsButtonConfig.glade:28
#: ../ui/settingsButtonConfig.glade:22
msgid "Device"
msgstr ""
#: ../ui/settingsButtonConfig.glade:38
#: ../ui/settingsButtonConfig.glade:45
msgid "Disable drawing for this device"
msgstr ""
@ -1604,24 +1612,20 @@ msgstr ""
msgid "Drag and drop Components fom here to the toolbars and back."
msgstr ""
#: ../ui/main.glade:755
#: ../ui/main.glade:763
msgid "Draw _Line"
msgstr ""
#: ../ui/settingsButtonConfig.glade:128
msgid "Drawing type"
msgstr ""
#: ../ui/texdialog.glade:66
msgid "Enter / edit LaTeX Text"
msgstr ""
#: ../ui/main.glade:917
#: ../ui/main.glade:925
msgid "Eraser Optio_ns"
msgstr ""
#: ../ui/settingsButtonConfig.glade:168
msgid "Eraser type"
#: ../ui/settingsButtonConfig.glade:119
msgid "Eraser Type - don't change"
msgstr ""
#: ../ui/exportSettings.glade:24
@ -1632,19 +1636,19 @@ msgstr ""
msgid "Export as..."
msgstr ""
#: ../ui/main.glade:897 ../ui/main.glade:1034
#: ../ui/main.glade:905 ../ui/main.glade:1042
msgid "Fi_ll"
msgstr ""
#: ../ui/main.glade:905 ../ui/main.glade:1042
#: ../ui/main.glade:913 ../ui/main.glade:1050
msgid "Fill transparency"
msgstr ""
#: ../ui/main.glade:1469
#: ../ui/main.glade:1477
msgid "Find next occurrence of the search string"
msgstr ""
#: ../ui/main.glade:1448
#: ../ui/main.glade:1456
msgid "Find previous occurrence of the search string"
msgstr ""
@ -1660,7 +1664,7 @@ msgstr ""
msgid "Goto Page"
msgstr ""
#: ../ui/main.glade:820
#: ../ui/main.glade:828
msgid "H_and Tool"
msgstr ""
@ -1684,7 +1688,7 @@ msgstr ""
msgid "Hide the vertical scrollbar"
msgstr ""
#: ../ui/main.glade:991
#: ../ui/main.glade:999
msgid "Highlighter Opti_ons"
msgstr ""
@ -1700,7 +1704,7 @@ msgstr ""
msgid "Insert Latex"
msgstr ""
#: ../ui/main.glade:1254
#: ../ui/main.glade:1262
msgid "Insert a copy of the current page below"
msgstr ""
@ -1778,7 +1782,7 @@ msgid ""
"by Denis Auroux"
msgstr ""
#: ../ui/main.glade:836
#: ../ui/main.glade:844
msgid "Pen _Options"
msgstr ""
@ -1844,19 +1848,19 @@ msgstr ""
msgid "Show vertical scrollbar on the left side"
msgstr ""
#: ../ui/settingsButtonConfig.glade:154
#: ../ui/settingsButtonConfig.glade:120
msgid "Standard"
msgstr ""
#: ../ui/main.glade:1587
#: ../ui/main.glade:1595
msgid "State PLACEHOLDER"
msgstr ""
#: ../ui/main.glade:1213
#: ../ui/main.glade:1221
msgid "Swap the current page with the one above"
msgstr ""
#: ../ui/main.glade:1234
#: ../ui/main.glade:1242
msgid "Swap the current page with the one below"
msgstr ""
@ -1868,7 +1872,7 @@ msgstr ""
msgid "Template:"
msgstr ""
#: ../ui/main.glade:1054
#: ../ui/main.glade:1062
msgid "Text Font..."
msgstr ""
@ -1876,14 +1880,6 @@ msgstr ""
msgid "The unit of the ruler is cm"
msgstr ""
#: ../ui/settingsButtonConfig.glade:91
msgid "Thickness"
msgstr ""
#: ../ui/settingsButtonConfig.glade:56
msgid "Tool"
msgstr ""
#: ../ui/settings.glade:1005
msgid ""
"Touch Screens which are detected by GTK are handled specially, and don't "
@ -1902,6 +1898,10 @@ msgstr ""
msgid "View"
msgstr ""
#: ../ui/settingsButtonConfig.glade:121
msgid "Whiteout"
msgstr ""
#: ../ui/pagesize.glade:182
msgid "Width:"
msgstr ""
@ -1958,7 +1958,7 @@ msgstr ""
msgid "_Goto Page"
msgstr ""
#: ../ui/main.glade:1076
#: ../ui/main.glade:1084
msgid "_Help"
msgstr ""
@ -2030,7 +2030,7 @@ msgstr ""
msgid "_Two Pages"
msgstr ""
#: ../ui/main.glade:800
#: ../ui/main.glade:808
msgid "_Vertical Space"
msgstr ""
@ -2038,31 +2038,31 @@ msgstr ""
msgid "_View"
msgstr ""
#: ../ui/main.glade:978
#: ../ui/main.glade:986
msgid "_delete strokes"
msgstr ""
#: ../ui/main.glade:855 ../ui/main.glade:927 ../ui/main.glade:1001
#: ../ui/main.glade:863 ../ui/main.glade:935 ../ui/main.glade:1009
msgid "_fine"
msgstr ""
#: ../ui/main.glade:864 ../ui/main.glade:936 ../ui/main.glade:1010
#: ../ui/main.glade:872 ../ui/main.glade:944 ../ui/main.glade:1018
msgid "_medium"
msgstr ""
#: ../ui/main.glade:960
#: ../ui/main.glade:968
msgid "_standard"
msgstr ""
#: ../ui/main.glade:873 ../ui/main.glade:945 ../ui/main.glade:1019
#: ../ui/main.glade:881 ../ui/main.glade:953 ../ui/main.glade:1027
msgid "_thick"
msgstr ""
#: ../ui/main.glade:846
#: ../ui/main.glade:854
msgid "_very fine"
msgstr ""
#: ../ui/main.glade:969
#: ../ui/main.glade:977
msgid "_whiteout"
msgstr ""
@ -2082,6 +2082,6 @@ msgstr ""
msgid "save to file"
msgstr ""
#: ../ui/main.glade:882
#: ../ui/main.glade:890
msgid "ver_y thick"
msgstr ""

60
src/gui/dialog/ButtonConfigGui.cpp
Unescape View File

@ -51,18 +51,16 @@ ButtonConfigGui::ButtonConfigGui(SettingsDialog* dlg, GladeSearchpath* gladeSear
GtkListStore* typeModel = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
GtkTreeIter iter;
ADD_TYPE_CB("empty.svg", _("Don't change"), TOOL_NONE);
ADD_TYPE_CB("tool_pencil.svg", _("Pen"), TOOL_PEN);
ADD_TYPE_CB("tool_eraser.svg", _("Eraser"), TOOL_ERASER);
ADD_TYPE_CB("tool_highlighter.svg", _("Highlighter"), TOOL_HILIGHTER);
ADD_TYPE_CB("tool_text.svg", _("Text"), TOOL_TEXT);
ADD_TYPE_CB("tool_image.svg", _("Insert image"), TOOL_IMAGE);
ADD_TYPE_CB("stretch.svg", _("Vertical space"), TOOL_VERTICAL_SPACE);
ADD_TYPE_CB("lasso.svg", _("Select region"), TOOL_SELECT_REGION);
ADD_TYPE_CB("rect-select.svg", _("Select rectangle"), TOOL_SELECT_RECT);
//ADD_TYPE_CB("rect-draw.svg", _("Draw rectangle"), TOOL_DRAW_RECT);
//ADD_TYPE_CB("circle-draw.svg", _("Draw circle"), TOOL_DRAW_CIRCLE);
ADD_TYPE_CB("hand.svg", _("Hand"), TOOL_HAND);
ADD_TYPE_CB("empty.svg", _("Tool - don't change"), TOOL_NONE);
ADD_TYPE_CB("tool_pencil.svg", _("Pen"), TOOL_PEN);
ADD_TYPE_CB("tool_eraser.svg", _("Eraser"), TOOL_ERASER);
ADD_TYPE_CB("tool_highlighter.svg", _("Highlighter"), TOOL_HILIGHTER);
ADD_TYPE_CB("tool_text.svg", _("Text"), TOOL_TEXT);
ADD_TYPE_CB("tool_image.svg", _("Insert image"), TOOL_IMAGE);
ADD_TYPE_CB("stretch.svg", _("Vertical space"), TOOL_VERTICAL_SPACE);
ADD_TYPE_CB("lasso.svg", _("Select region"), TOOL_SELECT_REGION);
ADD_TYPE_CB("rect-select.svg", _("Select rectangle"), TOOL_SELECT_RECT);
ADD_TYPE_CB("hand.svg", _("Hand"), TOOL_HAND);
this->cbTool = get("cbTool");
@ -78,7 +76,7 @@ ButtonConfigGui::ButtonConfigGui(SettingsDialog* dlg, GladeSearchpath* gladeSear
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(this->cbTool), renderer, "text", 1, NULL);
this->cbThickness = get("cbThickness");
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cbThickness), _("Don't change"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cbThickness), _("Thickness - don't change"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cbThickness), _("Thin"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cbThickness), _("Medium"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cbThickness), _("Thick"));
@ -88,7 +86,7 @@ ButtonConfigGui::ButtonConfigGui(SettingsDialog* dlg, GladeSearchpath* gladeSear
this->cbDrawingType = get("cbDrawingType");
// DRAWING_TYPE_DONT_CHANGE
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Don't change"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Drawing Type - don't change"));
// DRAWING_TYPE_DEFAULT
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Normal drawing"));
// DRAWING_TYPE_RULER
@ -99,6 +97,8 @@ ButtonConfigGui::ButtonConfigGui(SettingsDialog* dlg, GladeSearchpath* gladeSear
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Circle"));
// DRAWING_TYPE_ARROW
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Arrow"));
// DRAWING_TYPE_COORDINATE_SYSTEM
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw coordinate system"));
// DRAWING_TYPE_STROKE_RECOGNIZER
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Stroke recognizer"));
@ -327,24 +327,24 @@ void ButtonConfigGui::enableDisableTools()
{
case TOOL_PEN:
case TOOL_HILIGHTER:
gtk_widget_set_sensitive(cbThickness, true);
gtk_widget_set_sensitive(colorButton, true);
gtk_widget_set_sensitive(cbDrawingType, true);
gtk_widget_set_sensitive(cbEraserType, false);
gtk_widget_set_visible(cbThickness, true);
gtk_widget_set_visible(colorButton, true);
gtk_widget_set_visible(cbDrawingType, true);
gtk_widget_set_visible(cbEraserType, false);
break;
case TOOL_ERASER:
gtk_widget_set_sensitive(cbThickness, true);
gtk_widget_set_sensitive(colorButton, false);
gtk_widget_set_sensitive(cbDrawingType, false);
gtk_widget_set_sensitive(cbEraserType, true);
gtk_widget_set_visible(cbThickness, true);
gtk_widget_set_visible(colorButton, false);
gtk_widget_set_visible(cbDrawingType, false);
gtk_widget_set_visible(cbEraserType, true);
break;
case TOOL_TEXT:
gtk_widget_set_sensitive(cbThickness, false);
gtk_widget_set_sensitive(colorButton, true);
gtk_widget_set_sensitive(cbDrawingType, false);
gtk_widget_set_sensitive(cbEraserType, false);
gtk_widget_set_visible(cbThickness, false);
gtk_widget_set_visible(colorButton, true);
gtk_widget_set_visible(cbDrawingType, false);
gtk_widget_set_visible(cbEraserType, false);
break;
case TOOL_NONE:
@ -355,10 +355,10 @@ void ButtonConfigGui::enableDisableTools()
case TOOL_SELECT_REGION:
case TOOL_VERTICAL_SPACE:
case TOOL_HAND:
gtk_widget_set_sensitive(cbThickness, false);
gtk_widget_set_sensitive(colorButton, false);
gtk_widget_set_sensitive(cbDrawingType, false);
gtk_widget_set_sensitive(cbEraserType, false);
gtk_widget_set_visible(cbThickness, false);
gtk_widget_set_visible(colorButton, false);
gtk_widget_set_visible(cbDrawingType, false);
gtk_widget_set_visible(cbEraserType, false);
break;
default:
break;

258
ui/settingsButtonConfig.glade
Unescape View File

@ -10,23 +10,52 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<child>
<object class="GtkComboBoxText" id="cbDevice">
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lbDevice">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Device</property>
<property name="xalign">0</property>
<child>
<object class="GtkLabel" id="lbDevice">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Device</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="cbDevice">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cbDisableDrawing">
<property name="label" translatable="yes">Disable drawing for this device</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
@ -34,148 +63,79 @@
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cbDisableDrawing">
<property name="label" translatable="yes">Disable drawing for this device</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Tool</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="cbTool">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="cbThickness">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Thickness</property>
<property name="xalign">0</property>
<child>
<object class="GtkComboBox" id="cbTool">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="cbThickness">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="colorButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="cbDrawingType">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="cbEraserType">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<items>
<item translatable="yes">Eraser Type - don't change</item>
<item translatable="yes">Standard</item>
<item translatable="yes">Whiteout</item>
<item translatable="yes">Delete stroke</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Color</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="colorButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Drawing type</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="cbDrawingType">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">5</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="cbEraserType">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<items>
<item translatable="yes">Don't change</item>
<item translatable="yes">Standard</item>
<item translatable="yes">Delete stroke</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">6</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Eraser type</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>

Write Preview
Loading…
Cancel
Save