diff options
| author | Mikko Syrjä <mikko@3d-system.fi> | 2019-03-08 22:33:56 +0200 |
|---|---|---|
| committer | Mikko Syrjä <mikko@3d-system.fi> | 2019-03-08 22:33:56 +0200 |
| commit | caa8a50b5c30d9c82e4e5db2d5e24ad5e55aab6a (patch) | |
| tree | 7f982d39b290308f30b38eed9ac0a323996f05ce | |
| parent | acf0e164d66043d31e5e683d46eb02c837b7bb42 (diff) | |
| download | symedit-caa8a50b5c30d9c82e4e5db2d5e24ad5e55aab6a.tar.gz symedit-caa8a50b5c30d9c82e4e5db2d5e24ad5e55aab6a.zip | |
Command line parameter improvements.
| -rw-r--r-- | help/eng/usage.rst | 16 | ||||
| -rw-r--r-- | help/fin/usage.rst | 16 | ||||
| -rw-r--r-- | locale/symedit.en_GB.ts | 198 | ||||
| -rw-r--r-- | locale/symedit.fi_FI.ts | 198 | ||||
| -rw-r--r-- | locale/symedit.ts | 42 | ||||
| -rw-r--r-- | main.cpp | 45 | ||||
| -rw-r--r-- | main.qml | 5 | ||||
| -rw-r--r-- | symedit.cpp | 33 | ||||
| -rw-r--r-- | symedit.h | 10 | ||||
| -rw-r--r-- | symedit.pro | 3 |
10 files changed, 372 insertions, 194 deletions
diff --git a/help/eng/usage.rst b/help/eng/usage.rst index 20fe242..a20add5 100644 --- a/help/eng/usage.rst +++ b/help/eng/usage.rst @@ -8,6 +8,22 @@ Installation xxx +Command line +------------ + +Command line parameters:: + + Usage: ./symedit [options] file + + Options: + -t, --transfer Symbol file is transfer file. + -s, --symbol <symbol> Read symbol data from parameter <symbol>. + -l, --language <language> Application language abbreviation <language>. + -h, --help Displays this help. + + Arguments: + file Symbol file name. + Usage ----- diff --git a/help/fin/usage.rst b/help/fin/usage.rst index 68b42de..b323c25 100644 --- a/help/fin/usage.rst +++ b/help/fin/usage.rst @@ -8,6 +8,22 @@ Asennus xxx +Komentorivi +----------- + +Komentoriviparametrit:: + + Usage: ./symedit [options] file + + Options: + -t, --transfer Symbolitiedosto on siirtotiedosto. + -s, --symbol <symboli> Lue symbolin data parametrista <symboli>. + -l, --language <kieli> Sovelluksen kielen lyhenne <kieli>. + -h, --help Displays this help. + + Arguments: + file Symbolitiedoston nimi. + Käyttö ------ diff --git a/locale/symedit.en_GB.ts b/locale/symedit.en_GB.ts index eaa7a7d..b77be70 100644 --- a/locale/symedit.en_GB.ts +++ b/locale/symedit.en_GB.ts @@ -5,319 +5,351 @@ <name></name> <message id="id_application_title"> <source></source> - <translation>Symbol Editor</translation> + <translation type="unfinished">Symbol Editor</translation> </message> <message id="id_menu_file"> <source></source> - <translation>File</translation> + <translation type="unfinished">File</translation> </message> <message id="id_menu_file_open"> <source></source> - <translation>Open...</translation> + <translation type="unfinished">Open...</translation> </message> <message id="id_menu_file_save"> <source></source> - <translation>Save...</translation> + <translation type="unfinished">Save...</translation> </message> <message id="id_menu_file_exit"> <source></source> - <translation>Exit</translation> + <translation type="unfinished">Exit</translation> </message> <message id="id_menu_edit"> <source></source> - <translation>Edit</translation> + <translation type="unfinished">Edit</translation> </message> <message id="id_menu_edit_undo"> <source></source> - <translation>Undo</translation> + <translation type="unfinished">Undo</translation> </message> <message id="id_menu_edit_redo"> <source></source> - <translation>Redo</translation> + <translation type="unfinished">Redo</translation> </message> <message id="id_menu_edit_cut"> <source></source> - <translation>Cut</translation> + <translation type="unfinished">Cut</translation> </message> <message id="id_menu_edit_copy"> <source></source> - <translation>Copy</translation> + <translation type="unfinished">Copy</translation> </message> <message id="id_menu_edit_paste"> <source></source> - <translation>Paste</translation> + <translation type="unfinished">Paste</translation> </message> <message id="id_menu_edit_rotate_right"> <source></source> - <translation>Rotate Right</translation> + <translation type="unfinished">Rotate Right</translation> </message> <message id="id_menu_edit_rotate_left"> <source></source> - <translation>Rotate Left</translation> + <translation type="unfinished">Rotate Left</translation> </message> <message id="id_menu_edit_raise_item"> <source></source> - <translation>Raise Item</translation> + <translation type="unfinished">Raise Item</translation> </message> <message id="id_menu_edit_lower_item"> <source></source> - <translation>Lower Item</translation> + <translation type="unfinished">Lower Item</translation> </message> <message id="id_menu_edit_delete_item"> <source></source> - <translation>Delete Item</translation> + <translation type="unfinished">Delete Item</translation> </message> <message id="id_menu_view"> <source></source> - <translation>View</translation> + <translation type="unfinished">View</translation> </message> <message id="id_menu_view_zoom_in"> <source></source> - <translation>Zoom In</translation> + <translation type="unfinished">Zoom In</translation> </message> <message id="id_menu_view_zoom_out"> <source></source> - <translation>Zoom Out</translation> + <translation type="unfinished">Zoom Out</translation> </message> <message id="id_menu_view_zoom_all"> <source></source> - <translation>Maximum</translation> + <translation type="unfinished">Maximum</translation> </message> <message id="id_menu_view_grid"> <source></source> - <translation>Show Grid</translation> + <translation type="unfinished">Show Grid</translation> </message> <message id="id_menu_view_preview"> <source></source> - <translation>Preview</translation> + <translation type="unfinished">Preview</translation> </message> <message id="id_menu_tool"> <source></source> - <translation>Tool</translation> + <translation type="unfinished">Tool</translation> </message> <message id="id_menu_tool_select"> <source></source> - <translation>Select</translation> + <translation type="unfinished">Select</translation> </message> <message id="id_menu_tool_line"> <source></source> - <translation>Line</translation> + <translation type="unfinished">Line</translation> </message> <message id="id_menu_tool_rect_corner"> <source></source> - <translation>Rectangle Corner</translation> + <translation type="unfinished">Rectangle Corner</translation> </message> <message id="id_menu_tool_rect_center"> <source></source> - <translation>Rectangle Center</translation> + <translation type="unfinished">Rectangle Center</translation> </message> <message id="id_menu_tool_circle_corner"> <source></source> - <translation>Circle Corner</translation> + <translation type="unfinished">Circle Corner</translation> </message> <message id="id_menu_tool_circle_radius"> <source></source> - <translation>Circle Radius</translation> + <translation type="unfinished">Circle Radius</translation> </message> <message id="id_menu_tool_circle_center"> <source></source> - <translation>Circle Center</translation> + <translation type="unfinished">Circle Center</translation> </message> <message id="id_menu_tool_arc_semi"> <source></source> - <translation>Semicircle</translation> + <translation type="unfinished">Semicircle</translation> </message> <message id="id_menu_tool_arc_quarter"> <source></source> - <translation>Quarter Circle</translation> + <translation type="unfinished">Quarter Circle</translation> </message> <message id="id_menu_tool_text"> <source></source> - <translation>Text</translation> + <translation type="unfinished">Text</translation> </message> <message id="id_menu_help"> <source></source> - <translation>Help</translation> + <translation type="unfinished">Help</translation> </message> <message id="id_menu_help_contents"> <source></source> - <translation>Contents</translation> + <translation type="unfinished">Contents</translation> </message> <message id="id_menu_help_about"> <source></source> - <translation>About</translation> + <translation type="unfinished">About</translation> </message> <message id="id_tooltip_edit_undo"> <source></source> - <translation>Undo edit</translation> + <translation type="unfinished">Undo edit</translation> </message> <message id="id_tooltip_edit_redo"> <source></source> - <translation>Redo edit</translation> + <translation type="unfinished">Redo edit</translation> </message> <message id="id_tooltip_edit_cut"> <source></source> - <translation>Cut symbol</translation> + <translation type="unfinished">Cut symbol</translation> </message> <message id="id_tooltip_edit_copy"> <source></source> - <translation>Copy symbol</translation> + <translation type="unfinished">Copy symbol</translation> </message> <message id="id_tooltip_edit_paste"> <source></source> - <translation>Paste symbol</translation> + <translation type="unfinished">Paste symbol</translation> </message> <message id="id_tooltip_edit_rotate_right"> <source></source> - <translation>Rotate right</translation> + <translation type="unfinished">Rotate right</translation> </message> <message id="id_tooltip_edit_rotate_left"> <source></source> - <translation>Rotate left</translation> + <translation type="unfinished">Rotate left</translation> </message> <message id="id_tooltip_edit_raise_item"> <source></source> - <translation>Raise item</translation> + <translation type="unfinished">Raise item</translation> </message> <message id="id_tooltip_edit_lower_item"> <source></source> - <translation>Lower item</translation> + <translation type="unfinished">Lower item</translation> </message> <message id="id_tooltip_delete_item"> <source></source> - <translation>Delete item</translation> + <translation type="unfinished">Delete item</translation> </message> - <message id="id_tooltip_zoom_all"> - <source></source> - <translation>Maximum zoom</translation> - </message> - <message id="id_tooltip_zoom_preview"> + <message id="id_tooltip_zoom_all"> <source></source> - <translation>Preview symbol</translation> + <translation type="unfinished">Maximum zoom</translation> + </message> + <message id="id_tooltip_zoom_preview"> + <source></source> + <translation type="unfinished">Preview symbol</translation> </message> <message id="id_tooltip_tool_select"> <source></source> - <translation>Select item</translation> + <translation type="unfinished">Select item</translation> </message> <message id="id_tooltip_tool_line"> <source></source> - <translation>Draw line</translation> + <translation type="unfinished">Draw line</translation> </message> <message id="id_tooltip_tool_rect_corner"> <source></source> - <translation>Rectangle corner</translation> + <translation type="unfinished">Rectangle corner</translation> </message> <message id="id_tooltip_tool_rect_center"> <source></source> - <translation>Rectangle center</translation> + <translation type="unfinished">Rectangle center</translation> </message> <message id="id_tooltip_tool_circle_corner"> <source></source> - <translation>Circle corner</translation> + <translation type="unfinished">Circle corner</translation> </message> <message id="id_tooltip_tool_circle_radius"> <source></source> - <translation>Circle radius</translation> + <translation type="unfinished">Circle radius</translation> </message> <message id="id_tooltip_tool_circle_center"> <source></source> - <translation>Circle center</translation> + <translation type="unfinished">Circle center</translation> </message> <message id="id_tooltip_tool_text"> <source></source> - <translation>Draw text</translation> + <translation type="unfinished">Draw text</translation> </message> <message id="id_toolbar_snap_grid"> <source></source> - <translation>Snap Grid</translation> + <translation type="unfinished">Snap Grid</translation> </message> <message id="id_toolbar_fill_item"> <source></source> - <translation>Fill Item</translation> + <translation type="unfinished">Fill Item</translation> </message> <message id="id_toolbar_fill_none"> <source></source> - <translation>0 No fill</translation> + <translation type="unfinished">0 No fill</translation> </message> <message id="id_toolbar_fill_back"> <source></source> - <translation>1 Background</translation> + <translation type="unfinished">1 Background</translation> </message> <message id="id_toolbar_fill_area"> <source></source> - <translation>2 Fill area</translation> + <translation type="unfinished">2 Fill area</translation> </message> <message id="id_toolbar_line_width"> <source></source> - <translation>Line Width</translation> + <translation type="unfinished">Line Width</translation> </message> <message id="id_toolbar_text_size"> <source></source> - <translation>Text Size</translation> + <translation type="unfinished">Text Size</translation> </message> <message id="id_toolbar_alignment"> <source></source> - <translation>Alignment</translation> + <translation type="unfinished">Alignment</translation> </message> <message id="id_toolbar_align_top_right"> <source></source> - <translation>1 Top right</translation> + <translation type="unfinished">1 Top right</translation> </message> <message id="id_toolbar_align_top_center"> <source></source> - <translation>2 Top center</translation> + <translation type="unfinished">2 Top center</translation> </message> <message id="id_toolbar_align_top_left"> <source></source> - <translation>3 Top left</translation> + <translation type="unfinished">3 Top left</translation> </message> <message id="id_toolbar_align_base_right"> <source></source> - <translation>4 Base right</translation> + <translation type="unfinished">4 Base right</translation> </message> <message id="id_toolbar_align_base_center"> <source></source> - <translation>5 Base center</translation> + <translation type="unfinished">5 Base center</translation> </message> <message id="id_toolbar_align_base_left"> <source></source> - <translation>6 Base left</translation> + <translation type="unfinished">6 Base left</translation> </message> <message id="id_toolbar_align_bottom_right"> <source></source> - <translation>7 Bottom right</translation> + <translation type="unfinished">7 Bottom right</translation> </message> <message id="id_toolbar_align_bottom_center"> <source></source> - <translation>8 Bottom center</translation> + <translation type="unfinished">8 Bottom center</translation> </message> <message id="id_toolbar_align_bottom_left"> <source></source> - <translation>9 Bottom left</translation> + <translation type="unfinished">9 Bottom left</translation> </message> <message id="id_toolbar_align_middle_right"> <source></source> - <translation>10 Middle right</translation> + <translation type="unfinished">10 Middle right</translation> </message> <message id="id_toolbar_align_middle_center"> <source></source> - <translation>11 Middle center</translation> + <translation type="unfinished">11 Middle center</translation> </message> <message id="id_toolbar_align_middle_left"> <source></source> - <translation>12 Middle left</translation> + <translation type="unfinished">12 Middle left</translation> </message> <message id="id_toolbar_text_field"> <source></source> - <translation>Text</translation> + <translation type="unfinished">Text</translation> </message> <message id="id_dialog_about"> <source></source> - <translation>About Program</translation> + <translation type="unfinished">About Program</translation> </message> <message id="id_dialog_about_text"> <source></source> - <translation>Symbol editor for 3D-Win</translation> + <translation type="unfinished">Symbol editor for 3D-Win</translation> + </message> + <message id="id_tooltip_tool_semi_radius"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_tooltip_tool_quarter_radius"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_cli_symbol"> + <source></source> + <translation>symbol</translation> + </message> + <message id="id_cli_symbol_description"> + <source></source> + <translation>Read symbol from parameter <symbol>.</translation> + </message> + <message id="id_cli_language"> + <source></source> + <translation>language</translation> + </message> + <message id="id_cli_language_description"> + <source></source> + <translation>Application language abbreviation <language>.</translation> + </message> + <message id="id_cli_transfer_file"> + <source></source> + <translation>Symbol file is transfer file.</translation> + </message> + <message id="id_cli_symbol_file_name"> + <source></source> + <translation>Symbol file name.</translation> </message> </context> </TS> diff --git a/locale/symedit.fi_FI.ts b/locale/symedit.fi_FI.ts index 23cd14d..6fc8a18 100644 --- a/locale/symedit.fi_FI.ts +++ b/locale/symedit.fi_FI.ts @@ -5,319 +5,351 @@ <name></name> <message id="id_application_title"> <source></source> - <translation>Symbolieditori</translation> + <translation type="unfinished">Symbolieditori</translation> </message> <message id="id_menu_file"> <source></source> - <translation>Tiedosto</translation> + <translation type="unfinished">Tiedosto</translation> </message> <message id="id_menu_file_open"> <source></source> - <translation>Avaa...</translation> + <translation type="unfinished">Avaa...</translation> </message> <message id="id_menu_file_save"> <source></source> - <translation>Tallenna...</translation> + <translation type="unfinished">Tallenna...</translation> </message> <message id="id_menu_file_exit"> <source></source> - <translation>Lopeta</translation> + <translation type="unfinished">Lopeta</translation> </message> <message id="id_menu_edit"> <source></source> - <translation>Muokkaa</translation> + <translation type="unfinished">Muokkaa</translation> </message> <message id="id_menu_edit_undo"> <source></source> - <translation>Kumoa</translation> + <translation type="unfinished">Kumoa</translation> </message> <message id="id_menu_edit_redo"> <source></source> - <translation>Tee uudelleen</translation> + <translation type="unfinished">Tee uudelleen</translation> </message> <message id="id_menu_edit_cut"> <source></source> - <translation>Leikkaa</translation> + <translation type="unfinished">Leikkaa</translation> </message> <message id="id_menu_edit_copy"> <source></source> - <translation>Kopioi</translation> + <translation type="unfinished">Kopioi</translation> </message> <message id="id_menu_edit_paste"> <source></source> - <translation>Liitä</translation> + <translation type="unfinished">Liitä</translation> </message> <message id="id_menu_edit_rotate_right"> <source></source> - <translation>Käännä oikealle</translation> + <translation type="unfinished">Käännä oikealle</translation> </message> <message id="id_menu_edit_rotate_left"> <source></source> - <translation>Käännä vasemmalle</translation> + <translation type="unfinished">Käännä vasemmalle</translation> </message> <message id="id_menu_edit_raise_item"> <source></source> - <translation>Nosta kohdetta</translation> + <translation type="unfinished">Nosta kohdetta</translation> </message> <message id="id_menu_edit_lower_item"> <source></source> - <translation>Alenna kohdetta</translation> + <translation type="unfinished">Alenna kohdetta</translation> </message> <message id="id_menu_edit_delete_item"> <source></source> - <translation>Poista kohde</translation> + <translation type="unfinished">Poista kohde</translation> </message> <message id="id_menu_view"> <source></source> - <translation>Näytä</translation> + <translation type="unfinished">Näytä</translation> </message> <message id="id_menu_view_zoom_in"> <source></source> - <translation>Lähennä</translation> + <translation type="unfinished">Lähennä</translation> </message> <message id="id_menu_view_zoom_out"> <source></source> - <translation>Loitonna</translation> + <translation type="unfinished">Loitonna</translation> </message> <message id="id_menu_view_zoom_all"> <source></source> - <translation>Maksimi</translation> + <translation type="unfinished">Maksimi</translation> </message> <message id="id_menu_view_grid"> <source></source> - <translation>Ruudukko</translation> + <translation type="unfinished">Ruudukko</translation> </message> <message id="id_menu_view_preview"> <source></source> - <translation>Esikatselu</translation> + <translation type="unfinished">Esikatselu</translation> </message> <message id="id_menu_tool"> <source></source> - <translation>Työkalut</translation> + <translation type="unfinished">Työkalut</translation> </message> <message id="id_menu_tool_select"> <source></source> - <translation>Valitse</translation> + <translation type="unfinished">Valitse</translation> </message> <message id="id_menu_tool_line"> <source></source> - <translation>Viiva</translation> + <translation type="unfinished">Viiva</translation> </message> <message id="id_menu_tool_rect_corner"> <source></source> - <translation>Suorakulmio kulmista</translation> + <translation type="unfinished">Suorakulmio kulmista</translation> </message> <message id="id_menu_tool_rect_center"> <source></source> - <translation>Suorakulmio keskeltä</translation> + <translation type="unfinished">Suorakulmio keskeltä</translation> </message> <message id="id_menu_tool_circle_corner"> <source></source> - <translation>Ympyrä kulmista</translation> + <translation type="unfinished">Ympyrä kulmista</translation> </message> <message id="id_menu_tool_circle_radius"> <source></source> - <translation>Ympyrä halkaisija</translation> + <translation type="unfinished">Ympyrä halkaisija</translation> </message> <message id="id_menu_tool_circle_center"> <source></source> - <translation>Ympyrä keskeltä</translation> + <translation type="unfinished">Ympyrä keskeltä</translation> </message> <message id="id_menu_tool_arc_semi"> <source></source> - <translation>Puoliympyrä</translation> + <translation type="unfinished">Puoliympyrä</translation> </message> <message id="id_menu_tool_arc_quarter"> <source></source> - <translation>Neljännesympyrä</translation> + <translation type="unfinished">Neljännesympyrä</translation> </message> <message id="id_menu_tool_text"> <source></source> - <translation>Teksti</translation> + <translation type="unfinished">Teksti</translation> </message> <message id="id_menu_help"> <source></source> - <translation>Ohje</translation> + <translation type="unfinished">Ohje</translation> </message> <message id="id_menu_help_contents"> <source></source> - <translation>Sisältö</translation> + <translation type="unfinished">Sisältö</translation> </message> <message id="id_menu_help_about"> <source></source> - <translation>Tietoja</translation> + <translation type="unfinished">Tietoja</translation> </message> <message id="id_tooltip_edit_undo"> <source></source> - <translation>Kumoa toiminto</translation> + <translation type="unfinished">Kumoa toiminto</translation> </message> <message id="id_tooltip_edit_redo"> <source></source> - <translation>Tee toiminto uudelleen</translation> + <translation type="unfinished">Tee toiminto uudelleen</translation> </message> <message id="id_tooltip_edit_cut"> <source></source> - <translation>Leikkaa symboli</translation> + <translation type="unfinished">Leikkaa symboli</translation> </message> <message id="id_tooltip_edit_copy"> <source></source> - <translation>Kopioi symboli</translation> + <translation type="unfinished">Kopioi symboli</translation> </message> <message id="id_tooltip_edit_paste"> <source></source> - <translation>Liitä symboli</translation> + <translation type="unfinished">Liitä symboli</translation> </message> <message id="id_tooltip_edit_rotate_right"> <source></source> - <translation>Käännä oikealle</translation> + <translation type="unfinished">Käännä oikealle</translation> </message> <message id="id_tooltip_edit_rotate_left"> <source></source> - <translation>Käännä vasemmalle</translation> + <translation type="unfinished">Käännä vasemmalle</translation> </message> <message id="id_tooltip_edit_raise_item"> <source></source> - <translation>Nosta kohdetta</translation> + <translation type="unfinished">Nosta kohdetta</translation> </message> <message id="id_tooltip_edit_lower_item"> <source></source> - <translation>Alenna kohdetta</translation> + <translation type="unfinished">Alenna kohdetta</translation> </message> <message id="id_tooltip_delete_item"> <source></source> - <translation>Poista kohde</translation> + <translation type="unfinished">Poista kohde</translation> </message> - <message id="id_tooltip_zoom_all"> - <source></source> - <translation>Maksimizoomaus</translation> - </message> - <message id="id_tooltip_zoom_preview"> + <message id="id_tooltip_zoom_all"> <source></source> - <translation>Symbolin esikatselu</translation> + <translation type="unfinished">Maksimizoomaus</translation> + </message> + <message id="id_tooltip_zoom_preview"> + <source></source> + <translation type="unfinished">Symbolin esikatselu</translation> </message> <message id="id_tooltip_tool_select"> <source></source> - <translation>Valitse kohde</translation> + <translation type="unfinished">Valitse kohde</translation> </message> <message id="id_tooltip_tool_line"> <source></source> - <translation>Piirrä viiva</translation> + <translation type="unfinished">Piirrä viiva</translation> </message> <message id="id_tooltip_tool_rect_corner"> <source></source> - <translation>Suorakulmio kulmista</translation> + <translation type="unfinished">Suorakulmio kulmista</translation> </message> <message id="id_tooltip_tool_rect_center"> <source></source> - <translation>Suorakulmio keskeltä</translation> + <translation type="unfinished">Suorakulmio keskeltä</translation> </message> <message id="id_tooltip_tool_circle_corner"> <source></source> - <translation>Ympyrä kulmista</translation> + <translation type="unfinished">Ympyrä kulmista</translation> </message> <message id="id_tooltip_tool_circle_radius"> <source></source> - <translation>Ympyrä halkasija</translation> + <translation type="unfinished">Ympyrä halkasija</translation> </message> <message id="id_tooltip_tool_circle_center"> <source></source> - <translation>Ympyrä keskeltä</translation> + <translation type="unfinished">Ympyrä keskeltä</translation> </message> <message id="id_tooltip_tool_text"> <source></source> - <translation>Piirrä teksti</translation> + <translation type="unfinished">Piirrä teksti</translation> </message> <message id="id_toolbar_snap_grid"> <source></source> - <translation>Tartunta</translation> + <translation type="unfinished">Tartunta</translation> </message> <message id="id_toolbar_fill_item"> <source></source> - <translation>Täyttö</translation> + <translation type="unfinished">Täyttö</translation> </message> <message id="id_toolbar_fill_none"> <source></source> - <translation>0 Ei täyttöä</translation> + <translation type="unfinished">0 Ei täyttöä</translation> </message> <message id="id_toolbar_fill_back"> <source></source> - <translation>1 Taustaväri</translation> + <translation type="unfinished">1 Taustaväri</translation> </message> <message id="id_toolbar_fill_area"> <source></source> - <translation>2 Alueen täyttö</translation> + <translation type="unfinished">2 Alueen täyttö</translation> </message> <message id="id_toolbar_line_width"> <source></source> - <translation>Viivan leveys</translation> + <translation type="unfinished">Viivan leveys</translation> </message> <message id="id_toolbar_text_size"> <source></source> - <translation>Tekstin koko</translation> + <translation type="unfinished">Tekstin koko</translation> </message> <message id="id_toolbar_alignment"> <source></source> - <translation>Asemointi</translation> + <translation type="unfinished">Asemointi</translation> </message> <message id="id_toolbar_align_top_right"> <source></source> - <translation>1 Ylhäällä oikealla</translation> + <translation type="unfinished">1 Ylhäällä oikealla</translation> </message> <message id="id_toolbar_align_top_center"> <source></source> - <translation>2 Ylhäällä keskellä</translation> + <translation type="unfinished">2 Ylhäällä keskellä</translation> </message> <message id="id_toolbar_align_top_left"> <source></source> - <translation>3 Ylhäällä vasemmalla</translation> + <translation type="unfinished">3 Ylhäällä vasemmalla</translation> </message> <message id="id_toolbar_align_base_right"> <source></source> - <translation>4 Alareunassa oikealla</translation> + <translation type="unfinished">4 Alareunassa oikealla</translation> </message> <message id="id_toolbar_align_base_center"> <source></source> - <translation>5 Alareunassa keskellä</translation> + <translation type="unfinished">5 Alareunassa keskellä</translation> </message> <message id="id_toolbar_align_base_left"> <source></source> - <translation>6 Alareunassa vasemmalla</translation> + <translation type="unfinished">6 Alareunassa vasemmalla</translation> </message> <message id="id_toolbar_align_bottom_right"> <source></source> - <translation>7 Alhaalla oikealla</translation> + <translation type="unfinished">7 Alhaalla oikealla</translation> </message> <message id="id_toolbar_align_bottom_center"> <source></source> - <translation>8 Alhaalla keskellä</translation> + <translation type="unfinished">8 Alhaalla keskellä</translation> </message> <message id="id_toolbar_align_bottom_left"> <source></source> - <translation>9 Alhaalla vasemmalla</translation> + <translation type="unfinished">9 Alhaalla vasemmalla</translation> </message> <message id="id_toolbar_align_middle_right"> <source></source> - <translation>10 Puolivälissä oikealla</translation> + <translation type="unfinished">10 Puolivälissä oikealla</translation> </message> <message id="id_toolbar_align_middle_center"> <source></source> - <translation>11 Puolivälissä keskellä</translation> + <translation type="unfinished">11 Puolivälissä keskellä</translation> </message> <message id="id_toolbar_align_middle_left"> <source></source> - <translation>12 Puolivälissä vasemmalla</translation> + <translation type="unfinished">12 Puolivälissä vasemmalla</translation> </message> <message id="id_toolbar_text_field"> <source></source> - <translation>Teksti</translation> + <translation type="unfinished">Teksti</translation> </message> <message id="id_dialog_about"> <source></source> - <translation>Tietoja ohjelmasta</translation> + <translation type="unfinished">Tietoja ohjelmasta</translation> </message> <message id="id_dialog_about_text"> <source></source> - <translation>3D-Win symbolieditori</translation> + <translation type="unfinished">3D-Win symbolieditori</translation> + </message> + <message id="id_tooltip_tool_semi_radius"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_tooltip_tool_quarter_radius"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_cli_symbol"> + <source></source> + <translation>symboli</translation> + </message> + <message id="id_cli_symbol_description"> + <source></source> + <translation>Lue symboli parametrista <symboli>.</translation> + </message> + <message id="id_cli_language"> + <source></source> + <translation>kieli</translation> + </message> + <message id="id_cli_language_description"> + <source></source> + <translation>Sovelluksen kielen lyhenne <kieli>.</translation> + </message> + <message id="id_cli_transfer_file"> + <source></source> + <translation>Symbolitiedosto on siirtotiedosto.</translation> + </message> + <message id="id_cli_symbol_file_name"> + <source></source> + <translation>Symbolitiedoston nimi.</translation> </message> </context> </TS> diff --git a/locale/symedit.ts b/locale/symedit.ts index 0b9c513..bf67612 100644 --- a/locale/symedit.ts +++ b/locale/symedit.ts @@ -175,11 +175,11 @@ <source></source> <translation type="unfinished"></translation> </message> - <message id="id_tooltip_zoom_all"> - <source></source> - <translation type="unfinished"></translation> - </message> - <message id="id_tooltip_zoom_preview"> + <message id="id_tooltip_zoom_all"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_tooltip_zoom_preview"> <source></source> <translation type="unfinished"></translation> </message> @@ -319,5 +319,37 @@ <source></source> <translation type="unfinished"></translation> </message> + <message id="id_tooltip_tool_semi_radius"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_tooltip_tool_quarter_radius"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_cli_symbol"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_cli_language"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_cli_symbol_description"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_cli_language_description"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_cli_transfer_file"> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="id_cli_symbol_file_name"> + <source></source> + <translation type="unfinished"></translation> + </message> </context> </TS> @@ -17,29 +17,60 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); - // register enumerations - qmlRegisterUncreatableMetaObject(Operation::staticMetaObject, - "Org.Syrja.Symbol.Operation", 1, 0, "Operation", "Error: only enums" ); + // set base language translators + QLocale locale; + QTranslator backuptranslator, localetranslator, currenttranslator; + if ( backuptranslator.load(":/locale/symedit.en_GB.qm") ) + QCoreApplication::installTranslator(&backuptranslator); + if ( localetranslator.load(locale, ":/locale/symedit.") ) + QCoreApplication::installTranslator(&localetranslator); + // register command line arguments QCommandLineParser parser; + parser.addPositionalArgument("file", qtTrId("id_cli_symbol_file_name")); + QCommandLineOption transferoption(QStringList() << "t" << "transfer", qtTrId("id_cli_transfer_file")); + parser.addOption(transferoption); + QCommandLineOption symboloption(QStringList() << "s" << "symbol", + qtTrId("id_cli_symbol_description"), qtTrId("id_cli_symbol")); + parser.addOption(symboloption); + QCommandLineOption languageoption(QStringList() << "l" << "language", + qtTrId("id_cli_language_description"), qtTrId("id_cli_language")); + parser.addOption(languageoption); + parser.addHelpOption(); parser.process(app); - QString symbol; + // read command line arguments + QString filename; const QStringList arguments = parser.positionalArguments(); if ( arguments.size() ) - symbol = arguments.at(0); + filename = arguments.at(0); + bool transfer = parser.isSet(transferoption); + QString symbol = parser.value(symboloption); + QString language = parser.value(languageoption); + + // set current translator + if ( currenttranslator.load(language == "fin" ? ":/locale/symedit.fi_FI.qm" : "") ) + QCoreApplication::installTranslator(¤ttranslator); + + // register enumerations + qmlRegisterUncreatableMetaObject(Operation::staticMetaObject, + "Org.Syrja.Symbol.Operation", 1, 0, "Operation", "Error: only enums" ); // register manager - SymEditManager manager(symbol); QQmlApplicationEngine engine; + SymEditManager manager(filename, symbol); engine.rootContext()->setContextProperty("manager", &manager); + // start application engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); if ( engine.rootObjects().isEmpty() ) return -1; - int result = app.exec(); + if ( transfer ) + { + //## save file + } manager.SaveSettings(); return result; @@ -327,12 +327,13 @@ ApplicationWindow function open() { - + manager.open(); + editor.update() } function save() { - + manager.save(); } function zoom(dir) diff --git a/symedit.cpp b/symedit.cpp index 7e636f4..da2d9ec 100644 --- a/symedit.cpp +++ b/symedit.cpp @@ -73,22 +73,23 @@ void SymEditSettings::Save() const SymEditManager::SymEditManager(QObject* parent) : QObject(parent) { Settings.Load(); - - QLocale locale; -// if ( BackupTranslator.load(":/locale/symedit.en_GB.qm") ) - if ( BackupTranslator.load(":/locale/symedit.fi_FI.qm") ) - QGuiApplication::installTranslator(&BackupTranslator); - if ( LocaleTranslator.load(locale, ":/locale/symedit.") ) - QGuiApplication::installTranslator(&LocaleTranslator); } //! Constructor. /*! + \param filename Symbol file name from command line. \param symbol Symbol string from command line. */ -SymEditManager::SymEditManager(const QString& symbol) : SymEditManager(nullptr) +SymEditManager::SymEditManager(const QString& filename, const QString& symbol) + : SymEditManager(nullptr) { - Symbol.Load(symbol); + if ( !filename.isEmpty() ) + { + //## load file + } + + if ( !symbol.isEmpty() ) + Symbol.Load(symbol); } //! Set window initialized. @@ -431,6 +432,20 @@ bool SymEditManager::raiseItem(int dir) return false; } +//! Open symbol file. +bool SymEditManager::open() +{ + //## + return false; +} + +//! Save symbol file. +bool SymEditManager::save() +{ + //## + return false; +} + //! Undo edit operation. /*! \param undo True undoes, false redoes. @@ -37,7 +37,7 @@ class SymEditManager : public QObject public: explicit SymEditManager(QObject* parent = nullptr); - explicit SymEditManager(const QString& symbol); + explicit SymEditManager(const QString& filename, const QString& symbol); //! Save settings. void SaveSettings() const { Settings.Save(); } @@ -80,6 +80,9 @@ public: Q_INVOKABLE void rotateSymbol(int dir); Q_INVOKABLE bool raiseItem(int dir); + Q_INVOKABLE bool open(); + Q_INVOKABLE bool save(); + Q_INVOKABLE bool undo(bool undo); Q_INVOKABLE void help(QString topic) const; @@ -87,13 +90,12 @@ private: void undosave(); bool Initialized = false; //!< Initialization mutex. + QString SymbolFile; //!< Symbol file name. + SymEditSymbol Symbol; //!< Current symbol. SymEditSettings Settings; //!< Editor settings. std::deque<QString> UndoStack; //!< Undo stack. std::deque<QString> RedoStack; //!< Redo stack. - - QTranslator BackupTranslator; //!< UI backup translator. - QTranslator LocaleTranslator; //!< UI locale translator. }; #endif diff --git a/symedit.pro b/symedit.pro index 4586988..68e2b75 100644 --- a/symedit.pro +++ b/symedit.pro @@ -66,4 +66,5 @@ DISTFILES += \ help/eng/tools.rst \ help/eng/usage.rst \ help/eng/Makefile \ - help/eng/conf.py + help/eng/conf.py \ + LICENSE |
