WebSVN – Code-Repo – Path Comparison – / – /Misc Projects/ Rev 363 and /Misc Projects Rev 362

Ignore whitespace Rev 363 → Rev 362

/Misc Projects/PcMarlinInterface/PasteController.cpp
File deleted

/Misc Projects/PcMarlinInterface/PasteController.h
File deleted

 /Misc Projects/PcMarlinInterface/MainWindow.cpp
 ,13 → 8,11
     setCentralWidget(centralWidget);
     // Misc button group
-    groupOther = new QGroupBox("Other");
+    groupMacro = new QGroupBox("Other");
     btnMacro = new QPushButton("&Macros");
-    btnPaste = new QPushButton("&Paste");
-    QGridLayout *otherLayout = new QGridLayout();
-    otherLayout->addWidget(btnMacro, 0, 0);
-    otherLayout->addWidget(btnPaste, 1, 0);
-    groupOther->setLayout(otherLayout);
+    QHBoxLayout *macroLayout = new QHBoxLayout();
+    macroLayout->addWidget(btnMacro);
+    groupMacro->setLayout(macroLayout);
     // Initialize serial widget
     serialWidget = new SerialWidget();
 ,20 → 46,13
     connect(serialWidget, SIGNAL(Connected()), macroWidget, SLOT(EnableTransmit()));
     connect(serialWidget, SIGNAL(Disconnected()), macroWidget, SLOT(DisableTransmit()));
-    // Initialize paste controller widget
-    pasteDockWidget = new QDockWidget("Paste Controller", this);
-    pasteWidget = new PasteController(pasteDockWidget);
-    pasteDockWidget->setWidget(pasteWidget);
-    pasteDockWidget->setFloating(true);
     // Connect local widgets
     connect(btnMacro, SIGNAL(clicked()), macroDockWidget->toggleViewAction(), SLOT(trigger()));
-    connect(btnPaste, SIGNAL(clicked()), pasteDockWidget->toggleViewAction(), SLOT(trigger()));
     // Main layout
     QGridLayout *mainLayout = new QGridLayout();
     mainLayout->addWidget(groupSerialInit, 0, 0, 1, 1, Qt::AlignLeft);
-    mainLayout->addWidget(groupOther, 0, 1, 1, 1, Qt::AlignLeft);
+    mainLayout->addWidget(groupMacro, 0, 1, 1, 1, Qt::AlignLeft);
     mainLayout->addWidget(groupSerialData, 1, 0, 1, 2);
     mainLayout->setColumnStretch(0, 0);
     mainLayout->setColumnStretch(1, 1);

 /Misc Projects/PcMarlinInterface/MainWindow.h
 ,7 → 5,6
 #include "SerialWidget.h"
 #include "MacroWidget.h"
 #include "IOWidget.h"
-#include "PasteController.h"
 class MainWindow : public QMainWindow
 {
 ,18 → 34,12
         IOWidget *ioWidget;
         QGroupBox *groupSerialData;
-        QGroupBox *groupOther;
         // Macro controller + UI
         MacroWidget *macroWidget;
         QDockWidget *macroDockWidget;
+        QGroupBox *groupMacro;
         QPushButton *btnMacro;
-        // Paste controller + UI
-        PasteController *pasteWidget;
-        QDockWidget *pasteDockWidget;
-        QPushButton *btnPaste;
         // Status bar
         QLabel *labelSerialStatus;

 /Misc Projects/PcMarlinInterface/PcMarlinInterface.pro
 ,8 → 17,7
     SerialHelper.cpp \
     MacroWidget.cpp \
     SerialWidget.cpp \
-    IOWidget.cpp \
-    PasteController.cpp
+    IOWidget.cpp
 HEADERS  += GlobalDefines.h \
     MainWindow.h \
 ,11 → 24,8
     SerialHelper.h \
     MacroWidget.h \
     SerialWidget.h \
-    IOWidget.h \
-    PasteController.h
+    IOWidget.h
 RESOURCES += Resources.qrc
 RC_FILE = Icon.rc
-FORMS +=

 /Misc Projects/PcMarlinInterface/PcMarlinInterface.pro.user
 ,10 → 1,10
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.3.0, 2015-03-05T14:44:31. -->
+<!-- Written by QtCreator 3.3.0, 2015-03-04T03:06:04. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{22bd4f67-ea17-48ee-8299-171e5aa125c2}</value>
+  <value type="QByteArray">{4c29e835-aad4-4677-99d7-2a63e01ab69b}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>

 /Misc Projects/PcMarlinInterface/SerialHelper.cpp
 ,14 → 8,11
     stopBits << "1 Bit" << "1.5 Bits" << "2 Bits";
     parity << "None" << "Even" << "Odd" << "Space" << "Mark";
     flowControl << "None" << "Hardware" << "Software";
-    serialPort = NULL;
 }
 SerialHelper::~SerialHelper()
 {
-    if (serialPort != NULL && serialPort->isOpen())
-        serialPort->close();
+    serialPort->close();
     delete serialPort;
 }

/Misc Projects/PcMarlinInterface/Resources/arrow_right.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/Misc Projects/PcMarlinInterface/Resources/arrow_right.png
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/Misc Projects/PcMarlinInterface/Resources/arrow_up.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/Misc Projects/PcMarlinInterface/Resources/arrow_up.png
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/Misc Projects/PcMarlinInterface/Resources/download.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/Misc Projects/PcMarlinInterface/Resources/download.png
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/Misc Projects/PcMarlinInterface/Resources/arrow_down.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/Misc Projects/PcMarlinInterface/Resources/arrow_down.png
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/Misc Projects/PcMarlinInterface/Resources/upload.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/Misc Projects/PcMarlinInterface/Resources/upload.png
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/Misc Projects/PcMarlinInterface/Resources/arrow_left.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/Misc Projects/PcMarlinInterface/Resources/arrow_left.png
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/Misc Projects/PcMarlinInterface/Resources/close.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/Misc Projects/PcMarlinInterface/Resources/close.png
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

 /Misc Projects/PcMarlinInterface/Resources.qrc
 ,12 → 3,5
         <file>Resources/Icon_16.bmp</file>
         <file>Resources/Icon_32.bmp</file>
         <file>Resources/Icon_64.bmp</file>
-        <file>Resources/arrow_down.png</file>
-        <file>Resources/arrow_up.png</file>
-        <file>Resources/arrow_left.png</file>
-        <file>Resources/arrow_right.png</file>
-        <file>Resources/close.png</file>
-        <file>Resources/download.png</file>
-        <file>Resources/upload.png</file>
     </qresource>
 </RCC>

Subversion Repositories Code-Repo

Compare Revisions

Ignore whitespace Rev 363 → Rev 362