done

Author: KeltorHD

client/mainwindow.cpp

@@ -77,13 +77,10 @@ void MainWindow::slotReadyRead()
 
         int32_t length;
         std::memcpy(&length, buf, sizeof(int32_t));
-//        qDebug() << "len buf: " <<length;
 
         this->msg_length = length - 1;
     }
 
-//    qDebug() << "slot ready read, bytesAvailable: " << this->socket->bytesAvailable();
-
     if (this->socket->bytesAvailable() >= this->msg_length)
     {
         this->msg_length = -1;
@@ -97,8 +94,12 @@ void MainWindow::slotError(QAbstractSocket::SocketError)
     this->popup->set_title("Произошла ошибка");
     this->popup->set_description("Ошибка соединения с сервером");
     this->popup->exec();
-    this->socket->close();
-    socket->connectToHost(this->host, this->port);
+
+    if (this->forward == type_forward::login || this->forward == type_forward::registration)
+    {
+        this->socket->close();
+        socket->connectToHost(this->host, this->port);
+    }
 }
 
 void MainWindow::slotConnected()
@@ -578,7 +579,8 @@ void MainWindow::fill_db_patterns(tinyxml2::XMLElement *body)
         QString img_64 {pattern->FirstChildElement("img")->GetText()};
         QString img_type {pattern->FirstChildElement("img_type")->GetText()};
 
-        QSqlQuery insert("INSERT INTO Pattern (name, description, code, path_to_image)"
+        QSqlQuery insert;
+        insert.exec("INSERT INTO Pattern (name, description, code, path_to_image)"
                         " VALUES ('" + name + "', '" + description + "', '" + code + "', 'temp')");
 
         QSqlQuery id_query("SELECT id FROM Pattern ORDER BY id DESC");

client/mainwindow.ui

@@ -28,7 +28,7 @@
     <item>
      <widget class="QStackedWidget" name="screen_stacked">
       <property name="currentIndex">
-       <number>1</number>
+       <number>4</number>
       </property>
       <widget class="QWidget" name="login">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -594,13 +594,39 @@
             <property name="sizeConstraint">
              <enum>QLayout::SetMinimumSize</enum>
             </property>
+            <item>
+             <spacer name="verticalSpacer_14">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
             <item>
              <layout class="QVBoxLayout" name="result_layout">
               <property name="sizeConstraint">
                <enum>QLayout::SetDefaultConstraint</enum>
               </property>
              </layout>
             </item>
+            <item>
+             <spacer name="verticalSpacer_13">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </widget>
          </widget>
@@ -702,7 +728,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>655</width>
+             <width>512</width>
              <height>594</height>
             </rect>
            </property>

server/handler_server.cpp

@@ -263,8 +263,6 @@ std::string Handler_server::patterns() const
 
 	tinyxml2::XMLPrinter printer;
 	doc.Print(&printer);
-
-	std::cout << std::strlen(printer.CStr()) << std::endl;
 
 	return printer.CStr();
 }