- Launch OLA setup web page in a new window. Menu File

This commit is contained in:
Santi Noreña 2013-03-09 15:21:00 +01:00
parent e24f617e52
commit 70c51c5368
5 changed files with 53 additions and 20 deletions

View file

@ -160,10 +160,11 @@ libreMediaServer::libreMediaServer(QStringList args, QWidget *parent)
connect(ui.actionChange_Media_Path, SIGNAL(triggered()), this, SLOT(ChangeMediaPath()));
connect(ui.actionInitMSEX, SIGNAL(triggered()), this, SLOT(initMSEX()));
connect(ui.actionMake_Thumbs, SIGNAL(triggered()), this, SLOT(makeThumbs()));
connect(ui.actionLaunch_OLA_Setup,SIGNAL(triggered()),this, SLOT(olasetup()));
// Load the configuration
open_start();
// Connect MSEx Timer
connect(m_msex,SIGNAL(frameRequest()), this, SLOT(sendFrame()));
connect(m_msex,SIGNAL(frameRequest()), this, SLOT(sendFrame()));
}
///////////////////////////////////////////////////////////////////
@ -460,6 +461,13 @@ void libreMediaServer::olastart()
// connect(ola, SIGNAL(finished(int)), this, SLOT(olastart()));
}
void libreMediaServer::olasetup()
{
QWebView *view = new QWebView();
view->load(QUrl("http://localhost:9090/ola.html"));
view->show();
}
///////////////////////////////////////////////////////////////////
// Menu CITP/MSEx
///////////////////////////////////////////////////////////////////

View file

@ -20,23 +20,25 @@
#define LIBREMEDIASERVER_H
#include <QMainWindow>
#include <QApplication>
#include <QObject>
#include <QDesktopWidget>
#include <QtDebug>
#include <QtNetwork>
#include <QLocalServer>
#include <QLocalSocket>
#include <QFile>
#include <QFileInfo>
#include <QFileDialog>
#include <QTextStream>
#include <QWebView>
#include <QUrl>
#include "msex.h"
#include "CITPDefines.h"
#include "MSEXDefines.h"
#include "ui_libremediaserver.h"
#include <QtNetwork>
#include <QLocalServer>
#include <QLocalSocket>
#include <QObject>
#include <QApplication>
#include <QDesktopWidget>
#include <QtDebug>
#include <QFileInfo>
#include <QFileDialog>
#include <QFile>
#include <QTextStream>
#define VERSION "LibreMediaServer Version 0.04-1"
#define COPYRIGHT "(C) 2012-2013 Santi Norena libremediaserver@gmail.com"
#define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details"
@ -99,6 +101,7 @@ public slots:
private slots:
void olastart(); // Init the OLA daemon
void olasetup();
// Video
void newPeer();
void newmessage();

View file

@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = libremediaserver
QT += network script
QT += network script webkit
CONFIG += debug
DESTDIR = ./debug

View file

@ -27,6 +27,18 @@
<height>441</height>
</rect>
</property>
<property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="cursor">
<cursorShape>CrossCursor</cursorShape>
</property>
@ -1191,7 +1203,11 @@
</property>
</widget>
</widget>
<widget class="QStatusBar" name="statusBar"/>
<widget class="QStatusBar" name="statusBar">
<property name="accessibleName">
<string notr="true"/>
</property>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
@ -1208,6 +1224,7 @@
<addaction name="actionOpen_conf"/>
<addaction name="actionSave_conf"/>
<addaction name="actionChange_Media_Path"/>
<addaction name="actionLaunch_OLA_Setup"/>
</widget>
<widget class="QMenu" name="menuCITP_MSEx">
<property name="title">
@ -1258,6 +1275,11 @@
<string>Make Thumbs</string>
</property>
</action>
<action name="actionLaunch_OLA_Setup">
<property name="text">
<string>OLA Setup</string>
</property>
</action>
</widget>
<resources/>
<connections/>