Browse Source

New head actions: insert, remove

Kandrashin Denis 13 years ago
parent
commit
f9ec9b0a36

+ 28 - 1
source/fb2main.cpp

@@ -527,6 +527,9 @@ void Fb2MainWindow::viewQsci()
     FB2DELETE(textEdit);
     FB2DELETE(dockTree);
     FB2DELETE(headTree);
+    FB2DELETE(toolEdit);
+    menuEdit->clear();
+    menuText->clear();
     createQsci();
     qsciEdit->setText(xml);
 }
@@ -653,6 +656,9 @@ void Fb2MainWindow::viewText()
     tool->addAction(actionZoomIn);
     tool->addAction(actionZoomOut);
     tool->addAction(actionZoomOrig);
+
+    act = textEdit->pageAction(QWebPage::InspectElement);
+    menuView->addAction(act);
 }
 
 void Fb2MainWindow::viewHead()
@@ -664,6 +670,26 @@ void Fb2MainWindow::viewHead()
     menuEdit->clear();
     menuText->clear();
     createHead();
+
+    FB2DELETE(toolEdit);
+    QToolBar *tool = toolEdit = addToolBar(tr("Edit"));
+    tool->setMovable(false);
+    tool->addSeparator();
+
+    QAction *act;
+    QMenu *menu = menuEdit;
+
+    act = new QAction(icon("list-add"), tr("Insert"), this);
+    act->setPriority(QAction::LowPriority);
+    act->setShortcuts(QKeySequence::New);
+    menu->addAction(act);
+    tool->addAction(act);
+
+    act = new QAction(icon("list-remove"), tr("Delete"), this);
+    act->setPriority(QAction::LowPriority);
+    act->setShortcuts(QKeySequence::Delete);
+    menu->addAction(act);
+    tool->addAction(act);
 }
 
 void Fb2MainWindow::viewTree()
@@ -685,7 +711,8 @@ void Fb2MainWindow::clipboardDataChanged()
 void Fb2MainWindow::showInspector()
 {
     if (!textEdit) return;
-    QWebInspector *inspector = new QWebInspector();
+    QWebInspector * inspector = new QWebInspector();
     inspector->setPage(textEdit->page());
     inspector->show();
 }
+

+ 2 - 0
source/fb2main.h

@@ -11,6 +11,7 @@ class QMenu;
 class QModelIndex;
 class QTextEdit;
 class QTreeView;
+class QWebInspector;
 QT_END_NAMESPACE
 
 class QsciScintilla;
@@ -75,6 +76,7 @@ private:
     Fb2MainWindow *findFb2MainWindow(const QString &fileName);
 
     Fb2WebView *textEdit;
+    QWebInspector *inspector;
     QTreeView *headTree;
     QTextEdit *noteEdit;
     QTextEdit *messageEdit;

BIN
source/res/16/list-add.png


BIN
source/res/16/list-remove.png


BIN
source/res/24/list-add.png


BIN
source/res/24/list-remove.png


+ 4 - 0
source/res/fb2edit.qrc

@@ -17,6 +17,8 @@
         <file>16/format-text-strikethrough.png</file>
         <file>16/format-text-subscript.png</file>
         <file>16/format-text-superscript.png</file>
+        <file>16/list-add.png</file>
+        <file>16/list-remove.png</file>
         <file>16/window-close.png</file>
         <file>16/zoom-in.png</file>
         <file>16/zoom-original.png</file>
@@ -38,6 +40,8 @@
         <file>24/format-text-strikethrough.png</file>
         <file>24/format-text-subscript.png</file>
         <file>24/format-text-superscript.png</file>
+        <file>24/list-add.png</file>
+        <file>24/list-remove.png</file>
         <file>24/window-close.png</file>
         <file>24/zoom-in.png</file>
         <file>24/zoom-original.png</file>