Modify main menu

source/fb2main.cpp

@@ -300,16 +300,47 @@ void Fb2MainWindow::createActions()
 
     menu->addSeparator();
 
-    actionInsert = act = new QAction(icon("list-add"), tr("Insert"), this);
+    actionFind = act = new QAction(icon("edit-find"), tr("&Find..."), this);
+    act->setShortcuts(QKeySequence::Find);
+    menu->addAction(act);
+
+    actionReplace = act = new QAction(icon("edit-find-replace"), tr("&Replace..."), this);
+    menu->addAction(act);
+
+    menu->addSeparator();
+
+    actionInsert = act = new QAction(icon("list-add"), tr("&Append"), this);
     act->setPriority(QAction::LowPriority);
     act->setShortcuts(QKeySequence::New);
     menu->addAction(act);
 
-    actionDelete = act = new QAction(icon("list-remove"), tr("Delete"), this);
+    actionDelete = act = new QAction(icon("list-remove"), tr("&Delete"), this);
     act->setPriority(QAction::LowPriority);
     act->setShortcuts(QKeySequence::Delete);
     menu->addAction(act);
 
+    menu->addSeparator();
+
+    act = new QAction(icon("preferences-desktop"), tr("&Settings"), this);
+    act->setShortcuts(QKeySequence::Preferences);
+    act->setStatusTip(tr("Application settings"));
+    connect(act, SIGNAL(triggered()), SLOT(openSettings()));
+    menu->addAction(act);
+
+    menu = menuBar()->addMenu(tr("&Insert", "Main menu"));
+
+    act = new QAction(icon("insert-image"), tr("&Image"), this);
+    menu->addAction(act);
+
+    act = new QAction(icon("insert-link"), tr("&Link"), this);
+    menu->addAction(act);
+
+    act = new QAction(icon("insert-object"), tr("&Object"), this);
+    menu->addAction(act);
+
+    act = new QAction(icon("insert-text"), tr("&Text"), this);
+    menu->addAction(act);
+
     menuText = menu = menuBar()->addMenu(tr("Fo&rmat"));
 
     actionTextBold = act = new QAction(icon("format-text-bold"), tr("Bold"), this);
@@ -399,6 +430,12 @@ void Fb2MainWindow::createActions()
     menu->addAction(act);
 }
 
