Skip to content

Commit

Permalink
Merge pull request #59 from rafaelthca/master
Browse files Browse the repository at this point in the history 
Closed issues #53, #51, #50, #49, #40, #5
  • Loading branch information
@rafaelthca
rafaelthca committed Oct 10, 2016
2 parents 7438e45 + 9ef22da commit 9d676b0
Show file tree
Hide file tree
Showing 158 changed files with 4,568 additions and 1,085 deletions.
7 changes: 4 additions & 3 deletions Deps/Deps.mdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ItemType>GenericProject</ItemType>
<ProjectGuid>{A1E62CD3-3A15-4CC4-8DFA-209DEFD4D446}</ProjectGuid>
<ReleaseVersion>2.0</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Default|AnyCPU' ">
<OutputPath>.\</OutputPath>
<OutputPath>.</OutputPath>
</PropertyGroup>
<ItemGroup>
<None Include="IKVM.OpenJDK.Beans.dll" />
Expand All @@ -30,7 +31,6 @@
<None Include="IKVM.Runtime.dll" />
<None Include="libsqlite3.so" />
<None Include="msvcr90.dll" />
<None Include="Spartacus.dll" />
<None Include="sqlceca40.dll" />
<None Include="sqlcecompact40.dll" />
<None Include="sqlceer40EN.dll" />
Expand All @@ -39,6 +39,7 @@
<None Include="sqlcese40.dll" />
<None Include="sqlite3.dll" />
<None Include="UCanAccess.dll" />
<None Include="Spartacus.dll" />
</ItemGroup>
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)" Outputs="$(TargetPath)"/>
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)" Outputs="$(TargetPath)" />
</Project>
Binary file modified Deps/Spartacus.dll
View file
Binary file not shown.
0 ...amework,Version=v4.5.AssemblyAttribute.cs → ...amework,Version=v4.5.AssemblyAttribute.cs
View file
File renamed without changes.
27 changes: 27 additions & 0 deletions OmniConversion/obj/Release/OmniConversion.csproj.FilesWrittenAbsolute.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/home/william/Documents/Projects/OmniDB/OmniConversion/obj/Release/.NETFramework,Version=v4.5.AssemblyAttribute.cs
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/OmniConversion.exe.mdb
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/OmniConversion.exe
/home/william/Documents/Projects/OmniDB/OmniConversion/obj/Release/OmniConversion.exe
/home/william/Documents/Projects/OmniDB/OmniConversion/obj/Release/OmniConversion.exe.mdb
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/Spartacus.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/OmniDatabase.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/OmniDatabase.dll.mdb
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Jdbc.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Core.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/UCanAccess.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.Runtime.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Util.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Text.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Naming.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.XML.API.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Misc.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Security.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.SwingAWT.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.XML.Bind.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Management.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Remoting.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Beans.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Media.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Charsets.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.XML.Parse.dll
/home/william/Documents/Projects/OmniDB/OmniConversion/bin/Release/IKVM.OpenJDK.Corba.dll
14 changes: 2 additions & 12 deletions OmniDB.userprefs
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
<Properties StartupItem="OmniDB/OmniDB.csproj">
<MonoDevelop.Ide.Workbench ActiveDocument="OmniDB/web.config">
<Files>
<File FileName="OmniDB/MainDB.aspx" Line="10" Column="87" />
<File FileName="OmniDB/Users.aspx" Line="13" Column="79" />
<File FileName="OmniDB/Login.aspx" Line="11" Column="61" />
<File FileName="OmniDB/CreateConversion.aspx" Line="10" Column="80" />
<File FileName="OmniDB/Conversions.aspx" Line="20" Column="86" />
<File FileName="OmniDB/Connections.aspx" Line="17" Column="82" />
<File FileName="OmniDB/web.config" Line="27" Column="54" />
</Files>
</MonoDevelop.Ide.Workbench>
<Properties StartupConfiguration="{63F55D57-D1FF-43E5-929A-029E1DDEBC99}|">
<MonoDevelop.Ide.Workbench />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
Expand Down
112 changes: 58 additions & 54 deletions OmniDB/Connections.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,28 @@

<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico"/>

<link rel="stylesheet" type="text/css" href="css/style.css?v1.5" />
<link rel="stylesheet" type="text/css" href="css/handsontable.full.css?v1.5"/>
<link rel="stylesheet" type="text/css" href="css/msdropdown/dd.css?v1.5" />
<link rel="stylesheet" type="text/css" href="lib/tabs/css/tabs.css?v1.5" />

