Skip to content

S
skylivex
Commit d7cb61d5 authored by Franco (nextime) Lanza's avatar Franco (nextime) Lanza
Browse files
Options

Merge branch 'SkyliveX-Ivan' 

Conflicts:
	gui/maingui.html
	skylivex.pro.user
parents 43216d5b 07196361
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 72 deletions
gui/login.html
View file @ d7cb61d5
<html>
<head>
<link href='http://fonts.googleapis.com/css?family=Arial' rel='stylesheet' type='text/css'>
<title>SkyliveX</title>
<script type="text/javascript" src="SkyliveX.js"></script>
<script type="text/javascript" src="SkyliveX.js"></script>
<script type="text/javascript">
function sendLogin()
{
......@@ -16,6 +17,7 @@
document.getElementById("alert").innerHTML=msg;
}
</script>
<style>
#page {
background-color: #0000FF;
......@@ -24,17 +26,29 @@
margin: 0 auto;
}
</style>
<style>
body {
font-family: 'Arial', serif;
font-size: 30px;
}
</style>
</head>
<body>
<div id="page">
<b>SkyliveX 0.1.0 Login</b>
<b><font size="3">SkyliveX 0.1.0 Login</font></b>
<div id="res"></div>
<div id="alert"></div>
<div id="alert" style="font-family: 'Arial', serif; font-size: 18px; color: #FF0000; background-color: #000000;">Enter your user and pass.</div>
<font size="2">
<form id="login" name="loginform">
Username: <input type="text" value="" name="user" placeholder="username">
Password: <input type="password" value="" name="pass" placeholder="password">
<center>
<table>
<tr><td><div style="font-family: 'Arial', serif; font-size: 14px; color: #FFFFFF;">Username:</div></td><td><input type="text" value="" name="user" placeholder="username" style="width: 150px; padding: 2px; border: 1px solid black"></td></tr>
<tr><td><div style="font-family: 'Arial', serif; font-size: 14px; color: #FFFFFF;">Password:</div></td><td><input type="password" value="" name="pass" placeholder="password" style="width: 150px; padding: 2px; border: 1px solid black"></td></tr>
</table>
</center>
<input type="submit" value="Login" onClick="sendLogin();">
</form>
</font>
</div>
</body>
</html>
......
gui/maingui.html
View file @ d7cb61d5
......@@ -3,82 +3,92 @@
<title>SkyliveX 0.1.0</title>
<script type="text/javascript" src="SkyliveX.js"></script>
<style>
#page {
body {
background-color: #FFFFFF;
background-image:url('img/mainbg2.jpg');
color: #000000;
text-align: center;
margin: 0 auto;
overflow:hidden;
}
#top {
height:40px;
border: 1px solid #000000;
width:auto;
position: absolute;
top: 8px;
right: 8px;
left: 8px;
}
#left {
width: 330px;
position: absolute;
top:48px;
left: 8px;
right: 8px;
bottom: 8px;
border: 1px solid #FF0000;
}
#livearea {
border: 1px solid #00FF00;
position: relative;
}
#toolsarea {
border: 1px solid #0000FF;
position: absolute;
bottom: 0px;
right: 0px;
left: 0px;
top: 242px;
}
#right {
position: absolute;
top: 48px;
left: 338px;
right: 8px;
bottom: 8px;
border: 1px solid #FF0FF0;
}
#chatarea {
overflow-y: auto;
border: 1px solid #00FF00;
position: absolute;
bottom: 70px;
top: 0px;
right: 130px;
left: 0px;
#datitele{
position: absolute;
top: 82px;
left: 438px;
height:100px;
width:50px;
color: #BBBBBB;
font-size:16px;
background-color: #000000;
}
#chatlist {
overflow-y: auto;
width: 130px;
position: absolute;
border: 1px solid #00FF00;
bottom: 70px;
top: 0px;
right: 0px;
}
#chatinput {
position: absolute;
height: 70px;
bottom: 0px;
right: 0px;
left: 0px;
border: 1px solid #0000FF;
#status {
height:35px;
width:350px;
color: #FFFF00;
text-align: left;
font-size:12px;
position: absolute;
top: 359px;
left: 38px;
}
#livearea {
height:240x;
width:320px;
top:73px;
left: 61px;
position: absolute;
}
#chatarea {
position: absolute;
top: 465px;
left: 23px;
height:154px;
width:407px;
overflow-y: auto;
background-color: #FFFFFF;
}
#userlist {
position: absolute;
top: 466px;
left: 470px;
height:220px;
width:140px;
color: #FFFF00;
background-color: #AAAAFF;
}
#chatinput {
position: absolute;
top: 642px;
left: 23px;
height:50px;
width:298px;
background-color: #FFFFFF;
}
#telescope {
position: absolute;
top: 23px;
left: 312px;
width: auto;
color: #CCCCCC;
font-size:18px;
background-color: #000000;
}
#numteleselect {
position: absolute;
top: 20px;
left: 407px;
}
</style>
</head>
<<<<<<< HEAD
<body>
<div id="page">
<div id="top">
......@@ -103,6 +113,52 @@
</div>
</div>
</div>
=======
<body>
<div id="status">
Telescopio chiuso per maltempo
</div>
<div id="datitele">
RA<br>
DEC<br>
CCD Temp.<br>
FWHM<br>
</div>
<div id="livearea">
<img src="http://live1.skylive.name/tele1/live640.jpg"></img>
</div>
<div id="chatarea">
Welcome to Skylive Chat, you are connected as Administrator!
</div>
<div id="userlist">
ivan_staff<br>
nextime<br>
</div>
<div id="chatinput">
Write the chat text here
</div>
<div id="telescope">
Telescope
</div>
<div id="numteleselect">
<select name="numtele">
<option selected>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
</select>
</div>
>>>>>>> SkyliveX-Ivan
</body>
</html>
gui/splash.html
View file @ d7cb61d5
......@@ -26,7 +26,7 @@
<body>
<div id="loading">
<img src="img/logo.png"></img>
<h3 id="loadstring">Loading...</h3>
<h3 id="loadstring">Loading2...</h3>
</div>
</body>
</html>
skylivex.pro.user
View file @ d7cb61d5
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<<<<<<< HEAD
<!-- Written by Qt Creator 2.6.1, 2013-02-21T01:36:54. -->
=======
<!-- Written by Qt Creator 2.6.2, 2013-02-23T18:09:25. -->
>>>>>>> SkyliveX-Ivan
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......@@ -51,10 +55,17 @@
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<<<<<<< HEAD
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.0.0 GCC 64bit (SDK)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.0.0 GCC 64bit (SDK)</value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">qt.500.gcc_64.essentials_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
=======
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.0.1 MinGW 32bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.0.1 MinGW 32bit</value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">qt.501.win32_mingw47.essentials_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
>>>>>>> SkyliveX-Ivan
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
......@@ -78,6 +89,7 @@
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<<<<<<< HEAD
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
......@@ -88,6 +100,9 @@
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
=======
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
>>>>>>> SkyliveX-Ivan
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
......@@ -114,7 +129,11 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
<<<<<<< HEAD
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/nextime/skylivex/</value>
=======
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/Ivan/Documents/GitHub/skylivex-build-Desktop_Qt_5_0_1_MinGW_32bit-Debug</value>
>>>>>>> SkyliveX-Ivan
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
......@@ -138,6 +157,7 @@
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<<<<<<< HEAD
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
......@@ -148,6 +168,9 @@
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
=======
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
>>>>>>> SkyliveX-Ivan
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
......@@ -174,7 +197,11 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<<<<<<< HEAD
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/nextime/skylivex/</value>
=======
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/Ivan/Documents/GitHub/skylivex-build-Desktop_Qt_5_0_1_MinGW_32bit-Release</value>
>>>>>>> SkyliveX-Ivan
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
......@@ -225,7 +252,11 @@
</valuelist>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">skylivex</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<<<<<<< HEAD
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/nextime/skylivex/src/skylivex.pro</value>
=======
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Ivan/Documents/GitHub/skylivex/src/skylivex.pro</value>
>>>>>>> SkyliveX-Ivan
<value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">src/skylivex.pro</value>
......@@ -248,7 +279,11 @@
</data>
<data>
<variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
<<<<<<< HEAD
<value type="QString">{d2672f72-ce2b-4ab4-891e-45453a7867e7}</value>
=======
<value type="QString">{7fa6f781-ad21-404c-8274-b96c33c70159}</value>
>>>>>>> SkyliveX-Ivan
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
......
src/mainwin.cpp
View file @ d7cb61d5
......@@ -248,7 +248,7 @@ void MainWin::handle_loginres(SKMessage &msg)
//std::cout << "LOGIN OK" << std::endl;
QString html("gui/maingui.html");
setHtmlFile(html, true, false);
resize(800, 600);
resize(636, 733);
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment