fix .gitignore changes

[proxmark3-svn] / client / ui / ui_overlays.h

diff --git a/client/ui/ui_overlays.h b/client/ui/ui_overlays.h
index 83aa3e6cea617037574d0d00fa3ceedb42d383bf..ff0665e53e10ea03cc81572b41864c1c1b8992db 100644 (file)
--- a/client/ui/ui_overlays.h
+++ b/client/ui/ui_overlays.h
@@ -1,13 +1,13 @@
 /********************************************************************************
 /********************************************************************************

-** Form generated from reading UI file 'overlaystQ7020.ui'
+** Form generated from reading UI file 'overlays.ui'

 **
 ** Created by: Qt User Interface Compiler version 4.8.6
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 
 **
 ** Created by: Qt User Interface Compiler version 4.8.6
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/
 

-#ifndef OVERLAYSTQ7020_H
-#define OVERLAYSTQ7020_H
+#ifndef OVERLAYS_H
+#define OVERLAYS_H

 
 #include <QtCore/QVariant>
 #include <QAction>
 
 #include <QtCore/QVariant>
 #include <QAction>


@@ -34,11 +34,17 @@ public:
     QWidget *tab;
     QVBoxLayout *verticalLayout_2;
     QFormLayout *formLayout;
     QWidget *tab;
     QVBoxLayout *verticalLayout_2;
     QFormLayout *formLayout;

-    QLabel *label;

     QLabel *label_5;
     QLabel *label_5;

+    QLabel *label;

     QSlider *horizontalSlider_window;
     QSpacerItem *verticalSpacer;
     QWidget *tab_3;
     QSlider *horizontalSlider_window;
     QSpacerItem *verticalSpacer;
     QWidget *tab_3;

+    QVBoxLayout *verticalLayout_4;
+    QFormLayout *formLayout_4;
+    QLabel *label_8;
+    QLabel *label_9;
+    QSlider *horizontalSlider_askedge;
+    QSpacerItem *verticalSpacer_3;

     QWidget *tab_2;
     QVBoxLayout *verticalLayout;
     QFormLayout *formLayout_2;
     QWidget *tab_2;
     QVBoxLayout *verticalLayout;
     QFormLayout *formLayout_2;


@@ -72,16 +78,16 @@ public:
         verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
         formLayout = new QFormLayout();
         formLayout->setObjectName(QString::fromUtf8("formLayout"));
         verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
         formLayout = new QFormLayout();
         formLayout->setObjectName(QString::fromUtf8("formLayout"));

-        label = new QLabel(tab);
-        label->setObjectName(QString::fromUtf8("label"));
-
-        formLayout->setWidget(0, QFormLayout::LabelRole, label);
-

         label_5 = new QLabel(tab);
         label_5->setObjectName(QString::fromUtf8("label_5"));
 
         formLayout->setWidget(0, QFormLayout::FieldRole, label_5);
 
         label_5 = new QLabel(tab);
         label_5->setObjectName(QString::fromUtf8("label_5"));
 
         formLayout->setWidget(0, QFormLayout::FieldRole, label_5);
 

+        label = new QLabel(tab);
+        label->setObjectName(QString::fromUtf8("label"));
+
+        formLayout->setWidget(0, QFormLayout::LabelRole, label);
+

 
         verticalLayout_2->addLayout(formLayout);
 
 
         verticalLayout_2->addLayout(formLayout);
 


@@ -101,6 +107,37 @@ public:
         tabWidget_overlays->addTab(tab, QString());
         tab_3 = new QWidget();
         tab_3->setObjectName(QString::fromUtf8("tab_3"));
         tabWidget_overlays->addTab(tab, QString());
         tab_3 = new QWidget();
         tab_3->setObjectName(QString::fromUtf8("tab_3"));

+        verticalLayout_4 = new QVBoxLayout(tab_3);
+        verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
+        formLayout_4 = new QFormLayout();
+        formLayout_4->setObjectName(QString::fromUtf8("formLayout_4"));
+        formLayout_4->setContentsMargins(-1, -1, -1, 0);
+        label_8 = new QLabel(tab_3);
+        label_8->setObjectName(QString::fromUtf8("label_8"));
+
+        formLayout_4->setWidget(0, QFormLayout::LabelRole, label_8);
+
+        label_9 = new QLabel(tab_3);
+        label_9->setObjectName(QString::fromUtf8("label_9"));
+
+        formLayout_4->setWidget(0, QFormLayout::FieldRole, label_9);
+
+
+        verticalLayout_4->addLayout(formLayout_4);
+
+        horizontalSlider_askedge = new QSlider(tab_3);
+        horizontalSlider_askedge->setObjectName(QString::fromUtf8("horizontalSlider_askedge"));
+        horizontalSlider_askedge->setMinimum(5);
+        horizontalSlider_askedge->setMaximum(80);
+        horizontalSlider_askedge->setValue(20);
+        horizontalSlider_askedge->setOrientation(Qt::Horizontal);
+
+        verticalLayout_4->addWidget(horizontalSlider_askedge);
+
+        verticalSpacer_3 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout_4->addItem(verticalSpacer_3);
+

         tabWidget_overlays->addTab(tab_3, QString());
         tab_2 = new QWidget();
         tab_2->setObjectName(QString::fromUtf8("tab_2"));
         tabWidget_overlays->addTab(tab_3, QString());
         tab_2 = new QWidget();
         tab_2->setObjectName(QString::fromUtf8("tab_2"));


@@ -189,8 +226,9 @@ public:
         QObject::connect(horizontalSlider_window, SIGNAL(valueChanged(int)), label_5, SLOT(setNum(int)));
         QObject::connect(horizontalSlider_dirthr_up, SIGNAL(valueChanged(int)), label_6, SLOT(setNum(int)));
         QObject::connect(horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), label_7, SLOT(setNum(int)));
         QObject::connect(horizontalSlider_window, SIGNAL(valueChanged(int)), label_5, SLOT(setNum(int)));
         QObject::connect(horizontalSlider_dirthr_up, SIGNAL(valueChanged(int)), label_6, SLOT(setNum(int)));
         QObject::connect(horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), label_7, SLOT(setNum(int)));

+        QObject::connect(horizontalSlider_askedge, SIGNAL(valueChanged(int)), label_9, SLOT(setNum(int)));

 
 

-        tabWidget_overlays->setCurrentIndex(0);
+        tabWidget_overlays->setCurrentIndex(1);

 
 
         QMetaObject::connectSlotsByName(Form);
 
 
         QMetaObject::connectSlotsByName(Form);


@@ -199,18 +237,20 @@ public:
     void retranslateUi(QWidget *Form)
     {
         Form->setWindowTitle(QApplication::translate("Form", "Overlays", 0));
     void retranslateUi(QWidget *Form)
     {
         Form->setWindowTitle(QApplication::translate("Form", "Overlays", 0));

-        label->setText(QApplication::translate("Form", "Window size", 0));

         label_5->setText(QString());
         label_5->setText(QString());

+        label->setText(QApplication::translate("Form", "Window size", 0));

         tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab), QApplication::translate("Form", "Autocorrelate", 0));
         tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab), QApplication::translate("Form", "Autocorrelate", 0));

-        tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_3), QApplication::translate("Form", "Askdemod", 0));
+        label_8->setText(QApplication::translate("Form", "Edge Jump Threshold", 0));
+        label_9->setText(QString());
+        tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_3), QApplication::translate("Form", "AskEdge", 0));

         label_2->setText(QApplication::translate("Form", "Up", 0));
         label_6->setText(QString());
         label_3->setText(QApplication::translate("Form", "Down", 0));
         label_7->setText(QString());
         tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_2), QApplication::translate("Form", "Dirthreshold", 0));
         pushButton_apply->setText(QApplication::translate("Form", "Apply", 0));
         label_2->setText(QApplication::translate("Form", "Up", 0));
         label_6->setText(QString());
         label_3->setText(QApplication::translate("Form", "Down", 0));
         label_7->setText(QString());
         tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_2), QApplication::translate("Form", "Dirthreshold", 0));
         pushButton_apply->setText(QApplication::translate("Form", "Apply", 0));

-        pushButton_sticky->setText(QApplication::translate("Form", "Sticky", 0));
-        label_4->setText(QApplication::translate("Form", "TextLabel", 0));
+        pushButton_sticky->setText(QApplication::translate("Form", "Restore", 0));
+        label_4->setText(QString());

     } // retranslateUi
 
 };
     } // retranslateUi
 
 };


@@ -221,4 +261,4 @@ namespace Ui {
 
 QT_END_NAMESPACE
 
 
 QT_END_NAMESPACE
 

-#endif // OVERLAYSTQ7020_H
+#endif // OVERLAYS_H