<script type="text/javascript" src="js/jquery-1.11.2.min.js?v1.5" ></script>
<script type="text/javascript" src="js/jquery.dd.min.js?v1.5" ></script>
<script type="text/javascript" src="lib/tabs/lib/tabs.js?v1.5" ></script>
<script type="text/javascript" src="js/handsontable.full.js?v1.5" ></script>
<script type="text/javascript" src="js/AjaxControl.js?v1.5" ></script>
<script type="text/javascript" src="js/NotificationControl.js?v1.5"></script>
<script type="text/javascript" src="js/Renderers.js?v1.5" ></script>
<script type="text/javascript" src="js/HeaderActions.js?v1.5" ></script>
<script type="text/javascript" src="js/Connections.js?v1.5" ></script>
<link rel="stylesheet" type="text/css" href="css/style.css?v1.6" />
<link rel="stylesheet" type="text/css" href="css/handsontable.full.css?v1.6"/>
<link rel="stylesheet" type="text/css" href="css/msdropdown/dd.css?v1.6" />
<link rel="stylesheet" type="text/css" href="lib/tabs/css/tabs.css?v1.6" />

<script type="text/javascript" src="js/jquery-1.11.2.min.js?v1.6" ></script>
<script type="text/javascript" src="js/jquery.dd.min.js?v1.6" ></script>
<script type="text/javascript" src="lib/tabs/lib/tabs.js?v1.6" ></script>
<script type="text/javascript" src="js/handsontable.full.js?v1.6" ></script>
<script type="text/javascript" src="js/AjaxControl.js?v1.6" ></script>
<script type="text/javascript" src="js/NotificationControl.js?v1.6"></script>
<script type="text/javascript" src="js/Renderers.js?v1.6" ></script>
<script type="text/javascript" src="js/HeaderActions.js?v1.6" ></script>
<script type="text/javascript" src="js/Connections.js?v1.6" ></script>

<script type="text/javascript">
//Global variables
var v_connections_data;
var v_editor_theme = "<%= v_session.v_editor_theme %>";
var v_theme_type = "<%= v_session.v_theme_type %>";
var v_theme_id = "<%= v_session.v_theme_id %>";
var v_editor_font_size = "<%= v_session.v_editor_font_size %>";
</script>
Expand Down Expand Up @@ -59,15 +61,15 @@
</div>

<div id='div_save' style='visibility: hidden; display:inline-block;'>
<button class="bt_blue" onclick="saveConnections()">Save Data</button>
<button onclick="saveConnections()">Save Data</button>
</div>

<div id='div_conn_list' style='width: 80%; margin:20px;'></div>

<div id="div_config_user" style="display: none;">
<div class="modal_background_dark">
<div class ="white_box" style="width: 40%; left: 30%; top: 30%;">
<img src="images/window_close.png" class="img_close" onclick="hideConfigUser()"/>
<a class="modal-closer" onclick="hideConfigUser()">x</a>

<div id="config_tabs" style='margin-top: 10px; margin-left: 10px; margin-right: 10px; margin-bottom: 10px;'>
<ul>
Expand Down Expand Up @@ -95,45 +97,46 @@
<div style="text-align: center;">
<div style="margin-bottom: 10px;">Editor theme</div>
<select id="sel_editor_theme" style="width: 200px; margin-bottom: 20px;">
<option value="omnidb">(Light) OmniDB</option>
<option value="chrome">(Light) Chrome</option>
<option value="clouds">(Light) Clouds</option>
<option value="crimson_editor">(Light) Crimson Editor</option>
<option value="dawn">(Light) Dawn</option>
<option value="dreamweaver">(Light) Dreamweaver</option>
<option value="eclipse">(Light) Eclipse</option>
<option value="github">(Light) Github</option>
<option value="iplastic">(Light) Iplastic</option>
<option value="katzenmilch">(Light) Katzenmilch</option>
<option value="kuroir">(Light) Kuroir</option>
<option value="solarized_light">(Light) Solarized Light</option>
<option value="sqlserver">(Light) SQL Server</option>
<option value="textmate">(Light) Textmate</option>
<option value="tomorrow">(Light) Tomorrow</option>
<option value="xcode">(Light) XCode</option>
<option value="ambiance">(Dark) Ambiance</option>
<option value="chaos">(Dark) Chaos</option>
<option value="clouds_midnight">(Dark) Clouds Midnight</option>
<option value="cobalt">(Dark) Cobalt</option>
<option value="idle_fingers">(Dark) Idle Fingers</option>
<option value="kr_theme">(Dark) KR Theme</option>
<option value="merbivore">(Dark) Merbivore</option>
<option value="merbivore_soft">(Dark) Merbivore Soft</option>
<option value="mono_industrial">(Dark) Mono Industrial</option>
<option value="monokai">(Dark) Monokai</option>
<option value="pastel_on_dark">(Dark) Pastel On Dark</option>
<option value="solarized_dark">(Dark) Solarized Dark</option>
<option value="terminal">(Dark) Terminal</option>
<option value="tomorrow_night">(Dark) Tomorrow Night</option>
<option value="tomorrow_night_blue">(Dark) Tomorrow Night Blue</option>
<option value="tomorrow_night_bright">(Dark) Tomorrow Night Bright</option>
<option value="tomorrow_night_eighties">(Dark) Tomorrow Night 80s</option>
<option value="twilight">(Dark) Twilight</option>
<option value="vibrant_ink">(Dark) Vibrant Ink</option>
<option value="1">(Light) OmniDB</option>
<option value="2">(Light) Chrome</option>
<option value="3">(Light) Clouds</option>
<option value="4">(Light) Crimson Editor</option>
<option value="5">(Light) Dawn</option>
<option value="6">(Light) Dreamweaver</option>
<option value="7">(Light) Eclipse</option>
<option value="8">(Light) Github</option>
<option value="9">(Light) Iplastic</option>
<option value="10">(Light) Katzenmilch</option>
<option value="11">(Light) Kuroir</option>
<option value="12">(Light) Solarized Light</option>
<option value="13">(Light) SQL Server</option>
<option value="14">(Light) Textmate</option>
<option value="15">(Light) Tomorrow</option>
<option value="16">(Light) XCode</option>
<option value="17">(Dark) OmniDB Dark</option>
<option value="18">(Dark) Ambiance</option>
<option value="19">(Dark) Chaos</option>
<option value="20">(Dark) Clouds Midnight</option>
<option value="21">(Dark) Cobalt</option>
<option value="22">(Dark) Idle Fingers</option>
<option value="23">(Dark) KR Theme</option>
<option value="24">(Dark) Merbivore</option>
<option value="25">(Dark) Merbivore Soft</option>
<option value="26">(Dark) Mono Industrial</option>
<option value="27">(Dark) Monokai</option>
<option value="28">(Dark) Pastel On Dark</option>
<option value="29">(Dark) Solarized Dark</option>
<option value="30">(Dark) Terminal</option>
<option value="31">(Dark) Tomorrow Night</option>
<option value="32">(Dark) Tomorrow Night Blue</option>
<option value="33">(Dark) Tomorrow Night Bright</option>
<option value="34">(Dark) Tomorrow Night 80s</option>
<option value="35">(Dark) Twilight</option>
<option value="36">(Dark) Vibrant Ink</option>
</select>
</div>
<div style="text-align: center;">
<button class="bt_blue" onclick="saveConfigUser();">Save Changes</button>
<button onclick="saveConfigUser();">Save Changes</button>
</div>
</div>

Expand All @@ -151,7 +154,7 @@
<input id="txt_confirm_new_pwd" type="password" style="width: 200px; margin-bottom: 20px;">
</div>
<div style="text-align: center;">
<button class="bt_blue" onclick="saveConfigUser();">Save Changes</button>
<button onclick="saveConfigUser();">Save Changes</button>
</div>
</div>
</div>
Expand All @@ -163,7 +166,7 @@
<div id="div_about" style="display: none;">
<div class="modal_background_dark">
<div class ="white_box" style="width: 40%; left: 30%; top: 30%;">
<img src="images/window_close.png" class="img_close" onclick="hideAbout()"/>
<a class="modal-closer" onclick="hideAbout()">x</a>
<div style="width: 100%; text-align: center;">
<div style="margin: 20px;"><h1><% Response.Write(v_session.v_omnidb_version); %></h1></div>
<div style="margin: 20px;">
Expand All @@ -174,6 +177,7 @@
<img src="images/firebird_medium.png" title="Firebird"/>
<img src="images/sqlite_medium.png" title="SQLite"/>
<img src="images/access_medium.png" title="Microsoft Access"/>
<img src="images/mariadb_medium.png" title="MariaDB"/>
</div>
<div style="margin: 20px;">Rafael Thofehrn Castro<br/><b>Creator</b></div>
<div style="margin: 20px;">William Ivanski<br/><b>Collaborator</b></div>
Expand Down
Loading

0 comments on commit 9d676b0

Please sign in to comment.