홈 탐색 도움말
가입하기 로그인
oleg
/
fb2edit
의 미러 https://github.com/lintest/fb2edit.git
1
0
포크 0
파일 이슈 0 위키
소스 검색

Small changes in class Fb2NoteView

Kandrashin Denis 13 년 전
부모
a19da1feed
커밋
96b0d54c19
2개의 변경된 파일과 30개의 추가작업 그리고 24개의 파일을 삭제
통합 보기 변경상태 보기
  1. 26 22
      source/fb2view.cpp
  2. 4 2
      source/fb2view.hpp

+ 26 - 22
source/fb2view.cpp
파일 보기 

@@ -22,6 +22,7 @@ class Fb2NoteView : public QWebView
 
 {
 
 {
 
 public:
 
 public:
 
     explicit Fb2NoteView(QWidget* parent = 0) : QWebView(parent) {}
 
     explicit Fb2NoteView(QWidget* parent = 0) : QWebView(parent) {}
 
+    void hint(const QWebElement element, const QRect &rect);
 
 protected:
 
 protected:
 
     void paintEvent(QPaintEvent *event);
 
     void paintEvent(QPaintEvent *event);
 
 };
 
 };
 
@@ -35,6 +36,19 @@ void Fb2NoteView::paintEvent(QPaintEvent *event)
 
     painter.drawRect( QRect(QPoint(0, 0), size) );
 
     painter.drawRect( QRect(QPoint(0, 0), size) );
 
 }
 
 }
 
 
 
+void Fb2NoteView::hint(const QWebElement element, const QRect &rect)
 
+{
 
+    QString html = element.toOuterXml();
 
+    html.prepend(
 
+        "<body bgcolor=lightyellow style='overflow:hidden;padding:0;margin:0;margin-top:2;'>"
 
+        "<div class=body name=notes style='padding:0;margin:0;'>"
 
+    );
 
+    html.append("</div></body>");
 
+    setGeometry(rect);
 
+    setHtml(html);
 
+    show();
 
+}
 
+
 
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 
 //  Fb2WebPage
 
 //  Fb2WebPage
 
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 
@@ -85,15 +99,15 @@ Fb2WebView::~Fb2WebView()
 
     FB2DELETE(m_noteView);
 
     FB2DELETE(m_noteView);
 
 }
 
 }
 
 
 
-QWebView * Fb2WebView::noteView()
 
+Fb2NoteView & Fb2WebView::noteView()
 
 {
 
 {
 
-    if (m_noteView) return m_noteView;
 
+    if (m_noteView) return *m_noteView;
 
     m_noteView = new Fb2NoteView(qobject_cast<QWidget*>(parent()));
 
     m_noteView = new Fb2NoteView(qobject_cast<QWidget*>(parent()));
 
     m_noteView->setPage(new Fb2WebPage(this));
 
     m_noteView->setPage(new Fb2WebPage(this));
 
     m_noteView->page()->setNetworkAccessManager(page()->networkAccessManager());
 
     m_noteView->page()->setNetworkAccessManager(page()->networkAccessManager());
 
     m_noteView->page()->setContentEditable(false);
 
     m_noteView->page()->setContentEditable(false);
 
     m_noteView->setGeometry(QRect(100, 100, 400, 200));
 
     m_noteView->setGeometry(QRect(100, 100, 400, 200));
 
-    return m_noteView;
 
+    return *m_noteView;
 
 }
 
 }
 
 
 
 QWebElement Fb2WebView::doc()
 
 QWebElement Fb2WebView::doc()
 
@@ -126,39 +140,29 @@ void Fb2WebView::linkHovered(const QString &link, const QString &title, const QS
 
     Q_UNUSED(title);
 
     Q_UNUSED(title);
 
     Q_UNUSED(textContent);
 
     Q_UNUSED(textContent);
 
 
 
-    if (link.isEmpty()) {
 
+    const QString href = QUrl(link).fragment();
 
+    if (href.isEmpty()) {
 
         if (m_noteView) m_noteView->hide();
 
         if (m_noteView) m_noteView->hide();
 
         return;
 
         return;
 
     }
 
     }
 
 
 
-    const QString href = QUrl(link).fragment();
 
-    QString query = QString("DIV[id=%1]").arg(href);
 
-    QWebElement element = doc().findFirst(query);
 
+    const QString query = QString("DIV#%1").arg(href);
 
+    const QWebElement element = doc().findFirst(query);
 
     if (element.isNull()) {
 
     if (element.isNull()) {
 
         if (m_noteView) m_noteView->hide();
 
         if (m_noteView) m_noteView->hide();
 
         return;
 
         return;
 
     }
 
     }
 
 
 
+    QRect rect = geometry();
 
     QSize size = element.geometry().size() + QSize(2, 4);
 
     QSize size = element.geometry().size() + QSize(2, 4);
 
-    int center = geometry().size().height() / 2;
 
+    int center = rect.size().height() / 2;
 
     int h = size.height();
 
     int h = size.height();
 
     if (h > center) size.setHeight(center - 10);
 
     if (h > center) size.setHeight(center - 10);
 
-    int x = (geometry().size().width() - size.width()) / 2;
 
+    int x = (rect.size().width() - size.width()) / 2;
 
     int y = m_point.y();
 
     int y = m_point.y();
 
     if ( y > h ) y = y - h - 10; else y = y + 10;
 
     if ( y > h ) y = y - h - 10; else y = y + 10;
 
-    QPoint point = QPoint(x, y) + geometry().topLeft();
 
-    QRect rect(point, size);
 
-
 
-    QWebView * view = noteView();
 
-    QString html = element.toOuterXml();
 
-    html.prepend(
 
-        "<html><body bgcolor=lightyellow style=\"overflow:hidden;padding:0;margin:0;margin-top:2;\">"
 
-        "<div class=body name=notes style=\"padding:0;margin:0;\">"
 
-    );
 
-    html.append("</div></body></html>");
 
-    view->setGeometry(rect);
 
-    view->setHtml(html);
 
-    view->show();
 
+    QPoint point = QPoint(x, y) + rect.topLeft();
 
+    noteView().hint(element, QRect(point, size));
 
 }
 
 }
 
 
 
 void Fb2WebView::load(const QString &filename, const QString &xml)
 
 void Fb2WebView::load(const QString &filename, const QString &xml)

+ 4 - 2
source/fb2view.hpp
파일 보기 

@@ -9,6 +9,8 @@
 
 
 
 #include "fb2temp.hpp"
 
 #include "fb2temp.hpp"
 
 
 
+class Fb2NoteView;
 
+
 
 class Fb2BaseWebView : public QWebView
 
 class Fb2BaseWebView : public QWebView
 
 {
 
 {
 
     Q_OBJECT
 
     Q_OBJECT
 
@@ -99,12 +101,12 @@ private slots:
 
 private:
 
 private:
 
     void execCommand(const QString &cmd, const QString &arg);
 
     void execCommand(const QString &cmd, const QString &arg);
 
     Fb2TemporaryFile * file(const QString &name);
 
     Fb2TemporaryFile * file(const QString &name);
 
-    QWebView * noteView();
 
+    Fb2NoteView & noteView();
 
     QWebElement doc();
 
     QWebElement doc();
 
 
 
 private:
 
 private:
 
     Fb2TemporaryList m_files;
 
     Fb2TemporaryList m_files;
 
-    QWebView *m_noteView;
 
+    Fb2NoteView *m_noteView;
 
     QThread *m_thread;
 
     QThread *m_thread;
 
     QPoint m_point;
 
     QPoint m_point;
 
 };
 
 };