Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rhodes Emulator merge (from win32-emulator branch)
- Loading branch information
Showing
28 changed files
with
4,117 additions
and
143 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -150,3 +150,4 @@ xcuserdata | |
|
|
||
| Manifest.java | ||
|
|
||
| platform/wm/rhodes/emulator/GeneratedFiles/* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #include "ExternalWebView.h" | ||
| #include "ui_ExternalWebView.h" | ||
|
|
||
| ExternalWebView::ExternalWebView(QWidget *parent) : | ||
| QWidget(parent), | ||
| ui(new Ui::ExternalWebView) | ||
| { | ||
| ui->setupUi(this); | ||
| this->ui->webView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true); | ||
| this->move(0,0); | ||
| } | ||
|
|
||
| ExternalWebView::~ExternalWebView() | ||
| { | ||
| } | ||
|
|
||
| void ExternalWebView::navigate(QUrl url) | ||
| { | ||
| ui->webView->setUrl(url); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #ifndef EXTERNALWEBVIEW_H | ||
| #define EXTERNALWEBVIEW_H | ||
|
|
||
| #include <QWidget> | ||
| #include <QUrl> | ||
|
|
||
| namespace Ui { | ||
| class ExternalWebView; | ||
| } | ||
|
|
||
| class ExternalWebView : public QWidget | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| explicit ExternalWebView(QWidget *parent = 0); | ||
| ~ExternalWebView(); | ||
| void navigate(QUrl url); | ||
| private: | ||
| Ui::ExternalWebView *ui; | ||
| }; | ||
|
|
||
| #endif // EXTERNALWEBVIEW_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <ui version="4.0"> | ||
| <class>ExternalWebView</class> | ||
| <widget class="QWidget" name="ExternalWebView"> | ||
| <property name="geometry"> | ||
| <rect> | ||
| <x>0</x> | ||
| <y>0</y> | ||
| <width>800</width> | ||
| <height>600</height> | ||
| </rect> | ||
| </property> | ||
| <property name="windowTitle"> | ||
| <string>External Browser</string> | ||
| </property> | ||
| <property name="locale"> | ||
| <locale language="English" country="UnitedStates"/> | ||
| </property> | ||
| <layout class="QVBoxLayout" name="verticalLayout"> | ||
| <property name="spacing"> | ||
| <number>0</number> | ||
| </property> | ||
| <property name="margin"> | ||
| <number>0</number> | ||
| </property> | ||
| <item> | ||
| <widget class="QWebView" name="webView"> | ||
| <property name="url"> | ||
| <url> | ||
| <string>about:blank</string> | ||
| </url> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| </layout> | ||
| </widget> | ||
| <customwidgets> | ||
| <customwidget> | ||
| <class>QWebView</class> | ||
| <extends>QWidget</extends> | ||
| <header>QtWebKit/QWebView</header> | ||
| </customwidget> | ||
| </customwidgets> | ||
| <resources/> | ||
| <connections/> | ||
| </ui> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #ifndef MAINWINDOWCALLBACK_H | ||
| #define MAINWINDOWCALLBACK_H | ||
|
|
||
| #include <string> | ||
|
|
||
| class IMainWindowCallback | ||
| { | ||
| public: | ||
| virtual void updateSizeProperties(int width, int height) = 0; | ||
| virtual void onActivate(int active) = 0; | ||
| virtual void logEvent(const ::std::string& message) = 0; | ||
| virtual void createCustomMenu(void) = 0; | ||
| virtual void onCustomMenuItemCommand(int nItemPos) = 0; | ||
| protected: | ||
| virtual ~IMainWindowCallback() {}; | ||
| }; | ||
|
|
||
| #endif // MAINWINDOWCALLBACK_H |
Oops, something went wrong.