From b05e84b90cf22cfd1fd6ba314fbd95595be968bf Mon Sep 17 00:00:00 2001 From: aknoerig Date: Thu, 28 Apr 2016 14:12:31 +0200 Subject: [PATCH] pull last fixes + change release script --- .gitignore | 3 + fritzing.sh => Fritzing.sh | 0 tools/linux_release_script/release.sh | 4 +- ui_consolesettings.h | 230 ++++++++++++++++++++++++++ ui_consolewindow.h | 150 +++++++++++++++++ ui_modfiledialog.h | 86 ++++++++++ 6 files changed, 471 insertions(+), 2 deletions(-) rename fritzing.sh => Fritzing.sh (100%) create mode 100644 ui_consolesettings.h create mode 100644 ui_consolewindow.h create mode 100644 ui_modfiledialog.h diff --git a/.gitignore b/.gitignore index a73118361..3adfed777 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ ##################### phoenix.pro.user /phoenix-build-* +/release* +/build* +/debug* *.user *.user* diff --git a/fritzing.sh b/Fritzing.sh similarity index 100% rename from fritzing.sh rename to Fritzing.sh diff --git a/tools/linux_release_script/release.sh b/tools/linux_release_script/release.sh index a2bcbbe5e..a95d5012d 100755 --- a/tools/linux_release_script/release.sh +++ b/tools/linux_release_script/release.sh @@ -14,7 +14,7 @@ echo " Execute this script from outside the fritzing-app folder" echo " But script now operates from fritzing-app folder, rather than cloning a new one and operating from there" echo "" -QT_HOME="/home/username/Qt/5.6/gcc_64" +QT_HOME="/home/ubuntu/qt5.6" #QT_HOME="/home/vuser/Qt5.2.1/5.2.1/gcc_64" # 64bit version #QT_HOME="~/Qt5.2.1/5.2.1/gcc" # doesn't work for some reason @@ -59,7 +59,7 @@ echo "making release folder: $release_folder" mkdir $release_folder echo "copying release files" -cp -rf sketches/ help/ translations/ fritzing.sh Fritzing.1 fritzing.desktop fritzing.rc fritzing.appdata.xml readme.md LICENSE.CC-BY-SA LICENSE.GPL2 LICENSE.GPL3 $release_folder/ +cp -rf sketches/ help/ translations/ Fritzing.sh Fritzing.1 fritzing.desktop fritzing.rc fritzing.appdata.xml readme.md LICENSE.CC-BY-SA LICENSE.GPL2 LICENSE.GPL3 $release_folder/ mv Fritzing $release_folder/ cd $release_folder echo "cleaning translations" diff --git a/ui_consolesettings.h b/ui_consolesettings.h new file mode 100644 index 000000000..b4034ed21 --- /dev/null +++ b/ui_consolesettings.h @@ -0,0 +1,230 @@ +/******************************************************************************** +** Form generated from reading UI file 'consolesettings.ui' +** +** Created by: Qt User Interface Compiler version 5.2.1 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_CONSOLESETTINGS_H +#define UI_CONSOLESETTINGS_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_ConsoleSettings +{ +public: + QGridLayout *gridLayout_3; + QGroupBox *parametersBox; + QGridLayout *gridLayout_2; + QLabel *baudRateLabel; + QComboBox *baudRateBox; + QLabel *dataBitsLabel; + QComboBox *dataBitsBox; + QLabel *parityLabel; + QComboBox *parityBox; + QLabel *stopBitsLabel; + QComboBox *stopBitsBox; + QLabel *flowControlLabel; + QComboBox *flowControlBox; + QGroupBox *selectBox; + QGridLayout *gridLayout; + QComboBox *serialPortInfoListBox; + QLabel *descriptionLabel; + QLabel *manufacturerLabel; + QLabel *serialNumberLabel; + QLabel *locationLabel; + QLabel *vidLabel; + QLabel *pidLabel; + QHBoxLayout *horizontalLayout; + QSpacerItem *horizontalSpacer; + QPushButton *applyButton; + QGroupBox *additionalOptionsGroupBox; + QVBoxLayout *verticalLayout; + QCheckBox *localEchoCheckBox; + + void setupUi(QDialog *ConsoleSettings) + { + if (ConsoleSettings->objectName().isEmpty()) + ConsoleSettings->setObjectName(QStringLiteral("ConsoleSettings")); + ConsoleSettings->resize(400, 336); + gridLayout_3 = new QGridLayout(ConsoleSettings); + gridLayout_3->setObjectName(QStringLiteral("gridLayout_3")); + parametersBox = new QGroupBox(ConsoleSettings); + parametersBox->setObjectName(QStringLiteral("parametersBox")); + gridLayout_2 = new QGridLayout(parametersBox); + gridLayout_2->setObjectName(QStringLiteral("gridLayout_2")); + baudRateLabel = new QLabel(parametersBox); + baudRateLabel->setObjectName(QStringLiteral("baudRateLabel")); + + gridLayout_2->addWidget(baudRateLabel, 0, 0, 1, 1); + + baudRateBox = new QComboBox(parametersBox); + baudRateBox->setObjectName(QStringLiteral("baudRateBox")); + + gridLayout_2->addWidget(baudRateBox, 0, 1, 1, 1); + + dataBitsLabel = new QLabel(parametersBox); + dataBitsLabel->setObjectName(QStringLiteral("dataBitsLabel")); + + gridLayout_2->addWidget(dataBitsLabel, 1, 0, 1, 1); + + dataBitsBox = new QComboBox(parametersBox); + dataBitsBox->setObjectName(QStringLiteral("dataBitsBox")); + + gridLayout_2->addWidget(dataBitsBox, 1, 1, 1, 1); + + parityLabel = new QLabel(parametersBox); + parityLabel->setObjectName(QStringLiteral("parityLabel")); + + gridLayout_2->addWidget(parityLabel, 2, 0, 1, 1); + + parityBox = new QComboBox(parametersBox); + parityBox->setObjectName(QStringLiteral("parityBox")); + + gridLayout_2->addWidget(parityBox, 2, 1, 1, 1); + + stopBitsLabel = new QLabel(parametersBox); + stopBitsLabel->setObjectName(QStringLiteral("stopBitsLabel")); + + gridLayout_2->addWidget(stopBitsLabel, 3, 0, 1, 1); + + stopBitsBox = new QComboBox(parametersBox); + stopBitsBox->setObjectName(QStringLiteral("stopBitsBox")); + + gridLayout_2->addWidget(stopBitsBox, 3, 1, 1, 1); + + flowControlLabel = new QLabel(parametersBox); + flowControlLabel->setObjectName(QStringLiteral("flowControlLabel")); + + gridLayout_2->addWidget(flowControlLabel, 4, 0, 1, 1); + + flowControlBox = new QComboBox(parametersBox); + flowControlBox->setObjectName(QStringLiteral("flowControlBox")); + + gridLayout_2->addWidget(flowControlBox, 4, 1, 1, 1); + + + gridLayout_3->addWidget(parametersBox, 0, 1, 1, 1); + + selectBox = new QGroupBox(ConsoleSettings); + selectBox->setObjectName(QStringLiteral("selectBox")); + gridLayout = new QGridLayout(selectBox); + gridLayout->setObjectName(QStringLiteral("gridLayout")); + serialPortInfoListBox = new QComboBox(selectBox); + serialPortInfoListBox->setObjectName(QStringLiteral("serialPortInfoListBox")); + + gridLayout->addWidget(serialPortInfoListBox, 0, 0, 1, 1); + + descriptionLabel = new QLabel(selectBox); + descriptionLabel->setObjectName(QStringLiteral("descriptionLabel")); + + gridLayout->addWidget(descriptionLabel, 1, 0, 1, 1); + + manufacturerLabel = new QLabel(selectBox); + manufacturerLabel->setObjectName(QStringLiteral("manufacturerLabel")); + + gridLayout->addWidget(manufacturerLabel, 2, 0, 1, 1); + + serialNumberLabel = new QLabel(selectBox); + serialNumberLabel->setObjectName(QStringLiteral("serialNumberLabel")); + + gridLayout->addWidget(serialNumberLabel, 3, 0, 1, 1); + + locationLabel = new QLabel(selectBox); + locationLabel->setObjectName(QStringLiteral("locationLabel")); + + gridLayout->addWidget(locationLabel, 4, 0, 1, 1); + + vidLabel = new QLabel(selectBox); + vidLabel->setObjectName(QStringLiteral("vidLabel")); + + gridLayout->addWidget(vidLabel, 5, 0, 1, 1); + + pidLabel = new QLabel(selectBox); + pidLabel->setObjectName(QStringLiteral("pidLabel")); + + gridLayout->addWidget(pidLabel, 6, 0, 1, 1); + + + gridLayout_3->addWidget(selectBox, 0, 0, 1, 1); + + horizontalLayout = new QHBoxLayout(); + horizontalLayout->setObjectName(QStringLiteral("horizontalLayout")); + horizontalSpacer = new QSpacerItem(96, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + horizontalLayout->addItem(horizontalSpacer); + + applyButton = new QPushButton(ConsoleSettings); + applyButton->setObjectName(QStringLiteral("applyButton")); + + horizontalLayout->addWidget(applyButton); + + + gridLayout_3->addLayout(horizontalLayout, 2, 0, 1, 2); + + additionalOptionsGroupBox = new QGroupBox(ConsoleSettings); + additionalOptionsGroupBox->setObjectName(QStringLiteral("additionalOptionsGroupBox")); + verticalLayout = new QVBoxLayout(additionalOptionsGroupBox); + verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + localEchoCheckBox = new QCheckBox(additionalOptionsGroupBox); + localEchoCheckBox->setObjectName(QStringLiteral("localEchoCheckBox")); + localEchoCheckBox->setChecked(true); + + verticalLayout->addWidget(localEchoCheckBox); + + + gridLayout_3->addWidget(additionalOptionsGroupBox, 1, 0, 1, 2); + + + retranslateUi(ConsoleSettings); + + QMetaObject::connectSlotsByName(ConsoleSettings); + } // setupUi + + void retranslateUi(QDialog *ConsoleSettings) + { + ConsoleSettings->setWindowTitle(QApplication::translate("ConsoleSettings", "Settings", 0)); + parametersBox->setTitle(QApplication::translate("ConsoleSettings", "Select Parameters", 0)); + baudRateLabel->setText(QApplication::translate("ConsoleSettings", "BaudRate:", 0)); + dataBitsLabel->setText(QApplication::translate("ConsoleSettings", "Data bits:", 0)); + parityLabel->setText(QApplication::translate("ConsoleSettings", "Parity:", 0)); + stopBitsLabel->setText(QApplication::translate("ConsoleSettings", "Stop bits:", 0)); + flowControlLabel->setText(QApplication::translate("ConsoleSettings", "Flow control:", 0)); + selectBox->setTitle(QApplication::translate("ConsoleSettings", "Select Serial Port", 0)); + descriptionLabel->setText(QApplication::translate("ConsoleSettings", "Description:", 0)); + manufacturerLabel->setText(QApplication::translate("ConsoleSettings", "Manufacturer:", 0)); + serialNumberLabel->setText(QApplication::translate("ConsoleSettings", "Serial number:", 0)); + locationLabel->setText(QApplication::translate("ConsoleSettings", "Location:", 0)); + vidLabel->setText(QApplication::translate("ConsoleSettings", "Vendor ID:", 0)); + pidLabel->setText(QApplication::translate("ConsoleSettings", "Product ID:", 0)); + applyButton->setText(QApplication::translate("ConsoleSettings", "Apply", 0)); + additionalOptionsGroupBox->setTitle(QApplication::translate("ConsoleSettings", "Additional options", 0)); + localEchoCheckBox->setText(QApplication::translate("ConsoleSettings", "Local echo", 0)); + } // retranslateUi + +}; + +namespace Ui { + class ConsoleSettings: public Ui_ConsoleSettings {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_CONSOLESETTINGS_H diff --git a/ui_consolewindow.h b/ui_consolewindow.h new file mode 100644 index 000000000..fab240fb6 --- /dev/null +++ b/ui_consolewindow.h @@ -0,0 +1,150 @@ +/******************************************************************************** +** Form generated from reading UI file 'consolewindow.ui' +** +** Created by: Qt User Interface Compiler version 5.2.1 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_CONSOLEWINDOW_H +#define UI_CONSOLEWINDOW_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_ConsoleWindow +{ +public: + QAction *actionAbout; + QAction *actionAboutQt; + QAction *actionConnect; + QAction *actionDisconnect; + QAction *actionConfigure; + QAction *actionClear; + QAction *actionQuit; + QWidget *centralWidget; + QVBoxLayout *verticalLayout; + QMenuBar *menuBar; + QMenu *menuCalls; + QMenu *menuTools; + QToolBar *mainToolBar; + QStatusBar *statusBar; + + void setupUi(QMainWindow *ConsoleWindow) + { + if (ConsoleWindow->objectName().isEmpty()) + ConsoleWindow->setObjectName(QStringLiteral("ConsoleWindow")); + ConsoleWindow->resize(400, 300); + actionAbout = new QAction(ConsoleWindow); + actionAbout->setObjectName(QStringLiteral("actionAbout")); + actionAboutQt = new QAction(ConsoleWindow); + actionAboutQt->setObjectName(QStringLiteral("actionAboutQt")); + actionConnect = new QAction(ConsoleWindow); + actionConnect->setObjectName(QStringLiteral("actionConnect")); + actionDisconnect = new QAction(ConsoleWindow); + actionDisconnect->setObjectName(QStringLiteral("actionDisconnect")); + actionConfigure = new QAction(ConsoleWindow); + actionConfigure->setObjectName(QStringLiteral("actionConfigure")); + actionClear = new QAction(ConsoleWindow); + actionClear->setObjectName(QStringLiteral("actionClear")); + actionQuit = new QAction(ConsoleWindow); + actionQuit->setObjectName(QStringLiteral("actionQuit")); + QIcon icon; + icon.addFile(QStringLiteral(":/images/application-exit.png"), QSize(), QIcon::Normal, QIcon::Off); + actionQuit->setIcon(icon); + centralWidget = new QWidget(ConsoleWindow); + centralWidget->setObjectName(QStringLiteral("centralWidget")); + verticalLayout = new QVBoxLayout(centralWidget); + verticalLayout->setSpacing(6); + verticalLayout->setContentsMargins(11, 11, 11, 11); + verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + ConsoleWindow->setCentralWidget(centralWidget); + menuBar = new QMenuBar(ConsoleWindow); + menuBar->setObjectName(QStringLiteral("menuBar")); + menuBar->setGeometry(QRect(0, 0, 400, 22)); + menuCalls = new QMenu(menuBar); + menuCalls->setObjectName(QStringLiteral("menuCalls")); + menuTools = new QMenu(menuBar); + menuTools->setObjectName(QStringLiteral("menuTools")); + ConsoleWindow->setMenuBar(menuBar); + mainToolBar = new QToolBar(ConsoleWindow); + mainToolBar->setObjectName(QStringLiteral("mainToolBar")); + ConsoleWindow->addToolBar(Qt::TopToolBarArea, mainToolBar); + statusBar = new QStatusBar(ConsoleWindow); + statusBar->setObjectName(QStringLiteral("statusBar")); + ConsoleWindow->setStatusBar(statusBar); + + menuBar->addAction(menuCalls->menuAction()); + menuBar->addAction(menuTools->menuAction()); + menuCalls->addAction(actionConnect); + menuCalls->addAction(actionDisconnect); + menuCalls->addSeparator(); + menuCalls->addAction(actionQuit); + menuTools->addAction(actionConfigure); + menuTools->addAction(actionClear); + mainToolBar->addAction(actionConnect); + mainToolBar->addAction(actionDisconnect); + mainToolBar->addAction(actionConfigure); + mainToolBar->addAction(actionClear); + + retranslateUi(ConsoleWindow); + + QMetaObject::connectSlotsByName(ConsoleWindow); + } // setupUi + + void retranslateUi(QMainWindow *ConsoleWindow) + { + ConsoleWindow->setWindowTitle(QApplication::translate("ConsoleWindow", "Serial Monitor", 0)); + actionAbout->setText(QApplication::translate("ConsoleWindow", "&About", 0)); +#ifndef QT_NO_TOOLTIP + actionAbout->setToolTip(QApplication::translate("ConsoleWindow", "About program", 0)); +#endif // QT_NO_TOOLTIP + actionAbout->setShortcut(QApplication::translate("ConsoleWindow", "Alt+A", 0)); + actionAboutQt->setText(QApplication::translate("ConsoleWindow", "About Qt", 0)); + actionConnect->setText(QApplication::translate("ConsoleWindow", "C&onnect", 0)); +#ifndef QT_NO_TOOLTIP + actionConnect->setToolTip(QApplication::translate("ConsoleWindow", "Connect to serial port", 0)); +#endif // QT_NO_TOOLTIP + actionConnect->setShortcut(QApplication::translate("ConsoleWindow", "Ctrl+O", 0)); + actionDisconnect->setText(QApplication::translate("ConsoleWindow", "&Disconnect", 0)); +#ifndef QT_NO_TOOLTIP + actionDisconnect->setToolTip(QApplication::translate("ConsoleWindow", "Disconnect from serial port", 0)); +#endif // QT_NO_TOOLTIP + actionDisconnect->setShortcut(QApplication::translate("ConsoleWindow", "Ctrl+D", 0)); + actionConfigure->setText(QApplication::translate("ConsoleWindow", "&Configure", 0)); +#ifndef QT_NO_TOOLTIP + actionConfigure->setToolTip(QApplication::translate("ConsoleWindow", "Configure serial port", 0)); +#endif // QT_NO_TOOLTIP + actionConfigure->setShortcut(QApplication::translate("ConsoleWindow", "Alt+C", 0)); + actionClear->setText(QApplication::translate("ConsoleWindow", "C&lear", 0)); +#ifndef QT_NO_TOOLTIP + actionClear->setToolTip(QApplication::translate("ConsoleWindow", "Clear data", 0)); +#endif // QT_NO_TOOLTIP + actionClear->setShortcut(QApplication::translate("ConsoleWindow", "Alt+L", 0)); + actionQuit->setText(QApplication::translate("ConsoleWindow", "&Quit", 0)); + actionQuit->setShortcut(QApplication::translate("ConsoleWindow", "Ctrl+Q", 0)); + menuCalls->setTitle(QApplication::translate("ConsoleWindow", "Monitor", 0)); + menuTools->setTitle(QApplication::translate("ConsoleWindow", "Tools", 0)); + } // retranslateUi + +}; + +namespace Ui { + class ConsoleWindow: public Ui_ConsoleWindow {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_CONSOLEWINDOW_H diff --git a/ui_modfiledialog.h b/ui_modfiledialog.h new file mode 100644 index 000000000..1c9aac34d --- /dev/null +++ b/ui_modfiledialog.h @@ -0,0 +1,86 @@ +/******************************************************************************** +** Form generated from reading UI file 'modfiledialog.ui' +** +** Created by: Qt User Interface Compiler version 5.6.0 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_MODFILEDIALOG_H +#define UI_MODFILEDIALOG_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_ModFileDialog +{ +public: + QVBoxLayout *verticalLayout; + QLabel *label; + QLabel *decision; + QListWidget *listWidget; + QDialogButtonBox *buttonBox; + + void setupUi(QDialog *ModFileDialog) + { + if (ModFileDialog->objectName().isEmpty()) + ModFileDialog->setObjectName(QStringLiteral("ModFileDialog")); + ModFileDialog->resize(400, 300); + verticalLayout = new QVBoxLayout(ModFileDialog); + verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + label = new QLabel(ModFileDialog); + label->setObjectName(QStringLiteral("label")); + + verticalLayout->addWidget(label); + + decision = new QLabel(ModFileDialog); + decision->setObjectName(QStringLiteral("decision")); + + verticalLayout->addWidget(decision); + + listWidget = new QListWidget(ModFileDialog); + listWidget->setObjectName(QStringLiteral("listWidget")); + + verticalLayout->addWidget(listWidget); + + buttonBox = new QDialogButtonBox(ModFileDialog); + buttonBox->setObjectName(QStringLiteral("buttonBox")); + buttonBox->setOrientation(Qt::Horizontal); + buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); + + verticalLayout->addWidget(buttonBox); + + + retranslateUi(ModFileDialog); + QObject::connect(buttonBox, SIGNAL(accepted()), ModFileDialog, SLOT(accept())); + QObject::connect(buttonBox, SIGNAL(rejected()), ModFileDialog, SLOT(reject())); + + QMetaObject::connectSlotsByName(ModFileDialog); + } // setupUi + + void retranslateUi(QDialog *ModFileDialog) + { + ModFileDialog->setWindowTitle(QApplication::translate("ModFileDialog", "Modified files", 0)); + label->setText(QString()); + decision->setText(QApplication::translate("ModFileDialog", "decision", 0)); + } // retranslateUi + +}; + +namespace Ui { + class ModFileDialog: public Ui_ModFileDialog {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_MODFILEDIALOG_H