Prepare version 0.3

Denvi · Aug 22, 2015 · dd63bec · dd63bec
1 parent c103dcc
commit dd63bec
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 76 deletions.
diff --git a/combobox.cpp b/combobox.cpp
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #include <QDebug>
 #include <QKeyEvent>
 #include "combobox.h"

diff --git a/combobox.h b/combobox.h
@@ -1,3 +1,6 @@
+// This file is a part of "grblControl" application.
+// Copyright 2015 Hayrullin Denis Ravilevich
+
 #ifndef COMBOBOX_H
 #define COMBOBOX_H
 

diff --git a/frmabout.cpp b/frmabout.cpp
@@ -11,6 +11,8 @@ frmAbout::frmAbout(QWidget *parent) :
 {
     ui->setupUi(this);
 
+    ui->lblAbout->setText(ui->lblAbout->text().arg(qApp->applicationVersion()));
+
     QFile file(qApp->applicationDirPath() + "/LICENSE");
 
     if (file.open(QIODevice::ReadOnly)) {

diff --git a/frmabout.ui b/frmabout.ui
@@ -44,9 +44,9 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="lblAbout">
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;grblControl&lt;br/&gt;Version: 0.2&lt;br/&gt;License: GNU GENERAL PUBLIC LICENSE&lt;br/&gt;Visit: &lt;a href=&quot;https://github.com/Denvi/grblControl/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/Denvi/grblControl/&lt;br/&gt;&lt;/span&gt;&lt;/a&gt;© 2015 Hayrullin Denis Ravilevich&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;grblControl&lt;br/&gt;Version: %1&lt;br/&gt;License: GNU GENERAL PUBLIC LICENSE&lt;br/&gt;Visit: &lt;a href=&quot;https://github.com/Denvi/grblControl/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/Denvi/grblControl/&lt;br/&gt;&lt;/span&gt;&lt;/a&gt;© 2015 Hayrullin Denis Ravilevich&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

diff --git a/frmmain.ui b/frmmain.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>905</width>
-    <height>976</height>
+    <width>788</width>
+    <height>891</height>
    </rect>
   </property>
   <property name="palette">
@@ -1935,8 +1935,8 @@ QComboBox::drop-down {
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>905</width>
-     <height>26</height>
+     <width>788</width>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="mnuFile">

diff --git a/frmsettings.ui b/frmsettings.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>366</width>
-    <height>679</height>
+    <width>321</width>
+    <height>579</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -44,6 +44,12 @@ QSpinBox, QDoubleSpinBox {
    </property>
    <item>
     <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title">
       <string>Connection</string>
      </property>
@@ -129,6 +135,12 @@ QSpinBox, QDoubleSpinBox {
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_6">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title">
       <string>Visualizer</string>
      </property>
@@ -309,6 +321,12 @@ QSpinBox, QDoubleSpinBox {
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_4">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title">
       <string>Tool graphic representation</string>
      </property>
@@ -451,6 +469,12 @@ QSpinBox, QDoubleSpinBox {
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title">
       <string>GRBL</string>
      </property>
@@ -680,6 +704,9 @@ QSpinBox, QDoubleSpinBox {
           <property name="alignment">
            <set>Qt::AlignCenter</set>
           </property>
+          <property name="placeholderText">
+           <string>Command 1; command 2; ...</string>
+          </property>
          </widget>
         </item>
        </layout>
@@ -736,6 +763,12 @@ QSpinBox, QDoubleSpinBox {
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title">
       <string>Console</string>
      </property>

diff --git a/grbl_control.pro b/grbl_control.pro
@@ -8,6 +8,10 @@ QT       = core gui opengl serialport winextras
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+VERSION = 0.3
+
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+
 TARGET = grbl_control
 TEMPLATE = app
 

diff --git a/main.cpp b/main.cpp
@@ -43,6 +43,8 @@ int main(int argc, char *argv[])
         if (baseTranslator->load(baseTranslationFileName)) a.installTranslator(baseTranslator); else delete baseTranslator;
     }   
 
+    a.setApplicationVersion(APP_VERSION);
+
     frmMain w;
     w.show();
 

diff --git a/translations/grblControl_ru.qm b/translations/grblControl_ru.qm