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

Merge pull request #657 from andreasb242/master

Browse Source 
Rotation- and Gridsnapping stored to Settings
presentation
andreasb242 7 years ago committed by GitHub
parent 0dead141c8 7dfed3da7b
commit 741c052b92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 1582 additions and 1523 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. 27
      po/cs.po
  2. 2810
      po/de.po
  3. 27
      po/it.po
  4. 27
      po/pl.po
  5. 27
      po/zh.po
  6. 27
      po/zh_HK.po
  7. 27
      po/zh_TW.po
  8. 37
      src/control/Control.cpp
  9. 12
      src/control/Control.h
  10. 54
      src/control/settings/Settings.cpp
  11. 16
      src/control/settings/Settings.h
  12. 2
      src/control/tools/ArrowHandler.cpp
  13. 2
      src/control/tools/CoordinateSystemHandler.cpp
  14. 2
      src/control/tools/EditSelection.cpp
  15. 8
      src/control/tools/RulerHandler.cpp

27
po/cs.po
Unescape View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xournalpp 1.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-29 19:00+0100\n"
"POT-Creation-Date: 2018-12-30 12:21+0100\n"
"PO-Revision-Date: 2017-09-18 09:58+0200\n"
"Last-Translator: Jan Hrdina <jan.hrdka@gmail.com>\n"
"Language-Team: čeština <>\n"
@ -458,7 +458,7 @@ msgstr "Zpět"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:25
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:272
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:326
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:324
msgid "Background"
msgstr "Pozadí"
@ -523,7 +523,7 @@ msgstr "Neznámá barva „{1}“ (nedefinovaná ve výchozím seznamu barev)!"
msgid "Configure Page Template"
msgstr ""
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:277
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:279
msgid "Contents"
msgstr "Obsah"
@ -1089,7 +1089,7 @@ msgstr "Vložit obrázek"
msgid "Insert latex"
msgstr "Vložit LaTeX"
#: ../src/undo/InsertLayerUndoAction.cpp:39
#: ../src/undo/InsertLayerUndoAction.cpp:40
msgid "Insert layer"
msgstr "Vložit vrstvu"
@ -1101,21 +1101,21 @@ msgstr "Vložit stránku"
msgid "Jump to Page (first Page: 1)"
msgstr "Přejít na stránku (první stránka: 1)"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:352
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:350
msgid "Layer"
msgstr "Vrstva"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:47
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:79
msgid "Layer Preview"
msgstr "Náhled vrstvy"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:335
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:333
msgid "Layer selection"
msgstr "Výběr vrstvy"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:29
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:262
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:322
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:320
msgid "Layer {1}"
msgstr "Vrstva {1}"
@ -1146,7 +1146,7 @@ msgid "Load file"
msgstr "Načíst soubor"
#: ../src/gui/PageView.cpp:738
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:106
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:105
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:20
msgid "Loading..."
msgstr "Načítání..."
@ -1181,6 +1181,11 @@ msgstr "Tlačítko myši"
msgid "Move"
msgstr "Přesunout"
#: ../src/undo/MoveLayerUndoAction.cpp:38
#, fuzzy
msgid "Move layer"
msgstr "Smazat vrstvu"
#: ../src/undo/SwapUndoAction.cpp:88
msgid "Move page downwards"
msgstr "Přesunout stránku dolů"
@ -1320,7 +1325,7 @@ msgstr "_Předchozí anotovaná stránka"
msgid "Page"
msgstr "Stránka"
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:26
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:28
msgid "Page Preview"
msgstr "Náhledy stránek"
@ -2007,7 +2012,7 @@ msgstr ""
"Používáte větev {1}/{2}. Send Bugreport will direct you to this repo's issue "
"tracker."
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:94
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:96
msgid ""
"Your current document does not contain PDF Page no {1}\n"
"Would you like to insert this page?\n"

2810
po/de.po
View File

File diff suppressed because it is too large Load Diff

