diff --git a/doc/PythonExamples/LEON3_LOAD.py b/doc/PythonExamples/LEON3_LOAD.py --- a/doc/PythonExamples/LEON3_LOAD.py +++ b/doc/PythonExamples/LEON3_LOAD.py @@ -1,8 +1,8 @@ -#!/usr/bin/lppmon -e +#!/usr/bin/socexplorer -e proxy.loadSysDriver("AHBUARTplugin","AHBUART"); proxy.loadSysDriverToParent("dsu3plugin","AHBUART"); -proxy.loadSysDriverToParent("APB UART PLUGIN","AHBUART"); +proxy.loadSysDriverToParent("APB_UART_PLUGIN","AHBUART"); AHBUART.open("/dev/ttyUSB0",30000000) FILE=QtGui.QFileDialog.getOpenFileName() if FILE!="": diff --git a/ressources/SocExplorer.qrc b/ressources/SocExplorer.qrc --- a/ressources/SocExplorer.qrc +++ b/ressources/SocExplorer.qrc @@ -16,4 +16,7 @@ txt/about.html + + Styles/SocExplorer.css + diff --git a/ressources/Styles/SocExplorer.css b/ressources/Styles/SocExplorer.css new file mode 100644 --- /dev/null +++ b/ressources/Styles/SocExplorer.css @@ -0,0 +1,12 @@ +QGroupBox { + border: 1px solid gray; + border-radius: 9px; + margin-top: 0.5em; +} + +QGroupBox::title { + subcontrol-origin: margin; + left: 10px; + padding: 0 3px 0 3px; +} + diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -36,6 +36,12 @@ SocExplorerMainWindow::SocExplorerMainWi this->setAcceptDrops(true); this->pluginManager->setRootLoadable(true); this->PythonConsoleInst->pyConsoleRunFile(ScriptToEval); + QFile file(":/styles/SocExplorer.css"); + if(file.open(QIODevice::ReadOnly | QIODevice::Text)) + { + qApp->setStyleSheet(file.readAll()); + file.close(); + } } @@ -162,8 +168,6 @@ void SocExplorerMainWindow::makeMenu() SocExplorerMainWindow::~SocExplorerMainWindow() { - delete this->p_about; - delete this->p_pluginGUIlist; } diff --git a/src/src.pro b/src/src.pro --- a/src/src.pro +++ b/src/src.pro @@ -114,8 +114,13 @@ HEADERS += mainwindow.h \ include ( NicePyConsole/NicePyConsole.pri) -win32:RESOURCES = $${SOCEXPLORER_ROOT}/ressources/socexplorer.qrc -unix:RESOURCES += $${SOCEXPLORER_ROOT}/ressources/socexplorer.qrc +win32{ + RESOURCES = ../ressources/SocExplorer.qrc +} + +unix{ + RESOURCES = ../ressources/SocExplorer.qrc +} TRANSLATIONS = ../translations/socexplorer_fr.ts \ ../translations/socexplorer_en.ts