Miscellaneous UI corrections.

10 files changed, 70 insertions, 22 deletions

diff --git a/help/eng/menu.rst b/help/eng/menu.rst
index 155fefd..6d2dbb7 100644
--- a/help/eng/menu.rst
+++ b/help/eng/menu.rst
@@ -1,5 +1,5 @@
-Valikkotoiminnot
-================
+Menu functions
+==============
 
 Operations available in application menu.
 
@@ -10,6 +10,8 @@ File
 	:scale: 50 %
 .. |save image| image:: ../../image/save_icon&48.png
 	:scale: 50 %
+.. |save as image| image:: ../../image/save_as.png
+	:scale: 50 %
 .. |exit image| image:: ../../image/exit_icon&48.png
 	:scale: 50 %
 
@@ -23,8 +25,8 @@ Opens symbol from text file. Shortcut key Ctrl+O.
 
 Saves symbol to text file. Shortcut key Ctrl+S.
 
-Save as
-^^^^^^^
+|save as image| Save as
+^^^^^^^^^^^^^^^^^^^^^^^
 
 Saves symbol to text file with new name. Shortcut key Ctrl+Shift+S.
 
diff --git a/help/fin/menu.rst b/help/fin/menu.rst
index f1ec528..9370c2b 100644
--- a/help/fin/menu.rst
+++ b/help/fin/menu.rst
@@ -10,6 +10,8 @@ Tiedosto
 	:scale: 50 %
 .. |save image| image:: ../../image/save_icon&48.png
 	:scale: 50 %
+.. |save as image| image:: ../../image/save_as.png
+	:scale: 50 %
 .. |exit image| image:: ../../image/exit_icon&48.png
 	:scale: 50 %
 
@@ -23,8 +25,8 @@ Avaa symbolin tekstitiedostosta. Pikanäppäin Ctrl+O.
 
 Tallentaa symbolin tekstitiedostoon. Pikanäppäin Ctrl+S.
 
-Tallenna nimellä
-^^^^^^^^^^^^^^^^
+|save as image| Tallenna nimellä
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Tallentaa symbolin tekstitiedostoon uudella nimellä. Pikanäppäin Ctrl+Shift+S.
 
diff --git a/image/save_as.png b/image/save_as.png
new file mode 100644
index 0000000..0bc1ddb
--- /dev/null
+++ b/image/save_as.png
diff --git a/locale/symedit.en_GB.ts b/locale/symedit.en_GB.ts
index b0c924b..737c738 100644
--- a/locale/symedit.en_GB.ts
+++ b/locale/symedit.en_GB.ts
@@ -9,6 +9,7 @@
     </message>
     <message id="id_menu_file">
         <source></source>
+        <extracomment>file menu</extracomment>
         <translation>&amp;File</translation>
     </message>
     <message id="id_menu_file_open">
@@ -29,6 +30,7 @@
     </message>
     <message id="id_menu_edit">
         <source></source>
+        <extracomment>edit menu</extracomment>
         <translation>&amp;Edit</translation>
     </message>
     <message id="id_menu_edit_undo">
@@ -151,7 +153,19 @@
         <source></source>
         <translation>About</translation>
     </message>
-    <message id="id_tooltip_edit_undo">
+	<message id="id_tooltip_file_open">
+		<source></source>
+		<translation>Open file</translation>
+	</message>
+	<message id="id_tooltip_file_save">
+		<source></source>
+		<translation>Save file</translation>
+	</message>
+	<message id="id_tooltip_file_save_as">
+		<source></source>
+		<translation>Save file with other name</translation>
+	</message>
+	<message id="id_tooltip_edit_undo">
         <source></source>
         <translation>Undo edit</translation>
     </message>
diff --git a/locale/symedit.fi_FI.ts b/locale/symedit.fi_FI.ts
index 388a13e..b0aea4b 100644
--- a/locale/symedit.fi_FI.ts
+++ b/locale/symedit.fi_FI.ts
@@ -9,6 +9,7 @@
     </message>
     <message id="id_menu_file">
         <source></source>
+        <extracomment>file menu</extracomment>
         <translation>&amp;Tiedosto</translation>
     </message>
     <message id="id_menu_file_open">
@@ -29,6 +30,7 @@
     </message>
     <message id="id_menu_edit">
         <source></source>
+        <extracomment>edit menu</extracomment>
         <translation>&amp;Muokkaa</translation>
     </message>
     <message id="id_menu_edit_undo">
@@ -151,7 +153,19 @@
         <source></source>
         <translation>Tietoja</translation>
     </message>