27
po/it.po
Unescape View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xournalpp 1.0.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-29 19:00+0100\n"
"POT-Creation-Date: 2018-12-30 12:21+0100\n"
"PO-Revision-Date: 2018-12-25 17:21+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@ -469,7 +469,7 @@ msgstr "Indietro"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:25
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:272
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:326
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:324
msgid "Background"
msgstr "Sfondo"
@ -537,7 +537,7 @@ msgstr "Colore sconosciuto: \"{1}\" (non definito nella lista di default)"
msgid "Configure Page Template"
msgstr "Configura Template Pagina"
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:277
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:279
#, fuzzy
msgid "Contents"
msgstr "Contenuti"
@ -1115,7 +1115,7 @@ msgstr "Inserisci immagine"
msgid "Insert latex"
msgstr "Inserisci latex"
#: ../src/undo/InsertLayerUndoAction.cpp:39
#: ../src/undo/InsertLayerUndoAction.cpp:40
msgid "Insert layer"
msgstr "Inserisci livello"
@ -1127,22 +1127,22 @@ msgstr "Inserisci pagina"
msgid "Jump to Page (first Page: 1)"
msgstr "Vai a Pagina (prima Pagina: 1)"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:352
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:350
msgid "Layer"
msgstr "Livello"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:47
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:79
msgid "Layer Preview"
msgstr "Anteprima Livello"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:335
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:333
#, fuzzy
msgid "Layer selection"
msgstr "Selezione a livello"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:29
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:262
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:322
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:320
#, fuzzy
msgid "Layer {1}"
msgstr "Livello {1}"
@ -1174,7 +1174,7 @@ msgid "Load file"
msgstr "Carica file"
#: ../src/gui/PageView.cpp:738
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:106
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:105
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:20
msgid "Loading..."
msgstr "Caricamento..."
@ -1209,6 +1209,11 @@ msgstr "Pulsante del Mouse"
msgid "Move"
msgstr "Muovi"
#: ../src/undo/MoveLayerUndoAction.cpp:38
#, fuzzy
msgid "Move layer"
msgstr "Cancella livello"
#: ../src/undo/SwapUndoAction.cpp:88
#, fuzzy
msgid "Move page downwards"
@ -1349,7 +1354,7 @@ msgstr "P_recedente pagina annotata"
msgid "Page"
msgstr "Pagina"
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:26
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:28
msgid "Page Preview"
msgstr "Anteprima Pagina"
@ -2031,7 +2036,7 @@ msgid ""
"issue tracker."
msgstr ""
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:94
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:96
msgid ""
"Your current document does not contain PDF Page no {1}\n"
"Would you like to insert this page?\n"

27
po/pl.po
Unescape View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xournalpp 1.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-29 19:00+0100\n"
"POT-Creation-Date: 2018-12-30 12:21+0100\n"
"PO-Revision-Date: 2015-10-01 00:00+0200\n"
"Last-Translator: Marek Pikuła <marek@pikula.co>\n"
"Language-Team: Xournal++ team\n"
@ -456,7 +456,7 @@ msgstr "Wstecz"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:25
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:272
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:326
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:324
msgid "Background"
msgstr "Tło"
@ -521,7 +521,7 @@ msgstr "Nie rozpoznano koloru \"{1}\" (nie zdefiniowany w domyślnych)!"
msgid "Configure Page Template"
msgstr ""
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:277
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:279
msgid "Contents"
msgstr "Zawartość"
@ -1089,7 +1089,7 @@ msgstr "Wstaw obraz"
msgid "Insert latex"
msgstr "Wstaw LaTeX"
#: ../src/undo/InsertLayerUndoAction.cpp:39
#: ../src/undo/InsertLayerUndoAction.cpp:40
msgid "Insert layer"
msgstr "Wstaw warstwę"
@ -1101,21 +1101,21 @@ msgstr "Wstaw stronę"
msgid "Jump to Page (first Page: 1)"
msgstr "Skocz do strony (pierwsza strona: 1)"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:352
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:350
msgid "Layer"
msgstr "Warstwa"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:47
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:79
msgid "Layer Preview"
msgstr "Podgląd warstwy"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:335
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:333
msgid "Layer selection"
msgstr "Wybór warstw"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:29
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:262
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:322
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:320
msgid "Layer {1}"
msgstr "Warstwa {1}"
@ -1146,7 +1146,7 @@ msgid "Load file"
msgstr "Wczytaj plik"
#: ../src/gui/PageView.cpp:738
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:106
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:105
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:20
msgid "Loading..."
msgstr "Ładowanie..."
@ -1181,6 +1181,11 @@ msgstr "Przycisk myszy"
msgid "Move"
msgstr "Przesuń"
#: ../src/undo/MoveLayerUndoAction.cpp:38
#, fuzzy
msgid "Move layer"
msgstr "Usuń warstwę"
#: ../src/undo/SwapUndoAction.cpp:88
msgid "Move page downwards"
msgstr "Przenieś stronę niżej"
@ -1320,7 +1325,7 @@ msgstr "P_oprzednia adnotowana strona"
msgid "Page"
msgstr "Strona"
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:26
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:28
msgid "Page Preview"
msgstr "Podgląd strony"
@ -2009,7 +2014,7 @@ msgstr ""
"Używasz gałęzi {1}/{2}. Raport błędu zostanie wysłany do repozytorium "
"źródłowego."
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:94
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:96
msgid ""
"Your current document does not contain PDF Page no {1}\n"
"Would you like to insert this page?\n"

27
po/zh.po
Unescape View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xournalpp 1.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-29 19:00+0100\n"
"POT-Creation-Date: 2018-12-30 12:21+0100\n"
"PO-Revision-Date: 2018-11-14 19:55+0100\n"
"Last-Translator: Andreas Butti <andreasbutti at gmail dot com>\n"
"Language-Team: Xournal++ team\n"
@ -425,7 +425,7 @@ msgstr "后退"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:25
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:272
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:326
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:324
msgid "Background"
msgstr "背景"
@ -490,7 +490,7 @@ msgstr "色彩\"{1}\"未定义！"
msgid "Configure Page Template"
msgstr ""
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:277
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:279
msgid "Contents"
msgstr "内容"
@ -1056,7 +1056,7 @@ msgstr "插入图片"
msgid "Insert latex"
msgstr "插入LaTeX"
#: ../src/undo/InsertLayerUndoAction.cpp:39
#: ../src/undo/InsertLayerUndoAction.cpp:40
msgid "Insert layer"
msgstr "插入层"
@ -1068,21 +1068,21 @@ msgstr "插入页面"
msgid "Jump to Page (first Page: 1)"
msgstr "跳到页面(第一页:1)"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:352
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:350
msgid "Layer"
msgstr "图层"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:47
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:79
msgid "Layer Preview"
msgstr "图层预览"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:335
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:333
msgid "Layer selection"
msgstr "选择图层"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:29
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:262
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:322
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:320
msgid "Layer {1}"
msgstr "{1}图层"
@ -1113,7 +1113,7 @@ msgid "Load file"
msgstr "加载文件"
#: ../src/gui/PageView.cpp:738
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:106
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:105
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:20
msgid "Loading..."
msgstr "加载中..."
@ -1148,6 +1148,11 @@ msgstr "鼠标按钮"
msgid "Move"
msgstr "移动"
#: ../src/undo/MoveLayerUndoAction.cpp:38
#, fuzzy
msgid "Move layer"
msgstr "删除层"
#: ../src/undo/SwapUndoAction.cpp:88
msgid "Move page downwards"
msgstr "向后移动页面"
@ -1287,7 +1292,7 @@ msgstr "前一個標註頁(_r)"
msgid "Page"
msgstr "页面"
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:26
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:28
msgid "Page Preview"
msgstr "页面预览"
@ -1959,7 +1964,7 @@ msgid ""
"issue tracker."
msgstr ""
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:94
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:96
msgid ""
"Your current document does not contain PDF Page no {1}\n"
"Would you like to insert this page?\n"