+void Fb2MainWindow::openSettings()
+{
+    QMessageBox::about(this, tr("Settings"),
+        tr("The <b>fb2edit</b> is application for editing FB2-files."));
+}
+
 void Fb2MainWindow::createTree()
 {
     if (treeView) return;

source/fb2main.h

@@ -59,6 +59,7 @@ private slots:
     void redoChanged();
     void showInspector();
     void zoomOrig();
+    void openSettings();
 
 private:
     bool loadXML(const QString &filename);
@@ -105,6 +106,8 @@ private:
         *actionCopy,
         *actionPaste,
         *actionSelect,
+        *actionFind,
+        *actionReplace,
         *actionInsert,
         *actionDelete,
         *actionTextBold,

source/res/fb2edit.qrc

@@ -17,8 +17,17 @@
         <file>16/format-text-strikethrough.png</file>
         <file>16/format-text-subscript.png</file>
         <file>16/format-text-superscript.png</file>
+        <file>16/go-down.png</file>
+        <file>16/go-next.png</file>
+        <file>16/go-previous.png</file>
+        <file>16/go-up.png</file>
+        <file>16/insert-image.png</file>
+        <file>16/insert-link.png</file>
+        <file>16/insert-object.png</file>
+        <file>16/insert-text.png</file>
         <file>16/list-add.png</file>
         <file>16/list-remove.png</file>
+        <file>16/preferences-desktop.png</file>
         <file>16/window-close.png</file>
         <file>16/zoom-in.png</file>
         <file>16/zoom-original.png</file>
@@ -40,8 +49,17 @@
         <file>24/format-text-strikethrough.png</file>
         <file>24/format-text-subscript.png</file>
         <file>24/format-text-superscript.png</file>
+        <file>24/go-down.png</file>
+        <file>24/go-next.png</file>
+        <file>24/go-previous.png</file>
+        <file>24/go-up.png</file>
+        <file>24/insert-image.png</file>
+        <file>24/insert-link.png</file>
+        <file>24/insert-object.png</file>
+        <file>24/insert-text.png</file>
         <file>24/list-add.png</file>
         <file>24/list-remove.png</file>
+        <file>24/preferences-desktop.png</file>
         <file>24/window-close.png</file>
         <file>24/zoom-in.png</file>
         <file>24/zoom-original.png</file>

source/ts/ru.ts

@@ -131,6 +131,7 @@
     </message>
     <message>
         <location filename="../fb2main.cpp" line="185"/>
+        <location filename="../fb2main.cpp" line="415"/>
         <source>The &lt;b&gt;fb2edit&lt;/b&gt; is application for editing FB2-files.</source>
         <translation></translation>
     </message>
@@ -210,46 +211,36 @@
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="303"/>
-        <source>Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../fb2main.cpp" line="308"/>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../fb2main.cpp" line="616"/>
-        <location filename="../fb2main.cpp" line="697"/>
-        <location filename="../fb2main.cpp" line="827"/>
+        <location filename="../fb2main.cpp" line="632"/>
+        <location filename="../fb2main.cpp" line="713"/>
+        <location filename="../fb2main.cpp" line="843"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="747"/>
+        <location filename="../fb2main.cpp" line="763"/>
         <source>&amp;Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="753"/>
+        <location filename="../fb2main.cpp" line="769"/>
         <source>&amp;Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="759"/>
+        <location filename="../fb2main.cpp" line="775"/>
         <source>&amp;Strikethrough</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../fb2main.cpp" line="266"/>
-        <location filename="../fb2main.cpp" line="705"/>
+        <location filename="../fb2main.cpp" line="721"/>
         <source>&amp;Undo</source>
         <translation>&amp;Отменить</translation>
     </message>
     <message>
         <location filename="../fb2main.cpp" line="272"/>
-        <location filename="../fb2main.cpp" line="712"/>
+        <location filename="../fb2main.cpp" line="728"/>
         <source>&amp;Redo</source>
         <translation>&amp;Повторить</translation>
     </message>
@@ -263,52 +254,78 @@
     </message>
     <message>
         <location filename="../fb2main.cpp" line="280"/>
-        <location filename="../fb2main.cpp" line="721"/>
+        <location filename="../fb2main.cpp" line="737"/>
         <source>Cu&amp;t</source>
         <translation>Вы&amp;резать</translation>
     </message>
     <message>
         <location filename="../fb2main.cpp" line="283"/>
-        <location filename="../fb2main.cpp" line="724"/>
+        <location filename="../fb2main.cpp" line="740"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../fb2main.cpp" line="287"/>
-        <location filename="../fb2main.cpp" line="729"/>
+        <location filename="../fb2main.cpp" line="745"/>
         <source>&amp;Copy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
         <location filename="../fb2main.cpp" line="290"/>
-        <location filename="../fb2main.cpp" line="732"/>
+        <location filename="../fb2main.cpp" line="748"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../fb2main.cpp" line="294"/>
-        <location filename="../fb2main.cpp" line="737"/>
+        <location filename="../fb2main.cpp" line="753"/>
         <source>&amp;Paste</source>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
         <location filename="../fb2main.cpp" line="297"/>
-        <location filename="../fb2main.cpp" line="740"/>
+        <location filename="../fb2main.cpp" line="756"/>
         <source>Paste the clipboard&apos;s contents into the current selection</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="313"/>
+        <location filename="../fb2main.cpp" line="303"/>
+        <source>&amp;Settings</source>
+        <translation type="unfinished">&amp;Настройки</translation>
+    </message>
+    <message>
+        <location filename="../fb2main.cpp" line="305"/>
+        <source>Application settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fb2main.cpp" line="309"/>
+        <source>&amp;Insert</source>
+        <comment>Main menu</comment>
+        <translation type="unfinished">&amp;Вставка</translation>
+    </message>
+    <message>
+        <location filename="../fb2main.cpp" line="311"/>
+        <source>&amp;Append</source>
+        <translation type="unfinished">&amp;Добавить</translation>
+    </message>
+    <message>
+        <location filename="../fb2main.cpp" line="316"/>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Удалить</translation>
+    </message>
+    <message>
+        <location filename="../fb2main.cpp" line="323"/>
         <source>Fo&amp;rmat</source>
         <translation>Фо&amp;рмат</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="380"/>
+        <location filename="../fb2main.cpp" line="390"/>
         <source>&amp;Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="384"/>
+        <location filename="../fb2main.cpp" line="394"/>
         <source>&amp;Web inspector</source>
         <translation type="unfinished"></translation>
     </message>
@@ -317,109 +334,114 @@
         <translation type="obsolete">Формат</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="315"/>
+        <location filename="../fb2main.cpp" line="325"/>
         <source>Bold</source>
         <translation>Жирный</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="320"/>
+        <location filename="../fb2main.cpp" line="330"/>
         <source>Italic</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="325"/>
+        <location filename="../fb2main.cpp" line="335"/>
         <source>Strikethrough</source>
         <translation>Зачеркнутый</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="329"/>
-        <location filename="../fb2main.cpp" line="764"/>
+        <location filename="../fb2main.cpp" line="339"/>
+        <location filename="../fb2main.cpp" line="780"/>
         <source>Superscript</source>
         <translation>Верхний индекс</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="333"/>
-        <location filename="../fb2main.cpp" line="769"/>
+        <location filename="../fb2main.cpp" line="343"/>
+        <location filename="../fb2main.cpp" line="785"/>
         <source>Subscript</source>
         <translation>Нижний индекс</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="337"/>
+        <location filename="../fb2main.cpp" line="347"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="343"/>
+        <location filename="../fb2main.cpp" line="353"/>
         <source>&amp;Text</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="351"/>
+        <location filename="../fb2main.cpp" line="361"/>
         <source>&amp;Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="358"/>
+        <location filename="../fb2main.cpp" line="368"/>
         <source>&amp;XML</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="367"/>
+        <location filename="../fb2main.cpp" line="377"/>
         <source>Zoom in</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="371"/>
+        <location filename="../fb2main.cpp" line="381"/>
         <source>Zoom out</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="375"/>
+        <location filename="../fb2main.cpp" line="385"/>
         <source>Zoom original</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="389"/>
+        <location filename="../fb2main.cpp" line="399"/>
         <source>&amp;Help</source>
         <translation>&amp;?</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="391"/>
+        <location filename="../fb2main.cpp" line="401"/>
         <source>&amp;About</source>
         <translation>&amp;О программа...</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="392"/>
+        <location filename="../fb2main.cpp" line="402"/>
         <source>Show the application&apos;s About box</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="396"/>
+        <location filename="../fb2main.cpp" line="406"/>
         <source>About &amp;Qt</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="397"/>
+        <location filename="../fb2main.cpp" line="407"/>
         <source>Show the Qt library&apos;s About box</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="409"/>
+        <location filename="../fb2main.cpp" line="414"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../fb2main.cpp" line="425"/>
         <source>Contents</source>
         <translation>Содержание</translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="504"/>
+        <location filename="../fb2main.cpp" line="520"/>
         <source>Ready</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="528"/>
+        <location filename="../fb2main.cpp" line="544"/>
         <source>The document has been modified. Do you want to save your changes?</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../fb2main.cpp" line="543"/>
+        <location filename="../fb2main.cpp" line="559"/>
         <source>Cannot write file %1: %2.</source>
         <translation></translation>
     </message>