Skip to content

Commit

Permalink
Revert "Probably outdated..."
Browse files Browse the repository at this point in the history
This reverts commit 464da4da9c1fa8380a6b51a660b74ddcd591b34b.
  • Loading branch information
Utat Uav committed Jan 1, 2015
1 parent 3707261 commit 7c7fd94
Show file tree
Hide file tree
Showing 37 changed files with 516 additions and 3,735 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

QT_BEGIN_MOC_NAMESPACE
struct qt_meta_stringdata_MainPicWidget_t {
QByteArrayData data[3];
char stringdata[26];
QByteArrayData data[4];
char stringdata[44];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
Expand All @@ -31,9 +31,10 @@ static const qt_meta_stringdata_MainPicWidget_t qt_meta_stringdata_MainPicWidget
{
QT_MOC_LITERAL(0, 0, 13),
QT_MOC_LITERAL(1, 14, 10),
QT_MOC_LITERAL(2, 25, 0)
QT_MOC_LITERAL(2, 25, 0),
QT_MOC_LITERAL(3, 26, 17)
},
"MainPicWidget\0toggleMode\0"
"MainPicWidget\0toggleMode\0\0mainWindowResized"
};
#undef QT_MOC_LITERAL

Expand All @@ -43,17 +44,19 @@ static const uint qt_meta_data_MainPicWidget[] = {
7, // revision
0, // classname
0, 0, // classinfo
1, 14, // methods
2, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount

// slots: name, argc, parameters, tag, flags
1, 0, 19, 2, 0x0a /* Public */,
1, 0, 24, 2, 0x0a /* Public */,
3, 0, 25, 2, 0x0a /* Public */,

// slots: parameters
QMetaType::Void,
QMetaType::Void,

0 // eod
Expand All @@ -65,6 +68,7 @@ void MainPicWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i
MainPicWidget *_t = static_cast<MainPicWidget *>(_o);
switch (_id) {
case 0: _t->toggleMode(); break;
case 1: _t->mainWindowResized(); break;
default: ;
}
}
Expand Down Expand Up @@ -96,13 +100,13 @@ int MainPicWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 1)
if (_id < 2)
qt_static_metacall(this, _c, _id, _a);
_id -= 1;
_id -= 2;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 1)
if (_id < 2)
*reinterpret_cast<int*>(_a[0]) = -1;
_id -= 1;
_id -= 2;
}
return _id;
}
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenu>
#include <QtWidgets/QMenuBar>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QScrollArea>
#include <QtWidgets/QStatusBar>
#include <QtWidgets/QToolBar>
#include <QtWidgets/QWidget>
Expand All @@ -27,7 +31,13 @@ class Ui_MainWindow
public:
QAction *actionOpen;
QWidget *centralWidget;
QScrollArea *scrollArea;
QWidget *scrollAreaWidgetContents;
QWidget *gridLayoutWidget;
QGridLayout *scrollAreaGridLayout;
QPushButton *pushButton;
QMenuBar *menuBar;
QMenu *menuFile;
QToolBar *mainToolBar;
QStatusBar *statusBar;

Expand All @@ -40,10 +50,34 @@ class Ui_MainWindow
actionOpen->setObjectName(QStringLiteral("actionOpen"));
centralWidget = new QWidget(MainWindow);
centralWidget->setObjectName(QStringLiteral("centralWidget"));
scrollArea = new QScrollArea(centralWidget);
scrollArea->setObjectName(QStringLiteral("scrollArea"));
scrollArea->setGeometry(QRect(10, 30, 631, 321));
scrollArea->setWidgetResizable(true);
scrollAreaWidgetContents = new QWidget();
scrollAreaWidgetContents->setObjectName(QStringLiteral("scrollAreaWidgetContents"));
scrollAreaWidgetContents->setGeometry(QRect(0, 0, 629, 319));
gridLayoutWidget = new QWidget(scrollAreaWidgetContents);
gridLayoutWidget->setObjectName(QStringLiteral("gridLayoutWidget"));
gridLayoutWidget->setGeometry(QRect(0, 0, 631, 321));
scrollAreaGridLayout = new QGridLayout(gridLayoutWidget);
scrollAreaGridLayout->setSpacing(6);
scrollAreaGridLayout->setContentsMargins(11, 11, 11, 11);
scrollAreaGridLayout->setObjectName(QStringLiteral("scrollAreaGridLayout"));
scrollAreaGridLayout->setSizeConstraint(QLayout::SetFixedSize);
scrollAreaGridLayout->setContentsMargins(0, 0, 0, 0);
pushButton = new QPushButton(gridLayoutWidget);
pushButton->setObjectName(QStringLiteral("pushButton"));

scrollAreaGridLayout->addWidget(pushButton, 0, 0, 1, 1);

scrollArea->setWidget(scrollAreaWidgetContents);
MainWindow->setCentralWidget(centralWidget);
menuBar = new QMenuBar(MainWindow);
menuBar->setObjectName(QStringLiteral("menuBar"));
menuBar->setGeometry(QRect(0, 0, 683, 21));
menuFile = new QMenu(menuBar);
menuFile->setObjectName(QStringLiteral("menuFile"));
MainWindow->setMenuBar(menuBar);
mainToolBar = new QToolBar(MainWindow);
mainToolBar->setObjectName(QStringLiteral("mainToolBar"));
Expand All @@ -52,6 +86,9 @@ class Ui_MainWindow
statusBar->setObjectName(QStringLiteral("statusBar"));
MainWindow->setStatusBar(statusBar);

menuBar->addAction(menuFile->menuAction());
menuFile->addAction(actionOpen);

retranslateUi(MainWindow);

QMetaObject::connectSlotsByName(MainWindow);
Expand All @@ -61,6 +98,8 @@ class Ui_MainWindow
{
MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
actionOpen->setText(QApplication::translate("MainWindow", "Open", 0));
pushButton->setText(QApplication::translate("MainWindow", "Button", 0));
menuFile->setTitle(QApplication::translate("MainWindow", "File", 0));
} // retranslateUi

};
Expand Down
Loading

0 comments on commit 7c7fd94

Please sign in to comment.