27
po/zh_HK.po
Unescape View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xournalpp 1.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-29 19:00+0100\n"
"POT-Creation-Date: 2018-12-30 12:21+0100\n"
"PO-Revision-Date: 2018-11-14 20:04+0100\n"
"Last-Translator: Andreas Butti <andreasbutti at gmail dot com>\n"
"Language-Team: Xournal++ team\n"
@ -425,7 +425,7 @@ msgstr "後退"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:25
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:272
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:326
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:324
msgid "Background"
msgstr "背景"
@ -490,7 +490,7 @@ msgstr "色彩\"{1}\"未定義！"
msgid "Configure Page Template"
msgstr ""
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:277
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:279
msgid "Contents"
msgstr "內容"
@ -1057,7 +1057,7 @@ msgstr "插入圖片"
msgid "Insert latex"
msgstr "插入LaTeX"
#: ../src/undo/InsertLayerUndoAction.cpp:39
#: ../src/undo/InsertLayerUndoAction.cpp:40
msgid "Insert layer"
msgstr "插入層"
@ -1069,21 +1069,21 @@ msgstr "插入頁面"
msgid "Jump to Page (first Page: 1)"
msgstr "跳到頁面(第一頁:1)"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:352
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:350
msgid "Layer"
msgstr "圖層"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:47
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:79
msgid "Layer Preview"
msgstr "圖層預覽"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:335
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:333
msgid "Layer selection"
msgstr "選擇圖層"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:29
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:262
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:322
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:320
msgid "Layer {1}"
msgstr "{1}圖層"
@ -1114,7 +1114,7 @@ msgid "Load file"
msgstr "加載檔案"
#: ../src/gui/PageView.cpp:738
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:106
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:105
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:20
msgid "Loading..."
msgstr "加載中..."
@ -1149,6 +1149,11 @@ msgstr "滑鼠按鈕"
msgid "Move"
msgstr "移動"
#: ../src/undo/MoveLayerUndoAction.cpp:38
#, fuzzy
msgid "Move layer"
msgstr "刪除層"
#: ../src/undo/SwapUndoAction.cpp:88
msgid "Move page downwards"
msgstr "向後移動頁面"
@ -1288,7 +1293,7 @@ msgstr "前一個標註頁(_r)"
msgid "Page"
msgstr "頁面"
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:26
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:28
msgid "Page Preview"
msgstr "頁面預覽"
@ -1960,7 +1965,7 @@ msgid ""
"issue tracker."
msgstr ""
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:94
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:96
msgid ""
"Your current document does not contain PDF Page no {1}\n"
"Would you like to insert this page?\n"

27
po/zh_TW.po
Unescape View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xournalpp 1.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-29 19:00+0100\n"
"POT-Creation-Date: 2018-12-30 12:21+0100\n"
"PO-Revision-Date: 2018-11-14 19:57+0100\n"
"Last-Translator: Andreas Butti <andreasbutti at gmail dot com>\n"
"Language-Team: Xournal++ team\n"
@ -425,7 +425,7 @@ msgstr "後退"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:25
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:272
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:326
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:324
msgid "Background"
msgstr "背景"
@ -490,7 +490,7 @@ msgstr "色彩\"{1}\"未定義！"
msgid "Configure Page Template"
msgstr ""
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:277
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:279
msgid "Contents"
msgstr "內容"
@ -1056,7 +1056,7 @@ msgstr "插入圖片"
msgid "Insert latex"
msgstr "插入LaTeX"
#: ../src/undo/InsertLayerUndoAction.cpp:39
#: ../src/undo/InsertLayerUndoAction.cpp:40
msgid "Insert layer"
msgstr "插入層"
@ -1068,21 +1068,21 @@ msgstr "插入頁面"
msgid "Jump to Page (first Page: 1)"
msgstr "跳到頁面(第一頁:1)"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:352
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:350
msgid "Layer"
msgstr "圖層"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:47
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayers.cpp:79
msgid "Layer Preview"
msgstr "圖層預覽"
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:335
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:333
msgid "Layer selection"
msgstr "選擇圖層"
#: ../src/gui/sidebar/previews/layer/SidebarPreviewLayerEntry.cpp:29
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:262
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:322
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:320
msgid "Layer {1}"
msgstr "{1}圖層"
@ -1113,7 +1113,7 @@ msgid "Load file"
msgstr "加載檔案"
#: ../src/gui/PageView.cpp:738
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:106
#: ../src/gui/sidebar/previews/base/SidebarPreviewBaseEntry.cpp:105
#: ../src/gui/toolbarMenubar/ToolPageLayer.cpp:20
msgid "Loading..."
msgstr "加載中..."
@ -1148,6 +1148,11 @@ msgstr "滑鼠按鈕"
msgid "Move"
msgstr "移動"
#: ../src/undo/MoveLayerUndoAction.cpp:38
#, fuzzy
msgid "Move layer"
msgstr "刪除層"
#: ../src/undo/SwapUndoAction.cpp:88
msgid "Move page downwards"
msgstr "向後移動頁面"
@ -1287,7 +1292,7 @@ msgstr "前一個標註頁(_r)"
msgid "Page"
msgstr "頁面"
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:26
#: ../src/gui/sidebar/previews/page/SidebarPreviewPages.cpp:28
msgid "Page Preview"
msgstr "頁面預覽"
@ -1959,7 +1964,7 @@ msgid ""
"issue tracker."
msgstr ""
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:94
#: ../src/gui/sidebar/indextree/SidebarIndexPage.cpp:96
msgid ""
"Your current document does not contain PDF Page no {1}\n"
"Would you like to insert this page?\n"

37
src/control/Control.cpp
Unescape View File

@ -356,10 +356,8 @@ void Control::initWindow(MainWindow* win)
win->setFontButtonFont(settings->getFont());
// rotation snapping enabled by default
fireActionSelected(GROUP_SNAPPING, ACTION_ROTATION_SNAPPING);
// grid snapping enabled by default
fireActionSelected(GROUP_GRID_SNAPPING, ACTION_GRID_SNAPPING);
fireActionSelected(GROUP_SNAPPING, settings->isSnapRotation() ? ACTION_ROTATION_SNAPPING : ACTION_NONE);
fireActionSelected(GROUP_GRID_SNAPPING, settings->isSnapGrid() ? ACTION_GRID_SNAPPING : ACTION_NONE);
}
bool Control::autosaveCallback(Control* control)
@ -3065,48 +3063,21 @@ GtkWindow* Control::getGtkWindow()
bool Control::isFullscreen()
{
XOJ_CHECK_TYPE(Control);
return this->fullscreen;
}
bool Control::isRotationSnapping()
{
XOJ_CHECK_TYPE(Control);
return this->snapRotation;
}
bool Control::isGridSnapping()
{
XOJ_CHECK_TYPE(Control);
return this->snapGrid;
}
void Control::rotationSnappingToggle()
{
XOJ_CHECK_TYPE(Control);
if (!this->snapRotation)
{
this->snapRotation = true;
}
else
{
this->snapRotation = false;
}
settings->setSnapRotation(!settings->isSnapRotation());
}
void Control::gridSnappingToggle()
{
XOJ_CHECK_TYPE(Control);
if (!this->snapGrid)
{
this->snapGrid = true;
}
else
{
this->snapGrid = false;
}
settings->setSnapGrid(!settings->isSnapGrid());
}
TextEditor* Control::getTextEditor()

12
src/control/Control.h
Unescape View File

@ -144,8 +144,6 @@ public:
bool isInDragAndDropToolbar();
bool isFullscreen();
bool isRotationSnapping();
bool isGridSnapping();
bool searchTextOnPage(string text, int p, int* occures, double* top);
@ -295,16 +293,6 @@ private:
ZoomControl* zoom;
bool fullscreen = false;
/**
* Rotation snapping enabled by default
*/
bool snapRotation = true;
/**
* grid snapping enabled by default
*/
bool snapGrid = true;
Settings* settings;
MainWindow* win;

54
src/control/settings/Settings.cpp
Unescape View File

