Sync
Jeandet Alexis -
r15:c9290c6ca8bb default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -0,0 +1,12
1 QGroupBox {
2 border: 1px solid gray;
3 border-radius: 9px;
4 margin-top: 0.5em;
5 }
6
7 QGroupBox::title {
8 subcontrol-origin: margin;
9 left: 10px;
10 padding: 0 3px 0 3px;
11 }
12
@@ -1,8 +1,8
1 #!/usr/bin/lppmon -e
1 #!/usr/bin/socexplorer -e
2
2
3 proxy.loadSysDriver("AHBUARTplugin","AHBUART");
3 proxy.loadSysDriver("AHBUARTplugin","AHBUART");
4 proxy.loadSysDriverToParent("dsu3plugin","AHBUART");
4 proxy.loadSysDriverToParent("dsu3plugin","AHBUART");
5 proxy.loadSysDriverToParent("APB UART PLUGIN","AHBUART");
5 proxy.loadSysDriverToParent("APB_UART_PLUGIN","AHBUART");
6 AHBUART.open("/dev/ttyUSB0",30000000)
6 AHBUART.open("/dev/ttyUSB0",30000000)
7 FILE=QtGui.QFileDialog.getOpenFileName()
7 FILE=QtGui.QFileDialog.getOpenFileName()
8 if FILE!="":
8 if FILE!="":
@@ -16,4 +16,7
16 <qresource prefix="/about">
16 <qresource prefix="/about">
17 <file alias="about.html">txt/about.html</file>
17 <file alias="about.html">txt/about.html</file>
18 </qresource>
18 </qresource>
19 <qresource prefix="/styles">
20 <file alias="SocExplorer.css">Styles/SocExplorer.css</file>
21 </qresource>
19 </RCC>
22 </RCC>
@@ -36,6 +36,12 SocExplorerMainWindow::SocExplorerMainWi
36 this->setAcceptDrops(true);
36 this->setAcceptDrops(true);
37 this->pluginManager->setRootLoadable(true);
37 this->pluginManager->setRootLoadable(true);
38 this->PythonConsoleInst->pyConsoleRunFile(ScriptToEval);
38 this->PythonConsoleInst->pyConsoleRunFile(ScriptToEval);
39 QFile file(":/styles/SocExplorer.css");
40 if(file.open(QIODevice::ReadOnly | QIODevice::Text))
41 {
42 qApp->setStyleSheet(file.readAll());
43 file.close();
44 }
39 }
45 }
40
46
41
47
@@ -162,8 +168,6 void SocExplorerMainWindow::makeMenu()
162
168
163 SocExplorerMainWindow::~SocExplorerMainWindow()
169 SocExplorerMainWindow::~SocExplorerMainWindow()
164 {
170 {
165 delete this->p_about;
166 delete this->p_pluginGUIlist;
167 }
171 }
168
172
169
173
@@ -114,8 +114,13 HEADERS += mainwindow.h \
114
114
115 include ( NicePyConsole/NicePyConsole.pri)
115 include ( NicePyConsole/NicePyConsole.pri)
116
116
117 win32:RESOURCES = $${SOCEXPLORER_ROOT}/ressources/socexplorer.qrc
117 win32{
118 unix:RESOURCES += $${SOCEXPLORER_ROOT}/ressources/socexplorer.qrc
118 RESOURCES = ../ressources/SocExplorer.qrc
119 }
120
121 unix{
122 RESOURCES = ../ressources/SocExplorer.qrc
123 }
119
124
120 TRANSLATIONS = ../translations/socexplorer_fr.ts \
125 TRANSLATIONS = ../translations/socexplorer_fr.ts \
121 ../translations/socexplorer_en.ts
126 ../translations/socexplorer_en.ts
Comments 0
You need to be logged in to leave comments. Login now