Хранилища Subversion OpenInventory

Сравнить редакции

Не учитывать пробелы Редакция 204 → Редакция 205

/trunk/DBViewer/mainwindow.ui
6,8 → 6,8
<rect>
<x>0</x>
<y>0</y>
<width>1098</width>
<height>697</height>
<width>1103</width>
<height>710</height>
</rect>
</property>
<property name="windowTitle">
14,251 → 14,274
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralWidget">
<widget class="QTabWidget" name="tabWidget">
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>1071</width>
<height>591</height>
<y>20</y>
<width>1081</width>
<height>611</height>
</rect>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Данные</string>
</attribute>
<widget class="QTreeWidget" name="treeWidget_2">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>491</width>
<height>451</height>
</rect>
</property>
<column>
<property name="text">
<string notr="true">1</string>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
</column>
<column>
<property name="text">
<string>Тип узла</string>
</property>
</column>
<column>
<property name="text">
<string>ID</string>
</property>
</column>
<column>
<property name="text">
<string>Хранилище</string>
</property>
</column>
<column>
<property name="text">
<string>Поле-указатель</string>
</property>
</column>
</widget>
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>530</x>
<y>450</y>
<width>251</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>Добавить новый объект</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_3">
<property name="geometry">
<rect>
<x>530</x>
<y>490</y>
<width>151</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>Применить</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_2">
<property name="geometry">
<rect>
<x>850</x>
<y>450</y>
<width>211</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>Удалить объект</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_4">
<property name="geometry">
<rect>
<x>850</x>
<y>490</y>
<width>211</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>Сбросить изменения</string>
</property>
</widget>
<widget class="QTableView" name="tableView">
<property name="geometry">
<rect>
<x>510</x>
<y>10</y>
<width>551</width>
<height>431</height>
</rect>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Модели</string>
</attribute>
<widget class="QTreeWidget" name="treeWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>471</width>
<height>451</height>
</rect>
</property>
<column>
<property name="text">
<string notr="true">Имя класа</string>
</property>
</column>
<column>
<property name="text">
<string>ID класса</string>
</property>
</column>
<column>
<property name="text">
<string>Ном. стр.</string>
</property>
</column>
<column>
<property name="text">
<string>Ур. вл.</string>
</property>
</column>
<column>
<property name="text">
<string>row</string>
</property>
</column>
</widget>
<widget class="QComboBox" name="comboBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>480</y>
<width>381</width>
<height>31</height>
</rect>
</property>
<property name="editable">
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>420</x>
<y>480</y>
<width>78</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>ID</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_5">
<property name="geometry">
<rect>
<x>490</x>
<y>450</y>
<width>191</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>Добавить модель</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_7">
<property name="geometry">
<rect>
<x>490</x>
<y>490</y>
<width>130</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>Применить</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_6">
<property name="geometry">
<rect>
<x>830</x>
<y>450</y>
<width>221</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>Удалить модель</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_8">
<property name="geometry">
<rect>
<x>840</x>
<y>490</y>
<width>211</width>
<height>30</height>
</rect>
</property>
<property name="text">
<string>Сбросить изменения</string>
</property>
</widget>
<widget class="QTableView" name="tableView_2">
<property name="geometry">
<rect>
<x>490</x>
<y>10</y>
<width>561</width>
<height>431</height>
</rect>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Данные</string>
</attribute>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>10</y>
<width>1061</width>
<height>561</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QTreeWidget" name="treeWidget_2">
<property name="maximumSize">
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
<column>
<property name="text">
<string>Тип узла</string>
</property>
</column>
<column>
<property name="text">
<string>ID</string>
</property>
</column>
<column>
<property name="text">
<string>Хранилище</string>
</property>
</column>
<column>
<property name="text">
<string>Поле-указатель</string>
</property>
</column>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QTableView" name="tableView">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>3</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Добавить новый объект</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_3">
<property name="text">
<string>Применить</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>Удалить объект</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_4">
<property name="text">
<string>Сбросить изменения</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Модели</string>
</attribute>
<widget class="QWidget" name="horizontalLayoutWidget_2">
<property name="geometry">
<rect>
<x>10</x>
<y>9</y>
<width>1051</width>
<height>561</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QTreeWidget" name="treeWidget">
<column>
<property name="text">
<string notr="true">Имя класа</string>
</property>
</column>
<column>
<property name="text">
<string>ID класса</string>
</property>
</column>
<column>
<property name="text">
<string>Ном. стр.</string>
</property>
</column>
<column>
<property name="text">
<string>Ур. вл.</string>
</property>
</column>
<column>
<property name="text">
<string>row</string>
</property>
</column>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QComboBox" name="comboBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="editable">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>ID</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QTableView" name="tableView_2"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QPushButton" name="pushButton_5">
<property name="text">
<string>Добавить модель</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_7">
<property name="text">
<string>Применить</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QPushButton" name="pushButton_6">
<property name="text">
<string>Удалить модель</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_8">
<property name="text">
<string>Сбросить изменения</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="QMenuBar" name="menuBar">
266,7 → 289,7
<rect>
<x>0</x>
<y>0</y>
<width>1098</width>
<width>1103</width>
<height>27</height>
</rect>
</property>
/trunk/DBViewer/delegate.cpp
544,6 → 544,9
*/
 
 
 
 
 
QPalette::ColorGroup cg = (option.state & QStyle::State_Enabled) ?
((option.state & QStyle::State_Active) ? QPalette::Normal : QPalette::Inactive ) :
QPalette::Disabled;
553,11 → 556,13
 
painter->fillRect(option.rect, option.palette.color(cg, QPalette::Highlight));
 
 
 
int nX = option.rect.x() + ( ( option.rect.width() - m_pxPicture.rect().width() ) / 2 );
int nY = option.rect.y() + ( ( option.rect.height() - m_pxPicture.rect().height() ) / 2 );
// painter->setRenderHint(QPainter::Antialiasing);
painter->drawPixmap( nX, nY, m_pxPicture );
 
 
// drawFocus(painter, option, option.rect.adjusted(0, 0, -1, -1)); // since we draw the grid ourselves
 
/*
/trunk/DBViewer/mainwindow.cpp
6,6 → 6,9
ui(new Ui::MainWindow)
{
ui->setupUi(this);
ui->centralWidget->setLayout(ui->verticalLayout);
ui->tab->setLayout(ui->horizontalLayout);
ui->tab_2->setLayout(ui->horizontalLayout_3);
// connect( ui->comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(on_currentIndexChanged(int)));
model_is_build = false;
// MainWindow::readModel();