@ -76,6 +76,9 @@ void Settings::loadDefault()
this->addHorizontalSpace = false;
this->addVerticalSpace = false;
this->snapRotation = true;
this->snapGrid = true;
this->defaultSaveName = _("%F-Note-%H-%M");
// Eraser
@ -374,6 +377,14 @@ void Settings::parseItem(xmlDocPtr doc, xmlNodePtr cur)
{
this->addVerticalSpace = xmlStrcmp(value, (const xmlChar*) "true") ? false : true;
}
else if (xmlStrcmp(name, (const xmlChar*) "snapRotation") == 0)
{
this->snapRotation = xmlStrcmp(value, (const xmlChar*) "true") ? false : true;
}
else if (xmlStrcmp(name, (const xmlChar*) "snapGrid") == 0)
{
this->snapGrid = xmlStrcmp(value, (const xmlChar*) "true") ? false : true;
}
else if (xmlStrcmp(name, (const xmlChar*) "addHorizontalSpace") == 0)
{
this->addHorizontalSpace = xmlStrcmp(value, (const xmlChar*) "true") ? false : true;
@ -712,6 +723,9 @@ void Settings::save()
WRITE_BOOL_PROP(addHorizontalSpace);
WRITE_BOOL_PROP(addVerticalSpace);
WRITE_BOOL_PROP(snapRotation);
WRITE_BOOL_PROP(snapGrid);
WRITE_INT_PROP(selectionBorderColor);
WRITE_INT_PROP(backgroundColor);
WRITE_INT_PROP(selectionMarkerColor);
@ -972,6 +986,46 @@ void Settings::setShowBigCursor(bool b)
save();
}
bool Settings::isSnapRotation()
{
XOJ_CHECK_TYPE(Settings);
return this->snapRotation;
}
void Settings::setSnapRotation(bool b)
{
XOJ_CHECK_TYPE(Settings);
if (this->snapRotation == b)
{
return;
}
this->snapRotation = b;
save();
}
bool Settings::isSnapGrid()
{
XOJ_CHECK_TYPE(Settings);
return this->snapGrid;
}
void Settings::setSnapGrid(bool b)
{
XOJ_CHECK_TYPE(Settings);
if (this->snapGrid == b)
{
return;
}
this->snapGrid = b;
save();
}
ScrollbarHideType Settings::getScrollbarHideType()
{
XOJ_CHECK_TYPE(Settings);

16
src/control/settings/Settings.h
Unescape View File

@ -223,6 +223,12 @@ public:
bool getAddHorizontalSpace();
void setAddHorizontalSpace(bool space);
bool isSnapRotation();
void setSnapRotation(bool b);
bool isSnapGrid();
void setSnapGrid(bool b);
bool isShowBigCursor();
void setShowBigCursor(bool b);
@ -453,6 +459,16 @@ private:
*/
bool addVerticalSpace;
/**
* Rotation snapping enabled by default
*/
bool snapRotation;
/**
* grid snapping enabled by default
*/
bool snapGrid;
/**
* Default name if you save a new document
*/

2
src/control/tools/ArrowHandler.cpp
Unescape View File

@ -51,7 +51,7 @@ void ArrowHandler::drawShape(Point& c, bool shiftDown)
// an appropriate delta is Pi/3 radians for an arrow shape
double delta = M_PI / 6.0;
if (shiftDown || !xournal->getControl()->isRotationSnapping())
if (shiftDown || !xournal->getControl()->getSettings()->isSnapRotation())
{
stroke->addPoint(c);
stroke->addPoint(Point(c.x - arrowDist * cos(angle + delta), c.y - arrowDist * sin(angle + delta)));

2
src/control/tools/CoordinateSystemHandler.cpp
Unescape View File

@ -47,7 +47,7 @@ void CoordinateSystemHandler::drawShape(Point& currentPoint, bool shiftDown)
}
// Draw the other two points
if (shiftDown || !xournal->getControl()->isRotationSnapping())
if (shiftDown || !xournal->getControl()->getSettings()->isSnapRotation())
{
stroke->addPoint(Point(startingPoint.x, currentPoint.y));
stroke->addPoint(Point(currentPoint.x, currentPoint.y));

2
src/control/tools/EditSelection.cpp
Unescape View File

@ -661,7 +661,7 @@ CursorSelectionType EditSelection::getSelectionTypeForPos(double x, double y, do
void EditSelection::snapRotation()
{
bool snapping = this->view->getXournal()->getControl()->isRotationSnapping();
bool snapping = this->view->getXournal()->getControl()->getSettings()->isSnapRotation();
if (!snapping)
{
return;

8
src/control/tools/RulerHandler.cpp
Unescape View File

@ -22,7 +22,7 @@ void RulerHandler::snapToGrid(double& x, double& y)
{
XOJ_CHECK_TYPE(RulerHandler);
if(!xournal->getControl()->isGridSnapping())
if (!xournal->getControl()->getSettings()->isSnapGrid())
{
return;
}
@ -139,7 +139,7 @@ void RulerHandler::drawShape(Point& currentPoint, bool shiftDown)
/**
* Snap first point to grid (if enabled)
*/
if (!shiftDown && xournal->getControl()->isGridSnapping())
if (!shiftDown && xournal->getControl()->getSettings()->isSnapGrid())
{
Point firstPoint = stroke->getPoint(0);
snapToGrid(firstPoint.x,firstPoint.y);
@ -157,12 +157,12 @@ void RulerHandler::drawShape(Point& currentPoint, bool shiftDown)
}
else
{
if (xournal->getControl()->isRotationSnapping())
if (xournal->getControl()->getSettings()->isSnapRotation())
{
snapRotation(x,y);
}
if (xournal->getControl()->isGridSnapping())
if (xournal->getControl()->getSettings()->isSnapGrid())
{
snapToGrid(x,y);
}

Write Preview
Loading…
Cancel
Save