Skip to content
This repository has been archived by the owner on Jun 29, 2020. It is now read-only.

Commit

Permalink
Merge pull request #12 from juangburgos/release-jgb-v1.0.3
Browse files Browse the repository at this point in the history
v1.0.3
  • Loading branch information
juangburgos authored Jun 22, 2016
2 parents 9db36a7 + 3f4f0cf commit 1f6a84d
Show file tree
Hide file tree
Showing 23 changed files with 311 additions and 705 deletions.
16 changes: 13 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

***

[Download Windows Binaries (64-bits)](https://sourceforge.net/projects/wtdesigner/files/Windowsx64/v.1.0.2/)
[Download Windows Binaries (64-bits)](https://sourceforge.net/projects/wtdesigner/files/Windowsx64/v.1.0.3/)

* Install "vcredist_x64.exe" before running WtDesigner for the first time.
* Run WtDesigner with Administrator rights in Windows.

***

[Download Linux Binaries (64-bits)](https://sourceforge.net/projects/wtdesigner/files/Linux64/v.1.0.2/)
[Download Linux Binaries (64-bits)](https://sourceforge.net/projects/wtdesigner/files/Linux64/v.1.0.3/)

* Might be necessary to:

```bash
$ chmod +x ./WtDesignerInstallerV.1.0.2.run
$ chmod +x ./WtDesignerInstallerV.1.0.3.run
```

* Tested on **CentOS7** and **Ubuntu14.04**
Expand All @@ -31,6 +31,16 @@ A WYSIWYG (What You See Is What You Get) front-end editor which serves as bride

***

## Who

List of contributors:

* [juangburgos](https://github.com/juangburgos).

* [cls-nebadje](https://github.com/cls-nebadje).

***

## Why

Although C++ doesn’t come into mind as the first language for web development, there is a specific number of scenarios in which it can be advantageous with respect to other languages:
Expand Down
4 changes: 2 additions & 2 deletions deploy/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ All

Generate installer with:

binarycreator --offline-only -c config/config.xml -p packages WtDesignerInstallerV.1.0.2.exe
binarycreator --offline-only -c config/config.xml -p packages WtDesignerInstallerV.1.0.3.exe

PATH=$PATH:/home/juangburgos/Qt/QtIFW2.0.1/bin/
binarycreator --offline-only -c config/config_nix.xml -p packages WtDesignerInstallerV.1.0.2.run
binarycreator --offline-only -c config/config_nix.xml -p packages WtDesignerInstallerV.1.0.3.run
2 changes: 1 addition & 1 deletion deploy/config/config.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>WtDesigner</Name>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<Title>WtDesigner (Windows 64-bits)</Title>
<Publisher>Juan Gonzalez Burgos</Publisher>
<StartMenuDir>WtDesigner</StartMenuDir>
Expand Down
2 changes: 1 addition & 1 deletion deploy/config/config_nix.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>WtDesigner</Name>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<Title>WtDesigner (Linux 64-bit)</Title>
<Publisher>Juan Gonzalez Burgos</Publisher>
<StartMenuDir>WtDesigner</StartMenuDir>
Expand Down
4 changes: 2 additions & 2 deletions deploy/packages/WtDesigner/meta/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Package>
<DisplayName>WtDesigner</DisplayName>
<Description>A WYSIWYG designer for the Wt C++ library.</Description>
<Version>1.0.2</Version>
<ReleaseDate>2016-05-16</ReleaseDate>
<Version>1.0.3</Version>
<ReleaseDate>2016-06-16</ReleaseDate>
<Default>true</Default>
<Script>installscript.qs</Script>
<ForcedInstallation>true</ForcedInstallation>
Expand Down
9 changes: 7 additions & 2 deletions src/main/dialogs/dialogabout/dialogabout.ui
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<x>0</x>
<y>0</y>
<width>384</width>
<height>499</height>
<height>506</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
Expand All @@ -99,9 +99,14 @@
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Arial,Helvetica,sans'; font-size:16pt; font-weight:600; color:#e1e1e1;&quot;&gt;WtDesigner v.1.0.2&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Arial,Helvetica,sans'; font-size:16pt; font-weight:600; color:#e1e1e1;&quot;&gt;WtDesigner v.1.0.3&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#e1e1e1;&quot;&gt;Copyright (c) 2016 Juan Gonzalez Burgos&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; color:#e1e1e1;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#e1e1e1;&quot;&gt;Contributors:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; color:#e1e1e1;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#e1e1e1;&quot;&gt;- &lt;/span&gt;&lt;a href=&quot;https://github.com/juangburgos/&quot;&gt;&lt;span style=&quot; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;juangburgos&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#e1e1e1;&quot;&gt;- &lt;/span&gt;&lt;a href=&quot;https://github.com/cls-nebadje&quot;&gt;&lt;span style=&quot; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;cls-nebadje&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; color:#e1e1e1;&quot;&gt;This project could not have been possible without:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
Expand Down
2 changes: 1 addition & 1 deletion src/main/helperfunctions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ QMetaObject GetMetaObjectByClassName(QString strClassName)
}
else if (strClassName.compare("WCalendar") == 0)
{
metaObj = WtQtWCalendar::staticMetaObject;
metaObj = WtQtCalendar::staticMetaObject;
}
else if (strClassName.compare("WSlider") == 0)
{
Expand Down
Loading

0 comments on commit 1f6a84d

Please sign in to comment.