--- a/ginebra2/UrlSearchSnippet.h Thu Sep 23 15:32:11 2010 -0400
+++ b/ginebra2/UrlSearchSnippet.h Fri Oct 15 17:30:59 2010 -0400
@@ -39,32 +39,43 @@
QString url() const { return m_urlSearchEditor->text();}
void setUrl(const QString &url) {m_urlSearchEditor->setText(url);}
+ void cut() { m_urlSearchEditor->cut(); }
+ void copy() { m_urlSearchEditor->copy(); }
+ void paste() { m_urlSearchEditor->paste(); }
+ void setContextMenuStatus(bool on) { m_urlSearchEditor->setContextMenuStatus(on); }
+ void setFocusForEditor() { m_urlSearchEditor->setFocusForEditor(); }
+
Q_SIGNALS:
void changeEditMode(bool);
+ void contextEvent(bool);
+
+private slots:
+ void onContextEvent(bool isContentSelected);
protected:
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget);
virtual void resizeEvent(QGraphicsSceneResizeEvent * event);
private:
+ void createEditor();
+ void createIcons();
void loadToMainWindow();
void updateUrlSearchBtn();
QString formattedUrl() const;
+ void changeLoadState(bool editing=true);
+ QString urlToBeDisplayed();
+ QString currentTitle();
+ void changeLayout(const bool isSearch);
#ifdef BROWSER_LAYOUT_TENONE
void changeToTitle();
QString getWindowsViewTitle();
+ void layoutToEditMode(const bool editMode);
+ void hideIndicatorButton();
#endif
- void changeLoadState(bool editing=true);
- QString urlToBeDisplayed();
- QString currentTitle();
private slots:
void onContentMouseEvent(QEvent::Type type);
-#ifdef BROWSER_LAYOUT_TENONE
- void changeToUrl(QPointF&);
- void onTitleChange(const QString&);
-#endif
void setUrlText(const QString &);
void onChromeComplete();
void setStarted();
@@ -74,7 +85,7 @@
void setPageChanged();
void setPageFailed();
void clearProgress();
- void viewChanged();
+ void viewChanged(ControllableViewBase *newView);
void urlSearchActivatedByEnterKey();
void urlSearchActivated();
void focusChanged(bool focusIn);
@@ -82,6 +93,13 @@
void updateLoadStateAndSuggest(int /*position*/, int charsRemoved, int charsAdded);
void onNewWindowTransitionComplete();
void tapped(QPointF&);
+
+#ifdef BROWSER_LAYOUT_TENONE
+ void changeToUrl(QPointF&);
+ void onTitleChange(const QString&);
+ void showSecureIcon(bool show);
+ void urlTitleIndBtnActivated();
+#endif
private:
@@ -97,13 +115,17 @@
// ui components
QGraphicsWidget * m_viewPort;
ActionButton * m_urlSearchBtn;
+#ifdef BROWSER_LAYOUT_TENONE
+ ActionButton * m_urlTitleIndBtn;
+ ActionButton * m_urlTitleIndSecureBtn;
+#endif
GProgressEditor * m_urlSearchEditor;
// variables
int m_pendingClearCalls;
- qreal m_iconWidth;
- qreal m_iconHeight;
+ qreal m_buttonIconWidth;
+ qreal m_buttonIconHeight;
bool m_backFromNewWinTrans;
bool m_justFocusIn;
};
@@ -121,7 +143,18 @@
void setUrl(const QString &url);
Q_PROPERTY(QString url READ url WRITE setUrl)
-//public slots:
+Q_SIGNALS:
+ void contextEvent(bool isContentSelected, QString snippetId);
+
+public slots:
+ void cut();
+ void copy();
+ void paste();
+ bool editable() { return true; }
+ bool useNativeCopyPasteMenu() { return true; }
+ void sendContextMenuEvent(bool isContentSelected);
+ void setContextMenuStatus(bool on) { urlSearchItem()->setContextMenuStatus(on); }
+ void grabFocus() { urlSearchItem()->setFocusForEditor(); }
private:
GUrlSearchItem *urlSearchItem();