Subversion Repositories OpenInventory

Compare Revisions

Ignore whitespace Rev 209 → Rev 208

/trunk/DBViewer/treedelegateform.ui
File deleted
/trunk/DBViewer/treedelegateform.cpp
File deleted
/trunk/DBViewer/treedelegateform.h
File deleted
/trunk/DBViewer/mainwindow.ui
191,11 → 191,6
<string>row</string>
</property>
</column>
<column>
<property name="text">
<string>Фильтр</string>
</property>
</column>
</widget>
</item>
<item>
/trunk/DBViewer/mainwindow.cpp
35,7 → 35,6
ui->treeWidget_2->setAlternatingRowColors(true);
 
ui->treeWidget->setIconSize(QSize(30,30));
ui->treeWidget->setColumnWidth(0, 400);
ui->treeWidget_2->setIconSize(QSize(128,128));
 
MainWindow::readSettings();
87,7 → 86,6
ui->pushButton_4->setEnabled(false);
 
// setFrm.show();
treeForm.show();
 
connect(ui->getsettingAct, SIGNAL(triggered()), this, SLOT(getSetting())); // âûáîð â ãëàâíîé ôîðìå â ìåíþ "Áàçà äàííûõ" ïóíêòà "Ïàðàìåòðû ñîåäèíåíèÿ"
connect(setFrm.pushButton, SIGNAL(clicked()), this, SLOT(applySetting()));
194,17 → 192,7
// // // parents.last()->appendChild(new QTreeWidgetItem(columnData, parents.last()));
QTreeWidgetItem* itm_tmp;
itm_tmp = new QTreeWidgetItem( parents.last());
itm_tmp->setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled);
 
/*
QLineEdit * edit_line;
edit_line = new QLineEdit(this);
ui->treeWidget->setItemWidget(itm_tmp, 5, edit_line);
*/
//static QStandartDelegate delegate;
ui->treeWidget->setItemDelegateForColumn(5, &standart_delegate);
 
 
itm_tmp->setText(0, QString(columnData.at(0).toString()));
if (columnData.at(1).toString() == "true") {
itm_tmp->setCheckState(0,Qt::Checked);
/trunk/DBViewer/mainwindow.h
8,7 → 8,6
#include "settingform.h"
#include "delegate.h"
// #include "fileform.h"
#include "treedelegateform.h"
 
#include <QMainWindow>
#include <QStandardItemModel>
64,7 → 63,6
private:
Ui::MainWindow *ui;
//FileForm fileForm;
TreeDelegateForm treeForm;
 
settingForm setFrm;
//ïåðåìåííûå äëÿ ñîåäèíåíèÿ ñ áàçîé
/trunk/DBViewer/DBViewer.pro
20,18 → 20,15
mymodel.cpp \
settingform.cpp \
iconform.cpp \
fileform.cpp \
treedelegateform.cpp
fileform.cpp
HEADERS += mainwindow.h \
delegate.h \
mymodel.h \
settingform.h \
iconform.h \
fileform.h \
treedelegateform.h
fileform.h
FORMS += mainwindow.ui \
settingform.ui \
iconform.ui \
fileform.ui \
treedelegateform.ui
fileform.ui
RESOURCES += dbviewer.qrc