Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/b5ad19c17326da02c1c94cc50714ecadb70cbc1c
...commit
http://git.netsurf-browser.org/netsurf.git/commit/b5ad19c17326da02c1c94cc50714ecadb70cbc1c
...tree
http://git.netsurf-browser.org/netsurf.git/tree/b5ad19c17326da02c1c94cc50714ecadb70cbc1c
The branch, vince/qt6 has been updated
via b5ad19c17326da02c1c94cc50714ecadb70cbc1c (commit)
from e3c61704eee5fd1f4095410682c86199f41b91bf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=b5ad19c17326da02c1c94cc50714ecadb70cbc1c
commit b5ad19c17326da02c1c94cc50714ecadb70cbc1c
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix url setting
diff --git a/frontends/qt/urlbar.cls.h b/frontends/qt/urlbar.cls.h
index 3e4ceb0..ba5b535 100644
--- a/frontends/qt/urlbar.cls.h
+++ b/frontends/qt/urlbar.cls.h
@@ -22,6 +22,7 @@
*/
#include <QToolBar>
+#include <QLineEdit>
extern "C" {
#include "netsurf/types.h"
#include "netsurf/content_type.h"
@@ -33,8 +34,8 @@ class NS_URLBar :public QToolBar
Q_OBJECT
private:
struct browser_window *m_bw;
-
+ QLineEdit *m_input;
public:
NS_URLBar(QWidget* parent, struct browser_window *bw);
-
+ nserror set_url(struct nsurl *url);
};
diff --git a/frontends/qt/urlbar.cpp b/frontends/qt/urlbar.cpp
index a54f5d7..ae52595 100644
--- a/frontends/qt/urlbar.cpp
+++ b/frontends/qt/urlbar.cpp
@@ -23,6 +23,10 @@
#include <QLineEdit>
+extern "C" {
+#include "utils/nsurl.h"
+}
+
#include "qt/urlbar.cls.h"
/**
@@ -33,8 +37,21 @@ NS_URLBar::NS_URLBar(QWidget* parent, struct browser_window
*bw)
{
addAction(QIcon(":/icons/back.png"), "Back");
addAction(QIcon(":/icons/forward.png"), "Forward");
- QLineEdit *input=new QLineEdit();
- addWidget(input);
+ m_input=new QLineEdit();
+ addWidget(m_input);
+}
+
+nserror NS_URLBar::set_url(struct nsurl *url)
+{
+ size_t idn_url_l;
+ char *idn_url_s = NULL;
+ if (nsurl_get_utf8(url, &idn_url_s, &idn_url_l) == NSERROR_OK) {
+ m_input->setText(QString::fromUtf8(idn_url_s, idn_url_l-1));
+ free(idn_url_s);
+ } else {
+ m_input->setText(nsurl_access(url));
+ }
+ return NSERROR_OK;
}
#if 0
@@ -80,18 +97,6 @@ NS_URLBar::NS_URLBar(int X,int Y,int W,int H, struct
browser_window *bw)
resizable(m_input);
}
-nserror NS_URLBar::set_url(struct nsurl *url)
-{
- size_t idn_url_l;
- char *idn_url_s = NULL;
- if (nsurl_get_utf8(url, &idn_url_s, &idn_url_l) == NSERROR_OK) {
- m_input->value(idn_url_s, idn_url_l-1);
- free(idn_url_s);
- } else {
- m_input->value(nsurl_access(url));
- }
- return NSERROR_OK;
-}
void NS_URLBar::back_callback(Fl_Button *button)
{
diff --git a/frontends/qt/window.cls.h b/frontends/qt/window.cls.h
index f59e61e..6de6c6d 100644
--- a/frontends/qt/window.cls.h
+++ b/frontends/qt/window.cls.h
@@ -30,6 +30,7 @@ extern "C" {
}
#include "qt/widget.cls.h"
+#include "qt/urlbar.cls.h"
/**
* Class for netsurf window
@@ -40,7 +41,7 @@ class NS_Window : public QWidget
private:
struct browser_window *m_bw;
- //NS_URLBar *m_nsurlbar;
+ NS_URLBar *m_nsurlbar;
NS_Widget *m_nswidget;
//Fl_Scrollbar *m_vscrollbar;
//Fl_Scrollbar *m_hscrollbar;
diff --git a/frontends/qt/window.cpp b/frontends/qt/window.cpp
index 039516c..7cefadd 100644
--- a/frontends/qt/window.cpp
+++ b/frontends/qt/window.cpp
@@ -47,7 +47,6 @@ extern "C" {
}
#include "qt/window.cls.h"
-#include "qt/urlbar.cls.h"
#include "qt/window.h"
@@ -68,38 +67,34 @@ NS_Window::NS_Window(QWidget *parent, struct browser_window
*bw)
//int splitx = (nsoption_int(toolbar_status_size) * W) / 10000;
//int urlbarh = scrlsize * 2;
- //callback(static_close_callback, (void *)this);
-
// url bar
- //m_nsurlbar = new NS_URLBar(0, 0, W, urlbarh, bw);
- NS_URLBar *urlbar= new NS_URLBar(nullptr, m_bw);
+ m_nsurlbar = new NS_URLBar(nullptr, m_bw);
QScrollBar *vscrollbar= new QScrollBar(Qt::Vertical);
-
-
+
// browser drawing canvas widget
m_nswidget = new NS_Widget(this, bw);
QGridLayout *layout = new QGridLayout(this);
layout->setContentsMargins(0,0,0,0);
- layout->addWidget(urlbar, 0, 0, 1, 2);
+ layout->addWidget(m_nsurlbar, 0, 0, 1, 2);
layout->addWidget(m_nswidget,1,0);
layout->addWidget(vscrollbar, 1,1);
layout->setRowStretch(1,1);
-
- #if 0
+
+#if 0
// vertical scrollbar
m_vscrollbar = new Fl_Scrollbar(m_nswidget->w(),
m_nsurlbar->h(),
- scrlsize,
+ scrlsize,
m_nswidget->h());
m_vscrollbar->callback(static_vscroll_callback, (void *)m_nswidget);
m_vscrollbar->value(0, m_nswidget->h(), 0, m_nswidget->h());
// horizontal scrollbar
m_hscrollbar = new Fl_Scrollbar(splitx,
- m_nswidget->y() + m_nswidget->h(),
- m_nswidget->w() - splitx,
- scrlsize);
+ m_nswidget->y() + m_nswidget->h(),
+ m_nswidget->w() - splitx,
+ scrlsize);
m_hscrollbar->type(FL_HORIZONTAL);
m_hscrollbar->callback(static_hscroll_callback, (void *)m_nswidget);
m_hscrollbar->value(0, m_nswidget->w(), 0, m_nswidget->w());
@@ -109,7 +104,7 @@ NS_Window::NS_Window(QWidget *parent, struct browser_window
*bw)
end();
resizable(m_nswidget);
- #endif
+#endif
}
NS_Window::~NS_Window() {
@@ -256,7 +251,7 @@ NS_Window::static_set_scroll(struct gui_window *gw, const
struct rect *rect)
*/
nserror NS_Window::static_set_url(struct gui_window *gw, struct nsurl *url)
{
- //return gw->window->m_nsurlbar->set_url(url);
+ return gw->window->m_nsurlbar->set_url(url);
return NSERROR_OK;
}
-----------------------------------------------------------------------
Summary of changes:
frontends/qt/urlbar.cls.h | 5 +++--
frontends/qt/urlbar.cpp | 33 +++++++++++++++++++--------------
frontends/qt/window.cls.h | 3 ++-
frontends/qt/window.cpp | 27 +++++++++++----------------
4 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/frontends/qt/urlbar.cls.h b/frontends/qt/urlbar.cls.h
index 3e4ceb0..ba5b535 100644
--- a/frontends/qt/urlbar.cls.h
+++ b/frontends/qt/urlbar.cls.h
@@ -22,6 +22,7 @@
*/
#include <QToolBar>
+#include <QLineEdit>
extern "C" {
#include "netsurf/types.h"
#include "netsurf/content_type.h"
@@ -33,8 +34,8 @@ class NS_URLBar :public QToolBar
Q_OBJECT
private:
struct browser_window *m_bw;
-
+ QLineEdit *m_input;
public:
NS_URLBar(QWidget* parent, struct browser_window *bw);
-
+ nserror set_url(struct nsurl *url);
};
diff --git a/frontends/qt/urlbar.cpp b/frontends/qt/urlbar.cpp
index a54f5d7..ae52595 100644
--- a/frontends/qt/urlbar.cpp
+++ b/frontends/qt/urlbar.cpp
@@ -23,6 +23,10 @@
#include <QLineEdit>
+extern "C" {
+#include "utils/nsurl.h"
+}
+
#include "qt/urlbar.cls.h"
/**
@@ -33,8 +37,21 @@ NS_URLBar::NS_URLBar(QWidget* parent, struct browser_window
*bw)
{
addAction(QIcon(":/icons/back.png"), "Back");
addAction(QIcon(":/icons/forward.png"), "Forward");
- QLineEdit *input=new QLineEdit();
- addWidget(input);
+ m_input=new QLineEdit();
+ addWidget(m_input);
+}
+
+nserror NS_URLBar::set_url(struct nsurl *url)
+{
+ size_t idn_url_l;
+ char *idn_url_s = NULL;
+ if (nsurl_get_utf8(url, &idn_url_s, &idn_url_l) == NSERROR_OK) {
+ m_input->setText(QString::fromUtf8(idn_url_s, idn_url_l-1));
+ free(idn_url_s);
+ } else {
+ m_input->setText(nsurl_access(url));
+ }
+ return NSERROR_OK;
}
#if 0
@@ -80,18 +97,6 @@ NS_URLBar::NS_URLBar(int X,int Y,int W,int H, struct
browser_window *bw)
resizable(m_input);
}
-nserror NS_URLBar::set_url(struct nsurl *url)
-{
- size_t idn_url_l;
- char *idn_url_s = NULL;
- if (nsurl_get_utf8(url, &idn_url_s, &idn_url_l) == NSERROR_OK) {
- m_input->value(idn_url_s, idn_url_l-1);
- free(idn_url_s);
- } else {
- m_input->value(nsurl_access(url));
- }
- return NSERROR_OK;
-}
void NS_URLBar::back_callback(Fl_Button *button)
{
diff --git a/frontends/qt/window.cls.h b/frontends/qt/window.cls.h
index f59e61e..6de6c6d 100644
--- a/frontends/qt/window.cls.h
+++ b/frontends/qt/window.cls.h
@@ -30,6 +30,7 @@ extern "C" {
}
#include "qt/widget.cls.h"
+#include "qt/urlbar.cls.h"
/**
* Class for netsurf window
@@ -40,7 +41,7 @@ class NS_Window : public QWidget
private:
struct browser_window *m_bw;
- //NS_URLBar *m_nsurlbar;
+ NS_URLBar *m_nsurlbar;
NS_Widget *m_nswidget;
//Fl_Scrollbar *m_vscrollbar;
//Fl_Scrollbar *m_hscrollbar;
diff --git a/frontends/qt/window.cpp b/frontends/qt/window.cpp
index 039516c..7cefadd 100644
--- a/frontends/qt/window.cpp
+++ b/frontends/qt/window.cpp
@@ -47,7 +47,6 @@ extern "C" {
}
#include "qt/window.cls.h"
-#include "qt/urlbar.cls.h"
#include "qt/window.h"
@@ -68,38 +67,34 @@ NS_Window::NS_Window(QWidget *parent, struct browser_window
*bw)
//int splitx = (nsoption_int(toolbar_status_size) * W) / 10000;
//int urlbarh = scrlsize * 2;
- //callback(static_close_callback, (void *)this);
-
// url bar
- //m_nsurlbar = new NS_URLBar(0, 0, W, urlbarh, bw);
- NS_URLBar *urlbar= new NS_URLBar(nullptr, m_bw);
+ m_nsurlbar = new NS_URLBar(nullptr, m_bw);
QScrollBar *vscrollbar= new QScrollBar(Qt::Vertical);
-
-
+
// browser drawing canvas widget
m_nswidget = new NS_Widget(this, bw);
QGridLayout *layout = new QGridLayout(this);
layout->setContentsMargins(0,0,0,0);
- layout->addWidget(urlbar, 0, 0, 1, 2);
+ layout->addWidget(m_nsurlbar, 0, 0, 1, 2);
layout->addWidget(m_nswidget,1,0);
layout->addWidget(vscrollbar, 1,1);
layout->setRowStretch(1,1);
-
- #if 0
+
+#if 0
// vertical scrollbar
m_vscrollbar = new Fl_Scrollbar(m_nswidget->w(),
m_nsurlbar->h(),
- scrlsize,
+ scrlsize,
m_nswidget->h());
m_vscrollbar->callback(static_vscroll_callback, (void *)m_nswidget);
m_vscrollbar->value(0, m_nswidget->h(), 0, m_nswidget->h());
// horizontal scrollbar
m_hscrollbar = new Fl_Scrollbar(splitx,
- m_nswidget->y() + m_nswidget->h(),
- m_nswidget->w() - splitx,
- scrlsize);
+ m_nswidget->y() + m_nswidget->h(),
+ m_nswidget->w() - splitx,
+ scrlsize);
m_hscrollbar->type(FL_HORIZONTAL);
m_hscrollbar->callback(static_hscroll_callback, (void *)m_nswidget);
m_hscrollbar->value(0, m_nswidget->w(), 0, m_nswidget->w());
@@ -109,7 +104,7 @@ NS_Window::NS_Window(QWidget *parent, struct browser_window
*bw)
end();
resizable(m_nswidget);
- #endif
+#endif
}
NS_Window::~NS_Window() {
@@ -256,7 +251,7 @@ NS_Window::static_set_scroll(struct gui_window *gw, const
struct rect *rect)
*/
nserror NS_Window::static_set_url(struct gui_window *gw, struct nsurl *url)
{
- //return gw->window->m_nsurlbar->set_url(url);
+ return gw->window->m_nsurlbar->set_url(url);
return NSERROR_OK;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
