Skip to content

Commit

Permalink
pull last fixes + change release script
Browse files Browse the repository at this point in the history
  • Loading branch information
@aknoerig
aknoerig committed Apr 28, 2016
1 parent f2433ed commit b05e84b
Show file tree
Hide file tree
Showing 6 changed files with 471 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#####################
phoenix.pro.user
/phoenix-build-*
/release*
/build*
/debug*
*.user
*.user*

Expand Down
0 fritzing.sh → Fritzing.sh
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions tools/linux_release_script/release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down
230 changes: 230 additions & 0 deletions ui_consolesettings.h
View file
Original file line number Diff line number Diff line change
@@ -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 <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QVBoxLayout>

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
Loading

0 comments on commit b05e84b

Please sign in to comment.