-    <message id="id_tooltip_edit_undo">
+	<message id="id_tooltip_file_open">
+		<source></source>
+		<translation>Avaa tiedosto</translation>
+	</message>
+	<message id="id_tooltip_file_save">
+		<source></source>
+		<translation>Tallenna tiedosto</translation>
+	</message>
+	<message id="id_tooltip_file_save_as">
+		<source></source>
+		<translation>Tallenna tiedosto nimellä</translation>
+	</message>
+	<message id="id_tooltip_edit_undo">
         <source></source>
         <translation>Kumoa toiminto</translation>
     </message>
diff --git a/locale/symedit.ts b/locale/symedit.ts
index 126623f..c291ad7 100644
--- a/locale/symedit.ts
+++ b/locale/symedit.ts
@@ -5,6 +5,7 @@
     <name></name>
     <message id="id_menu_file">
         <source></source>
+        <extracomment>file menu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message id="id_menu_file_open">
@@ -25,6 +26,7 @@
     </message>
     <message id="id_menu_edit">
         <source></source>
+        <extracomment>edit menu</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message id="id_menu_edit_undo">
@@ -139,7 +141,19 @@
         <source></source>
         <translation type="unfinished"></translation>
     </message>
-    <message id="id_tooltip_edit_undo">
+	<message id="id_tooltip_file_open">
+		<source></source>
+		<translation type="unfinished"></translation>
+	</message>
+	<message id="id_tooltip_file_save">
+		<source></source>
+		<translation type="unfinished"></translation>
+	</message>
+	<message id="id_tooltip_file_save_as">
+		<source></source>
+		<translation type="unfinished"></translation>
+	</message>
+	<message id="id_tooltip_edit_undo">
         <source></source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/main.cpp b/main.cpp
index 43ecd1b..27204c8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
 	QString symbol = parser.value(symboloption);
 	QString language = parser.value(languageoption);
 	if ( language.isEmpty() )
-		language = "eng";
+		language = "eng";		//## use fi_FI and en_GB?
 
 	// set current translator
 	if ( currenttranslator.load(language == "fin" ? ":/locale/symedit.fi_FI.qm" : "") )
diff --git a/main.qml b/main.qml
index 5896ec6..ad8481c 100644
--- a/main.qml
+++ b/main.qml
@@ -119,7 +119,8 @@ ApplicationWindow
 				height: 30
 				z: 10
 //				BarTool { image: "image/open_icon&48.png"; tooltip: qsTrId("id_tooltip_file_open"); onClicked: open() }
-//				BarTool { image: "image/save_icon&48.png"; tooltip: qsTrId("id_tooltip_file_save"); onClicked: save() }
+//				BarTool { image: "image/save_icon&48.png"; tooltip: qsTrId("id_tooltip_file_save"); onClicked: save(false) }
+//				BarTool { image: "image/save_as.png"; tooltip: qsTrId("id_tooltip_file_save_as"); onClicked: save(true) }
 //				BarSeparator { }
 				BarTool { image: "image/undo_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_undo"); onClicked: undo(true) }
 				BarTool { image: "image/redo_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_redo"); onClicked: undo(false) }
diff --git a/qml.qrc b/qml.qrc
index 8224bc9..22e542e 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -37,5 +37,6 @@
         <file>image/quarter_radius.png</file>
         <file>image/circle_diameter.png</file>
         <file>image/semi_diameter.png</file>
+        <file>image/save_as.png</file>
     </qresource>
 </RCC>
diff --git a/symedit.pro b/symedit.pro
index e91ed44..cc98243 100644
--- a/symedit.pro
+++ b/symedit.pro
@@ -39,17 +39,21 @@ DISTFILES += \
 	.gitignore \
 	.editorconfig \
 	README.md \
+	LICENSE \
 	lrelease.sh \
 	lupdate.sh \
+	image/delete.kra \
+	image/polyline.kra \
+	image/rotate_left.kra \
+	image/rotate_right.kra \
 	image/circle_center.kra \
-    image/circle_corner.kra \
-    image/delete.kra \
-    image/polyline.kra \
+	image/circle_diameter.kra \
+	image/circle_corner.kra \
     image/rectangle_center.kra \
     image/rectangle_corner.kra \
-    image/rotate_left.kra \
-    image/rotate_right.kra \
-    image/text.kra \
+	image/semi_diameter.kra \
+	image/quarter_radius.kra \
+	image/text.kra \
     locale/symedit.ts \
     locale/symedit.fi_FI.ts \
     locale/symedit.en_GB.ts \
@@ -65,8 +69,4 @@ DISTFILES += \
     help/eng/tools.rst \
     help/eng/usage.rst \
     help/eng/Makefile \
-    help/eng/conf.py \
-    LICENSE \
-    image/circle_diameter.kra \
-    image/semi_diameter.kra \
-    image/quarter_radius.kra
+	help/eng/conf.py