Skip to content
Snippets Groups Projects
Commit fbde3bf3 authored by pospelov's avatar pospelov
Browse files

Attempt to compile qt-manhattan with SIP

parent 62869659
No related branches found
No related tags found
No related merge requests found
Showing
with 65 additions and 14 deletions
%Import QtGui/QtGuimod.sip
namespace Manhattan {
class FancyTabWidget : public QWidget{
%TypeHeaderCode
#include "fancytabwidget.h"
%End
public:
FancyTabWidget(QWidget *parent = 0);
void insertTab(int index, QWidget *tab /TransferThis/, const QIcon &icon, const QString &label);
};
};
\ No newline at end of file
%Module ManhattanStyle
%Import QtGui/QtGuimod.sip
%Import QtCore/QtCoremod.sip
%Import QtWebKit/QtWebKitmod.sip
%Include FancyTabWidget.sip
...@@ -33,6 +33,7 @@ BOOST_PYTHON_MODULE(libManhattanStyle) ...@@ -33,6 +33,7 @@ BOOST_PYTHON_MODULE(libManhattanStyle)
class_<Manhattan::FancyTabWidget, boost::noncopyable, std::auto_ptr<Manhattan::FancyTabWidget> >("FancyTabWidget") class_<Manhattan::FancyTabWidget, boost::noncopyable, std::auto_ptr<Manhattan::FancyTabWidget> >("FancyTabWidget")
.def(init<QWidget*>())
.def("insertTab",&Manhattan::FancyTabWidget::insertTab) .def("insertTab",&Manhattan::FancyTabWidget::insertTab)
; ;
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <QIcon> #include <QIcon>
#include <QString> #include <QString>
#include <QColor> #include <QColor>
#include <QWebView>
#include "manhattanstyle.h" #include "manhattanstyle.h"
#include "fancytabwidget.h" #include "fancytabwidget.h"
...@@ -83,6 +84,7 @@ template <> struct MetaData<QWidget> { static const char* className() { return " ...@@ -83,6 +84,7 @@ template <> struct MetaData<QWidget> { static const char* className() { return "
template <> struct MetaData<QIcon> { static const char* className() { return "QIcon";} }; template <> struct MetaData<QIcon> { static const char* className() { return "QIcon";} };
template <> struct MetaData<QColor> { static const char* className() { return "QColor";} }; template <> struct MetaData<QColor> { static const char* className() { return "QColor";} };
template <> struct MetaData<QAction> { static const char* className() { return "QAction";} }; template <> struct MetaData<QAction> { static const char* className() { return "QAction";} };
template <> struct MetaData<QWebView> { static const char* className() { return "QWebView";} };
//template <> struct MetaData<QString> { static const char* className() { return "QString";} }; //template <> struct MetaData<QString> { static const char* className() { return "QString";} };
...@@ -164,6 +166,7 @@ struct QClass_converters ...@@ -164,6 +166,7 @@ struct QClass_converters
// transfer ownership from python to C++ // transfer ownership from python to C++
#if SIP_API_MAJOR_NR >=4 #if SIP_API_MAJOR_NR >=4
std::cout << "XXX 2.1" << std::endl;
sip_API->api_transfer_to(obj_ptr, 0); sip_API->api_transfer_to(obj_ptr, 0);
#else #else
sip_API->api_transfer(obj_ptr, 1); sip_API->api_transfer(obj_ptr, 1);
...@@ -387,6 +390,7 @@ void export_sip() ...@@ -387,6 +390,7 @@ void export_sip()
QClass_converters<QWidget>(); // from python QClass_converters<QWidget>(); // from python
QClass_converters<QAction>(); // from/to python QClass_converters<QAction>(); // from/to python
QClass_converters<QIcon>(); QClass_converters<QIcon>();
QClass_converters<QWebView>();
//QClass_converters<QString>(); //QClass_converters<QString>();
//QClass_converters<QColor>(); //QClass_converters<QColor>();
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
TARGET = ManhattanStyle TARGET = ManhattanStyle
TEMPLATE = lib TEMPLATE = lib
QT += core gui QT += core gui webkit webkitwidgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
# making standard shared library extension # making standard shared library extension
......
GUI/pygui/images/mode_exp.png

2.12 KiB

GUI/pygui/images/mode_fit.png

1.58 KiB

GUI/pygui/images/mode_job.png

9.23 KiB

GUI/pygui/images/mode_sample.png

869 B

GUI/pygui/images/mode_script.png

1.66 KiB

GUI/pygui/images/mode_simul.png

2.66 KiB

GUI/pygui/images/mode_welcome.png

2.4 KiB

...@@ -23,6 +23,7 @@ def fromPyQt(object, type): ...@@ -23,6 +23,7 @@ def fromPyQt(object, type):
return type.wrap(ptr) return type.wrap(ptr)
#import ManhattanStyle as lms
import libManhattanStyle as lms import libManhattanStyle as lms
from views.WelcomeView import WelcomeView from views.WelcomeView import WelcomeView
...@@ -32,26 +33,26 @@ class MainWindow(QMainWindow): ...@@ -32,26 +33,26 @@ class MainWindow(QMainWindow):
baseName = QApplication.style().objectName() baseName = QApplication.style().objectName()
manhattan_style = lms.ManhattanStyle( str(baseName) ) #manhattan_style = lms.ManhattanStyle( str(baseName) )
#manhattan_style = lms.ManhattanStyle( sip.unwrapinstance(baseName) ) #manhattan_style = lms.ManhattanStyle( sip.unwrapinstance(baseName) )
#manhattan_style = lms.ManhattanStyle( fromPyQt(baseName, lms.QString) ) #manhattan_style = lms.ManhattanStyle( fromPyQt(baseName, lms.QString) )
#lms.StyleHelper.setBaseColor( fromPyQt(QColor(0x086FA1), lms.QColor) ) #lms.StyleHelper.setBaseColor( fromPyQt(QColor(0x086FA1), lms.QColor) )
k = QColor(Qt.red) #k = QColor(Qt.red)
lms.StyleHelper.setBaseColor(k ) #lms.StyleHelper.setBaseColor(k )
qApp.setStyle( lms.toPyQt(manhattan_style) ) #qApp.setStyle( lms.toPyQt(manhattan_style) )
self.__tabWidget = lms.FancyTabWidget(self)
self.__tabWidget = lms.FancyTabWidget()
self.__welcomeView = WelcomeView() self.__welcomeView = WelcomeView()
#self.__welcomeView = QWidget()
self.__tabWidget.insertTab(0, self.__welcomeView, QIcon(":/images/mode_welcome.png"), "Welcome" ) print "PPPPP 1.1"
self.__tabWidget.insertTab(0, self.__welcomeView, QIcon("images/mode_welcome.png"), "Welcome" )
print "PPPPP 1.2"
#self.__tabWidget.insertTab(0, fromPyQt(self.__welcomeView, lms.QWidget), fromPyQt(QIcon(":/images/mode_welcome.png"), lms.QIcon), fromPyQt(QString("Welcome"), lms.QString )) #self.__tabWidget.insertTab(0, fromPyQt(self.__welcomeView, lms.QWidget), fromPyQt(QIcon(":/images/mode_welcome.png"), lms.QIcon), fromPyQt(QString("Welcome"), lms.QString ))
self.setCentralWidget( lms.toPyQt(self.__tabWidget) ) self.setCentralWidget( lms.toPyQt(self.__tabWidget) )
#self.setCentralWidget( toPyQt(self.__tabWidget, QWidget) ) #self.setCentralWidget( self.__welcomeView )
from PyQt4.QtCore import ( from PyQt4.QtCore import (
QObject, QObject, QUrl, SIGNAL, SLOT
) )
from PyQt4.QtGui import ( from PyQt4.QtGui import (
QMainWindow, QWidget, QMainWindow, QWidget, QDesktopServices
) )
from PyQt4.QtWebKit import (
QWebPage, QWebView
)
# class WelcomeView(QWidget):
# def __init__(self, parent = None):
# QWidget.__init__(self, parent)
class WelcomeView(QWidget): class WelcomeView(QWebView):
def __init__(self, parent = None): def __init__(self, parent = None):
QWidget.__init__(self, parent) super(WelcomeView, self).__init__(parent)
self.url = QUrl("http://apps.jcns.fz-juelich.de/doku/sc/bornagain::start")
self.load(self.url)
self.connect(self, SIGNAL("linkClicked(const QUrl &)"), self.onWebLinkClicked)
self.page().setLinkDelegationPolicy( QWebPage.DelegateAllLinks )
def onWebLinkClicked(self, url):
print "XXXclicked"
QDesktopServices.openUrl(url)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment